优化代码

eitc-admin/src/main/java/com/eitc/common/aspect/DataFilterAspect.java

@@ -39,7 +39,7 @@ public class DataFilterAspect {
     @Before("dataFilterCut()")
     public void dataFilter(JoinPoint point) {
         Object params = point.getArgs()[0];
-        if(params != null && params instanceof Map){
+        if(params instanceof Map){
             UserDetail user = SecurityUser.getUser();
 
             //如果是超级管理员或超级租户，则不进行数据过滤
@@ -53,7 +53,7 @@ public class DataFilterAspect {
                 Map map = (Map)params;
                 String sqlFilter = getSqlFilter(user, point);
                 map.put(Constant.SQL_FILTER, new DataScope(sqlFilter));
-            }catch (Exception e){
+            }catch (Exception ignored){
 
             }
 

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ActModelService.java

@@ -18,9 +18,9 @@ import org.activiti.engine.repository.ModelQuery;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 
@@ -39,9 +40,9 @@ import java.util.Map;
  */
 @Service
 public class ActModelService {
-    @Autowired
+    @Resource
     protected RepositoryService repositoryService;
-    @Autowired
+    @Resource
     private ObjectMapper objectMapper;
 
     public PageData<Model> page(Map<String, Object> params) {
@@ -93,7 +94,7 @@ public class ActModelService {
         ObjectNode stencilset = objectMapper.createObjectNode();
         stencilset.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");
         editorNode.set("stencilset", stencilset);
-        repositoryService.addModelEditorSource(model.getId(), editorNode.toString().getBytes("utf-8"));
+        repositoryService.addModelEditorSource(model.getId(), editorNode.toString().getBytes(StandardCharsets.UTF_8));
     }
 
     public void deploy(String id) {
@@ -158,13 +159,12 @@ public class ActModelService {
         List <String> names = repositoryService.getDeploymentResourceNames(deploymentId);
         String imageName = null;
         for(String name: names){
-            if(name.indexOf(".png")>=0){
+            if(name.contains(".png")){
                 imageName = name;
                 break;
             }
         }
         InputStream in = null;
-        InputStream in1 = null;
         try {
             if(StringUtils.isNotEmpty(imageName)){
                 in = repositoryService.getResourceAsStream(deploymentId,imageName);

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ActProcessService.java

@@ -1,17 +1,15 @@
 package com.eitc.modules.activiti.service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.eitc.common.constant.Constant;
-import com.eitc.common.exception.ErrorCode;
 import com.eitc.common.exception.EitcException;
+import com.eitc.common.exception.ErrorCode;
 import com.eitc.common.page.PageData;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.activiti.bpmn.converter.BpmnXMLConverter;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.editor.constants.ModelDataJsonConstants;
 import org.activiti.editor.language.json.converter.BpmnJsonConverter;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.ProcessEngineConfiguration;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.repository.Deployment;
 import org.activiti.engine.repository.Model;
@@ -19,17 +17,17 @@ import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.repository.ProcessDefinitionQuery;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -43,42 +41,36 @@ import java.util.zip.ZipInputStream;
  */
 @Service
 public class ActProcessService {
-    @Autowired
+    @Resource
     protected RepositoryService repositoryService;
 
-    @Autowired
-    protected HistoryService historyService;
-
-    @Autowired
-    protected ProcessEngineConfiguration processEngineConfiguration;
-
     /**
      * 流程列表
      */
     public PageData<Map<String, Object>> page(Map<String, Object> params) {
-        String key = (String)params.get("key");
-        String processName = (String)params.get("processName");
-        boolean isLatestVersion = params.get("isLatestVersion")== null? false : (boolean)params.get("isLatestVersion");
+        String key = (String) params.get("key");
+        String processName = (String) params.get("processName");
+        boolean isLatestVersion = params.get("isLatestVersion") != null && (boolean) params.get("isLatestVersion");
 
         //分页参数
         int curPage = 1;
         int limit = 10;
-        if(params.get(Constant.PAGE) != null){
-            curPage = Integer.parseInt((String)params.get(Constant.PAGE));
+        if (params.get(Constant.PAGE) != null) {
+            curPage = Integer.parseInt((String) params.get(Constant.PAGE));
         }
-        if(params.get(Constant.LIMIT) != null){
-            limit = Integer.parseInt((String)params.get(Constant.LIMIT));
+        if (params.get(Constant.LIMIT) != null) {
+            limit = Integer.parseInt((String) params.get(Constant.LIMIT));
         }
 
         ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
-            .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc();
-        if(isLatestVersion){
+                .orderByProcessDefinitionId().desc().orderByProcessDefinitionKey().desc();
+        if (isLatestVersion) {
             processDefinitionQuery.latestVersion();
         }
-        if(StringUtils.isNotEmpty(key)){
+        if (StringUtils.isNotEmpty(key)) {
             processDefinitionQuery.processDefinitionKeyLike(key);
         }
-        if(StringUtils.isNotEmpty(processName)){
+        if (StringUtils.isNotEmpty(processName)) {
             processDefinitionQuery.processDefinitionNameLike(processName);
         }
 
@@ -89,7 +81,7 @@ public class ActProcessService {
             objectList.add(processDefinitionConvert(processDefinition));
         }
 
-        return new PageData<>(objectList, (int)processDefinitionQuery.count());
+        return new PageData<>(objectList, (int) processDefinitionQuery.count());
     }
 
 
@@ -116,49 +108,56 @@ public class ActProcessService {
 
     /**
      * 部署
+     *
      * @param file 文件
      */
     public void deploy(MultipartFile file) throws IOException {
         String fileName = file.getOriginalFilename();
         String extension = FilenameUtils.getExtension(fileName);
-        if("zip".equalsIgnoreCase(extension) || "bar".equalsIgnoreCase(extension)) {
+        if ("zip".equalsIgnoreCase(extension) || "bar".equalsIgnoreCase(extension)) {
             ZipInputStream zip = new ZipInputStream(file.getInputStream());
             repositoryService.createDeployment().addZipInputStream(zip).deploy();
-        }else if(fileName.indexOf("bpmn20.xml") != -1){
-            repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
-        }else if("bpmn".equalsIgnoreCase(extension)){
-            repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
-        }else{
-            throw new EitcException(ErrorCode.ACT_DEPLOY_FORMAT_ERROR);
+        } else {
+            assert fileName != null;
+            if (fileName.contains("bpmn20.xml")) {
+                repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
+            } else if ("bpmn".equalsIgnoreCase(extension)) {
+                repositoryService.createDeployment().addInputStream(fileName, file.getInputStream()).deploy();
+            } else {
+                throw new EitcException(ErrorCode.ACT_DEPLOY_FORMAT_ERROR);
+            }
         }
     }
 
     /**
      * 激活流程
+     *
      * @param id 流程ID
      */
-    public void active(String id){
+    public void active(String id) {
         repositoryService.activateProcessDefinitionById(id, true, null);
     }
 
     /**
      * 挂起流程
+     *
      * @param id 流程ID
      */
-    public void suspend(String id){
+    public void suspend(String id) {
         repositoryService.suspendProcessDefinitionById(id, true, null);
     }
 
     /**
      * 将部署的流程转换为模型
+     *
      * @param id 流程ID
      */
-    public Model convertToModel(String id) throws UnsupportedEncodingException, XMLStreamException {
+    public Model convertToModel(String id) throws XMLStreamException {
         ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult();
         InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(),
                 processDefinition.getResourceName());
         XMLInputFactory xif = XMLInputFactory.newInstance();
-        InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
+        InputStreamReader in = new InputStreamReader(bpmnStream, StandardCharsets.UTF_8);
         XMLStreamReader xtr = xif.createXMLStreamReader(in);
         BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
 
@@ -169,7 +168,7 @@ public class ActProcessService {
         modelData.setName(processDefinition.getResourceName());
         modelData.setCategory(processDefinition.getCategory());
         modelData.setDeploymentId(processDefinition.getDeploymentId());
-        modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
+        modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count() + 1)));
 
         ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
         modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName());
@@ -179,28 +178,28 @@ public class ActProcessService {
 
         repositoryService.saveModel(modelData);
 
-        repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
+        repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes(StandardCharsets.UTF_8));
 
         return modelData;
     }
 
     /**
      * 删除部署
-     * @param deploymentId  部署ID
+     *
+     * @param deploymentId 部署ID
      */
-    public void deleteDeployment(String deploymentId){
+    public void deleteDeployment(String deploymentId) {
         repositoryService.deleteDeployment(deploymentId, true);
     }
 
     /**
      * 获取资源文件
-     * @param deploymentId  部署ID
+     *
+     * @param deploymentId 部署ID
      * @param resourceName 资源名称
      */
     public InputStream getResourceAsStream(String deploymentId, String resourceName) {
-        InputStream resourceAsStream = repositoryService.getResourceAsStream(deploymentId, resourceName);
-
-        return resourceAsStream;
+        return repositoryService.getResourceAsStream(deploymentId, resourceName);
     }
 
 }

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ActRunningService.java

@@ -16,9 +16,9 @@ import org.activiti.engine.impl.pvm.process.ActivityImpl;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.runtime.ProcessInstanceQuery;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -31,13 +31,13 @@ import java.util.Map;
  */
 @Service
 public class ActRunningService {
-    @Autowired
+    @Resource
     private RuntimeService runtimeService;
 
-    @Autowired
+    @Resource
     private IdentityService identityService;
 
-    @Autowired
+    @Resource
     protected RepositoryService repositoryService;
 
     /**

eitc-admin/src/main/java/com/eitc/modules/activiti/service/ActTaskService.java

@@ -33,10 +33,10 @@ import org.activiti.engine.task.Task;
 import org.activiti.engine.task.TaskInfo;
 import org.activiti.engine.task.TaskQuery;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -46,15 +46,15 @@ import java.util.*;
  */
 @Service
 public class ActTaskService extends BaseServiceImpl {
-    @Autowired
+    @Resource
     protected TaskService taskService;
-    @Autowired
+    @Resource
     protected HistoryService historyService;
-    @Autowired
+    @Resource
     protected RepositoryService repositoryService;
-    @Autowired
+    @Resource
     protected RuntimeService runtimeService;
-    @Autowired
+    @Resource
     private SysRoleUserService sysRoleUserService;
 
     /**
@@ -65,8 +65,8 @@ public class ActTaskService extends BaseServiceImpl {
      */
     public PageData<TaskDTO> page(Map<String, Object> params) {
         String userId = (String) params.get("userId");
-        Integer curPage = 1;
-        Integer limit = 10;
+        int curPage = 1;
+        int limit = 10;
         if (params.get(Constant.PAGE) != null) {
             curPage = Integer.parseInt((String) params.get(Constant.PAGE));
         }
@@ -78,7 +78,7 @@ public class ActTaskService extends BaseServiceImpl {
             taskQuery.taskAssignee(userId);
         }
         if (StringUtils.isNotEmpty((String)params.get("taskName"))){
-            taskQuery.taskNameLike("%"+(String)params.get("taskName")+"%");
+            taskQuery.taskNameLike("%"+ params.get("taskName") +"%");
         }
         if(StringUtils.isNotEmpty((String)params.get("isRoleGroup"))&&"1".equals(params.get("isRoleGroup"))){
             List<Long> listRoles = sysRoleUserService.getRoleIdList(SecurityUser.getUserId());
@@ -87,11 +87,7 @@ public class ActTaskService extends BaseServiceImpl {
                 listStr.add(role.toString());
             }
             listStr.add(SecurityUser.getUserId().toString());
-            if(!listStr.isEmpty()){
-                taskQuery.taskCandidateGroupIn(listStr);
-            } else {
-                return new PageData<>(new ArrayList<>(), 0);
-            }
+            taskQuery.taskCandidateGroupIn(listStr);
         }
         taskQuery.orderByTaskCreateTime().desc();
         List<Task> list = taskQuery.listPage((curPage - 1) * limit, limit);
@@ -259,10 +255,10 @@ public class ActTaskService extends BaseServiceImpl {
 
     public void deleteTaskVariable(String taskId, String variableName, String scope) {
         if (StringUtils.isNotEmpty(scope)) {
-            if ("global".equals(scope.toLowerCase())) {
+            if ("global".equalsIgnoreCase(scope)) {
                 Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
                 runtimeService.removeVariable(task.getExecutionId(), variableName);
-            } else if ("local".equals(scope.toLowerCase())) {
+            } else if ("local".equalsIgnoreCase(scope)) {
                 taskService.removeVariable(taskId, variableName);
             }
         } else {
@@ -277,7 +273,7 @@ public class ActTaskService extends BaseServiceImpl {
      */
     @Transactional(rollbackFor = Exception.class)
     public void doBackPreviousTask(String taskId, String comment) {
-        Map<String, Object> variables = null;
+        Map<String, Object> variables;
         HistoricTaskInstance currTask = historyService.createHistoricTaskInstanceQuery().taskId(taskId).singleResult();
         if(this.isMultiInstance(taskId)){
             throw new EitcException(ErrorCode.BACK_PROCESS_PARALLEL_ERROR);
@@ -291,11 +287,8 @@ public class ActTaskService extends BaseServiceImpl {
         if(canBackActivitys.isEmpty()) {
             throw new EitcException(ErrorCode.SUPERIOR_NOT_EXIST);
         }
-        List<PvmTransition> originPvmTransitionList = new ArrayList<PvmTransition>();
         List<PvmTransition> pvmTransitionList = currActivity.getOutgoingTransitions();
-        for (PvmTransition pvmTransition : pvmTransitionList) {
-            originPvmTransitionList.add(pvmTransition);
-        }
+        List<PvmTransition> originPvmTransitionList = new ArrayList<>(pvmTransitionList);
         pvmTransitionList.clear();
         List<HistoricActivityInstance> historicActivityInstances = historyService
                 .createHistoricActivityInstanceQuery().activityType("userTask")
@@ -408,12 +401,9 @@ public class ActTaskService extends BaseServiceImpl {
             taskService.complete(taskId);
         } else {
             ActivityImpl currActivity = findActivitiImpl(taskId, null);
-            List<PvmTransition> oriPvmTransitionList = new ArrayList<PvmTransition>();
-            List<PvmTransition> pvmTransitionList = currActivity
-                    .getOutgoingTransitions();
-            for (PvmTransition pvmTransition : pvmTransitionList) {
-                oriPvmTransitionList.add(pvmTransition);
-            }
+            assert currActivity != null;
+            List<PvmTransition> pvmTransitionList = currActivity.getOutgoingTransitions();
+            List<PvmTransition> oriPvmTransitionList = new ArrayList<>(pvmTransitionList);
             pvmTransitionList.clear();
             TransitionImpl newTransition = currActivity.createOutgoingTransition();
             ActivityImpl pointActivity = findActivitiImpl(taskId, endActivity.getId());
@@ -425,12 +415,11 @@ public class ActTaskService extends BaseServiceImpl {
             comment = message + "["+ comment+ "]";
             taskService.addComment(task.getId(), task.getProcessInstanceId(), comment);
             taskService.complete(taskId);
+            assert pointActivity != null;
             pointActivity.getIncomingTransitions().remove(newTransition);
             List<PvmTransition> pvmTransitionListC = currActivity.getOutgoingTransitions();
             pvmTransitionListC.clear();
-            for (PvmTransition pvmTransition : oriPvmTransitionList) {
-                pvmTransitionListC.add(pvmTransition);
-            }
+            pvmTransitionListC.addAll(oriPvmTransitionList);
         }
 
     }
@@ -447,7 +436,7 @@ public class ActTaskService extends BaseServiceImpl {
         if (StringUtils.isEmpty(activityId)) {
             activityId = task.getTaskDefinitionKey();
         }
-        if ("END".equals(activityId.toUpperCase())) {
+        if ("END".equalsIgnoreCase(activityId)) {
             for (ActivityImpl activityImpl : processDefinition.getActivities()) {
                 String type = (String)activityImpl.getProperty("type");
                 if("endEvent".equals(type)){
@@ -455,8 +444,7 @@ public class ActTaskService extends BaseServiceImpl {
                 }
             }
         }
-        ActivityImpl activityImpl = processDefinition.findActivity(activityId);
-        return activityImpl;
+        return processDefinition.findActivity(activityId);
     }
 
     /**
@@ -505,17 +493,14 @@ public class ActTaskService extends BaseServiceImpl {
             throw new EitcException(ErrorCode.REJECT_PROCESS_HANDLEING_ERROR);
         }
         ActivityImpl currActivity = processDefinitionEntity.findActivity(currTask.getTaskDefinitionKey());
-        List<PvmTransition> originPvmTransitionList = new ArrayList<>();
         List<PvmTransition> pvmTransitionList = currActivity.getOutgoingTransitions();
-        for (PvmTransition pvmTransition : pvmTransitionList) {
-            originPvmTransitionList.add(pvmTransition);
-        }
+        List<PvmTransition> originPvmTransitionList = new ArrayList<>(pvmTransitionList);
         pvmTransitionList.clear();
         List<HistoricActivityInstance> historicActivityInstances = historyService
                 .createHistoricActivityInstanceQuery().activityType("userTask")
                 .processInstanceId(processInstance.getId())
                 .finished().orderByHistoricActivityInstanceEndTime().asc().list();
-        TransitionImpl transitionImpl = null;
+        TransitionImpl transitionImpl;
         if (historicActivityInstances.size() > 0) {
             ActivityImpl lastActivity = processDefinitionEntity.findActivity(historicActivityInstances.get(0).getActivityId());
             transitionImpl = currActivity.createOutgoingTransition();
@@ -534,18 +519,14 @@ public class ActTaskService extends BaseServiceImpl {
         }
         currActivity.getOutgoingTransitions().remove(transitionImpl);
 
-        for (PvmTransition pvmTransition : originPvmTransitionList) {
-            pvmTransitionList.add(pvmTransition);
-        }
+        pvmTransitionList.addAll(originPvmTransitionList);
     }
 
     public void completeTaskByVariables(TaskDTO taskDTO) {
         if(null != taskDTO.getParams()){
-            Set keySet = taskDTO.getParams().keySet();
-            Iterator iterator = keySet.iterator();
-            while(iterator.hasNext()){
-                String key = (String)iterator.next();
-                this.setTaskVariable(taskDTO.getTaskId(),key , taskDTO.getParams().get(key));
+            Set<String> keySet = taskDTO.getParams().keySet();
+            for (String key : keySet) {
+                this.setTaskVariable(taskDTO.getTaskId(), key, taskDTO.getParams().get(key));
             }
         }
         this.completeTask(taskDTO.getTaskId(), taskDTO.getComment());

eitc-admin/src/main/java/com/eitc/modules/devtools/service/impl/GeneratorServiceImpl.java

@@ -196,7 +196,7 @@ public class GeneratorServiceImpl implements GeneratorService {
         //导入的包列表
         Set<String> imports = fieldTypeService.getPackageListByTableId(tableInfo.getId());
         //过滤为空的数据
-        imports = imports.stream().filter(i -> StringUtils.isNotBlank(i)).collect(Collectors.toSet());
+        imports = imports.stream().filter(StringUtils::isNotBlank).collect(Collectors.toSet());
         dataModel.put("imports", imports);
 
         //基类

eitc-admin/src/main/java/com/eitc/modules/message/email/EmailUtils.java

@@ -12,11 +12,11 @@ import com.eitc.modules.sys.service.SysParamsService;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import javax.mail.internet.MimeMessage;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -31,12 +31,12 @@ import java.util.Properties;
 @Component
 public class EmailUtils {
 
-    private Logger logger = LoggerFactory.getLogger(getClass());
-    @Autowired
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+    @Resource
     private SysParamsService sysParamsService;
-    @Autowired
+    @Resource
     private SysMailTemplateService sysMailTemplateService;
-    @Autowired
+    @Resource
     private SysMailLogService sysMailLogService;
 
     private final static String KEY = Constant.MAIL_CONFIG_KEY;
@@ -101,7 +101,7 @@ public class EmailUtils {
 
         sysMailLogService.save(templateId, config.getUsername(), to, cc, template.getSubject(), content, status);
 
-        return status == Constant.SUCCESS ? true : false;
+        return status == Constant.SUCCESS;
     }
 
     /**
@@ -166,7 +166,7 @@ public class EmailUtils {
 
         sysMailLogService.save(null, config.getUsername(), to, cc, subject, content, status);
 
-        return status == Constant.SUCCESS ? true : false;
+        return status == Constant.SUCCESS;
     }
 
 }

eitc-admin/src/main/java/com/eitc/modules/message/sms/QcloudSmsService.java

@@ -34,9 +34,7 @@ public class QcloudSmsService extends AbstractSmsService {
         //短信参数
         ArrayList<String> paramsList = new ArrayList<>();
         if(MapUtil.isNotEmpty(params)){
-            for(String value : params.values()){
-                paramsList.add(value);
-            }
+            paramsList.addAll(params.values());
         }
         SmsSingleSenderResult result;
         try {

eitc-admin/src/main/java/com/eitc/modules/oss/cloud/MinioCloudStorageService.java

@@ -26,9 +26,7 @@ public class MinioCloudStorageService extends AbstractCloudStorageService {
     private void init(){
         try {
             minioClient = new MinioClient(config.getMinioEndPoint(), config.getMinioAccessKey(), config.getMinioSecretKey());
-        } catch (InvalidEndpointException e) {
-            e.printStackTrace();
-        } catch (InvalidPortException e) {
+        } catch (InvalidEndpointException | InvalidPortException e) {
             e.printStackTrace();
         }
     }

eitc-admin/src/main/java/com/eitc/modules/sys/service/impl/SysDeptServiceImpl.java

@@ -127,7 +127,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
 	private String getPidList(Long pid){
 		//顶级部门，无上级部门
 		if(Constant.DEPT_ROOT.equals(pid)){
-			return Constant.DEPT_ROOT + "";
+			return String.valueOf(Constant.DEPT_ROOT);
 		}
 
 		//所有部门的id、pid列表

eitc-admin/src/main/java/com/eitc/modules/sys/service/impl/SysMenuServiceImpl.java

@@ -15,26 +15,23 @@ import com.eitc.modules.sys.enums.SuperAdminEnum;
 import com.eitc.modules.sys.service.SysLanguageService;
 import com.eitc.modules.sys.service.SysMenuService;
 import com.eitc.modules.sys.service.SysRoleMenuService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 @Service
 public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuDao, SysMenuEntity> implements SysMenuService {
-	@Autowired
+	@Resource
 	private SysRoleMenuService sysRoleMenuService;
-	@Autowired
+	@Resource
 	private SysLanguageService sysLanguageService;
 
 	@Override
 	public SysMenuDTO get(Long id) {
 		SysMenuEntity entity = baseDao.getById(id, HttpContextUtils.getLanguage());
-
-		SysMenuDTO dto = ConvertUtils.sourceToTarget(entity, SysMenuDTO.class);
-
-		return dto;
+		return ConvertUtils.sourceToTarget(entity, SysMenuDTO.class);
 	}
 
 	@Override

eitc-common/src/main/java/com/eitc/common/aspect/RedisAspect.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Component;
 @Aspect
 @Component
 public class RedisAspect {
-    private Logger logger = LoggerFactory.getLogger(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
     /**
      * 是否开启redis缓存  true开启   false关闭
      */

eitc-common/src/main/java/com/eitc/common/xss/SqlFilter.java

@@ -32,7 +32,7 @@ public class SqlFilter {
 
         //判断是否包含非法字符
         for(String keyword : keywords){
-            if(str.indexOf(keyword) != -1){
+            if(str.contains(keyword)){
                 throw new EitcException(ErrorCode.INVALID_SYMBOL);
             }
         }

eitc-dynamic-datasource/src/main/java/com/eitc/commons/dynamic/datasource/config/DynamicContextHolder.java

@@ -9,13 +9,7 @@ import java.util.Deque;
  * @author Mark eitc@163.com
  */
 public class DynamicContextHolder {
-    @SuppressWarnings("unchecked")
-    private static final ThreadLocal<Deque<String>> CONTEXT_HOLDER = new ThreadLocal() {
-        @Override
-        protected Object initialValue() {
-            return new ArrayDeque();
-        }
-    };
+    private static final ThreadLocal<Deque<String>> CONTEXT_HOLDER = ThreadLocal.withInitial(ArrayDeque::new);
 
     /**
      * 获得当前线程数据源