Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.core.api.iservice.base;
 
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -36,6 +35,9 @@ public interface ISystemInitService {
     @ApiOperation(value = "加载语言数据",notes = "加载语言数据")
     void putAndLoadSysLocaleLanguage();
 
+    @ApiOperation(value = "加载权限资源",notes = "加载权限资源")
+    void putAndLoadSysMenu();
+
     /**
      * 从缓存获取对象数据
      * @param key       Redis Key

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java

@@ -1,13 +1,12 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService;
 import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
-import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
-import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
-import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
+import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
 import cn.estsh.impp.framework.boot.util.ImppRedis;
@@ -45,6 +44,12 @@ public class SystemInitService implements ISystemInitService {
     @Autowired
     public ISystemResourceService systemResourceService;
 
+    @Autowired
+    private ISysLocaleResourceService localeResourceService;
+
+    @Autowired
+    private ISysMenuService menuService;
+
     @Resource(name= CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
@@ -57,6 +62,7 @@ public class SystemInitService implements ISystemInitService {
         putAndLoadSysConfig();
         putAndLoadSysDictionary();
         putAndLoadSysLocaleLanguage();
+//        putAndLoadSysMenu();
     }
 
     @Override
@@ -155,6 +161,12 @@ public class SystemInitService implements ISystemInitService {
         }
     }
 
+    @ApiOperation(value = "加载语言数据",notes = "加载语言数据")
+    public void putAndLoadSysMenu() {
+        localeResourceService.tranSysMenu(menuService.findSysMenuAll());
+    }
+
+
 
     /**
      * 缓存存放数据统一管理

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java

@@ -230,6 +230,9 @@ public class SysLocaleResourceService implements ISysLocaleResourceService {
                         }
 
                         /* 保存 Redis */
+                        if(redisMenuKey.equals("CACHE_LANGUAGE:用户管理")){
+                            System.out.println("===./");
+                        }
                         redisRes.putHashMap(redisMenuKey, menuResourceMap, 0);
                     }