diff --git a/dsp/dsp.iml b/dsp/dsp.iml
index e8cfc03..6453e56 100644
--- a/dsp/dsp.iml
+++ b/dsp/dsp.iml
@@ -20,7 +20,7 @@
-
+
diff --git a/oscm/server/src/main/java/com/jsc/oscm/service/TaskService.java b/oscm/server/src/main/java/com/jsc/oscm/service/TaskService.java
index fb96e36..ad1d33e 100644
--- a/oscm/server/src/main/java/com/jsc/oscm/service/TaskService.java
+++ b/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 params = new HashMap<>();
//先更新xxljob
XxlJobInfo xxlJobInfo = buildXxlJobByTask(task);
String resultString = HttpUtil.post(xxlJobAdminServer + "xxl-job-admin/api/update", xxlJobInfo);
diff --git a/xxl-job/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java b/xxl-job/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java
index 7a1b277..30c5435 100644
--- a/xxl-job/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java
+++ b/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,31 +63,34 @@ public class JobApiController {
// valid
if (!"POST".equalsIgnoreCase(request.getMethod())) {
- return new ReturnT(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(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(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)) {
- List callbackParamList = GsonTool.fromJson(data, List.class, HandleCallbackParam.class);
- return adminBiz.callback(callbackParamList);
- } else if ("registry".equals(uri)) {
- RegistryParam registryParam = GsonTool.fromJson(data, RegistryParam.class);
- return adminBiz.registry(registryParam);
- } else if ("registryRemove".equals(uri)) {
- RegistryParam registryParam = GsonTool.fromJson(data, RegistryParam.class);
- return adminBiz.registryRemove(registryParam);
-
- }else {
- return new ReturnT(ReturnT.FAIL_CODE, "invalid request, uri-mapping("+ uri +") not found.");
- }
+ switch (uri) {
+ case "callback":
+ List callbackParamList = GsonTool.fromJson(data, List.class, HandleCallbackParam.class);
+ return adminBiz.callback(callbackParamList);
+ case "registry": {
+ RegistryParam registryParam = GsonTool.fromJson(data, RegistryParam.class);
+ return adminBiz.registry(registryParam);
+ }
+ case "registryRemove": {
+ RegistryParam registryParam = GsonTool.fromJson(data, RegistryParam.class);
+ return adminBiz.registryRemove(registryParam);
+
+ }
+ default:
+ return new ReturnT(ReturnT.FAIL_CODE, "invalid request, uri-mapping(" + uri + ") not found.");
+ }
}
diff --git a/xxl-job/xxl-job-executor/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java b/xxl-job/xxl-job-executor/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java
index b61680f..5be0b00 100644
--- a/xxl-job/xxl-job-executor/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java
+++ b/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;