From 06df6fa93c8f9968870c1ed0351b22d8403b3f19 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Thu, 7 Mar 2019 22:06:25 +0800
Subject: [PATCH] :bug: fixed #114

---
 pom.xml                                 | 4 +---
 src/main/resources/application-dev.yaml | 7 +++++--
 src/main/resources/application.yaml     | 5 +++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8575db0c5..eb84e6262 100755
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
 		<java.version>1.8</java.version>
 		<oh-my-email.version>0.0.4</oh-my-email.version>
 		<lombok.version>1.18.4</lombok.version>
-		<ehcache.version>3.6.3</ehcache.version>
 		<hutool.version>4.5.0</hutool.version>
 		<upyun-java-sdk.version>4.0.1</upyun-java-sdk.version>
 		<qiniu-java-sdk.version>7.2.18</qiniu-java-sdk.version>
@@ -121,9 +120,8 @@
 
 		<!-- EhCache -->
 		<dependency>
-			<groupId>org.ehcache</groupId>
+			<groupId>net.sf.ehcache</groupId>
 			<artifactId>ehcache</artifactId>
-			<version>${ehcache.version}</version>
 		</dependency>
 
 		<!-- hutool工具包 -->
diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml
index 2a87a110b..cd99d23b0 100755
--- a/src/main/resources/application-dev.yaml
+++ b/src/main/resources/application-dev.yaml
@@ -10,8 +10,6 @@ server:
     session:
       timeout: 86400s
 spring:
-  cache:
-    type: none
   output:
     ansi:
       enabled: always
@@ -60,6 +58,11 @@ spring:
   # 多语言资源文件路径
   messages:
     basename: i18n/messages
+
+  cache:
+    type: ehcache
+    ehcache:
+      config: classpath:ehcache.xml
 logging:
   level:
     cc.ryanc.halo: DEBUG
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 24d1e2d5d..a13b6bf37 100755
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -60,6 +60,11 @@ spring:
   # 多语言资源文件路径
   messages:
     basename: i18n/messages
+
+  cache:
+    type: ehcache
+    ehcache:
+      config: classpath:ehcache.xml
 logging:
   level:
     cc.ryanc.halo: INFO