去掉cache

pom.xml

@@ -81,11 +81,11 @@
                 <artifactId>core-uid</artifactId>
                 <version>${qmth.boot.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.qmth.boot</groupId>
-                <artifactId>core-cache</artifactId>
-                <version>${qmth.boot.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.qmth.boot</groupId>-->
+<!--                <artifactId>core-cache</artifactId>-->
+<!--                <version>${qmth.boot.version}</version>-->
+<!--            </dependency>-->
 <!--            <dependency>-->
 <!--                <groupId>com.qmth.boot</groupId>-->
 <!--                <artifactId>core-concurrent</artifactId>-->

sop-api/src/main/java/com/qmth/sop/server/api/SysController.java

@@ -9,7 +9,7 @@ import com.google.gson.reflect.TypeToken;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.boot.core.cache.service.CacheService;
+//import com.qmth.boot.core.cache.service.CacheService;
 import com.qmth.sop.business.bean.dto.*;
 import com.qmth.sop.business.bean.params.LoginParam;
 import com.qmth.sop.business.bean.result.*;
@@ -82,8 +82,8 @@ public class SysController {
     @Resource
     SysRoleService sysRoleService;
 
-    @Resource
-    CacheService cacheService;
+//    @Resource
+//    CacheService cacheService;
 
     @Resource
     TBServiceService tbServiceService;
@@ -484,25 +484,25 @@ public class SysController {
     @ApiResponses({ @ApiResponse(code = 200, message = "返回信息", response = Object.class) })
     public Result cacheClear(@ApiParam(value = "缓存值") @RequestParam(required = false) String endpoint,
             @ApiParam(value = "缓存key") @RequestParam(required = false) String key) {
-        if (Objects.nonNull(endpoint) && Objects.nonNull(key)) {
-            cacheService.evict(endpoint, key);
-        } else if (Objects.nonNull(endpoint)) {
-            cacheService.clear(endpoint);
-        } else {
-            cacheService.clear(SystemConstant.USER_ACCOUNT_CACHE);
-            cacheService.clear(SystemConstant.SYS_CONFIG_CACHE);
-            cacheService.clear(SystemConstant.USER_OAUTH_CACHE);
-            cacheService.clear(SystemConstant.ORG_CACHE);
-            cacheService.clear(SystemConstant.PRIVILEGE_URL_CACHE);
-            cacheService.clear(SystemConstant.ROLE_PRIVILEGE_CACHE);
-            cacheService.clear(SystemConstant.USER_ROLE_PRIVILEGE_CACHE);
-            cacheService.clear(SystemConstant.FORM_WIDGET_CACHE);
-            cacheService.clear(SystemConstant.TABLE_PROP_CACHE);
-            cacheService.clear(SystemConstant.ROLE_CACHE);
-            cacheService.clear(SystemConstant.USER_MENU_CACHE);
-            cacheService.clear(SystemConstant.SCHOOL_CACHE);
-            cacheService.clear(SystemConstant.SCHOOL_CODE_CACHE);
-        }
+//        if (Objects.nonNull(endpoint) && Objects.nonNull(key)) {
+//            cacheService.evict(endpoint, key);
+//        } else if (Objects.nonNull(endpoint)) {
+//            cacheService.clear(endpoint);
+//        } else {
+//            cacheService.clear(SystemConstant.USER_ACCOUNT_CACHE);
+//            cacheService.clear(SystemConstant.SYS_CONFIG_CACHE);
+//            cacheService.clear(SystemConstant.USER_OAUTH_CACHE);
+//            cacheService.clear(SystemConstant.ORG_CACHE);
+//            cacheService.clear(SystemConstant.PRIVILEGE_URL_CACHE);
+//            cacheService.clear(SystemConstant.ROLE_PRIVILEGE_CACHE);
+//            cacheService.clear(SystemConstant.USER_ROLE_PRIVILEGE_CACHE);
+//            cacheService.clear(SystemConstant.FORM_WIDGET_CACHE);
+//            cacheService.clear(SystemConstant.TABLE_PROP_CACHE);
+//            cacheService.clear(SystemConstant.ROLE_CACHE);
+//            cacheService.clear(SystemConstant.USER_MENU_CACHE);
+//            cacheService.clear(SystemConstant.SCHOOL_CACHE);
+//            cacheService.clear(SystemConstant.SCHOOL_CODE_CACHE);
+//        }
         return ResultUtil.ok(true);
     }
 

sop-business/src/main/java/com/qmth/sop/business/cache/impl/CommonCacheServiceImpl.java

@@ -2,7 +2,6 @@ package com.qmth.sop.business.cache.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.gson.reflect.TypeToken;
-import com.qmth.boot.core.cache.service.CacheService;
 import com.qmth.sop.business.bean.auth.AuthBean;
 import com.qmth.sop.business.bean.dto.MenuDto;
 import com.qmth.sop.business.bean.dto.MenuPrivilegeDto;
@@ -46,8 +45,8 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     @Resource
     SysConfigService sysConfigService;
 
-    @Resource
-    CacheService cacheService;
+    //    @Resource
+    //    CacheService cacheService;
 
     @Resource
     SysUserRoleService sysUserRoleService;
@@ -73,6 +72,9 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     @Resource
     BasicSchoolService basicSchoolService;
 
+    @Resource
+    TBSessionService tbSessionService;
+
     /**
      * 添加用户缓存
      *
@@ -94,7 +96,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     @Override
     //    @CachePut(value = SystemConstant.USER_ACCOUNT_CACHE, key = "#p0", condition = "#result != null")
     public SysUser updateUserCache(Long userId) {
-        cacheService.evict(SystemConstant.USER_ACCOUNT_CACHE, String.valueOf(userId));
+        //        cacheService.evict(SystemConstant.USER_ACCOUNT_CACHE, String.valueOf(userId));
         return userCacheCommon(userId);
     }
 
@@ -105,16 +107,16 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     private SysUser userCacheCommon(Long userId) {
-        SysUser sysUser = (SysUser) cacheService.get(SystemConstant.USER_ACCOUNT_CACHE, String.valueOf(userId));
-        if (Objects.isNull(sysUser)) {
-            sysUser = sysUserService.getById(userId);
-            if (Objects.nonNull(sysUser)) {
-                cacheService.put(SystemConstant.USER_ACCOUNT_CACHE, String.valueOf(userId), sysUser);
-            } else {
-                throw ExceptionResultEnum.ERROR.exception("userId[" + userId + "]用户不存在");
-            }
-        }
-        return sysUser;
+        //        SysUser sysUser = (SysUser) cacheService.get(SystemConstant.USER_ACCOUNT_CACHE, String.valueOf(userId));
+        //        if (Objects.isNull(sysUser)) {
+        //            sysUser = sysUserService.getById(userId);
+        //            if (Objects.nonNull(sysUser)) {
+        //                cacheService.put(SystemConstant.USER_ACCOUNT_CACHE, String.valueOf(userId), sysUser);
+        //            } else {
+        //                throw ExceptionResultEnum.ERROR.exception("userId[" + userId + "]用户不存在");
+        //            }
+        //        }
+        return sysUserService.getById(userId);
     }
 
     /**
@@ -125,7 +127,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     @Override
     //    @CacheEvict(value = SystemConstant.USER_ACCOUNT_CACHE, key = "#p0")
     public void removeUserCache(Long userId) {
-        cacheService.evict(SystemConstant.USER_ACCOUNT_CACHE, String.valueOf(userId));
+        //        cacheService.evict(SystemConstant.USER_ACCOUNT_CACHE, String.valueOf(userId));
     }
 
     /**
@@ -135,15 +137,15 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     private SysConfig sysConfigCacheCommon(String key) {
-        SysConfig sysConfig = (SysConfig) cacheService.get(SystemConstant.SYS_CONFIG_CACHE, key);
-        if (Objects.isNull(sysConfig)) {
-            sysConfig = sysConfigService.getOne(
-                    new QueryWrapper<SysConfig>().lambda().eq(SysConfig::getConfigKey, key));
-            if (Objects.nonNull(sysConfig)) {
-                cacheService.put(SystemConstant.SYS_CONFIG_CACHE, key, sysConfig);
-            }
-        }
-        return sysConfig;
+        //        SysConfig sysConfig = (SysConfig) cacheService.get(SystemConstant.SYS_CONFIG_CACHE, key);
+        //        if (Objects.isNull(sysConfig)) {
+        //            sysConfig = sysConfigService.getOne(
+        //                    new QueryWrapper<SysConfig>().lambda().eq(SysConfig::getConfigKey, key));
+        //            if (Objects.nonNull(sysConfig)) {
+        //                cacheService.put(SystemConstant.SYS_CONFIG_CACHE, key, sysConfig);
+        //            }
+        //        }
+        return sysConfigService.getOne(new QueryWrapper<SysConfig>().lambda().eq(SysConfig::getConfigKey, key));
     }
 
     /**
@@ -167,7 +169,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     @Override
     //    @CachePut(value = SystemConstant.SYS_CONFIG_CACHE, key = "#p0", condition = "#result != null")
     public SysConfig updateSysConfigCache(String key) {
-        cacheService.evict(SystemConstant.SYS_CONFIG_CACHE, key);
+        //        cacheService.evict(SystemConstant.SYS_CONFIG_CACHE, key);
         return sysConfigCacheCommon(key);
     }
 
@@ -179,7 +181,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     @Override
     //    @CacheEvict(value = SystemConstant.SYS_CONFIG_CACHE, key = "#p0")
     public void removeSysConfigCache(String key) {
-        cacheService.evict(SystemConstant.SYS_CONFIG_CACHE, key);
+        //        cacheService.evict(SystemConstant.SYS_CONFIG_CACHE, key);
     }
 
     /**
@@ -191,7 +193,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     @Override
     public void updateSysConfigCacheForDb(String key, SysConfig sysConfig) {
         //        cacheManager.getCache(SystemConstant.SYS_CONFIG_CACHE).put(key, sysConfig);
-        cacheService.put(SystemConstant.SYS_CONFIG_CACHE, key, sysConfig);
+        //        cacheService.put(SystemConstant.SYS_CONFIG_CACHE, key, sysConfig);
     }
 
     /**
@@ -202,15 +204,16 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     private SysConfig sysConfigCacheCommon(Long orgId, String key) {
-        SysConfig sysConfig = (SysConfig) cacheService.get(SystemConstant.SYS_CONFIG_CACHE, orgId + "_" + key);
-        if (Objects.isNull(sysConfig)) {
-            sysConfig = sysConfigService.getOne(new QueryWrapper<SysConfig>().lambda().eq(SysConfig::getOrgId, orgId)
-                    .eq(SysConfig::getConfigKey, key));
-            if (Objects.nonNull(sysConfig)) {
-                cacheService.put(SystemConstant.SYS_CONFIG_CACHE, orgId + "_" + key, sysConfig);
-            }
-        }
-        return sysConfig;
+        //        SysConfig sysConfig = (SysConfig) cacheService.get(SystemConstant.SYS_CONFIG_CACHE, orgId + "_" + key);
+        //        if (Objects.isNull(sysConfig)) {
+        //            sysConfig = sysConfigService.getOne(new QueryWrapper<SysConfig>().lambda().eq(SysConfig::getOrgId, orgId)
+        //                    .eq(SysConfig::getConfigKey, key));
+        //            if (Objects.nonNull(sysConfig)) {
+        //                cacheService.put(SystemConstant.SYS_CONFIG_CACHE, orgId + "_" + key, sysConfig);
+        //            }
+        //        }
+        return sysConfigService.getOne(
+                new QueryWrapper<SysConfig>().lambda().eq(SysConfig::getOrgId, orgId).eq(SysConfig::getConfigKey, key));
     }
 
     /**
@@ -236,7 +239,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     @Override
     //    @CachePut(value = SystemConstant.SYS_CONFIG_CACHE, key = "#p0 + '-' + #p1", condition = "#result != null")
     public SysConfig updateSysConfigCache(Long orgId, String key) {
-        cacheService.evict(SystemConstant.SYS_CONFIG_CACHE, orgId + "_" + key);
+        //        cacheService.evict(SystemConstant.SYS_CONFIG_CACHE, orgId + "_" + key);
         return sysConfigCacheCommon(orgId, key);
     }
 
@@ -249,7 +252,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
     @Override
     //    @CacheEvict(value = SystemConstant.SYS_CONFIG_CACHE, key = "#p0 + '-' + #p1")
     public void removeSysConfigCache(Long orgId, String key) {
-        cacheService.evict(SystemConstant.SYS_CONFIG_CACHE, orgId + "_" + key);
+        //        cacheService.evict(SystemConstant.SYS_CONFIG_CACHE, orgId + "_" + key);
     }
 
     /**
@@ -260,7 +263,9 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void setUserSession(String sessionId, Object o) {
-        cacheService.put(SystemConstant.SESSION, sessionId, o);
+        //        cacheService.put(SystemConstant.SESSION, sessionId, o);
+        TBSession tbSession = (TBSession) o;
+        tbSessionService.updateById(tbSession);
     }
 
     /**
@@ -271,7 +276,8 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public Object getUserSession(String sessionId) {
-        return cacheService.get(SystemConstant.SESSION, sessionId);
+        //        return cacheService.get(SystemConstant.SESSION, sessionId);
+        return tbSessionService.getById(sessionId);
     }
 
     /**
@@ -281,7 +287,8 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void deleteUserSession(String sessionId) {
-        cacheService.evict(SystemConstant.SESSION, sessionId);
+        //        cacheService.evict(SystemConstant.SESSION, sessionId);
+        tbSessionService.removeById(sessionId);
     }
 
     /**
@@ -292,56 +299,56 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public AuthBean userAuthCache(Long userId) {
-        AuthBean authBean = (AuthBean) cacheService.get(SystemConstant.USER_OAUTH_CACHE, String.valueOf(userId));
-        if (Objects.isNull(authBean)) {
-            try {
-                SysUser user = this.userCache(userId);
-                Optional.ofNullable(user).orElseThrow(() -> ExceptionResultEnum.USER_NO_DATA.exception());
-                //查询用户角色和权限
-                List<SysUserRole> sysUserRoleList = this.userRolePrivilegeCache(user.getId());
-                if (Objects.nonNull(sysUserRoleList) && sysUserRoleList.size() > 0) {
-                    Set<Long> roleIds = sysUserRoleList.stream().map(s -> s.getRoleId()).collect(Collectors.toSet());
-                    List<SysRolePrivilege> sysRolePrivilegeList = new ArrayList<>();
-                    for (Long l : roleIds) {
-                        sysRolePrivilegeList.addAll(this.rolePrivilegeCache(l));
-                    }
-                    Set<Long> privilegeIds = sysRolePrivilegeList.stream().map(s -> s.getPrivilegeId())
-                            .collect(Collectors.toSet());
-                    List<SysRole> sysRoleList = sysRoleService.list(
-                            new QueryWrapper<SysRole>().lambda().in(SysRole::getId, roleIds)
-                                    .eq(SysRole::getEnable, true));
-                    int count = Objects.nonNull(sysRoleList) && sysRoleList.size() > 0 ?
-                            (int) sysRoleList.stream()
-                                    .filter(s -> Objects.equals(s.getName(), RoleTypeEnum.ADMIN.getDesc())).count() :
-                            0;
-                    QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
-                    if (count > 0) {//超级系统管理员
-                        sysPrivilegeQueryWrapper.lambda().eq(SysPrivilege::getType, PrivilegeEnum.URL)
+        //        AuthBean authBean = (AuthBean) cacheService.get(SystemConstant.USER_OAUTH_CACHE, String.valueOf(userId));
+        //        if (Objects.isNull(authBean)) {
+        AuthBean authBean = null;
+        try {
+            SysUser user = this.userCache(userId);
+            Optional.ofNullable(user).orElseThrow(() -> ExceptionResultEnum.USER_NO_DATA.exception());
+            //查询用户角色和权限
+            List<SysUserRole> sysUserRoleList = this.userRolePrivilegeCache(user.getId());
+            if (Objects.nonNull(sysUserRoleList) && sysUserRoleList.size() > 0) {
+                Set<Long> roleIds = sysUserRoleList.stream().map(s -> s.getRoleId()).collect(Collectors.toSet());
+                List<SysRolePrivilege> sysRolePrivilegeList = new ArrayList<>();
+                for (Long l : roleIds) {
+                    sysRolePrivilegeList.addAll(this.rolePrivilegeCache(l));
+                }
+                Set<Long> privilegeIds = sysRolePrivilegeList.stream().map(s -> s.getPrivilegeId())
+                        .collect(Collectors.toSet());
+                List<SysRole> sysRoleList = sysRoleService.list(
+                        new QueryWrapper<SysRole>().lambda().in(SysRole::getId, roleIds).eq(SysRole::getEnable, true));
+                int count = Objects.nonNull(sysRoleList) && sysRoleList.size() > 0 ?
+                        (int) sysRoleList.stream()
+                                .filter(s -> Objects.equals(s.getName(), RoleTypeEnum.ADMIN.getDesc())).count() :
+                        0;
+                QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
+                if (count > 0) {//超级系统管理员
+                    sysPrivilegeQueryWrapper.lambda().eq(SysPrivilege::getType, PrivilegeEnum.URL)
+                            .eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);
+                    List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
+                    authBean = new AuthBean(sysRoleList,
+                            sysPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()));
+                } else {
+                    SysOrg org = Objects.nonNull(user.getOrgId()) ? this.orgCache(user.getOrgId()) : null;
+                    List<SysPrivilege> sysPrivilegeList = new ArrayList<>();
+                    if (privilegeIds.size() > 0) {
+                        sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds)
+                                .eq(SysPrivilege::getType, PrivilegeEnum.URL)
                                 .eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);
-                        List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
-                        authBean = new AuthBean(sysRoleList,
-                                sysPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()));
-                    } else {
-                        SysOrg org = Objects.nonNull(user.getOrgId()) ? this.orgCache(user.getOrgId()) : null;
-                        List<SysPrivilege> sysPrivilegeList = new ArrayList<>();
-                        if (privilegeIds.size() > 0) {
-                            sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds)
-                                    .eq(SysPrivilege::getType, PrivilegeEnum.URL)
-                                    .eq(SysPrivilege::getProperty, PrivilegePropertyEnum.AUTH);
-                            sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
-                        }
-                        authBean = new AuthBean(sysRoleList,
-                                sysPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()), org);
+                        sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
                     }
+                    authBean = new AuthBean(sysRoleList,
+                            sysPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()), org);
                 }
-                if (Objects.nonNull(authBean)) {
-                    cacheService.put(SystemConstant.USER_OAUTH_CACHE, String.valueOf(userId), authBean);
-                }
-            } catch (Exception e) {
-                log.error(SystemConstant.LOG_ERROR, e);
-                throw ExceptionResultEnum.ERROR.exception("添加用户鉴权缓存失败");
             }
+            //                if (Objects.nonNull(authBean)) {
+            //                    cacheService.put(SystemConstant.USER_OAUTH_CACHE, String.valueOf(userId), authBean);
+            //                }
+        } catch (Exception e) {
+            log.error(SystemConstant.LOG_ERROR, e);
+            throw ExceptionResultEnum.ERROR.exception("添加用户鉴权缓存失败");
         }
+        //        }
         return authBean;
     }
 
@@ -353,7 +360,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public AuthBean updateUserAuthCache(Long userId) {
-        cacheService.evict(SystemConstant.USER_OAUTH_CACHE, String.valueOf(userId));
+        //        cacheService.evict(SystemConstant.USER_OAUTH_CACHE, String.valueOf(userId));
         return userAuthCache(userId);
     }
 
@@ -364,7 +371,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeUserAuthCache(Long userId) {
-        cacheService.evict(SystemConstant.USER_OAUTH_CACHE, String.valueOf(userId));
+        //        cacheService.evict(SystemConstant.USER_OAUTH_CACHE, String.valueOf(userId));
     }
 
     /**
@@ -386,7 +393,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public List<SysUserRole> updateUserRolePrivilegeCache(Long userId) {
-        cacheService.evict(SystemConstant.USER_ROLE_PRIVILEGE_CACHE, String.valueOf(userId));
+        //        cacheService.evict(SystemConstant.USER_ROLE_PRIVILEGE_CACHE, String.valueOf(userId));
         return userRoleCacheCommon(userId);
     }
 
@@ -397,7 +404,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeUserRolePrivilegeCache(Long userId) {
-        cacheService.evict(SystemConstant.USER_ROLE_PRIVILEGE_CACHE, String.valueOf(userId));
+        //        cacheService.evict(SystemConstant.USER_ROLE_PRIVILEGE_CACHE, String.valueOf(userId));
     }
 
     /**
@@ -419,7 +426,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public SysOrg updateOrgCache(Long orgId) {
-        cacheService.evict(SystemConstant.ORG_CACHE, String.valueOf(orgId));
+        //        cacheService.evict(SystemConstant.ORG_CACHE, String.valueOf(orgId));
         return orgCacheCommon(orgId);
     }
 
@@ -430,7 +437,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeOrgCache(Long orgId) {
-        cacheService.evict(SystemConstant.ORG_CACHE, String.valueOf(orgId));
+        //        cacheService.evict(SystemConstant.ORG_CACHE, String.valueOf(orgId));
     }
 
     /**
@@ -452,7 +459,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public List<SysRolePrivilege> updateRolePrivilegeCache(Long roleId) {
-        cacheService.evict(SystemConstant.ROLE_PRIVILEGE_CACHE, String.valueOf(roleId));
+        //        cacheService.evict(SystemConstant.ROLE_PRIVILEGE_CACHE, String.valueOf(roleId));
         return rolePrivilegeCacheCommon(roleId);
     }
 
@@ -463,7 +470,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeRolePrivilegeCache(Long roleId) {
-        cacheService.evict(SystemConstant.ROLE_PRIVILEGE_CACHE, String.valueOf(roleId));
+        //        cacheService.evict(SystemConstant.ROLE_PRIVILEGE_CACHE, String.valueOf(roleId));
     }
 
     /**
@@ -485,7 +492,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public Set<String> updatePrivilegeUrlCache(PrivilegePropertyEnum privilegePropertyEnum) {
-        cacheService.evict(SystemConstant.PRIVILEGE_URL_CACHE, privilegePropertyEnum.name());
+        //        cacheService.evict(SystemConstant.PRIVILEGE_URL_CACHE, privilegePropertyEnum.name());
         return privilegeUrlCacheCommon(privilegePropertyEnum);
     }
 
@@ -496,7 +503,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removePrivilegeUrlCache(PrivilegePropertyEnum privilegePropertyEnum) {
-        cacheService.evict(SystemConstant.PRIVILEGE_URL_CACHE, privilegePropertyEnum.name());
+        //        cacheService.evict(SystemConstant.PRIVILEGE_URL_CACHE, privilegePropertyEnum.name());
     }
 
     /**
@@ -516,7 +523,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public List<FormWidgetResult> updateFormWidgetCache() {
-        cacheService.evict(SystemConstant.FORM_WIDGET_CACHE, SystemConstant.FORM_WIDGET_CACHE);
+        //        cacheService.evict(SystemConstant.FORM_WIDGET_CACHE, SystemConstant.FORM_WIDGET_CACHE);
         return formWidgetCacheCommon();
     }
 
@@ -525,7 +532,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeFormWidgetCache() {
-        cacheService.evict(SystemConstant.FORM_WIDGET_CACHE, SystemConstant.FORM_WIDGET_CACHE);
+        //        cacheService.evict(SystemConstant.FORM_WIDGET_CACHE, SystemConstant.FORM_WIDGET_CACHE);
     }
 
     /**
@@ -547,7 +554,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public TDFormWidget updateFormWidgetCache(Long id) {
-        cacheService.evict(SystemConstant.FORM_WIDGET_CACHE, String.valueOf(id));
+        //        cacheService.evict(SystemConstant.FORM_WIDGET_CACHE, String.valueOf(id));
         return formWidgetCacheCommon(id);
     }
 
@@ -558,7 +565,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeFormWidgetCache(Long id) {
-        cacheService.evict(SystemConstant.FORM_WIDGET_CACHE, String.valueOf(id));
+        //        cacheService.evict(SystemConstant.FORM_WIDGET_CACHE, String.valueOf(id));
     }
 
     /**
@@ -580,7 +587,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public List<TDTableProp> updateTablePropCache(Long widgetId) {
-        cacheService.evict(SystemConstant.TABLE_PROP_CACHE, String.valueOf(widgetId));
+        //        cacheService.evict(SystemConstant.TABLE_PROP_CACHE, String.valueOf(widgetId));
         return tablePropCacheCommon(widgetId);
     }
 
@@ -591,7 +598,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeTablePropCache(Long widgetId) {
-        cacheService.evict(SystemConstant.TABLE_PROP_CACHE, String.valueOf(widgetId));
+        //        cacheService.evict(SystemConstant.TABLE_PROP_CACHE, String.valueOf(widgetId));
     }
 
     /**
@@ -613,7 +620,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public MenuResult updateUserMenuCache(Long userId) {
-        cacheService.evict(SystemConstant.USER_MENU_CACHE, String.valueOf(userId));
+        //        cacheService.evict(SystemConstant.USER_MENU_CACHE, String.valueOf(userId));
         return userMenuCommon(userId);
     }
 
@@ -624,7 +631,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeUserMenuCache(Long userId) {
-        cacheService.evict(SystemConstant.USER_MENU_CACHE, String.valueOf(userId));
+        //        cacheService.evict(SystemConstant.USER_MENU_CACHE, String.valueOf(userId));
     }
 
     /**
@@ -646,7 +653,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public SysRole updateRoleCache(Long roleId) {
-        cacheService.evict(SystemConstant.ROLE_CACHE, String.valueOf(roleId));
+        //        cacheService.evict(SystemConstant.ROLE_CACHE, String.valueOf(roleId));
         return roleCacheCommon(roleId);
     }
 
@@ -657,7 +664,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeRoleCache(Long roleId) {
-        cacheService.evict(SystemConstant.ROLE_CACHE, String.valueOf(roleId));
+        //        cacheService.evict(SystemConstant.ROLE_CACHE, String.valueOf(roleId));
     }
 
     /**
@@ -690,7 +697,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public BasicSchool updateSchoolCache(Long schoolId) {
-        cacheService.evict(SystemConstant.SCHOOL_CACHE, String.valueOf(schoolId));
+        //        cacheService.evict(SystemConstant.SCHOOL_CACHE, String.valueOf(schoolId));
         return schoolCacheCommon(schoolId);
     }
 
@@ -702,7 +709,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public BasicSchool updateSchoolCache(String code) {
-        cacheService.evict(SystemConstant.SCHOOL_CODE_CACHE, code);
+        //        cacheService.evict(SystemConstant.SCHOOL_CODE_CACHE, code);
         return schoolCacheCommon(code);
     }
 
@@ -713,7 +720,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeSchoolCache(Long schoolId) {
-        cacheService.evict(SystemConstant.SCHOOL_CACHE, String.valueOf(schoolId));
+        //        cacheService.evict(SystemConstant.SCHOOL_CACHE, String.valueOf(schoolId));
     }
 
     /**
@@ -723,7 +730,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeSchoolCache(String code) {
-        cacheService.evict(SystemConstant.SCHOOL_CODE_CACHE, code);
+        //        cacheService.evict(SystemConstant.SCHOOL_CODE_CACHE, code);
     }
 
     /**
@@ -731,7 +738,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeSchoolIdCache() {
-        cacheService.clear(SystemConstant.SCHOOL_CACHE);
+        //        cacheService.clear(SystemConstant.SCHOOL_CACHE);
     }
 
     /**
@@ -739,7 +746,7 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      */
     @Override
     public void removeSchoolCodeCache() {
-        cacheService.clear(SystemConstant.SCHOOL_CODE_CACHE);
+        //        cacheService.clear(SystemConstant.SCHOOL_CODE_CACHE);
     }
 
     /**
@@ -749,14 +756,14 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected BasicSchool schoolCacheCommon(Long schoolId) {
-        BasicSchool basicSchool = (BasicSchool) cacheService.get(SystemConstant.SCHOOL_CACHE, String.valueOf(schoolId));
-        if (Objects.isNull(basicSchool)) {
-            basicSchool = basicSchoolService.getById(schoolId);
-            if (Objects.nonNull(basicSchool)) {
-                cacheService.put(SystemConstant.SCHOOL_CACHE, String.valueOf(schoolId), basicSchool);
-            }
-        }
-        return basicSchool;
+        //        BasicSchool basicSchool = (BasicSchool) cacheService.get(SystemConstant.SCHOOL_CACHE, String.valueOf(schoolId));
+        //        if (Objects.isNull(basicSchool)) {
+        //            basicSchool = basicSchoolService.getById(schoolId);
+        //            if (Objects.nonNull(basicSchool)) {
+        //                cacheService.put(SystemConstant.SCHOOL_CACHE, String.valueOf(schoolId), basicSchool);
+        //            }
+        //        }
+        return basicSchoolService.getById(schoolId);
     }
 
     /**
@@ -766,15 +773,15 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected BasicSchool schoolCacheCommon(String code) {
-        BasicSchool basicSchool = (BasicSchool) cacheService.get(SystemConstant.SCHOOL_CODE_CACHE, code);
-        if (Objects.isNull(basicSchool)) {
-            basicSchool = basicSchoolService.getOne(
-                    new QueryWrapper<BasicSchool>().lambda().eq(BasicSchool::getCode, code));
-            if (Objects.nonNull(basicSchool)) {
-                cacheService.put(SystemConstant.SCHOOL_CODE_CACHE, code, basicSchool);
-            }
-        }
-        return basicSchool;
+        //        BasicSchool basicSchool = (BasicSchool) cacheService.get(SystemConstant.SCHOOL_CODE_CACHE, code);
+        //        if (Objects.isNull(basicSchool)) {
+        //            basicSchool = basicSchoolService.getOne(
+        //                    new QueryWrapper<BasicSchool>().lambda().eq(BasicSchool::getCode, code));
+        //            if (Objects.nonNull(basicSchool)) {
+        //                cacheService.put(SystemConstant.SCHOOL_CODE_CACHE, code, basicSchool);
+        //            }
+        //        }
+        return basicSchoolService.getOne(new QueryWrapper<BasicSchool>().lambda().eq(BasicSchool::getCode, code));
     }
 
     /**
@@ -784,14 +791,14 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected SysRole roleCacheCommon(Long roleId) {
-        SysRole sysRole = (SysRole) cacheService.get(SystemConstant.ROLE_CACHE, String.valueOf(roleId));
-        if (Objects.isNull(sysRole)) {
-            sysRole = sysRoleService.getById(roleId);
-            if (Objects.nonNull(sysRole)) {
-                cacheService.put(SystemConstant.ROLE_CACHE, String.valueOf(roleId), sysRole);
-            }
-        }
-        return sysRole;
+        //        SysRole sysRole = (SysRole) cacheService.get(SystemConstant.ROLE_CACHE, String.valueOf(roleId));
+        //        if (Objects.isNull(sysRole)) {
+        //            sysRole = sysRoleService.getById(roleId);
+        //            if (Objects.nonNull(sysRole)) {
+        //                cacheService.put(SystemConstant.ROLE_CACHE, String.valueOf(roleId), sysRole);
+        //            }
+        //        }
+        return sysRoleService.getById(roleId);
     }
 
     /**
@@ -801,77 +808,76 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected MenuResult userMenuCommon(Long userId) {
-        MenuResult menuResult = (MenuResult) cacheService.get(SystemConstant.USER_MENU_CACHE, String.valueOf(userId));
-        if (Objects.isNull(menuResult)) {
-            List<SysUserRole> sysUserRoleList = this.userRolePrivilegeCache(userId);
-            List<SysRolePrivilege> sysRolePrivilegeList = new ArrayList<>();
-            for (SysUserRole s : sysUserRoleList) {
-                SysRole sysRole = this.roleCache(s.getRoleId());
-                if (Objects.nonNull(sysRole) && sysRole.getEnable()) {
-                    sysRolePrivilegeList.addAll(this.rolePrivilegeCache(s.getRoleId()));
-                }
+        //        MenuResult menuResult = (MenuResult) cacheService.get(SystemConstant.USER_MENU_CACHE, String.valueOf(userId));
+        //        if (Objects.isNull(menuResult)) {
+        List<SysUserRole> sysUserRoleList = this.userRolePrivilegeCache(userId);
+        List<SysRolePrivilege> sysRolePrivilegeList = new ArrayList<>();
+        for (SysUserRole s : sysUserRoleList) {
+            SysRole sysRole = this.roleCache(s.getRoleId());
+            if (Objects.nonNull(sysRole) && sysRole.getEnable()) {
+                sysRolePrivilegeList.addAll(this.rolePrivilegeCache(s.getRoleId()));
             }
-            Set<Long> privilegeIds = sysRolePrivilegeList.stream().map(s -> s.getPrivilegeId())
-                    .collect(Collectors.toSet());
-            QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
-            sysPrivilegeQueryWrapper.lambda().eq(SysPrivilege::getEnable, true).eq(SysPrivilege::getFrontDisplay, true)
-                    .orderByAsc(SysPrivilege::getSequence);
-
-            if (!privilegeIds.isEmpty()) {
-                sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds);
-            }
-            List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
-            List<MenuDto> menuDtoList = GsonUtil.fromJson(JacksonUtil.parseJson(sysPrivilegeList),
-                    new TypeToken<List<MenuDto>>() {
-
-                    }.getType());
-            LinkedMultiValueMap<Long, MenuDto> linkedMultiValueMap = new LinkedMultiValueMap<>();
-            List<MenuPrivilegeDto> menuPrivilegeDtoList = new ArrayList<>();
-            for (MenuDto m : menuDtoList) {
-                if (Objects.isNull(m.getParentId()) || m.getType() == PrivilegeEnum.MENU) {
-                    menuPrivilegeDtoList.add(GsonUtil.fromJson(GsonUtil.toJson(m), MenuPrivilegeDto.class));
+        }
+        Set<Long> privilegeIds = sysRolePrivilegeList.stream().map(s -> s.getPrivilegeId()).collect(Collectors.toSet());
+        QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
+        sysPrivilegeQueryWrapper.lambda().eq(SysPrivilege::getEnable, true).eq(SysPrivilege::getFrontDisplay, true)
+                .orderByAsc(SysPrivilege::getSequence);
+
+        if (!privilegeIds.isEmpty()) {
+            sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds);
+        }
+        List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
+        List<MenuDto> menuDtoList = GsonUtil.fromJson(JacksonUtil.parseJson(sysPrivilegeList),
+                new TypeToken<List<MenuDto>>() {
+
+                }.getType());
+        LinkedMultiValueMap<Long, MenuDto> linkedMultiValueMap = new LinkedMultiValueMap<>();
+        List<MenuPrivilegeDto> menuPrivilegeDtoList = new ArrayList<>();
+        for (MenuDto m : menuDtoList) {
+            if (Objects.isNull(m.getParentId()) || m.getType() == PrivilegeEnum.MENU) {
+                menuPrivilegeDtoList.add(GsonUtil.fromJson(GsonUtil.toJson(m), MenuPrivilegeDto.class));
+            } else {
+                if (!linkedMultiValueMap.containsKey(m.getParentId())) {
+                    linkedMultiValueMap.add(m.getParentId(), m);
                 } else {
-                    if (!linkedMultiValueMap.containsKey(m.getParentId())) {
-                        linkedMultiValueMap.add(m.getParentId(), m);
-                    } else {
-                        List<MenuDto> menuDtos = linkedMultiValueMap.get(m.getParentId());
-                        menuDtos.add(m);
-                        linkedMultiValueMap.put(m.getParentId(), menuDtos);
-                    }
+                    List<MenuDto> menuDtos = linkedMultiValueMap.get(m.getParentId());
+                    menuDtos.add(m);
+                    linkedMultiValueMap.put(m.getParentId(), menuDtos);
                 }
             }
-            for (MenuPrivilegeDto m : menuPrivilegeDtoList) {
-                List<MenuDto> menuDtos = linkedMultiValueMap.get(m.getId());
-                List<MenuDto> urls = null, buttons = null, links = null, lists = null, conditions = null;
-                if (Objects.nonNull(menuDtos)) {
-                    for (MenuDto menuDto : menuDtos) {
-                        if (menuDto.getType() == PrivilegeEnum.BUTTON) {
-                            buttons = Objects.isNull(buttons) ? new ArrayList<>() : buttons;
-                            buttons.add(GsonUtil.fromJson(GsonUtil.toJson(menuDto), MenuPrivilegeDto.class));
-                            m.setButtons(buttons);
-                        } else if (menuDto.getType() == PrivilegeEnum.LINK) {
-                            links = Objects.isNull(links) ? new ArrayList<>() : links;
-                            links.add(GsonUtil.fromJson(GsonUtil.toJson(menuDto), MenuPrivilegeDto.class));
-                            m.setLinks(links);
-                        } else if (menuDto.getType() == PrivilegeEnum.URL) {
-                            urls = Objects.isNull(urls) ? new ArrayList<>() : urls;
-                            urls.add(GsonUtil.fromJson(GsonUtil.toJson(menuDto), MenuPrivilegeDto.class));
-                            m.setUrls(urls);
-                        } else if (menuDto.getType() == PrivilegeEnum.LIST) {
-                            lists = Objects.isNull(lists) ? new ArrayList<>() : lists;
-                            lists.add(GsonUtil.fromJson(GsonUtil.toJson(menuDto), MenuPrivilegeDto.class));
-                            m.setLists(lists);
-                        } else if (menuDto.getType() == PrivilegeEnum.CONDITION) {
-                            conditions = Objects.isNull(conditions) ? new ArrayList<>() : conditions;
-                            conditions.add(GsonUtil.fromJson(GsonUtil.toJson(menuDto), MenuPrivilegeDto.class));
-                            m.setConditions(conditions);
-                        }
+        }
+        for (MenuPrivilegeDto m : menuPrivilegeDtoList) {
+            List<MenuDto> menuDtos = linkedMultiValueMap.get(m.getId());
+            List<MenuDto> urls = null, buttons = null, links = null, lists = null, conditions = null;
+            if (Objects.nonNull(menuDtos)) {
+                for (MenuDto menuDto : menuDtos) {
+                    if (menuDto.getType() == PrivilegeEnum.BUTTON) {
+                        buttons = Objects.isNull(buttons) ? new ArrayList<>() : buttons;
+                        buttons.add(GsonUtil.fromJson(GsonUtil.toJson(menuDto), MenuPrivilegeDto.class));
+                        m.setButtons(buttons);
+                    } else if (menuDto.getType() == PrivilegeEnum.LINK) {
+                        links = Objects.isNull(links) ? new ArrayList<>() : links;
+                        links.add(GsonUtil.fromJson(GsonUtil.toJson(menuDto), MenuPrivilegeDto.class));
+                        m.setLinks(links);
+                    } else if (menuDto.getType() == PrivilegeEnum.URL) {
+                        urls = Objects.isNull(urls) ? new ArrayList<>() : urls;
+                        urls.add(GsonUtil.fromJson(GsonUtil.toJson(menuDto), MenuPrivilegeDto.class));
+                        m.setUrls(urls);
+                    } else if (menuDto.getType() == PrivilegeEnum.LIST) {
+                        lists = Objects.isNull(lists) ? new ArrayList<>() : lists;
+                        lists.add(GsonUtil.fromJson(GsonUtil.toJson(menuDto), MenuPrivilegeDto.class));
+                        m.setLists(lists);
+                    } else if (menuDto.getType() == PrivilegeEnum.CONDITION) {
+                        conditions = Objects.isNull(conditions) ? new ArrayList<>() : conditions;
+                        conditions.add(GsonUtil.fromJson(GsonUtil.toJson(menuDto), MenuPrivilegeDto.class));
+                        m.setConditions(conditions);
                     }
                 }
             }
-            menuResult = new MenuResult(userId, menuPrivilegeDtoList);
-            cacheService.put(SystemConstant.USER_MENU_CACHE, String.valueOf(userId), menuResult);
         }
+        MenuResult menuResult = new MenuResult(userId, menuPrivilegeDtoList);
+        //            cacheService.put(SystemConstant.USER_MENU_CACHE, String.valueOf(userId), menuResult);
+        //        }
         return menuResult;
     }
 
@@ -881,16 +887,16 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected List<TDTableProp> tablePropCacheCommon(Long widgetId) {
-        List<TDTableProp> tablePropList = (List<TDTableProp>) cacheService.get(SystemConstant.TABLE_PROP_CACHE,
-                String.valueOf(widgetId));
-        if (CollectionUtils.isEmpty(tablePropList)) {
-            tablePropList = tdTablePropService.list(
-                    new QueryWrapper<TDTableProp>().lambda().eq(TDTableProp::getWidgetId, widgetId));
-            if (!CollectionUtils.isEmpty(tablePropList)) {
-                cacheService.put(SystemConstant.TABLE_PROP_CACHE, String.valueOf(widgetId), tablePropList);
-            }
-        }
-        return tablePropList;
+        //        List<TDTableProp> tablePropList = (List<TDTableProp>) cacheService.get(SystemConstant.TABLE_PROP_CACHE,
+        //                String.valueOf(widgetId));
+        //        if (CollectionUtils.isEmpty(tablePropList)) {
+        //            tablePropList = tdTablePropService.list(
+        //                    new QueryWrapper<TDTableProp>().lambda().eq(TDTableProp::getWidgetId, widgetId));
+        //            if (!CollectionUtils.isEmpty(tablePropList)) {
+        //                cacheService.put(SystemConstant.TABLE_PROP_CACHE, String.valueOf(widgetId), tablePropList);
+        //            }
+        //        }
+        return tdTablePropService.list(new QueryWrapper<TDTableProp>().lambda().eq(TDTableProp::getWidgetId, widgetId));
     }
 
     /**
@@ -900,15 +906,15 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected TDFormWidget formWidgetCacheCommon(Long id) {
-        TDFormWidget tdFormWidget = (TDFormWidget) cacheService.get(SystemConstant.FORM_WIDGET_CACHE,
-                String.valueOf(id));
-        if (Objects.isNull(tdFormWidget)) {
-            tdFormWidget = tdFormWidgetService.getById(id);
-            if (Objects.nonNull(tdFormWidget)) {
-                cacheService.put(SystemConstant.FORM_WIDGET_CACHE, String.valueOf(id), tdFormWidget);
-            }
-        }
-        return tdFormWidget;
+        //        TDFormWidget tdFormWidget = (TDFormWidget) cacheService.get(SystemConstant.FORM_WIDGET_CACHE,
+        //                String.valueOf(id));
+        //        if (Objects.isNull(tdFormWidget)) {
+        //            tdFormWidget = tdFormWidgetService.getById(id);
+        //            if (Objects.nonNull(tdFormWidget)) {
+        //                cacheService.put(SystemConstant.FORM_WIDGET_CACHE, String.valueOf(id), tdFormWidget);
+        //            }
+        //        }
+        return tdFormWidgetService.getById(id);
     }
 
     /**
@@ -917,8 +923,9 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected List<FormWidgetResult> formWidgetCacheCommon() {
-        List<FormWidgetResult> formWidgetResultList = (List<FormWidgetResult>) cacheService.get(
-                SystemConstant.FORM_WIDGET_CACHE, SystemConstant.FORM_WIDGET_CACHE);
+        //        List<FormWidgetResult> formWidgetResultList = (List<FormWidgetResult>) cacheService.get(
+        //                SystemConstant.FORM_WIDGET_CACHE, SystemConstant.FORM_WIDGET_CACHE);
+        List<FormWidgetResult> formWidgetResultList = null;
         if (CollectionUtils.isEmpty(formWidgetResultList)) {
             List<TDFormWidget> tdFormWidgetList = tdFormWidgetService.list(
                     new QueryWrapper<TDFormWidget>().select(" DISTINCT code "));
@@ -927,8 +934,8 @@ public class CommonCacheServiceImpl implements CommonCacheService {
                         new TypeToken<List<FormWidgetResult>>() {
 
                         }.getType());
-                cacheService.put(SystemConstant.FORM_WIDGET_CACHE, SystemConstant.FORM_WIDGET_CACHE,
-                        formWidgetResultList);
+                //                cacheService.put(SystemConstant.FORM_WIDGET_CACHE, SystemConstant.FORM_WIDGET_CACHE,
+                //                        formWidgetResultList);
             }
         }
         return formWidgetResultList;
@@ -941,15 +948,16 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected Set<String> privilegeUrlCacheCommon(PrivilegePropertyEnum privilegePropertyEnum) {
-        Set<String> privilegeUrlSet = (Set<String>) cacheService.get(SystemConstant.PRIVILEGE_URL_CACHE,
-                privilegePropertyEnum.name());
+        //        Set<String> privilegeUrlSet = (Set<String>) cacheService.get(SystemConstant.PRIVILEGE_URL_CACHE,
+        //                privilegePropertyEnum.name());
+        Set<String> privilegeUrlSet = null;
         if (CollectionUtils.isEmpty(privilegeUrlSet)) {
             List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(
                     new QueryWrapper<SysPrivilege>().lambda().eq(SysPrivilege::getType, PrivilegeEnum.URL)
                             .eq(SysPrivilege::getProperty, privilegePropertyEnum).eq(SysPrivilege::getEnable, true));
             if (!CollectionUtils.isEmpty(sysPrivilegeList)) {
                 privilegeUrlSet = sysPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet());
-                cacheService.put(SystemConstant.PRIVILEGE_URL_CACHE, privilegePropertyEnum.name(), privilegeUrlSet);
+                //                cacheService.put(SystemConstant.PRIVILEGE_URL_CACHE, privilegePropertyEnum.name(), privilegeUrlSet);
             }
         }
         return privilegeUrlSet;
@@ -962,14 +970,14 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected SysOrg orgCacheCommon(Long orgId) {
-        SysOrg sysOrg = (SysOrg) cacheService.get(SystemConstant.ORG_CACHE, String.valueOf(orgId));
-        if (Objects.isNull(sysOrg)) {
-            sysOrg = sysOrgService.getById(orgId);
-            if (Objects.nonNull(sysOrg)) {
-                cacheService.put(SystemConstant.ORG_CACHE, String.valueOf(orgId), sysOrg);
-            }
-        }
-        return sysOrg;
+        //        SysOrg sysOrg = (SysOrg) cacheService.get(SystemConstant.ORG_CACHE, String.valueOf(orgId));
+        //        if (Objects.isNull(sysOrg)) {
+        //            sysOrg = sysOrgService.getById(orgId);
+        //            if (Objects.nonNull(sysOrg)) {
+        //                cacheService.put(SystemConstant.ORG_CACHE, String.valueOf(orgId), sysOrg);
+        //            }
+        //        }
+        return sysOrgService.getById(orgId);
     }
 
     /**
@@ -979,15 +987,16 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected List<SysUserRole> userRoleCacheCommon(Long userId) {
-        List<SysUserRole> sysUserRoleList = (List<SysUserRole>) cacheService.get(
-                SystemConstant.USER_ROLE_PRIVILEGE_CACHE, String.valueOf(userId));
+        //        List<SysUserRole> sysUserRoleList = (List<SysUserRole>) cacheService.get(
+        //                SystemConstant.USER_ROLE_PRIVILEGE_CACHE, String.valueOf(userId));
+        List<SysUserRole> sysUserRoleList = null;
         if (CollectionUtils.isEmpty(sysUserRoleList)) {
             sysUserRoleList = sysUserRoleService.list(
                     new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, userId)
                             .eq(SysUserRole::getEnable, true));
-            if (!CollectionUtils.isEmpty(sysUserRoleList)) {
-                cacheService.put(SystemConstant.USER_ROLE_PRIVILEGE_CACHE, String.valueOf(userId), sysUserRoleList);
-            }
+            //            if (!CollectionUtils.isEmpty(sysUserRoleList)) {
+            //                cacheService.put(SystemConstant.USER_ROLE_PRIVILEGE_CACHE, String.valueOf(userId), sysUserRoleList);
+            //            }
         }
         return sysUserRoleList;
     }
@@ -999,14 +1008,15 @@ public class CommonCacheServiceImpl implements CommonCacheService {
      * @return
      */
     protected List<SysRolePrivilege> rolePrivilegeCacheCommon(Long roleId) {
-        List<SysRolePrivilege> sysRolePrivilegeList = (List<SysRolePrivilege>) cacheService.get(
-                SystemConstant.ROLE_PRIVILEGE_CACHE, String.valueOf(roleId));
+        //        List<SysRolePrivilege> sysRolePrivilegeList = (List<SysRolePrivilege>) cacheService.get(
+        //                SystemConstant.ROLE_PRIVILEGE_CACHE, String.valueOf(roleId));
+        List<SysRolePrivilege> sysRolePrivilegeList = null;
         if (CollectionUtils.isEmpty(sysRolePrivilegeList)) {
             sysRolePrivilegeList = sysRolePrivilegeService.list(
                     new QueryWrapper<SysRolePrivilege>().lambda().eq(SysRolePrivilege::getRoleId, roleId));
-            if (!CollectionUtils.isEmpty(sysRolePrivilegeList)) {
-                cacheService.put(SystemConstant.ROLE_PRIVILEGE_CACHE, String.valueOf(roleId), sysRolePrivilegeList);
-            }
+            //            if (!CollectionUtils.isEmpty(sysRolePrivilegeList)) {
+            //                cacheService.put(SystemConstant.ROLE_PRIVILEGE_CACHE, String.valueOf(roleId), sysRolePrivilegeList);
+            //            }
         }
         return sysRolePrivilegeList;
     }

sop-common/pom.xml

@@ -22,10 +22,10 @@
             <groupId>com.qmth.boot</groupId>
             <artifactId>core-uid</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.qmth.boot</groupId>
-            <artifactId>core-cache</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.qmth.boot</groupId>-->
+<!--            <artifactId>core-cache</artifactId>-->
+<!--        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>com.qmth.boot</groupId>-->
 <!--            <artifactId>data-redis</artifactId>-->