Merge branch 'xc' of https://gitea.rk-health.com/renkang/xj-platform into xc

jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/manager/DepartCacheManager.java

@@ -59,14 +59,14 @@ public class DepartCacheManager {
             initDepartCache();
             log.info("========缓存部门信息完成========");
         });
-
+        // 新疆项目无需缓存青海部门
-        taskExecutor.execute(() -> {
+//        taskExecutor.execute(() -> {
-            ClientSignThreadLocal.setClientSign(CommonConstant.QUARRY);
+//            ClientSignThreadLocal.setClientSign(CommonConstant.QUARRY);
-            log.info("========缓存青海部门信息开始========");
+//            log.info("========缓存青海部门信息开始========");
-            initDepartCache();
+//            initDepartCache();
-            log.info("========缓存青海部门信息完成========");
+//            log.info("========缓存青海部门信息完成========");
-            ClientSignThreadLocal.clear();
+//            ClientSignThreadLocal.clear();
-        });
+//        });
     }
 
     private void initDepartCache() {

jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/manager/UserCacheManager.java

@@ -146,15 +146,16 @@ public class UserCacheManager {
             log.info("缓存用户信息完成");
         });
 
-        asyncTaskExecutor.execute(() -> {
+        // 新疆项目无需缓存青海用户
-            ClientSignThreadLocal.setClientSign(CommonConstant.QUARRY);
+//        asyncTaskExecutor.execute(() -> {
-            log.info("缓存青海用户信息开始");
+//            ClientSignThreadLocal.setClientSign(CommonConstant.QUARRY);
-            // 青海用户缓存
+//            log.info("缓存青海用户信息开始");
-            delCacheUser();
+//            // 青海用户缓存
-            initUserCache();
+//            delCacheUser();
-            log.info("缓存青海用户信息完成");
+//            initUserCache();
-            ClientSignThreadLocal.clear();
+//            log.info("缓存青海用户信息完成");
-        });
+//            ClientSignThreadLocal.clear();
+//        });
     }
 
     private String getRedisKey() {