From e19ac016288032d72b612da3523c0f4a82f915b8 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 21 Nov 2019 17:36:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90=20?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=20=E5=BC=80=E6=9C=BA=E5=90=AF?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/base/ISystemInitService.java | 3 +++ .../serviceimpl/base/SystemInitService.java | 20 ++++++++++++++++---- .../serviceimpl/busi/SysLocaleResourceService.java | 3 +++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java index 381f6e5..e51c215 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java @@ -36,6 +36,9 @@ public interface ISystemInitService { @ApiOperation(value = "加载语言数据",notes = "加载语言数据") void putAndLoadSysLocaleLanguage(); + @ApiOperation(value = "加载权限资源",notes = "加载权限资源") + void putAndLoadSysMenu(); + /** * 从缓存获取对象数据 * @param key Redis Key diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java index 42a2982..d2f1888 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java +++ b/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 @@ -156,6 +162,12 @@ public class SystemInitService implements ISystemInitService { } + @Override + public void putAndLoadSysMenu() { + List menuList = menuService.findSysMenuAll(); + localeResourceService.tranSysMenu(menuList); + } + /** * 缓存存放数据统一管理 * @param key diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java index cc857fd..d1a1ba8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java +++ b/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); } From eb2ab399056840707a755fc6424554beae6dfbc4 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 21 Nov 2019 17:55:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/api/iservice/base/ISystemInitService.java | 1 - .../core/apiservice/serviceimpl/base/SystemInitService.java | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java index e51c215..9b3e918 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemInitService.java +++ b/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; /** diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java index d2f1888..386f77c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java @@ -62,7 +62,7 @@ public class SystemInitService implements ISystemInitService { putAndLoadSysConfig(); putAndLoadSysDictionary(); putAndLoadSysLocaleLanguage(); - putAndLoadSysMenu(); +// putAndLoadSysMenu(); } @Override @@ -161,13 +161,13 @@ public class SystemInitService implements ISystemInitService { } } - - @Override + @ApiOperation(value = "加载语言数据",notes = "加载语言数据") public void putAndLoadSysMenu() { - List menuList = menuService.findSysMenuAll(); - localeResourceService.tranSysMenu(menuList); + localeResourceService.tranSysMenu(menuService.findSysMenuAll()); } + + /** * 缓存存放数据统一管理 * @param key