冲突

sckw-auth/src/main/java/com/sckw/auth/service/impl/IndexServiceImpl.java

@@ -6,7 +6,6 @@ import com.sckw.auth.model.vo.req.RegisterReqVo;
 import com.sckw.auth.model.vo.res.DeptInfoResVo;
 import com.sckw.auth.model.vo.res.EntInfoResVo;
 import com.sckw.auth.model.vo.res.LoginResVo;
-import com.sckw.core.model.constant.CacheGroup;
 import com.sckw.system.api.model.dto.res.KwsRoleResDto;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
@@ -100,7 +99,7 @@ public class IndexServiceImpl implements IIndexService {
             String id = String.valueOf(loginResVo.getId());
             String token = EncryUtil.encry(Global.PRI_KEY, id);
             loginResVo.setToken(token);
-            RedissonUtils.add(CacheGroup.LOGININFO + id, JSON.toJSONString(loginResVo));
+            RedissonUtils.add(Global.REDIS_USER_PREFIX + id, JSON.toJSONString(loginResVo));
 
             //异步存redis
             ExecutorService executorService = new ThreadPoolExecutor(10, 20, 500L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
@@ -144,7 +143,7 @@ public class IndexServiceImpl implements IIndexService {
             for (UserAccessMenuInfoResDto userAccessMenuInfoResDto : userAccessMenuInfo) {
                 menus.addAll(Arrays.asList(userAccessMenuInfoResDto.getLinks().split(",")));
             }
-            RedissonUtils.putSet(CacheGroup.ACCESSMENU + id, menus);
+            RedissonUtils.putSet(Global.REDIS_SYS_MENU_PREFIX + id, menus);
         }
     }
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/LoginFilter.java

@@ -3,7 +3,6 @@ package com.sckw.core.filter;
 import com.alibaba.fastjson.JSONObject;
 import com.sckw.core.config.CustomConfig;
 import com.sckw.core.exception.SystemException;
-import com.sckw.core.model.constant.CacheGroup;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.EncryUtil;
 import com.sckw.core.utils.StringUtils;
@@ -16,7 +15,6 @@ import jakarta.annotation.PostConstruct;
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -74,7 +72,7 @@ public class LoginFilter implements Filter {
         }
 
         //从redis获取用户信息
-        Object object = RedissonUtils.get(CacheGroup.LOGININFO + key);
+        Object object = RedissonUtils.get(Global.REDIS_USER_PREFIX + key);
         if (Objects.isNull(object)) {
             throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.TOKEN_INVAILD);
         }
@@ -94,7 +92,7 @@ public class LoginFilter implements Filter {
     }
 
     private void checkMenu(String key, String url) {
-        if(!RedissonUtils.contains(CacheGroup.ACCESSMENU + key, url)) {
+        if(!RedissonUtils.contains(Global.REDIS_SYS_MENU_PREFIX + key, url)) {
             throw new SystemException(HttpStatus.AUTHORITY_NO_CODE, HttpStatus.ACCESS_FIAL);
         }
     }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/constant/CacheGroup.java

@@ -1,20 +0,0 @@
-package com.sckw.core.model.constant;
-
-/**
- * @author czh
- * @desc redis的分组
- * @date 2023/6/13
- */
-public class CacheGroup {
-
-    /**
-     * 登录信息
-     */
-    public static final String LOGININFO = "LOGIN:";
-
-    /**
-     * 按钮权限
-     */
-    public static final String ACCESSMENU = "ACCESSMENU:";
-
-}

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -4,7 +4,6 @@ import java.util.*;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.sckw.core.exception.SystemException;
-import com.sckw.core.model.constant.CacheGroup;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
@@ -13,8 +12,6 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.redis.utils.RedissonUtils;
-import com.sckw.system.api.model.dto.res.UserAccessMenuInfoResDto;
 import com.sckw.system.dao.*;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindMenuTreePojo;