ソースを参照

权限管理:执行器维度进行权限控制,管理员拥有全量权限,普通用户需要分配执行器权限后才允许相关操作

xuxueli 6 年 前
コミット
7ccdd75d4a

+ 34 - 3
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java ファイルの表示

1
 package com.xxl.job.admin.controller;
1
 package com.xxl.job.admin.controller;
2
 
2
 
3
+import com.xxl.job.admin.core.exception.XxlJobException;
3
 import com.xxl.job.admin.core.model.XxlJobGroup;
4
 import com.xxl.job.admin.core.model.XxlJobGroup;
4
 import com.xxl.job.admin.core.model.XxlJobInfo;
5
 import com.xxl.job.admin.core.model.XxlJobInfo;
6
+import com.xxl.job.admin.core.model.XxlJobUser;
5
 import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
7
 import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
6
 import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
8
 import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
7
 import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
9
 import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
10
+import com.xxl.job.admin.core.util.I18nUtil;
8
 import com.xxl.job.admin.dao.XxlJobGroupDao;
11
 import com.xxl.job.admin.dao.XxlJobGroupDao;
12
+import com.xxl.job.admin.service.LoginService;
9
 import com.xxl.job.admin.service.XxlJobService;
13
 import com.xxl.job.admin.service.XxlJobService;
10
 import com.xxl.job.core.biz.model.ReturnT;
14
 import com.xxl.job.core.biz.model.ReturnT;
11
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
15
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
12
 import com.xxl.job.core.glue.GlueTypeEnum;
16
 import com.xxl.job.core.glue.GlueTypeEnum;
13
 import org.springframework.stereotype.Controller;
17
 import org.springframework.stereotype.Controller;
14
 import org.springframework.ui.Model;
18
 import org.springframework.ui.Model;
19
+import org.springframework.util.StringUtils;
15
 import org.springframework.web.bind.annotation.RequestMapping;
20
 import org.springframework.web.bind.annotation.RequestMapping;
16
 import org.springframework.web.bind.annotation.RequestParam;
21
 import org.springframework.web.bind.annotation.RequestParam;
17
 import org.springframework.web.bind.annotation.ResponseBody;
22
 import org.springframework.web.bind.annotation.ResponseBody;
18
 
23
 
19
 import javax.annotation.Resource;
24
 import javax.annotation.Resource;
25
+import javax.servlet.http.HttpServletRequest;
26
+import java.util.ArrayList;
27
+import java.util.Arrays;
20
 import java.util.List;
28
 import java.util.List;
21
 import java.util.Map;
29
 import java.util.Map;
22
 
30
 
34
 	private XxlJobService xxlJobService;
42
 	private XxlJobService xxlJobService;
35
 	
43
 	
36
 	@RequestMapping
44
 	@RequestMapping
37
-	public String index(Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
45
+	public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
38
 
46
 
39
 		// 枚举-字典
47
 		// 枚举-字典
40
 		model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values());	// 路由策略-列表
48
 		model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values());	// 路由策略-列表
41
 		model.addAttribute("GlueTypeEnum", GlueTypeEnum.values());								// Glue类型-字典
49
 		model.addAttribute("GlueTypeEnum", GlueTypeEnum.values());								// Glue类型-字典
42
 		model.addAttribute("ExecutorBlockStrategyEnum", ExecutorBlockStrategyEnum.values());	// 阻塞处理策略-字典
50
 		model.addAttribute("ExecutorBlockStrategyEnum", ExecutorBlockStrategyEnum.values());	// 阻塞处理策略-字典
43
 
51
 
44
-		// 任务组
45
-		List<XxlJobGroup> jobGroupList =  xxlJobGroupDao.findAll();
52
+		// 执行器列表
53
+		List<XxlJobGroup> jobGroupList_all =  xxlJobGroupDao.findAll();
54
+
55
+		// filter group
56
+		List<XxlJobGroup> jobGroupList = new ArrayList<>();
57
+		if (jobGroupList_all!=null && jobGroupList_all.size()>0) {
58
+			XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
59
+			if (loginUser.getRole() == 1) {
60
+				jobGroupList = jobGroupList_all;
61
+			} else {
62
+				List<String> groupIdStrs = new ArrayList<>();
63
+				if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) {
64
+					groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(","));
65
+				}
66
+				for (XxlJobGroup groupItem:jobGroupList_all) {
67
+					if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) {
68
+						jobGroupList.add(groupItem);
69
+					}
70
+				}
71
+			}
72
+		}
73
+		if (jobGroupList==null || jobGroupList.size()==0) {
74
+			throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
75
+		}
76
+
46
 		model.addAttribute("JobGroupList", jobGroupList);
