同步近期修改

dsp/dsp.iml

@@ -20,7 +20,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:24.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:26.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.18" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.75" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />

oscm/server/src/main/java/com/jsc/oscm/service/TaskService.java

@@ -86,7 +86,6 @@ public class TaskService {
     public boolean updateTaskDirect(Task task) {
         task.setCron(task.getCron() == null || task.getCron().length() == 0 ? "0 0 0/6 * * ? *" : task.getCron()); //默认采集频率6小时一次
 
-        Map<String, String> params = new HashMap<>();
         //先更新xxljob
         XxlJobInfo xxlJobInfo = buildXxlJobByTask(task);
         String resultString = HttpUtil.post(xxlJobAdminServer + "xxl-job-admin/api/update", xxlJobInfo);

xxl-job/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java

@@ -48,7 +48,7 @@ public class JobApiController {
 	@Resource
 	private XxlJobService xxlJobService;
 	
-	private static Logger logger = LoggerFactory.getLogger(JobApiController.class);
+	private static final Logger logger = LoggerFactory.getLogger(JobApiController.class);
     /**
      * api
      *
@@ -63,30 +63,33 @@ public class JobApiController {
 
         // valid
         if (!"POST".equalsIgnoreCase(request.getMethod())) {
-            return new ReturnT<String>(ReturnT.FAIL_CODE, "invalid request, HttpMethod not support.");
+            return new ReturnT<>(ReturnT.FAIL_CODE, "invalid request, HttpMethod not support.");
         }
         if (uri==null || uri.trim().length()==0) {
-            return new ReturnT<String>(ReturnT.FAIL_CODE, "invalid request, uri-mapping empty.");
+            return new ReturnT<>(ReturnT.FAIL_CODE, "invalid request, uri-mapping empty.");
         }
         if (XxlJobAdminConfig.getAdminConfig().getAccessToken()!=null
                 && XxlJobAdminConfig.getAdminConfig().getAccessToken().trim().length()>0
                 && !XxlJobAdminConfig.getAdminConfig().getAccessToken().equals(request.getHeader(XxlJobRemotingUtil.XXL_JOB_ACCESS_TOKEN))) {
-            return new ReturnT<String>(ReturnT.FAIL_CODE, "The access token is wrong.");
+            return new ReturnT<>(ReturnT.FAIL_CODE, "The access token is wrong.");
         }
 
         // services mapping
-        if ("callback".equals(uri)) {
+		switch (uri) {
+			case "callback":
 				List<HandleCallbackParam> callbackParamList = GsonTool.fromJson(data, List.class, HandleCallbackParam.class);
 				return adminBiz.callback(callbackParamList);
-        } else if ("registry".equals(uri)) {
+			case "registry": {
 				RegistryParam registryParam = GsonTool.fromJson(data, RegistryParam.class);
 				return adminBiz.registry(registryParam);
-        } else if ("registryRemove".equals(uri)) {
+			}
+			case "registryRemove": {
 				RegistryParam registryParam = GsonTool.fromJson(data, RegistryParam.class);
 				return adminBiz.registryRemove(registryParam);
 
-        }else {
+			}
-            return new ReturnT<String>(ReturnT.FAIL_CODE, "invalid request, uri-mapping("+ uri +") not found.");
+			default:
+				return new ReturnT<String>(ReturnT.FAIL_CODE, "invalid request, uri-mapping(" + uri + ") not found.");
 		}
 
     }

xxl-job/xxl-job-executor/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java

@@ -37,7 +37,7 @@ import java.util.UUID;
  */
 @Component
 public class SampleXxlJob {
-    private static final Logger logger = LoggerFactory.getLogger(SampleXxlJob.class);
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
     @Value(value = "${oscm.server.url}")
     private String oscmServer;