From 44ae93782baf9eb2cc2719b087897da6ee49fc20 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Tue, 6 Aug 2019 11:56:52 +0800
Subject: [PATCH] =?UTF-8?q?Redis=20Bean=20=E5=90=8D=E7=A7=B0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/core/apiservice/controller/DemoRedisMqController.java      | 4 ++--
 .../i3plus/core/apiservice/controller/DemoResourceController.java     | 3 ++-
 .../i3plus/core/apiservice/controller/base/SystemController.java      | 3 ++-
 .../core/apiservice/controller/busi/SysDashboardController.java       | 2 +-
 .../i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java   | 2 +-
 .../i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java      | 3 ++-
 .../core/apiservice/serviceimpl/busi/PersonnelServiceService.java     | 4 ++--
 .../estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java | 3 ++-
 .../i3plus/core/apiservice/serviceimpl/busi/TestTransService.java     | 3 ++-
 9 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java
index b9ba874..28ce40d 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java
@@ -59,7 +59,7 @@ public class DemoRedisMqController extends CoreBaseController{
     /**
      * 缓存
      */
-    @Resource(name="redisCore")
+    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     private ImppRedis redisCore;
 
     /**
@@ -143,7 +143,7 @@ public class DemoRedisMqController extends CoreBaseController{
         return new ResultBean(true,"操作成功 ： " + locale.getLanguage() + "  " + locale.getCountry());
     }
 
-    @Resource(name="redisSession")
+    @Resource(name= CommonConstWords.IMPP_REDIS_SESSION)
     private ImppRedis redisSession;
 
     @GetMapping(value="/set-redis")
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java
index 73d9cf6..0ca5362 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java
@@ -5,6 +5,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
@@ -47,7 +48,7 @@ public class DemoResourceController extends CoreBaseController {
     /**
      * 缓存
      */
-    @Resource(name="redisCore")
+    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     private ImppRedis redisCore;
 
     /**
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java
index 509349d..2e7d3ee 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.base;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
 import cn.estsh.i3plus.icloud.wms.sdk.IWmsCommonCloud;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
@@ -49,7 +50,7 @@ public class SystemController {
     @Autowired
     private IWmsCommonCloud wmsCommonCloud;
 
-    @Resource(name="redisCore")
+    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     protected ImppRedis redisCore;
 
     @Autowired
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java
index 2807e91..e24a3b6 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java
@@ -47,7 +47,7 @@ public class SysDashboardController extends CoreBaseController {
     @Resource(name = "imppSessionManager")
     private DefaultWebSessionManager webSessionManager;
 
-    @Resource(name = "redisCore")
+    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     private ImppRedis redisCore;
 
     /**
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java
index 806cf14..a5af288 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java
@@ -41,7 +41,7 @@ public class SystemLoginService implements ISystemLoginService {
     /**
      * 核心的缓存
      */
-    @Resource(name="redisCore")
+    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     protected ImppRedis redisCore;
 
     @Override
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java
index 95c1ffb..eba6ea0 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
 import cn.estsh.i3plus.core.apiservice.dao.ISysMenuDao;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ModelEnumUtil;
@@ -59,7 +60,7 @@ public class CoreTreeService implements ICoreTreeService {
     /**
      * 核心的缓存
      */
-    @Resource(name = "redisCore")
+    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     protected ImppRedis redisCore;
 
     @Override
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
index d924e31..63e8809 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
@@ -87,10 +87,10 @@ public class PersonnelServiceService implements IPersonnelService {
     @Autowired
     private ISysRoleService roleService;
 
-    @Resource(name="redisCore")
+    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     protected ImppRedis redisCore;
 
-    @Resource(name="redisRes")
+    @Resource(name = CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
     @Autowired
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
index d292abc..2c6567d 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
@@ -9,6 +9,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.EncryptTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -107,7 +108,7 @@ public class SysUserService implements ISysUserService {
     /**
      * 缓存
      */
-    @Resource(name="redisSession")
+    @Resource(name= CommonConstWords.IMPP_REDIS_SESSION)
     private ImppRedis redisSession;
 
     @Override
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTransService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTransService.java
index cbf450a..09131b4 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTransService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTransService.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 import cn.estsh.i3plus.core.api.iservice.busi.ITestTransService;
 import cn.estsh.i3plus.core.apiservice.dao.ITestTransDao;
 import cn.estsh.i3plus.core.apiservice.dao.ITransDaoSec;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.i3plus.pojo.platform.repository.SysDepartmentRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysUserInfoRepository;
@@ -35,7 +36,7 @@ public class TestTransService implements ITestTransService {
     /**
      * 缓存
      */
-    @Resource(name="redisCore")
+    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     private ImppRedis redisCore;
 
     @Autowired