77
 		model.addAttribute("JobGroupList", jobGroupList);
47
 		model.addAttribute("jobGroup", jobGroup);
78
 		model.addAttribute("jobGroup", jobGroup);
48
 
79
 

+ 30 - 6
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java ファイルの表示

1
 package com.xxl.job.admin.controller;
1
 package com.xxl.job.admin.controller;
2
 
2
 
3
+import com.xxl.job.admin.core.exception.XxlJobException;
3
 import com.xxl.job.admin.core.model.XxlJobGroup;
4
 import com.xxl.job.admin.core.model.XxlJobGroup;
4
 import com.xxl.job.admin.core.model.XxlJobInfo;
5
 import com.xxl.job.admin.core.model.XxlJobInfo;
5
 import com.xxl.job.admin.core.model.XxlJobLog;
6
 import com.xxl.job.admin.core.model.XxlJobLog;
7
+import com.xxl.job.admin.core.model.XxlJobUser;
6
 import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
8
 import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
7
 import com.xxl.job.admin.core.util.I18nUtil;
9
 import com.xxl.job.admin.core.util.I18nUtil;
8
 import com.xxl.job.admin.dao.XxlJobGroupDao;
10
 import com.xxl.job.admin.dao.XxlJobGroupDao;
9
 import com.xxl.job.admin.dao.XxlJobInfoDao;
11
 import com.xxl.job.admin.dao.XxlJobInfoDao;
10
 import com.xxl.job.admin.dao.XxlJobLogDao;
12
 import com.xxl.job.admin.dao.XxlJobLogDao;
13
+import com.xxl.job.admin.service.LoginService;
11
 import com.xxl.job.core.biz.ExecutorBiz;
14
 import com.xxl.job.core.biz.ExecutorBiz;
12
 import com.xxl.job.core.biz.model.LogResult;
15
 import com.xxl.job.core.biz.model.LogResult;
13
 import com.xxl.job.core.biz.model.ReturnT;
16
 import com.xxl.job.core.biz.model.ReturnT;
21
 import org.springframework.web.bind.annotation.ResponseBody;
24
 import org.springframework.web.bind.annotation.ResponseBody;
22
 
25
 
23
 import javax.annotation.Resource;
26
 import javax.annotation.Resource;
27
+import javax.servlet.http.HttpServletRequest;
24
 import java.text.ParseException;
28
 import java.text.ParseException;
25
-import java.util.Date;
26
-import java.util.HashMap;
27
-import java.util.List;
28
-import java.util.Map;
29
+import java.util.*;
29
 
30
 
