From 07eb2424508911be986d0585ebfb37d2c48db0d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=9F=E5=8D=97=E4=B8=80=E7=82=B9=E9=9B=A8?=
 <wangsong0210@gmail.com>
Date: Mon, 23 Dec 2019 14:42:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/javaboy/vhr/model/Menu.java |  1 +
 .../main/java/org/javaboy/vhr/model/Meta.java |  2 ++
 .../main/java/org/javaboy/vhr/model/Role.java |  1 +
 .../org/javaboy/vhr/service/MenuService.java  |  1 +
 vhr/vhrserver/vhr-service/vhr-service.iml     | 28 +++++++++++++++----
 .../java/org/javaboy/vhr/VhrApplication.java  |  1 +
 vhr/vhrserver/vhr-web/vhr-web.iml             | 18 +++++++++++-
 7 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Menu.java b/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Menu.java
index 5a64900..bf04517 100644
--- a/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Menu.java
+++ b/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Menu.java
@@ -1,5 +1,6 @@
 package org.javaboy.vhr.model;
 
+import java.io.Serializable;
 import java.util.List;
 
 public class Menu implements Serializable {
diff --git a/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Meta.java b/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Meta.java
index 941b129..8a5e29f 100644
--- a/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Meta.java
+++ b/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Meta.java
@@ -1,5 +1,7 @@
 package org.javaboy.vhr.model;
 
+import java.io.Serializable;
+
 /**
  * @作者 江南一点雨
  * @公众号 江南一点雨
diff --git a/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Role.java b/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Role.java
index af6125a..d60a5f2 100644
--- a/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Role.java
+++ b/vhr/vhrserver/vhr-model/src/main/java/org/javaboy/vhr/model/Role.java
@@ -1,5 +1,6 @@
 package org.javaboy.vhr.model;
 
+import java.io.Serializable;
 import java.util.List;
 
 public class Role implements Serializable {
diff --git a/vhr/vhrserver/vhr-service/src/main/java/org/javaboy/vhr/service/MenuService.java b/vhr/vhrserver/vhr-service/src/main/java/org/javaboy/vhr/service/MenuService.java
index a2c6695..c6a8bd8 100644
--- a/vhr/vhrserver/vhr-service/src/main/java/org/javaboy/vhr/service/MenuService.java
+++ b/vhr/vhrserver/vhr-service/src/main/java/org/javaboy/vhr/service/MenuService.java
@@ -6,6 +6,7 @@ import org.javaboy.vhr.model.Hr;
 import org.javaboy.vhr.model.Menu;
 import org.javaboy.vhr.model.MenuRole;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
diff --git a/vhr/vhrserver/vhr-service/vhr-service.iml b/vhr/vhrserver/vhr-service/vhr-service.iml
index 594b726..f528cc5 100644
--- a/vhr/vhrserver/vhr-service/vhr-service.iml
+++ b/vhr/vhrserver/vhr-service/vhr-service.iml
@@ -46,7 +46,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.1.6.RELEASE" level="project" />
@@ -61,7 +60,7 @@
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.28" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.8.RELEASE" level="project" />
@@ -74,15 +73,32 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.1" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
diff --git a/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/VhrApplication.java b/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/VhrApplication.java
index 8d17fbe..6d3d729 100644
--- a/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/VhrApplication.java
+++ b/vhr/vhrserver/vhr-web/src/main/java/org/javaboy/vhr/VhrApplication.java
@@ -3,6 +3,7 @@ package org.javaboy.vhr;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 
 @SpringBootApplication
 @EnableCaching
diff --git a/vhr/vhrserver/vhr-web/vhr-web.iml b/vhr/vhrserver/vhr-web/vhr-web.iml
index 6bbc5ff..0508ca3 100644
--- a/vhr/vhrserver/vhr-web/vhr-web.iml
+++ b/vhr/vhrserver/vhr-web/vhr-web.iml
@@ -39,12 +39,28 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.39.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.1" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
-- 
GitLab