Merge branch '4.2.0-main' into v4.2.0

This commit is contained in:
tjq 2022-10-03 13:59:14 +08:00
commit 60209ebbc1
7 changed files with 11 additions and 7 deletions

View File

@ -14,7 +14,7 @@ services:
container_name: powerjob-mysql
image: powerjob/powerjob-mysql:4.1.1
ports:
- "3306:3306"
- "3307:3306"
volumes:
- ./powerjob-data/powerjob-mysql:/var/lib/mysql
command: --lower_case_table_names=1

View File

@ -187,6 +187,9 @@ public class JobInfoVO {
if (!StringUtils.isEmpty(jobInfoDO.getLogConfig())) {
jobInfoVO.setLogConfig(JSONObject.parseObject(jobInfoDO.getLogConfig(), LogConfig.class));
} else {
// 不存在 job 配置时防止前端报错
jobInfoVO.setLogConfig(new LogConfig());
}
return jobInfoVO;

View File

@ -12,3 +12,4 @@ ${AnsiColor.BRIGHT_RED}
* OfficialWebsite: http://www.powerjob.tech/
* SourceCode: https://github.com/PowerJob/PowerJob
* PoweredBy: SpringBoot${spring-boot.formatted-version} & Akka (v2.6.12) & Vert.x (v4.0.2)
${AnsiColor.DEFAULT}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -87,7 +87,7 @@ public class MapProcessorDemo implements MapProcessor {
@Getter
@NoArgsConstructor
@AllArgsConstructor
private static class SubTask {
public static class SubTask {
private Integer siteId;
private List<Integer> itemIds;
}

View File

@ -87,7 +87,7 @@ public class MapReduceProcessorDemo implements MapReduceProcessor {
@ToString
@NoArgsConstructor
@AllArgsConstructor
private static class TestSubTask {
public static class TestSubTask {
private String name;
private int age;
}