30
 /**
31
 /**
31
  * index controller
32
  * index controller
44
 	public XxlJobLogDao xxlJobLogDao;
45
 	public XxlJobLogDao xxlJobLogDao;
45
 
46
 
46
 	@RequestMapping
47
 	@RequestMapping
47
-	public String index(Model model, @RequestParam(required = false, defaultValue = "0") Integer jobId) {
48
+	public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "0") Integer jobId) {
48
 
49
 
49
 		// 执行器列表
50
 		// 执行器列表
50
-		List<XxlJobGroup> jobGroupList =  xxlJobGroupDao.findAll();
51
+		List<XxlJobGroup> jobGroupList_all =  xxlJobGroupDao.findAll();
52
+
53
+		// filter group
54
+		List<XxlJobGroup> jobGroupList = new ArrayList<>();
55
+		if (jobGroupList_all!=null && jobGroupList_all.size()>0) {
56
+			XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
57
+			if (loginUser.getRole() == 1) {
58
+				jobGroupList = jobGroupList_all;
59
+			} else {
60
+				List<String> groupIdStrs = new ArrayList<>();
61
+				if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) {
62
+					groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(","));
63
+				}
64
+				for (XxlJobGroup groupItem:jobGroupList_all) {
65
+					if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) {
66
+						jobGroupList.add(groupItem);
67
+					}
68
+				}
69
+			}
70
+		}
71
+		if (jobGroupList==null || jobGroupList.size()==0) {
72
+			throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
73
+		}
74
+
51
 		model.addAttribute("JobGroupList", jobGroupList);
75
 		model.addAttribute("JobGroupList", jobGroupList);
52
 
76
 
53
 		// 任务
77
 		// 任务

+ 5 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java ファイルの表示

1
 package com.xxl.job.admin.controller.resolver;
1
 package com.xxl.job.admin.controller.resolver;
2
 
2
 
3
+import com.xxl.job.admin.core.exception.XxlJobException;
3
 import com.xxl.job.core.biz.model.ReturnT;
4
 import com.xxl.job.core.biz.model.ReturnT;
4
 import com.xxl.job.admin.core.util.JacksonUtil;
5
 import com.xxl.job.admin.core.util.JacksonUtil;
5
 import org.slf4j.Logger;
6
 import org.slf4j.Logger;
26
 	@Override
27
 	@Override
27
 	public ModelAndView resolveException(HttpServletRequest request,
28
 	public ModelAndView resolveException(HttpServletRequest request,
28
 			HttpServletResponse response, Object handler, Exception ex) {
29
 			HttpServletResponse response, Object handler, Exception ex) {
29
-		logger.error("WebExceptionResolver:{}", ex);
30
+
31
+		if (!(ex instanceof XxlJobException)) {
32
+			logger.error("WebExceptionResolver:{}", ex);
33
+		}
30
 
34
 
31
 		// if json
35
 		// if json
32
 		boolean isJson = false;
36
 		boolean isJson = false;

+ 14 - 0
xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java ファイルの表示

1
+package com.xxl.job.admin.core.exception;
2
+
3
+/**
4
+ * @author xuxueli 2019-05-04 23:19:29
5
+ */
6
+public class XxlJobException extends RuntimeException {
7
+
8
+    public XxlJobException() {
9
+    }
10
+    public XxlJobException(String message) {
11
+        super(message);
12
+    }
13
+
14
+}

+ 0 - 5
xxl-job-admin/src/main/resources/application.properties ファイルの表示

38
 spring.mail.properties.mail.smtp.starttls.enable=true
38
 spring.mail.properties.mail.smtp.starttls.enable=true
39
 spring.mail.properties.mail.smtp.starttls.required=true
39
 spring.mail.properties.mail.smtp.starttls.required=true
40
 
40
 
41
-
42
-### xxl-job login
43
-xxl.job.login.username=admin
44
-xxl.job.login.password=123456
45
-
46
 ### xxl-job, access token
41
 ### xxl-job, access token
47
 xxl.job.accessToken=
42
 xxl.job.accessToken=
48
 
43
 

+ 1 - 0
xxl-job-admin/src/main/resources/i18n/message.properties ファイルの表示

194
 jobgroup_field_orderrange=取值范围为1~1000
194
 jobgroup_field_orderrange=取值范围为1~1000
195
 jobgroup_del_limit_0=拒绝删除,该执行器使用中
195
 jobgroup_del_limit_0=拒绝删除,该执行器使用中
196
 jobgroup_del_limit_1=拒绝删除, 系统至少保留一个执行器
196
 jobgroup_del_limit_1=拒绝删除, 系统至少保留一个执行器
197
+jobgroup_empty=不存在有效执行器,请联系管理员
197
 
198
 
198
 ## job conf
199
 ## job conf
199
 jobconf_block_SERIAL_EXECUTION=单机串行
200
 jobconf_block_SERIAL_EXECUTION=单机串行

+ 1 - 0
xxl-job-admin/src/main/resources/i18n/message_en.properties ファイルの表示

194
 jobgroup_field_orderrange=Order is limited to 1~1000
194
 jobgroup_field_orderrange=Order is limited to 1~1000
195
 jobgroup_del_limit_0=Refuse to delete, the executor is being used
195
 jobgroup_del_limit_0=Refuse to delete, the executor is being used
196
 jobgroup_del_limit_1=Refuses to delete, the system retains at least one executor
196
 jobgroup_del_limit_1=Refuses to delete, the system retains at least one executor
197
+jobgroup_empty=There is no valid executor. Please contact the administrator
197
 
198
 
198
 ## job conf
199
 ## job conf
199
 jobconf_block_SERIAL_EXECUTION=Serial execution
200
 jobconf_block_SERIAL_EXECUTION=Serial execution