Merge branch '4.2.0-main' into v4.2.0

docker-compose.yml

@@ -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

powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/JobInfoVO.java

@@ -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;

powerjob-server/powerjob-server-starter/src/main/resources/banner.txt

@@ -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}

powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/MapProcessorDemo.java

@@ -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;
     }

powerjob-worker-samples/src/main/java/tech/powerjob/samples/processors/MapReduceProcessorDemo.java

@@ -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;
     }