From 1df3cb341eedab1b0e1e517d9f68e995ec2e968a Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 13:43:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20IndexContro?= =?UTF-8?q?ller.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/admin/controller/IndexController.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/IndexController.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/IndexController.java index 75440380..61891e37 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/IndexController.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/IndexController.java @@ -8,10 +8,7 @@ import org.springframework.beans.propertyeditors.CustomDateEditor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -45,10 +42,9 @@ public class IndexController { @RequestMapping("/chartInfo") @ResponseBody public ReturnT> chartInfo(Date startDate, Date endDate) { - ReturnT> chartInfo = xxlJobService.chartInfo(startDate, endDate); - return chartInfo; + return xxlJobService.chartInfo(startDate, endDate); } - + @RequestMapping("/toLogin") @PermissionLimit(limit=false) public String toLogin(HttpServletRequest request, HttpServletResponse response) { @@ -57,22 +53,24 @@ public class IndexController { } return "login"; } - - @RequestMapping(value="login", method=RequestMethod.POST) + +// @RequestMapping(value="login", method=RequestMethod.POST) + @PostMapping("login") @ResponseBody @PermissionLimit(limit=false) public ReturnT loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember){ - boolean ifRem = (ifRemember!=null && ifRemember.trim().length()>0 && "on".equals(ifRemember))?true:false; + boolean ifRem = ifRemember!=null && ifRemember.trim().length()>0 && "on".equals(ifRemember); return loginService.login(request, response, userName, password, ifRem); } - - @RequestMapping(value="logout", method=RequestMethod.POST) + +// @RequestMapping(value="logout", method=RequestMethod.POST) + @PostMapping("logout") @ResponseBody @PermissionLimit(limit=false) public ReturnT logout(HttpServletRequest request, HttpServletResponse response){ return loginService.logout(request, response); } - + @RequestMapping("/help") public String help() { @@ -89,5 +87,5 @@ public class IndexController { dateFormat.setLenient(false); binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true)); } - + } From dae47b7a95d828e6d85395812e8d9acfe0932937 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 13:44:29 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20JobApiContr?= =?UTF-8?q?oller.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xxl/job/admin/controller/JobApiController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobApiController.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobApiController.java index aa51e739..2bed1155 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobApiController.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobApiController.java @@ -42,15 +42,15 @@ 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 @@ -64,7 +64,7 @@ public class JobApiController { 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."); + return new ReturnT<>(ReturnT.FAIL_CODE, "invalid request, uri-mapping("+ uri +") not found."); } } From b5e60923aadb061f60ca6881c564190445cdc691 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 13:44:58 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20JobCodeCont?= =?UTF-8?q?roller.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/JobCodeController.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobCodeController.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobCodeController.java index fe4a0e84..b1eb7365 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobCodeController.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobCodeController.java @@ -24,7 +24,7 @@ import java.util.List; @Controller @RequestMapping("/jobcode") public class JobCodeController { - + @Resource private XxlJobInfoDao xxlJobInfoDao; @Resource @@ -52,34 +52,34 @@ public class JobCodeController { model.addAttribute("jobLogGlues", jobLogGlues); return "jobcode/jobcode.index"; } - + @RequestMapping("/save") @ResponseBody public ReturnT save(Model model, int id, String glueSource, String glueRemark) { // valid if (glueRemark==null) { - return new ReturnT(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) ); + return new ReturnT<>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) ); } if (glueRemark.length()<4 || glueRemark.length()>100) { - return new ReturnT(500, I18nUtil.getString("jobinfo_glue_remark_limit")); + return new ReturnT<>(500, I18nUtil.getString("jobinfo_glue_remark_limit")); } - XxlJobInfo exists_jobInfo = xxlJobInfoDao.loadById(id); - if (exists_jobInfo == null) { - return new ReturnT(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid")); + XxlJobInfo existsJobInfo = xxlJobInfoDao.loadById(id); + if (existsJobInfo == null) { + return new ReturnT<>(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid")); } - - // update new code - exists_jobInfo.setGlueSource(glueSource); - exists_jobInfo.setGlueRemark(glueRemark); - exists_jobInfo.setGlueUpdatetime(new Date()); - exists_jobInfo.setUpdateTime(new Date()); - xxlJobInfoDao.update(exists_jobInfo); + // update new code + existsJobInfo.setGlueSource(glueSource); + existsJobInfo.setGlueRemark(glueRemark); + existsJobInfo.setGlueUpdatetime(new Date()); + + existsJobInfo.setUpdateTime(new Date()); + xxlJobInfoDao.update(existsJobInfo); // log old code XxlJobLogGlue xxlJobLogGlue = new XxlJobLogGlue(); - xxlJobLogGlue.setJobId(exists_jobInfo.getId()); - xxlJobLogGlue.setGlueType(exists_jobInfo.getGlueType()); + xxlJobLogGlue.setJobId(existsJobInfo.getId()); + xxlJobLogGlue.setGlueType(existsJobInfo.getGlueType()); xxlJobLogGlue.setGlueSource(glueSource); xxlJobLogGlue.setGlueRemark(glueRemark); @@ -88,9 +88,9 @@ public class JobCodeController { xxlJobLogGlueDao.save(xxlJobLogGlue); // remove code backup more than 30 - xxlJobLogGlueDao.removeOld(exists_jobInfo.getId(), 30); + xxlJobLogGlueDao.removeOld(existsJobInfo.getId(), 30); return ReturnT.SUCCESS; } - + } From 4f818cbde19c2c72c3aa81dfb3e2ebec6e29ba44 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 13:45:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20JobGroupCon?= =?UTF-8?q?troller.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/JobGroupController.java | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobGroupController.java index f1d1168a..0d6c0269 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobGroupController.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobGroupController.java @@ -33,6 +33,8 @@ public class JobGroupController { @Resource private XxlJobRegistryDao xxlJobRegistryDao; + private String systemPleaseInput= "system_please_input"; + @RequestMapping public String index(Model model) { return "jobgroup/jobgroup.index"; @@ -47,12 +49,12 @@ public class JobGroupController { // page query List list = xxlJobGroupDao.pageList(start, length, appname, title); - int list_count = xxlJobGroupDao.pageListCount(start, length, appname, title); + int listCount = xxlJobGroupDao.pageListCount(start, length, appname, title); // package result - Map maps = new HashMap(); - maps.put("recordsTotal", list_count); // 总记录数 - maps.put("recordsFiltered", list_count); // 过滤后的总记录数 + Map maps = new HashMap<>(); + maps.put("recordsTotal", listCount); // 总记录数 + maps.put("recordsFiltered", listCount); // 过滤后的总记录数 maps.put("data", list); // 分页列表 return maps; } @@ -63,22 +65,22 @@ public class JobGroupController { // valid if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) { - return new ReturnT(500, (I18nUtil.getString("system_please_input")+"AppName") ); + return new ReturnT<>(500, (I18nUtil.getString(systemPleaseInput)+"AppName") ); } if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_appname_length") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_field_appname_length") ); } if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) { - return new ReturnT(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); + return new ReturnT<>(500, (I18nUtil.getString(systemPleaseInput) + I18nUtil.getString("jobgroup_field_title")) ); } if (xxlJobGroup.getAddressType()!=0) { if (xxlJobGroup.getAddressList()==null || xxlJobGroup.getAddressList().trim().length()==0) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_addressType_limit") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_field_addressType_limit") ); } String[] addresss = xxlJobGroup.getAddressList().split(","); for (String item: addresss) { if (item==null || item.trim().length()==0) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") ); } } } @@ -92,36 +94,36 @@ public class JobGroupController { public ReturnT update(XxlJobGroup xxlJobGroup){ // valid if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) { - return new ReturnT(500, (I18nUtil.getString("system_please_input")+"AppName") ); + return new ReturnT<>(500, (I18nUtil.getString(systemPleaseInput)+"AppName") ); } if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_appname_length") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_field_appname_length") ); } if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) { - return new ReturnT(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) ); + return new ReturnT<>(500, (I18nUtil.getString(systemPleaseInput) + I18nUtil.getString("jobgroup_field_title")) ); } if (xxlJobGroup.getAddressType() == 0) { // 0=自动注册 List registryList = findRegistryByAppName(xxlJobGroup.getAppname()); - String addressListStr = null; + StringBuilder addressListStr = new StringBuilder(); if (registryList!=null && !registryList.isEmpty()) { Collections.sort(registryList); - addressListStr = ""; + addressListStr = new StringBuilder(); for (String item:registryList) { - addressListStr += item + ","; + addressListStr.append(item).append(","); } - addressListStr = addressListStr.substring(0, addressListStr.length()-1); + addressListStr = new StringBuilder(addressListStr.substring(0, addressListStr.length() - 1)); } - xxlJobGroup.setAddressList(addressListStr); + xxlJobGroup.setAddressList(addressListStr.toString()); } else { // 1=手动录入 if (xxlJobGroup.getAddressList()==null || xxlJobGroup.getAddressList().trim().length()==0) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_addressType_limit") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_field_addressType_limit") ); } String[] addresss = xxlJobGroup.getAddressList().split(","); for (String item: addresss) { if (item==null || item.trim().length()==0) { - return new ReturnT(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") ); } } } @@ -131,7 +133,7 @@ public class JobGroupController { } private List findRegistryByAppName(String appnameParam){ - HashMap> appAddressMap = new HashMap>(); + HashMap> appAddressMap = new HashMap<>(); List list = xxlJobRegistryDao.findAll(RegistryConfig.DEAD_TIMEOUT, new Date()); if (list != null) { for (XxlJobRegistry item: list) { @@ -139,7 +141,7 @@ public class JobGroupController { String appname = item.getRegistryKey(); List registryList = appAddressMap.get(appname); if (registryList == null) { - registryList = new ArrayList(); + registryList = new ArrayList<>(); } if (!registryList.contains(item.getRegistryValue())) { @@ -159,12 +161,12 @@ public class JobGroupController { // valid int count = xxlJobInfoDao.pageListCount(0, 10, id, -1, null, null, null); if (count > 0) { - return new ReturnT(500, I18nUtil.getString("jobgroup_del_limit_0") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_del_limit_0") ); } List allList = xxlJobGroupDao.findAll(); if (allList.size() == 1) { - return new ReturnT(500, I18nUtil.getString("jobgroup_del_limit_1") ); + return new ReturnT<>(500, I18nUtil.getString("jobgroup_del_limit_1") ); } int ret = xxlJobGroupDao.remove(id); @@ -175,7 +177,7 @@ public class JobGroupController { @ResponseBody public ReturnT loadById(int id){ XxlJobGroup jobGroup = xxlJobGroupDao.load(id); - return jobGroup!=null?new ReturnT(jobGroup):new ReturnT(ReturnT.FAIL_CODE, null); + return jobGroup!=null?new ReturnT<>(jobGroup):new ReturnT<>(ReturnT.FAIL_CODE, null); } } From 7866f81d8becf2c28412c0181948be48b620a113 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 13:45:55 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20JobInfoCont?= =?UTF-8?q?roller.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/JobInfoController.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index 3cf8029a..96c631f4 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -39,7 +39,7 @@ public class JobInfoController { private XxlJobGroupDao xxlJobGroupDao; @Resource private XxlJobService xxlJobService; - + @RequestMapping public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) { @@ -49,11 +49,11 @@ public class JobInfoController { model.addAttribute("ExecutorBlockStrategyEnum", ExecutorBlockStrategyEnum.values()); // 阻塞处理策略-字典 // 执行器列表 - List jobGroupList_all = xxlJobGroupDao.findAll(); + List jobGroupListAll = xxlJobGroupDao.findAll(); // filter group - List jobGroupList = filterJobGroupByRole(request, jobGroupList_all); - if (jobGroupList==null || jobGroupList.size()==0) { + List jobGroupList = filterJobGroupByRole(request, jobGroupListAll); + if (!jobGroupList.isEmpty()) { throw new XxlJobException(I18nUtil.getString("jobgroup_empty")); } @@ -63,18 +63,18 @@ public class JobInfoController { return "jobinfo/jobinfo.index"; } - public static List filterJobGroupByRole(HttpServletRequest request, List jobGroupList_all){ + public static List filterJobGroupByRole(HttpServletRequest request, List jobGroupListAll){ List jobGroupList = new ArrayList<>(); - if (jobGroupList_all!=null && jobGroupList_all.size()>0) { + if (jobGroupListAll!=null && !jobGroupListAll.isEmpty()) { XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY); if (loginUser.getRole() == 1) { - jobGroupList = jobGroupList_all; + jobGroupList = jobGroupListAll; } else { List groupIdStrs = new ArrayList<>(); if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) { groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(",")); } - for (XxlJobGroup groupItem:jobGroupList_all) { + for (XxlJobGroup groupItem:jobGroupListAll) { if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) { jobGroupList.add(groupItem); } @@ -89,46 +89,46 @@ public class JobInfoController { throw new RuntimeException(I18nUtil.getString("system_permission_limit") + "[username="+ loginUser.getUsername() +"]"); } } - + @RequestMapping("/pageList") @ResponseBody - public Map pageList(@RequestParam(required = false, defaultValue = "0") int start, + public Map pageList(@RequestParam(required = false, defaultValue = "0") int start, @RequestParam(required = false, defaultValue = "10") int length, int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author) { - + return xxlJobService.pageList(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author); } - + @RequestMapping("/add") @ResponseBody public ReturnT add(XxlJobInfo jobInfo) { return xxlJobService.add(jobInfo); } - + @RequestMapping("/update") @ResponseBody public ReturnT update(XxlJobInfo jobInfo) { return xxlJobService.update(jobInfo); } - + @RequestMapping("/remove") @ResponseBody public ReturnT remove(int id) { return xxlJobService.remove(id); } - + @RequestMapping("/stop") @ResponseBody public ReturnT pause(int id) { return xxlJobService.stop(id); } - + @RequestMapping("/start") @ResponseBody public ReturnT start(int id) { return xxlJobService.start(id); } - + @RequestMapping("/trigger") @ResponseBody //@PermissionLimit(limit = false) @@ -158,9 +158,9 @@ public class JobInfoController { } } } catch (ParseException e) { - return new ReturnT>(ReturnT.FAIL_CODE, I18nUtil.getString("jobinfo_field_cron_unvalid")); + return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString("jobinfo_field_cron_unvalid")); } - return new ReturnT>(result); + return new ReturnT<>(result); } - + } From 367e5a77ee466ab513349e0cf35991b77358b0ec Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 13:46:23 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20JobLogContr?= =?UTF-8?q?oller.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/JobLogController.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobLogController.java index ab4da852..3cc01cd2 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -50,11 +50,11 @@ public class JobLogController { public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "0") Integer jobId) { // 执行器列表 - List jobGroupList_all = xxlJobGroupDao.findAll(); + List jobGroupListAll = xxlJobGroupDao.findAll(); // filter group - List jobGroupList = JobInfoController.filterJobGroupByRole(request, jobGroupList_all); - if (jobGroupList==null || jobGroupList.size()==0) { + List jobGroupList = JobInfoController.filterJobGroupByRole(request, jobGroupListAll); + if (jobGroupList==null || jobGroupList.isEmpty()) { throw new XxlJobException(I18nUtil.getString("jobgroup_empty")); } @@ -80,9 +80,9 @@ public class JobLogController { @ResponseBody public ReturnT> getJobsByGroup(int jobGroup){ List list = xxlJobInfoDao.getJobsByGroup(jobGroup); - return new ReturnT>(list); + return new ReturnT<>(list); } - + @RequestMapping("/pageList") @ResponseBody public Map pageList(HttpServletRequest request, @@ -92,7 +92,7 @@ public class JobLogController { // valid permission JobInfoController.validPermission(request, jobGroup); // 仅管理员支持查询全部；普通用户仅支持查询有权限的 jobGroup - + // parse param Date triggerTimeStart = null; Date triggerTimeEnd = null; @@ -103,15 +103,15 @@ public class JobLogController { triggerTimeEnd = DateUtil.parseDateTime(temp[1]); } } - + // page query List list = xxlJobLogDao.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); - int list_count = xxlJobLogDao.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); - + int listCount = xxlJobLogDao.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus); + // package result - Map maps = new HashMap(); - maps.put("recordsTotal", list_count); // 总记录数 - maps.put("recordsFiltered", list_count); // 过滤后的总记录数 + Map maps = new HashMap<>(); + maps.put("recordsTotal", listCount); // 总记录数 + maps.put("recordsFiltered", listCount); // 过滤后的总记录数 maps.put("data", list); // 分页列表 return maps; } @@ -120,7 +120,7 @@ public class JobLogController { public String logDetailPage(int id, Model model){ // base check - ReturnT logStatue = ReturnT.SUCCESS; +// ReturnT logStatue = ReturnT.SUCCESS; XxlJobLog jobLog = xxlJobLogDao.load(id); if (jobLog == null) { throw new RuntimeException(I18nUtil.getString("joblog_logid_unvalid")); @@ -152,7 +152,7 @@ public class JobLogController { return logResult; } catch (Exception e) { logger.error(e.getMessage(), e); - return new ReturnT(ReturnT.FAIL_CODE, e.getMessage()); + return new ReturnT<>(ReturnT.FAIL_CODE, e.getMessage()); } } @@ -163,10 +163,10 @@ public class JobLogController { XxlJobLog log = xxlJobLogDao.load(id); XxlJobInfo jobInfo = xxlJobInfoDao.loadById(log.getJobId()); if (jobInfo==null) { - return new ReturnT(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid")); + return new ReturnT<>(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid")); } if (ReturnT.SUCCESS_CODE != log.getTriggerCode()) { - return new ReturnT(500, I18nUtil.getString("joblog_kill_log_limit")); + return new ReturnT<>(500, I18nUtil.getString("joblog_kill_log_limit")); } // request of kill @@ -176,7 +176,7 @@ public class JobLogController { runResult = executorBiz.kill(new KillParam(jobInfo.getId())); } catch (Exception e) { logger.error(e.getMessage(), e); - runResult = new ReturnT(500, e.getMessage()); + runResult = new ReturnT<>(500, e.getMessage()); } if (ReturnT.SUCCESS_CODE == runResult.getCode()) { @@ -184,9 +184,9 @@ public class JobLogController { log.setHandleMsg( I18nUtil.getString("joblog_kill_log_byman")+":" + (runResult.getMsg()!=null?runResult.getMsg():"")); log.setHandleTime(new Date()); xxlJobLogDao.updateHandleInfo(log); - return new ReturnT(runResult.getMsg()); + return new ReturnT<>(runResult.getMsg()); } else { - return new ReturnT(500, runResult.getMsg()); + return new ReturnT<>(500, runResult.getMsg()); } } @@ -215,16 +215,16 @@ public class JobLogController { } else if (type == 9) { clearBeforeNum = 0; // 清理所有日志数据 } else { - return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("joblog_clean_type_unvalid")); + return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString("joblog_clean_type_unvalid")); } List logIds = null; do { logIds = xxlJobLogDao.findClearLogIds(jobGroup, jobId, clearBeforeTime, clearBeforeNum, 1000); - if (logIds!=null && logIds.size()>0) { + if (logIds!=null && !logIds.isEmpty()) { xxlJobLogDao.clearLog(logIds); } - } while (logIds!=null && logIds.size()>0); + } while (logIds!=null && !logIds.isEmpty()); return ReturnT.SUCCESS; } From 16ea4644b38f71e1542ff8b1a437312551bf1217 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 13:46:46 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20UserControl?= =?UTF-8?q?ler.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/admin/controller/UserController.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/UserController.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/UserController.java index 573ffccf..9b7d5faa 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/UserController.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/controller/UserController.java @@ -33,6 +33,8 @@ public class UserController { private XxlJobUserDao xxlJobUserDao; @Resource private XxlJobGroupDao xxlJobGroupDao; + private String systemLenghLimit ="system_lengh_limit"; + private String fourTwenty ="[4-20]"; @RequestMapping @PermissionLimit(adminuser = true) @@ -54,12 +56,12 @@ public class UserController { // page list List list = xxlJobUserDao.pageList(start, length, username, role); - int list_count = xxlJobUserDao.pageListCount(start, length, username, role); + int listCount = xxlJobUserDao.pageListCount(start, length, username, role); // package result - Map maps = new HashMap(); - maps.put("recordsTotal", list_count); // 总记录数 - maps.put("recordsFiltered", list_count); // 过滤后的总记录数 + Map maps = new HashMap<>(); + maps.put("recordsTotal", listCount); // 总记录数 + maps.put("recordsFiltered", listCount); // 过滤后的总记录数 maps.put("data", list); // 分页列表 return maps; } @@ -71,19 +73,19 @@ public class UserController { // valid username if (!StringUtils.hasText(xxlJobUser.getUsername())) { - return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("system_please_input")+I18nUtil.getString("user_username") ); + return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString("system_please_input")+I18nUtil.getString("user_username") ); } xxlJobUser.setUsername(xxlJobUser.getUsername().trim()); if (!(xxlJobUser.getUsername().length()>=4 && xxlJobUser.getUsername().length()<=20)) { - return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString(systemLenghLimit)+fourTwenty ); } // valid password if (!StringUtils.hasText(xxlJobUser.getPassword())) { - return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("system_please_input")+I18nUtil.getString("user_password") ); + return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString("system_please_input")+I18nUtil.getString("user_password") ); } xxlJobUser.setPassword(xxlJobUser.getPassword().trim()); if (!(xxlJobUser.getPassword().length()>=4 && xxlJobUser.getPassword().length()<=20)) { - return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString(systemLenghLimit)+fourTwenty ); } // md5 password xxlJobUser.setPassword(DigestUtils.md5DigestAsHex(xxlJobUser.getPassword().getBytes())); @@ -91,7 +93,7 @@ public class UserController { // check repeat XxlJobUser existUser = xxlJobUserDao.loadByUserName(xxlJobUser.getUsername()); if (existUser != null) { - return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("user_username_repeat") ); + return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString("user_username_repeat") ); } // write @@ -107,14 +109,14 @@ public class UserController { // avoid opt login seft XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY); if (loginUser.getUsername().equals(xxlJobUser.getUsername())) { - return new ReturnT(ReturnT.FAIL.getCode(), I18nUtil.getString("user_update_loginuser_limit")); + return new ReturnT<>(ReturnT.FAIL.getCode(), I18nUtil.getString("user_update_loginuser_limit")); } // valid password if (StringUtils.hasText(xxlJobUser.getPassword())) { xxlJobUser.setPassword(xxlJobUser.getPassword().trim()); if (!(xxlJobUser.getPassword().length()>=4 && xxlJobUser.getPassword().length()<=20)) { - return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString(systemLenghLimit)+fourTwenty ); } // md5 password xxlJobUser.setPassword(DigestUtils.md5DigestAsHex(xxlJobUser.getPassword().getBytes())); @@ -135,7 +137,7 @@ public class UserController { // avoid opt login seft XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY); if (loginUser.getId() == id) { - return new ReturnT(ReturnT.FAIL.getCode(), I18nUtil.getString("user_update_loginuser_limit")); + return new ReturnT<>(ReturnT.FAIL.getCode(), I18nUtil.getString("user_update_loginuser_limit")); } xxlJobUserDao.delete(id); @@ -148,11 +150,11 @@ public class UserController { // valid password if (password==null || password.trim().length()==0){ - return new ReturnT(ReturnT.FAIL.getCode(), "密码不可为空"); + return new ReturnT<>(ReturnT.FAIL.getCode(), "密码不可为空"); } password = password.trim(); if (!(password.length()>=4 && password.length()<=20)) { - return new ReturnT(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString(systemLenghLimit)+fourTwenty ); } // md5 password From 952c0c9a0b81b8a7d70d6b6f15974098f45ccf66 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 13:51:01 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20EmailJobAla?= =?UTF-8?q?rm.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java index fe16fbdf..2f2bebe9 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java @@ -48,7 +48,7 @@ public class EmailJobAlarm implements JobAlarm { } // email info - XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(Integer.valueOf(info.getJobGroup())); + XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(info.getJobGroup()); String personal = I18nUtil.getString("admin_name_full"); String title = I18nUtil.getString("jobconf_monitor"); String content = MessageFormat.format(loadEmailJobAlarmTemplate(), @@ -57,7 +57,7 @@ public class EmailJobAlarm implements JobAlarm { info.getJobDesc(), alarmContent); - Set emailSet = new HashSet(Arrays.asList(info.getAlarmEmail().split(","))); + Set emailSet = new HashSet<>(Arrays.asList(info.getAlarmEmail().split(","))); for (String email: emailSet) { // make mail @@ -89,7 +89,8 @@ public class EmailJobAlarm implements JobAlarm { * @return */ private static final String loadEmailJobAlarmTemplate(){ - String mailBodyTemplate = "
" + I18nUtil.getString("jobconf_monitor_detail") + "：" + + + return "
" + I18nUtil.getString("jobconf_monitor_detail") + "：" + "\n" + " " + " \n" + @@ -110,8 +111,6 @@ public class EmailJobAlarm implements JobAlarm { " \n" + " \n" + "
"; - - return mailBodyTemplate; } }