MrBird 6 年 前
コミット
96d4834055
13 ファイル変更27 行追加16 行削除
  1. 1 1
      febs-auth/src/main/java/cc/mrbird/febs/auth/manager/UserManager.java
  2. 4 3
      febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/handler/BaseExceptionHandler.java
  3. 2 1
      febs-common/febs-common-security-starter/src/main/java/cc/mrbird/febs/common/security/starter/configure/FebsCloudResourceServerConfigure.java
  4. 2 1
      febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/BlackListServiceImpl.java
  5. 2 1
      febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/BlockLogServiceImpl.java
  6. 2 1
      febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RateLimitLogServiceImpl.java
  7. 2 1
      febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RateLimitRuleServiceImpl.java
  8. 2 1
      febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RouteLogServiceImpl.java
  9. 2 1
      febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RouteUserServiceImpl.java
  10. 1 1
      febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/MenuController.java
  11. 2 1
      febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/MenuServiceImpl.java
  12. 3 2
      febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/RoleServiceImpl.java
  13. 2 1
      febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserRoleServiceImpl.java

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

@@ -56,7 +56,7 @@ public class UserManager {
      */
     public String findUserPermissions(String username) {
         List<Menu> userPermissions = menuMapper.findUserPermissions(username);
-        return userPermissions.stream().map(Menu::getPerms).collect(Collectors.joining(","));
+        return userPermissions.stream().map(Menu::getPerms).collect(Collectors.joining(StringConstant.COMMA));
     }
 
     /**

+ 4 - 3
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/handler/BaseExceptionHandler.java

@@ -1,6 +1,7 @@
 package cc.mrbird.febs.common.core.handler;
 
 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.exception.FileDownloadException;
 import cc.mrbird.febs.common.core.utils.FebsUtil;
@@ -55,7 +56,7 @@ public class BaseExceptionHandler {
         StringBuilder message = new StringBuilder();
         List<FieldError> fieldErrors = e.getBindingResult().getFieldErrors();
         for (FieldError error : fieldErrors) {
-            message.append(error.getField()).append(error.getDefaultMessage()).append(",");
+            message.append(error.getField()).append(error.getDefaultMessage()).append(StringConstant.COMMA);
         }
         message = new StringBuilder(message.substring(0, message.length() - 1));
         log.error(message.toString());
@@ -76,7 +77,7 @@ public class BaseExceptionHandler {
         for (ConstraintViolation<?> violation : violations) {
             Path path = violation.getPropertyPath();
             String[] pathArr = StringUtils.splitByWholeSeparatorPreserveAllTokens(path.toString(), ".");
-            message.append(pathArr[1]).append(violation.getMessage()).append(",");
+            message.append(pathArr[1]).append(violation.getMessage()).append(StringConstant.COMMA);
         }
         message = new StringBuilder(message.substring(0, message.length() - 1));
         log.error(message.toString());
@@ -94,7 +95,7 @@ public class BaseExceptionHandler {
     public FebsResponse handlerMethodArgumentNotValidException(MethodArgumentNotValidException e) {
         StringBuilder message = new StringBuilder();
         for (FieldError error : e.getBindingResult().getFieldErrors()) {
-            message.append(error.getField()).append(error.getDefaultMessage()).append(",");
+            message.append(error.getField()).append(error.getDefaultMessage()).append(StringConstant.COMMA);
         }
         message = new StringBuilder(message.substring(0, message.length() - 1));
         log.error(message.toString());

+ 2 - 1
febs-common/febs-common-security-starter/src/main/java/cc/mrbird/febs/common/security/starter/configure/FebsCloudResourceServerConfigure.java

@@ -1,5 +1,6 @@
 package cc.mrbird.febs.common.security.starter.configure;
 
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.security.starter.handler.FebsAccessDeniedHandler;
 import cc.mrbird.febs.common.security.starter.handler.FebsAuthExceptionEntryPoint;
 import cc.mrbird.febs.common.security.starter.properties.FebsCloudSecurityProperties;
@@ -41,7 +42,7 @@ public class FebsCloudResourceServerConfigure extends ResourceServerConfigurerAd
 
     @Override
     public void configure(HttpSecurity http) throws Exception {
-        String[] anonUrls = StringUtils.splitByWholeSeparatorPreserveAllTokens(properties.getAnonUris(), ",");
+        String[] anonUrls = StringUtils.splitByWholeSeparatorPreserveAllTokens(properties.getAnonUris(), StringConstant.COMMA);
         if (ArrayUtils.isEmpty(anonUrls)) {
             anonUrls = new String[]{};
         }

+ 2 - 1
febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/BlackListServiceImpl.java

@@ -1,6 +1,7 @@
 package cc.mrbird.febs.gateway.enhance.service.impl;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.utils.DateUtil;
 import cc.mrbird.febs.gateway.enhance.entity.BlackList;
 import cc.mrbird.febs.gateway.enhance.mapper.BlackListMapper;
@@ -70,7 +71,7 @@ public class BlackListServiceImpl implements BlackListService {
 
     @Override
     public Flux<BlackList> delete(String ids) {
-        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, ",");
+        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, StringConstant.COMMA);
         return blackListMapper.deleteByIdIn(Arrays.asList(idArray))
                 .doOnNext(routeEnhanceCacheService::removeBlackList);
     }

+ 2 - 1
febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/BlockLogServiceImpl.java

@@ -1,6 +1,7 @@
 package cc.mrbird.febs.gateway.enhance.service.impl;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.utils.DateUtil;
 import cc.mrbird.febs.gateway.enhance.entity.BlockLog;
 import cc.mrbird.febs.gateway.enhance.mapper.BlockLogMapper;
@@ -47,7 +48,7 @@ public class BlockLogServiceImpl implements BlockLogService {
 
     @Override
     public Flux<BlockLog> delete(String ids) {
-        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, ",");
+        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, StringConstant.COMMA);
         return blockLogMapper.deleteByIdIn(Arrays.asList(idArray));
     }
 

+ 2 - 1
febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RateLimitLogServiceImpl.java

@@ -1,6 +1,7 @@
 package cc.mrbird.febs.gateway.enhance.service.impl;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.utils.DateUtil;
 import cc.mrbird.febs.gateway.enhance.entity.RateLimitLog;
 import cc.mrbird.febs.gateway.enhance.mapper.RateLimitLogMapper;
@@ -47,7 +48,7 @@ public class RateLimitLogServiceImpl implements RateLimitLogService {
 
     @Override
     public Flux<RateLimitLog> delete(String ids) {
-        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, ",");
+        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, StringConstant.COMMA);
         return rateLimitLogMapper.deleteByIdIn(Arrays.asList(idArray));
     }
 

+ 2 - 1
febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RateLimitRuleServiceImpl.java

@@ -1,6 +1,7 @@
 package cc.mrbird.febs.gateway.enhance.service.impl;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.utils.DateUtil;
 import cc.mrbird.febs.gateway.enhance.entity.RateLimitRule;
 import cc.mrbird.febs.gateway.enhance.mapper.RateLimitRuleMapper;
@@ -83,7 +84,7 @@ public class RateLimitRuleServiceImpl implements RateLimitRuleService {
 
     @Override
     public Flux<RateLimitRule> delete(String ids) {
-        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, ",");
+        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, StringConstant.COMMA);
         return rateLimitRuleMapper.deleteByIdIn(Arrays.asList(idArray))
                 .doOnNext(routeEnhanceCacheService::removeRateLimitRule);
     }

+ 2 - 1
febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RouteLogServiceImpl.java

@@ -1,6 +1,7 @@
 package cc.mrbird.febs.gateway.enhance.service.impl;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.utils.DateUtil;
 import cc.mrbird.febs.gateway.enhance.entity.RouteLog;
 import cc.mrbird.febs.gateway.enhance.mapper.RouteLogMapper;
@@ -52,7 +53,7 @@ public class RouteLogServiceImpl implements RouteLogService {
 
     @Override
     public Flux<RouteLog> delete(String ids) {
-        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, ",");
+        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, StringConstant.COMMA);
         return routeLogMapper.deleteByIdIn(Arrays.asList(idArray));
     }
 

+ 2 - 1
febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RouteUserServiceImpl.java

@@ -1,6 +1,7 @@
 package cc.mrbird.febs.gateway.enhance.service.impl;
 
 import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.utils.DateUtil;
 import cc.mrbird.febs.gateway.enhance.entity.RouteUser;
 import cc.mrbird.febs.gateway.enhance.mapper.RouteUserMapper;
@@ -60,7 +61,7 @@ public class RouteUserServiceImpl implements RouteUserService {
 
     @Override
     public Flux<RouteUser> delete(String ids) {
-        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, ",");
+        String[] idArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(ids, StringConstant.COMMA);
         return routeUserMapper.deleteByIdIn(Arrays.asList(idArray));
     }
 

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

@@ -40,7 +40,7 @@ public class MenuController {
         String userPermissions = this.menuService.findUserPermissions(username);
         String[] permissionArray = new String[0];
         if (StringUtils.isNoneBlank(userPermissions)) {
-            permissionArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(userPermissions, ",");
+            permissionArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(userPermissions, StringConstant.COMMA);
         }
         result.put("routes", userRouters);
         result.put("permissions", permissionArray);

+ 2 - 1
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/MenuServiceImpl.java

@@ -3,6 +3,7 @@ package cc.mrbird.febs.server.system.service.impl;
 import cc.mrbird.febs.common.core.entity.MenuTree;
 import cc.mrbird.febs.common.core.entity.Tree;
 import cc.mrbird.febs.common.core.entity.constant.PageConstant;
+import cc.mrbird.febs.common.core.entity.constant.StringConstant;
 import cc.mrbird.febs.common.core.entity.router.RouterMeta;
 import cc.mrbird.febs.common.core.entity.router.VueRouter;
 import cc.mrbird.febs.common.core.entity.system.Menu;
@@ -32,7 +33,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
     @Override
     public String findUserPermissions(String username) {
         List<Menu> userPermissions = this.baseMapper.findUserPermissions(username);
-        return userPermissions.stream().map(Menu::getPerms).collect(Collectors.joining(","));
+        return userPermissions.stream().map(Menu::getPerms).collect(Collectors.joining(StringConstant.COMMA));
     }
 
     @Override

+ 3 - 2
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/RoleServiceImpl.java

@@ -2,6 +2,7 @@ package cc.mrbird.febs.server.system.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.entity.system.Role;
 import cc.mrbird.febs.common.core.entity.system.RoleMenu;
 import cc.mrbird.febs.common.core.utils.SortUtil;
@@ -68,7 +69,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
         this.save(role);
 
         if (StringUtils.isNotBlank(role.getMenuIds())) {
-            String[] menuIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(role.getMenuIds(), ",");
+            String[] menuIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(role.getMenuIds(), StringConstant.COMMA);
             setRoleMenus(role, menuIds);
         }
     }
@@ -92,7 +93,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
 
         roleMenuService.remove(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, role.getRoleId()));
         if (StringUtils.isNotBlank(role.getMenuIds())) {
-            String[] menuIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(role.getMenuIds(), ",");
+            String[] menuIds = StringUtils.splitByWholeSeparatorPreserveAllTokens(role.getMenuIds(), StringConstant.COMMA);
             setRoleMenus(role, menuIds);
         }
     }

+ 2 - 1
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/UserRoleServiceImpl.java

@@ -1,5 +1,6 @@
 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.UserRole;
 import cc.mrbird.febs.server.system.mapper.UserRoleMapper;
 import cc.mrbird.febs.server.system.service.IUserRoleService;
@@ -36,7 +37,7 @@ public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> i
 
     @Override
     public List<String> findUserIdsByRoleId(String[] roleIds) {
-        List<UserRole> list = baseMapper.selectList(new LambdaQueryWrapper<UserRole>().in(UserRole::getRoleId, String.join(",", roleIds)));
+        List<UserRole> list = baseMapper.selectList(new LambdaQueryWrapper<UserRole>().in(UserRole::getRoleId, String.join(StringConstant.COMMA, roleIds)));
         return list.stream().map(userRole -> String.valueOf(userRole.getUserId())).collect(Collectors.toList());
     }