|
@@ -2,6 +2,7 @@ package com.xxl.job.admin.controller;
|
2
|
2
|
|
3
|
3
|
import com.xxl.job.admin.controller.annotation.PermissionLimit;
|
4
|
4
|
import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
|
|
5
|
+import com.xxl.job.admin.core.exception.XxlJobException;
|
5
|
6
|
import com.xxl.job.admin.core.util.JacksonUtil;
|
6
|
7
|
import com.xxl.job.core.biz.AdminBiz;
|
7
|
8
|
import com.xxl.job.core.biz.model.HandleCallbackParam;
|
|
@@ -28,6 +29,37 @@ public class JobApiController {
|
28
|
29
|
private AdminBiz adminBiz;
|
29
|
30
|
|
30
|
31
|
|
|
32
|
+ // ---------------------- base ----------------------
|
|
33
|
+
|
|
34
|
+ /**
|
|
35
|
+ * valid access token
|
|
36
|
+ */
|
|
37
|
+ private void validAccessToken(HttpServletRequest request){
|
|
38
|
+ if (XxlJobAdminConfig.getAdminConfig().getAccessToken()!=null
|
|
39
|
+ && XxlJobAdminConfig.getAdminConfig().getAccessToken().trim().length()>0
|
|
40
|
+ && !XxlJobAdminConfig.getAdminConfig().getAccessToken().equals(request.getHeader(XxlJobRemotingUtil.XXL_RPC_ACCESS_TOKEN))) {
|
|
41
|
+ throw new XxlJobException("The access token is wrong.");
|
|
42
|
+ }
|
|
43
|
+ }
|
|
44
|
+
|
|
45
|
+ /**
|
|
46
|
+ * parse Param
|
|
47
|
+ */
|
|
48
|
+ private Object parseParam(String data, Class<?> parametrized, Class<?>... parameterClasses){
|
|
49
|
+ Object param = null;
|
|
50
|
+ try {
|
|
51
|
+ if (parameterClasses != null) {
|
|
52
|
+ param = JacksonUtil.readValue(data, parametrized, parameterClasses);
|
|
53
|
+ } else {
|
|
54
|
+ param = JacksonUtil.readValue(data, parametrized);
|
|
55
|
+ }
|
|
56
|
+ } catch (Exception e) { }
|
|
57
|
+ if (param==null) {
|
|
58
|
+ throw new XxlJobException("The request data invalid.");
|
|
59
|
+ }
|
|
60
|
+ return param;
|
|
61
|
+ }
|
|
62
|
+
|
31
|
63
|
// ---------------------- admin biz ----------------------
|
32
|
64
|
|
33
|
65
|
/**
|
|
@@ -41,20 +73,10 @@ public class JobApiController {
|
41
|
73
|
@PermissionLimit(limit=false)
|
42
|
74
|
public ReturnT<String> callback(HttpServletRequest request, @RequestBody(required = false) String data) {
|
43
|
75
|
// valid
|
44
|
|
- if (XxlJobAdminConfig.getAdminConfig().getAccessToken()!=null
|
45
|
|
- && XxlJobAdminConfig.getAdminConfig().getAccessToken().trim().length()>0
|
46
|
|
- && !XxlJobAdminConfig.getAdminConfig().getAccessToken().equals(request.getHeader(XxlJobRemotingUtil.XXL_RPC_ACCESS_TOKEN))) {
|
47
|
|
- return new ReturnT<String>(ReturnT.FAIL_CODE, "The access token is wrong.");
|
48
|
|
- }
|
|
76
|
+ validAccessToken(request);
|
49
|
77
|
|
50
|
78
|
// param
|
51
|
|
- List<HandleCallbackParam> callbackParamList = null;
|
52
|
|
- try {
|
53
|
|
- callbackParamList = JacksonUtil.readValue(data, List.class, HandleCallbackParam.class);
|
54
|
|
- } catch (Exception e) { }
|
55
|
|
- if (callbackParamList==null || callbackParamList.size()==0) {
|
56
|
|
- return new ReturnT<String>(ReturnT.FAIL_CODE, "The request data invalid.");
|
57
|
|
- }
|
|
79
|
+ List<HandleCallbackParam> callbackParamList = (List<HandleCallbackParam>) parseParam(data, List.class, HandleCallbackParam.class);
|
58
|
80
|
|
59
|
81
|
// invoke
|
60
|
82
|
return adminBiz.callback(callbackParamList);
|
|
@@ -73,20 +95,10 @@ public class JobApiController {
|
73
|
95
|
@PermissionLimit(limit=false)
|
74
|
96
|
public ReturnT<String> registry(HttpServletRequest request, @RequestBody(required = false) String data) {
|
75
|
97
|
// valid
|
76
|
|
- if (XxlJobAdminConfig.getAdminConfig().getAccessToken()!=null
|
77
|
|
- && XxlJobAdminConfig.getAdminConfig().getAccessToken().trim().length()>0
|
78
|
|
- && !XxlJobAdminConfig.getAdminConfig().getAccessToken().equals(request.getHeader(XxlJobRemotingUtil.XXL_RPC_ACCESS_TOKEN))) {
|
79
|
|
- return new ReturnT<String>(ReturnT.FAIL_CODE, "The access token is wrong.");
|
80
|
|
- }
|
|
98
|
+ validAccessToken(request);
|
81
|
99
|
|
82
|
100
|
// param
|
83
|
|
- RegistryParam registryParam = null;
|
84
|
|
- try {
|
85
|
|
- registryParam = JacksonUtil.readValue(data, RegistryParam.class);
|
86
|
|
- } catch (Exception e) {}
|
87
|
|
- if (registryParam == null) {
|
88
|
|
- return new ReturnT<String>(ReturnT.FAIL_CODE, "The request data invalid.");
|
89
|
|
- }
|
|
101
|
+ RegistryParam registryParam = (RegistryParam) parseParam(data, RegistryParam.class);
|
90
|
102
|
|
91
|
103
|
// invoke
|
92
|
104
|
return adminBiz.registry(registryParam);
|
|
@@ -103,20 +115,10 @@ public class JobApiController {
|
103
|
115
|
@PermissionLimit(limit=false)
|
104
|
116
|
public ReturnT<String> registryRemove(HttpServletRequest request, @RequestBody(required = false) String data) {
|
105
|
117
|
// valid
|
106
|
|
- if (XxlJobAdminConfig.getAdminConfig().getAccessToken()!=null
|
107
|
|
- && XxlJobAdminConfig.getAdminConfig().getAccessToken().trim().length()>0
|
108
|
|
- && !XxlJobAdminConfig.getAdminConfig().getAccessToken().equals(request.getHeader(XxlJobRemotingUtil.XXL_RPC_ACCESS_TOKEN))) {
|
109
|
|
- return new ReturnT<String>(ReturnT.FAIL_CODE, "The access token is wrong.");
|
110
|
|
- }
|
|
118
|
+ validAccessToken(request);
|
111
|
119
|
|
112
|
120
|
// param
|
113
|
|
- RegistryParam registryParam = null;
|
114
|
|
- try {
|
115
|
|
- registryParam = JacksonUtil.readValue(data, RegistryParam.class);
|
116
|
|
- } catch (Exception e) {}
|
117
|
|
- if (registryParam == null) {
|
118
|
|
- return new ReturnT<String>(ReturnT.FAIL_CODE, "The request data invalid.");
|
119
|
|
- }
|
|
121
|
+ RegistryParam registryParam = (RegistryParam) parseParam(data, RegistryParam.class);
|
120
|
122
|
|
121
|
123
|
// invoke
|
122
|
124
|
return adminBiz.registryRemove(registryParam);
|