权限管理:执行器维度进行权限控制,管理员拥有全量权限,普通用户需要分配执行器权限后才允许相关操作
This commit is contained in:
parent
86fbb4d11b
commit
7ccdd75d4a
|
@ -1,22 +1,30 @@
|
||||||
package com.xxl.job.admin.controller;
|
package com.xxl.job.admin.controller;
|
||||||
|
|
||||||
|
import com.xxl.job.admin.core.exception.XxlJobException;
|
||||||
import com.xxl.job.admin.core.model.XxlJobGroup;
|
import com.xxl.job.admin.core.model.XxlJobGroup;
|
||||||
import com.xxl.job.admin.core.model.XxlJobInfo;
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
||||||
|
import com.xxl.job.admin.core.model.XxlJobUser;
|
||||||
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
|
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
|
||||||
import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
|
import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
|
||||||
import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
|
import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
|
||||||
|
import com.xxl.job.admin.core.util.I18nUtil;
|
||||||
import com.xxl.job.admin.dao.XxlJobGroupDao;
|
import com.xxl.job.admin.dao.XxlJobGroupDao;
|
||||||
|
import com.xxl.job.admin.service.LoginService;
|
||||||
import com.xxl.job.admin.service.XxlJobService;
|
import com.xxl.job.admin.service.XxlJobService;
|
||||||
import com.xxl.job.core.biz.model.ReturnT;
|
import com.xxl.job.core.biz.model.ReturnT;
|
||||||
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
|
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
|
||||||
import com.xxl.job.core.glue.GlueTypeEnum;
|
import com.xxl.job.core.glue.GlueTypeEnum;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.ui.Model;
|
import org.springframework.ui.Model;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
@ -34,15 +42,38 @@ public class JobInfoController {
|
||||||
private XxlJobService xxlJobService;
|
private XxlJobService xxlJobService;
|
||||||
|
|
||||||
@RequestMapping
|
@RequestMapping
|
||||||
public String index(Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
|
public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
|
||||||
|
|
||||||
// 枚举-字典
|
// 枚举-字典
|
||||||
model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values()); // 路由策略-列表
|
model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values()); // 路由策略-列表
|
||||||
model.addAttribute("GlueTypeEnum", GlueTypeEnum.values()); // Glue类型-字典
|
model.addAttribute("GlueTypeEnum", GlueTypeEnum.values()); // Glue类型-字典
|
||||||
model.addAttribute("ExecutorBlockStrategyEnum", ExecutorBlockStrategyEnum.values()); // 阻塞处理策略-字典
|
model.addAttribute("ExecutorBlockStrategyEnum", ExecutorBlockStrategyEnum.values()); // 阻塞处理策略-字典
|
||||||
|
|
||||||
// 任务组
|
// 执行器列表
|
||||||
List<XxlJobGroup> jobGroupList = xxlJobGroupDao.findAll();
|
List<XxlJobGroup> jobGroupList_all = xxlJobGroupDao.findAll();
|
||||||
|
|
||||||
|
// filter group
|
||||||
|
List<XxlJobGroup> jobGroupList = new ArrayList<>();
|
||||||
|
if (jobGroupList_all!=null && jobGroupList_all.size()>0) {
|
||||||
|
XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
|
||||||
|
if (loginUser.getRole() == 1) {
|
||||||
|
jobGroupList = jobGroupList_all;
|
||||||
|
} else {
|
||||||
|
List<String> groupIdStrs = new ArrayList<>();
|
||||||
|
if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) {
|
||||||
|
groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(","));
|
||||||
|
}
|
||||||
|
for (XxlJobGroup groupItem:jobGroupList_all) {
|
||||||
|
if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) {
|
||||||
|
jobGroupList.add(groupItem);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (jobGroupList==null || jobGroupList.size()==0) {
|
||||||
|
throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
|
||||||
|
}
|
||||||
|
|
||||||
model.addAttribute("JobGroupList", jobGroupList);
|
model.addAttribute("JobGroupList", jobGroupList);
|
||||||
model.addAttribute("jobGroup", jobGroup);
|
model.addAttribute("jobGroup", jobGroup);
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,16 @@
|
||||||
package com.xxl.job.admin.controller;
|
package com.xxl.job.admin.controller;
|
||||||
|
|
||||||
|
import com.xxl.job.admin.core.exception.XxlJobException;
|
||||||
import com.xxl.job.admin.core.model.XxlJobGroup;
|
import com.xxl.job.admin.core.model.XxlJobGroup;
|
||||||
import com.xxl.job.admin.core.model.XxlJobInfo;
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
||||||
import com.xxl.job.admin.core.model.XxlJobLog;
|
import com.xxl.job.admin.core.model.XxlJobLog;
|
||||||
|
import com.xxl.job.admin.core.model.XxlJobUser;
|
||||||
import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
|
import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
|
||||||
import com.xxl.job.admin.core.util.I18nUtil;
|
import com.xxl.job.admin.core.util.I18nUtil;
|
||||||
import com.xxl.job.admin.dao.XxlJobGroupDao;
|
import com.xxl.job.admin.dao.XxlJobGroupDao;
|
||||||
import com.xxl.job.admin.dao.XxlJobInfoDao;
|
import com.xxl.job.admin.dao.XxlJobInfoDao;
|
||||||
import com.xxl.job.admin.dao.XxlJobLogDao;
|
import com.xxl.job.admin.dao.XxlJobLogDao;
|
||||||
|
import com.xxl.job.admin.service.LoginService;
|
||||||
import com.xxl.job.core.biz.ExecutorBiz;
|
import com.xxl.job.core.biz.ExecutorBiz;
|
||||||
import com.xxl.job.core.biz.model.LogResult;
|
import com.xxl.job.core.biz.model.LogResult;
|
||||||
import com.xxl.job.core.biz.model.ReturnT;
|
import com.xxl.job.core.biz.model.ReturnT;
|
||||||
|
@ -21,11 +24,9 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.util.Date;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* index controller
|
* index controller
|
||||||
|
@ -44,10 +45,33 @@ public class JobLogController {
|
||||||
public XxlJobLogDao xxlJobLogDao;
|
public XxlJobLogDao xxlJobLogDao;
|
||||||
|
|
||||||
@RequestMapping
|
@RequestMapping
|
||||||
public String index(Model model, @RequestParam(required = false, defaultValue = "0") Integer jobId) {
|
public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "0") Integer jobId) {
|
||||||
|
|
||||||
// 执行器列表
|
// 执行器列表
|
||||||
List<XxlJobGroup> jobGroupList = xxlJobGroupDao.findAll();
|
List<XxlJobGroup> jobGroupList_all = xxlJobGroupDao.findAll();
|
||||||
|
|
||||||
|
// filter group
|
||||||
|
List<XxlJobGroup> jobGroupList = new ArrayList<>();
|
||||||
|
if (jobGroupList_all!=null && jobGroupList_all.size()>0) {
|
||||||
|
XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
|
||||||
|
if (loginUser.getRole() == 1) {
|
||||||
|
jobGroupList = jobGroupList_all;
|
||||||
|
} else {
|
||||||
|
List<String> groupIdStrs = new ArrayList<>();
|
||||||
|
if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) {
|
||||||
|
groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(","));
|
||||||
|
}
|
||||||
|
for (XxlJobGroup groupItem:jobGroupList_all) {
|
||||||
|
if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) {
|
||||||
|
jobGroupList.add(groupItem);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (jobGroupList==null || jobGroupList.size()==0) {
|
||||||
|
throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
|
||||||
|
}
|
||||||
|
|
||||||
model.addAttribute("JobGroupList", jobGroupList);
|
model.addAttribute("JobGroupList", jobGroupList);
|
||||||
|
|
||||||
// 任务
|
// 任务
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.xxl.job.admin.controller.resolver;
|
package com.xxl.job.admin.controller.resolver;
|
||||||
|
|
||||||
|
import com.xxl.job.admin.core.exception.XxlJobException;
|
||||||
import com.xxl.job.core.biz.model.ReturnT;
|
import com.xxl.job.core.biz.model.ReturnT;
|
||||||
import com.xxl.job.admin.core.util.JacksonUtil;
|
import com.xxl.job.admin.core.util.JacksonUtil;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
@ -26,7 +27,10 @@ public class WebExceptionResolver implements HandlerExceptionResolver {
|
||||||
@Override
|
@Override
|
||||||
public ModelAndView resolveException(HttpServletRequest request,
|
public ModelAndView resolveException(HttpServletRequest request,
|
||||||
HttpServletResponse response, Object handler, Exception ex) {
|
HttpServletResponse response, Object handler, Exception ex) {
|
||||||
logger.error("WebExceptionResolver:{}", ex);
|
|
||||||
|
if (!(ex instanceof XxlJobException)) {
|
||||||
|
logger.error("WebExceptionResolver:{}", ex);
|
||||||
|
}
|
||||||
|
|
||||||
// if json
|
// if json
|
||||||
boolean isJson = false;
|
boolean isJson = false;
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
package com.xxl.job.admin.core.exception;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author xuxueli 2019-05-04 23:19:29
|
||||||
|
*/
|
||||||
|
public class XxlJobException extends RuntimeException {
|
||||||
|
|
||||||
|
public XxlJobException() {
|
||||||
|
}
|
||||||
|
public XxlJobException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -38,11 +38,6 @@ spring.mail.properties.mail.smtp.auth=true
|
||||||
spring.mail.properties.mail.smtp.starttls.enable=true
|
spring.mail.properties.mail.smtp.starttls.enable=true
|
||||||
spring.mail.properties.mail.smtp.starttls.required=true
|
spring.mail.properties.mail.smtp.starttls.required=true
|
||||||
|
|
||||||
|
|
||||||
### xxl-job login
|
|
||||||
xxl.job.login.username=admin
|
|
||||||
xxl.job.login.password=123456
|
|
||||||
|
|
||||||
### xxl-job, access token
|
### xxl-job, access token
|
||||||
xxl.job.accessToken=
|
xxl.job.accessToken=
|
||||||
|
|
||||||
|
|
|
@ -194,6 +194,7 @@ jobgroup_field_order_digits=请输入整数
|
||||||
jobgroup_field_orderrange=取值范围为1~1000
|
jobgroup_field_orderrange=取值范围为1~1000
|
||||||
jobgroup_del_limit_0=拒绝删除,该执行器使用中
|
jobgroup_del_limit_0=拒绝删除,该执行器使用中
|
||||||
jobgroup_del_limit_1=拒绝删除, 系统至少保留一个执行器
|
jobgroup_del_limit_1=拒绝删除, 系统至少保留一个执行器
|
||||||
|
jobgroup_empty=不存在有效执行器,请联系管理员
|
||||||
|
|
||||||
## job conf
|
## job conf
|
||||||
jobconf_block_SERIAL_EXECUTION=单机串行
|
jobconf_block_SERIAL_EXECUTION=单机串行
|
||||||
|
|
|
@ -194,6 +194,7 @@ jobgroup_field_order_digits=Please enter a positive integer
|
||||||
jobgroup_field_orderrange=Order is limited to 1~1000
|
jobgroup_field_orderrange=Order is limited to 1~1000
|
||||||
jobgroup_del_limit_0=Refuse to delete, the executor is being used
|
jobgroup_del_limit_0=Refuse to delete, the executor is being used
|
||||||
jobgroup_del_limit_1=Refuses to delete, the system retains at least one executor
|
jobgroup_del_limit_1=Refuses to delete, the system retains at least one executor
|
||||||
|
jobgroup_empty=There is no valid executor. Please contact the administrator
|
||||||
|
|
||||||
## job conf
|
## job conf
|
||||||
jobconf_block_SERIAL_EXECUTION=Serial execution
|
jobconf_block_SERIAL_EXECUTION=Serial execution
|
||||||
|
|
Loading…
Reference in New Issue