代码优化

febs-auth/src/main/java/cc/mrbird/febs/auth/controller/SocialLoginController.java

@@ -4,6 +4,7 @@ import cc.mrbird.febs.auth.entity.BindUser;
 import cc.mrbird.febs.auth.entity.UserConnection;
 import cc.mrbird.febs.auth.service.SocialLoginService;
 import cc.mrbird.febs.common.core.entity.FebsResponse;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.exception.FebsException;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
 import lombok.RequiredArgsConstructor;
@@ -52,7 +53,7 @@ public class SocialLoginController {
     @GetMapping("/login/{oauthType}/{type}")
     public void renderAuth(@PathVariable String oauthType, @PathVariable String type, HttpServletResponse response) throws IOException, FebsException {
         AuthRequest authRequest = socialLoginService.renderAuth(oauthType);
-        response.sendRedirect(authRequest.authorize(oauthType + "::" + AuthStateUtils.createState()) + "::" + type);
+        response.sendRedirect(authRequest.authorize(oauthType + StringConstant.DOUBLE_COLON + AuthStateUtils.createState()) + "::" + type);
     }
 
     /**
@@ -66,7 +67,7 @@ public class SocialLoginController {
     public String login(@PathVariable String oauthType, AuthCallback callback, String state, Model model) {
         try {
             FebsResponse febsResponse = null;
-            String type = StringUtils.substringAfterLast(state, "::");
+            String type = StringUtils.substringAfterLast(state, StringConstant.DOUBLE_COLON);
             if (StringUtils.equals(type, TYPE_BIND)) {
                 febsResponse = socialLoginService.resolveBind(oauthType, callback);
             } else {

febs-auth/src/main/java/cc/mrbird/febs/auth/manager/UserManager.java

@@ -4,11 +4,11 @@ import cc.mrbird.febs.auth.mapper.MenuMapper;
 import cc.mrbird.febs.auth.mapper.UserMapper;
 import cc.mrbird.febs.auth.mapper.UserRoleMapper;
 import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.system.Menu;
 import cc.mrbird.febs.common.core.entity.system.SystemUser;
 import cc.mrbird.febs.common.core.entity.system.UserDataPermission;
 import cc.mrbird.febs.common.core.entity.system.UserRole;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -42,7 +42,7 @@ public class UserManager {
         SystemUser user = userMapper.findByName(username);
         if (user != null) {
             List<UserDataPermission> permissions = userMapper.findUserDataPermissions(user.getUserId());
-            String deptIds = permissions.stream().map(p -> String.valueOf(p.getDeptId())).collect(Collectors.joining(StringPool.COMMA));
+            String deptIds = permissions.stream().map(p -> String.valueOf(p.getDeptId())).collect(Collectors.joining(StringConstant.COMMA));
             user.setDeptIds(deptIds);
         }
         return user;

febs-auth/src/main/java/cc/mrbird/febs/auth/service/ValidateCodeService.java

@@ -16,6 +16,7 @@ public interface ValidateCodeService {
      *
      * @param request  HttpServletRequest
      * @param response HttpServletResponse
+     * @throws IOException           IO异常
      * @throws ValidateCodeException 验证码异常
      */
     void create(HttpServletRequest request, HttpServletResponse response) throws IOException, ValidateCodeException;

febs-auth/src/main/java/cc/mrbird/febs/auth/service/impl/FebsUserDetailServiceImpl.java

@@ -9,6 +9,7 @@ import cc.mrbird.febs.common.core.utils.FebsUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -17,6 +18,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * @author MrBird
@@ -43,8 +45,13 @@ public class FebsUserDetailServiceImpl implements UserDetailsService {
             if (StringUtils.equals(loginType, SocialConstant.SOCIAL_LOGIN)) {
                 password = passwordEncoder.encode(SocialConstant.SOCIAL_LOGIN_PASSWORD);
             }
+
+            List<GrantedAuthority> grantedAuthorities = AuthorityUtils.NO_AUTHORITIES;
+            if (StringUtils.isNotBlank(permissions)) {
+                grantedAuthorities = AuthorityUtils.commaSeparatedStringToAuthorityList(permissions);
+            }
             FebsAuthUser authUser = new FebsAuthUser(systemUser.getUsername(), password, true, true, true, notLocked,
-                    AuthorityUtils.commaSeparatedStringToAuthorityList(permissions));
+                    grantedAuthorities);
 
             BeanUtils.copyProperties(systemUser, authUser);
             return authUser;

febs-auth/src/main/java/cc/mrbird/febs/auth/service/impl/OauthClientDetailsServiceImpl.java

@@ -4,6 +4,7 @@ import cc.mrbird.febs.auth.entity.OauthClientDetails;
 import cc.mrbird.febs.auth.mapper.OauthClientDetailsMapper;
 import cc.mrbird.febs.auth.service.OauthClientDetailsService;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.exception.FebsException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -94,7 +95,7 @@ public class OauthClientDetailsServiceImpl extends ServiceImpl<OauthClientDetail
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteOauthClientDetails(String clientIds) {
-        Object[] clientIdArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(clientIds, ",");
+        Object[] clientIdArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(clientIds, StringConstant.COMMA);
         LambdaQueryWrapper<OauthClientDetails> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(OauthClientDetails::getClientId, clientIdArray);
         boolean removed = this.remove(queryWrapper);

febs-auth/src/main/java/cc/mrbird/febs/auth/service/impl/SocialLoginServiceImpl.java

@@ -10,6 +10,7 @@ import cc.mrbird.febs.common.core.entity.FebsResponse;
 import cc.mrbird.febs.common.core.entity.constant.GrantTypeConstant;
 import cc.mrbird.febs.common.core.entity.constant.ParamsConstant;
 import cc.mrbird.febs.common.core.entity.constant.SocialConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.system.SystemUser;
 import cc.mrbird.febs.common.core.exception.FebsException;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
@@ -166,9 +167,9 @@ public class SocialLoginServiceImpl implements SocialLoginService {
     private AuthCallback resolveAuthCallback(AuthCallback callback) {
         int stateLength = 3;
         String state = callback.getState();
-        String[] strings = StringUtils.splitByWholeSeparatorPreserveAllTokens(state, "::");
+        String[] strings = StringUtils.splitByWholeSeparatorPreserveAllTokens(state, StringConstant.DOUBLE_COLON);
         if (strings.length == stateLength) {
-            callback.setState(strings[0] + "::" + strings[1]);
+            callback.setState(strings[0] + StringConstant.DOUBLE_COLON + strings[1]);
         }
         return callback;
     }
@@ -204,7 +205,7 @@ public class SocialLoginServiceImpl implements SocialLoginService {
         requestParameters.put(USERNAME, user.getUsername());
         requestParameters.put(PASSWORD, SocialConstant.SOCIAL_LOGIN_PASSWORD);
 
-        String grantTypes = String.join(",", clientDetails.getAuthorizedGrantTypes());
+        String grantTypes = String.join(StringConstant.COMMA, clientDetails.getAuthorizedGrantTypes());
         TokenRequest tokenRequest = new TokenRequest(requestParameters, clientDetails.getClientId(), clientDetails.getScope(), grantTypes);
         return granter.grant(GrantTypeConstant.PASSWORD, tokenRequest);
     }

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/StringConstant.java

@@ -0,0 +1,70 @@
+package cc.mrbird.febs.common.core.entity.constant;
+
+/**
+ * @author MrBird
+ */
+public interface StringConstant {
+    String AMPERSAND = "&";
+    String AND = "and";
+    String AT = "@";
+    String ASTERISK = "*";
+    String STAR = "*";
+    String BACK_SLASH = "\\";
+    String COLON = ":";
+    String DOUBLE_COLON = "::";
+    String COMMA = ",";
+    String DASH = "-";
+    String DOLLAR = "$";
+    String DOT = ".";
+    String UNDER_LINE = "_";
+    String DOUBLE_DOT = "..";
+    String DOT_CLASS = ".class";
+    String DOT_JAVA = ".java";
+    String DOT_XML = ".xml";
+    String EMPTY = "";
+    String EQUALS = "=";
+    String FALSE = "false";
+    String SLASH = "/";
+    String HASH = "#";
+    String HAT = "^";
+    String LEFT_BRACE = "{";
+    String LEFT_BRACKET = "(";
+    String LEFT_CHEV = "<";
+    String DOT_NEWLINE = ",\n";
+    String NEWLINE = "\n";
+    String N = "n";
+    String NO = "no";
+    String NULL = "null";
+    String OFF = "off";
+    String ON = "on";
+    String PERCENT = "%";
+    String PIPE = "|";
+    String PLUS = "+";
+    String QUESTION_MARK = "?";
+    String EXCLAMATION_MARK = "!";
+    String QUOTE = "\"";
+    String RETURN = "\r";
+    String TAB = "\t";
+    String RIGHT_BRACE = "}";
+    String RIGHT_BRACKET = ")";
+    String RIGHT_CHEV = ">";
+    String SEMICOLON = ";";
+    String SINGLE_QUOTE = "'";
+    String BACKTICK = "`";
+    String SPACE = " ";
+    String TILDA = "~";
+    String LEFT_SQ_BRACKET = "[";
+    String RIGHT_SQ_BRACKET = "]";
+    String TRUE = "true";
+    String UNDERSCORE = "_";
+    String UTF_8 = "UTF-8";
+    String US_ASCII = "US-ASCII";
+    String ISO_8859_1 = "ISO-8859-1";
+    String Y = "y";
+    String YES = "yes";
+    String ONE = "1";
+    String ZERO = "0";
+    String DOLLAR_LEFT_BRACE = "${";
+    String HASH_LEFT_BRACE = "#{";
+    String CRLF = "\r\n";
+}

febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java

@@ -4,6 +4,7 @@ import cc.mrbird.febs.common.core.entity.CurrentUser;
 import cc.mrbird.febs.common.core.entity.FebsAuthUser;
 import cc.mrbird.febs.common.core.entity.constant.PageConstant;
 import cc.mrbird.febs.common.core.entity.constant.RegexpConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -77,7 +78,7 @@ public class FebsUtil {
      */
     public static String underscoreToCamel(String value) {
         StringBuilder result = new StringBuilder();
-        String[] arr = value.split("_");
+        String[] arr = value.split(StringConstant.UNDER_LINE);
         for (String s : arr) {
             result.append((String.valueOf(s.charAt(0))).toUpperCase()).append(s.substring(1));
         }
@@ -227,8 +228,8 @@ public class FebsUtil {
         HttpHeaders headers = request.getHeaders();
         String ip = headers.getFirst("x-forwarded-for");
         if (ip != null && ip.length() != 0 && !UNKNOW.equalsIgnoreCase(ip)) {
-            if (ip.contains(",")) {
-                ip = ip.split(",")[0];
+            if (ip.contains(StringConstant.COMMA)) {
+                ip = ip.split(StringConstant.COMMA)[0];
             }
         }
         if (ip == null || ip.length() == 0 || UNKNOW.equalsIgnoreCase(ip)) {

febs-common/febs-common-security-starter/src/main/java/cc/mrbird/febs/common/security/starter/interceptor/FebsServerProtectInterceptor.java

@@ -5,6 +5,7 @@ import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
 import cc.mrbird.febs.common.security.starter.properties.FebsCloudSecurityProperties;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.lang.NonNull;
 import org.springframework.util.Base64Utils;
 import org.springframework.web.servlet.HandlerInterceptor;
 
@@ -20,7 +21,7 @@ public class FebsServerProtectInterceptor implements HandlerInterceptor {
     private FebsCloudSecurityProperties properties;
 
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws IOException {
+    public boolean preHandle(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response, @NonNull Object handler) throws IOException {
         if (!properties.getOnlyFetchByGateway()) {
             return true;
         }

febs-server/febs-server-job/src/main/java/cc/mrbird/febs/server/job/controller/JobController.java

@@ -2,10 +2,10 @@ package cc.mrbird.febs.server.job.controller;
 
 import cc.mrbird.febs.common.core.entity.FebsResponse;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
 import cc.mrbird.febs.server.job.entity.Job;
 import cc.mrbird.febs.server.job.service.IJobService;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.wuwenze.poi.ExcelKit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -56,7 +56,7 @@ public class JobController {
     @DeleteMapping("{jobIds}")
     @PreAuthorize("hasAuthority('job:delete')")
     public void deleteJob(@NotBlank(message = "{required}") @PathVariable String jobIds) {
-        String[] ids = jobIds.split(StringPool.COMMA);
+        String[] ids = jobIds.split(StringConstant.COMMA);
         this.jobService.deleteJobs(ids);
     }
 

febs-server/febs-server-job/src/main/java/cc/mrbird/febs/server/job/controller/JobLogController.java

@@ -2,10 +2,10 @@ package cc.mrbird.febs.server.job.controller;
 
 import cc.mrbird.febs.common.core.entity.FebsResponse;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
 import cc.mrbird.febs.server.job.entity.JobLog;
 import cc.mrbird.febs.server.job.service.IJobLogService;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.wuwenze.poi.ExcelKit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -40,7 +40,7 @@ public class JobLogController {
     @DeleteMapping("{jobIds}")
     @PreAuthorize("hasAuthority('job:log:delete')")
     public void deleteJobLog(@NotBlank(message = "{required}") @PathVariable String jobIds) {
-        String[] ids = jobIds.split(StringPool.COMMA);
+        String[] ids = jobIds.split(StringConstant.COMMA);
         this.jobLogService.deleteJobLogs(ids);
     }
 

febs-server/febs-server-job/src/main/java/cc/mrbird/febs/server/job/service/impl/JobServiceImpl.java

@@ -2,6 +2,7 @@ package cc.mrbird.febs.server.job.service.impl;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
 import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.utils.SortUtil;
 import cc.mrbird.febs.server.job.entity.Job;
 import cc.mrbird.febs.server.job.helper.ScheduleUtils;
@@ -9,7 +10,6 @@ import cc.mrbird.febs.server.job.mapper.JobMapper;
 import cc.mrbird.febs.server.job.service.IJobService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -116,7 +116,7 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements IJobS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateBatch(String jobIds, String status) {
-        List<String> list = Arrays.asList(jobIds.split(StringPool.COMMA));
+        List<String> list = Arrays.asList(jobIds.split(StringConstant.COMMA));
         Job job = new Job();
         job.setStatus(status);
         this.baseMapper.update(job, new LambdaQueryWrapper<Job>().in(Job::getJobId, list));
@@ -125,14 +125,14 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements IJobS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void run(String jobIds) {
-        String[] list = jobIds.split(StringPool.COMMA);
+        String[] list = jobIds.split(StringConstant.COMMA);
         Arrays.stream(list).forEach(jobId -> ScheduleUtils.run(scheduler, this.findJob(Long.valueOf(jobId))));
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void pause(String jobIds) {
-        String[] list = jobIds.split(StringPool.COMMA);
+        String[] list = jobIds.split(StringConstant.COMMA);
         Arrays.stream(list).forEach(jobId -> ScheduleUtils.pauseJob(scheduler, Long.valueOf(jobId)));
         this.updateBatch(jobIds, Job.ScheduleStatus.PAUSE.getValue());
     }
@@ -140,7 +140,7 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements IJobS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void resume(String jobIds) {
-        String[] list = jobIds.split(StringPool.COMMA);
+        String[] list = jobIds.split(StringConstant.COMMA);
         Arrays.stream(list).forEach(jobId -> ScheduleUtils.resumeJob(scheduler, Long.valueOf(jobId)));
         this.updateBatch(jobIds, Job.ScheduleStatus.NORMAL.getValue());
     }

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java

@@ -2,10 +2,10 @@ package cc.mrbird.febs.server.system.controller;
 
 import cc.mrbird.febs.common.core.entity.FebsResponse;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.system.Dept;
 import cc.mrbird.febs.server.system.annotation.ControllerEndpoint;
 import cc.mrbird.febs.server.system.service.IDeptService;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.wuwenze.poi.ExcelKit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -48,7 +48,7 @@ public class DeptController {
     @PreAuthorize("hasAuthority('dept:delete')")
     @ControllerEndpoint(operation = "删除部门", exceptionMessage = "删除部门失败")
     public void deleteDepts(@NotBlank(message = "{required}") @PathVariable String deptIds) {
-        String[] ids = deptIds.split(StringPool.COMMA);
+        String[] ids = deptIds.split(StringConstant.COMMA);
         this.deptService.deleteDepts(ids);
     }
 

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/LogController.java

@@ -2,11 +2,11 @@ package cc.mrbird.febs.server.system.controller;
 
 import cc.mrbird.febs.common.core.entity.FebsResponse;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.system.Log;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
 import cc.mrbird.febs.server.system.annotation.ControllerEndpoint;
 import cc.mrbird.febs.server.system.service.ILogService;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.wuwenze.poi.ExcelKit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -39,7 +39,7 @@ public class LogController {
     @PreAuthorize("hasAuthority('log:delete')")
     @ControllerEndpoint(exceptionMessage = "删除日志失败")
     public void deleteLogss(@NotBlank(message = "{required}") @PathVariable String ids) {
-        String[] logIds = ids.split(StringPool.COMMA);
+        String[] logIds = ids.split(StringConstant.COMMA);
         this.logService.deleteLogs(logIds);
     }
 

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/LoginLogController.java

@@ -2,11 +2,11 @@ package cc.mrbird.febs.server.system.controller;
 
 import cc.mrbird.febs.common.core.entity.FebsResponse;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.system.LoginLog;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
 import cc.mrbird.febs.server.system.annotation.ControllerEndpoint;
 import cc.mrbird.febs.server.system.service.ILoginLogService;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.wuwenze.poi.ExcelKit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -46,7 +46,7 @@ public class LoginLogController {
     @PreAuthorize("hasAuthority('loginlog:delete')")
     @ControllerEndpoint(operation = "删除登录日志", exceptionMessage = "删除登录日志失败")
     public void deleteLogs(@NotBlank(message = "{required}") @PathVariable String ids) {
-        String[] loginLogIds = ids.split(StringPool.COMMA);
+        String[] loginLogIds = ids.split(StringConstant.COMMA);
         this.loginLogService.deleteLoginLogs(loginLogIds);
     }
 

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/MenuController.java

@@ -1,11 +1,11 @@
 package cc.mrbird.febs.server.system.controller;
 
 import cc.mrbird.febs.common.core.entity.FebsResponse;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.router.VueRouter;
 import cc.mrbird.febs.common.core.entity.system.Menu;
 import cc.mrbird.febs.server.system.annotation.ControllerEndpoint;
 import cc.mrbird.febs.server.system.service.IMenuService;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.wuwenze.poi.ExcelKit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -69,7 +69,7 @@ public class MenuController {
     @PreAuthorize("hasAuthority('menu:delete')")
     @ControllerEndpoint(operation = "删除菜单/按钮", exceptionMessage = "删除菜单/按钮失败")
     public void deleteMenus(@NotBlank(message = "{required}") @PathVariable String menuIds) {
-        String[] ids = menuIds.split(StringPool.COMMA);
+        String[] ids = menuIds.split(StringConstant.COMMA);
         this.menuService.deleteMeuns(ids);
     }
 

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/RoleController.java

@@ -2,11 +2,11 @@ package cc.mrbird.febs.server.system.controller;
 
 import cc.mrbird.febs.common.core.entity.FebsResponse;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.system.Role;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
 import cc.mrbird.febs.server.system.annotation.ControllerEndpoint;
 import cc.mrbird.febs.server.system.service.IRoleService;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.wuwenze.poi.ExcelKit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -61,7 +61,7 @@ public class RoleController {
     @PreAuthorize("hasAuthority('role:delete')")
     @ControllerEndpoint(operation = "删除角色", exceptionMessage = "删除角色失败")
     public void deleteRoles(@NotBlank(message = "{required}") @PathVariable String roleIds) {
-        String[] ids = roleIds.split(StringPool.COMMA);
+        String[] ids = roleIds.split(StringConstant.COMMA);
         this.roleService.deleteRoles(ids);
     }
 

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/UserController.java

@@ -2,6 +2,7 @@ package cc.mrbird.febs.server.system.controller;
 
 import cc.mrbird.febs.common.core.entity.FebsResponse;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.system.LoginLog;
 import cc.mrbird.febs.common.core.entity.system.SystemUser;
 import cc.mrbird.febs.common.core.exception.FebsException;
@@ -10,7 +11,6 @@ import cc.mrbird.febs.server.system.annotation.ControllerEndpoint;
 import cc.mrbird.febs.server.system.service.ILoginLogService;
 import cc.mrbird.febs.server.system.service.IUserDataPermissionService;
 import cc.mrbird.febs.server.system.service.IUserService;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.wuwenze.poi.ExcelKit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -112,7 +112,7 @@ public class UserController {
     @PreAuthorize("hasAuthority('user:delete')")
     @ControllerEndpoint(operation = "删除用户", exceptionMessage = "删除用户失败")
     public void deleteUsers(@NotBlank(message = "{required}") @PathVariable String userIds) {
-        String[] ids = userIds.split(StringPool.COMMA);
+        String[] ids = userIds.split(StringConstant.COMMA);
         this.userService.deleteUsers(ids);
     }
 
@@ -145,7 +145,7 @@ public class UserController {
     @PreAuthorize("hasAuthority('user:reset')")
     @ControllerEndpoint(exceptionMessage = "重置用户密码失败")
     public void resetPassword(@NotBlank(message = "{required}") String usernames) {
-        String[] usernameArr = usernames.split(StringPool.COMMA);
+        String[] usernameArr = usernames.split(StringConstant.COMMA);
         this.userService.resetPassword(usernameArr);
     }
 

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserDataPermissionServiceImpl.java

@@ -1,10 +1,10 @@
 package cc.mrbird.febs.server.system.service.impl;
 
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.system.UserDataPermission;
 import cc.mrbird.febs.server.system.mapper.UserDataPermissionMapper;
 import cc.mrbird.febs.server.system.service.IUserDataPermissionService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -38,6 +38,6 @@ public class UserDataPermissionServiceImpl extends ServiceImpl<UserDataPermissio
     public String findByUserId(String userId) {
         LambdaQueryWrapper<UserDataPermission> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(UserDataPermission::getUserId, userId);
-        return this.baseMapper.selectList(wrapper).stream().map(permission -> String.valueOf(permission.getDeptId())).collect(Collectors.joining(StringPool.COMMA));
+        return this.baseMapper.selectList(wrapper).stream().map(permission -> String.valueOf(permission.getDeptId())).collect(Collectors.joining(StringConstant.COMMA));
     }
 }

febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserServiceImpl.java

@@ -3,6 +3,7 @@ package cc.mrbird.febs.server.system.service.impl;
 import cc.mrbird.febs.common.core.entity.CurrentUser;
 import cc.mrbird.febs.common.core.entity.QueryRequest;
 import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.system.SystemUser;
 import cc.mrbird.febs.common.core.entity.system.UserDataPermission;
 import cc.mrbird.febs.common.core.entity.system.UserRole;
@@ -16,7 +17,6 @@ import cc.mrbird.febs.server.system.service.IUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -83,10 +83,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, SystemUser> impleme
         user.setPassword(passwordEncoder.encode(SystemUser.DEFAULT_PASSWORD));
         save(user);
         // 保存用户角色
-        String[] roles = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getRoleId(), StringPool.COMMA);
+        String[] roles = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getRoleId(), StringConstant.COMMA);
         setUserRoles(user, roles);
         // 保存用户数据权限关联关系
-        String[] deptIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getDeptIds(), StringPool.COMMA);
+        String[] deptIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getDeptIds(), StringConstant.COMMA);
         setUserDataPermissions(user, deptIds);
     }
 
@@ -102,11 +102,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, SystemUser> impleme
 
         String[] userIds = {String.valueOf(user.getUserId())};
         userRoleService.deleteUserRolesByUserId(userIds);
-        String[] roles = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getRoleId(), StringPool.COMMA);
+        String[] roles = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getRoleId(), StringConstant.COMMA);
         setUserRoles(user, roles);
 
         userDataPermissionService.deleteByUserIds(userIds);
-        String[] deptIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getDeptIds(), StringPool.COMMA);
+        String[] deptIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(user.getDeptIds(), StringConstant.COMMA);
         setUserDataPermissions(user, deptIds);
     }