diff --git a/cms/cms-dao/src/main/resources/applicationContext-jdbc.xml b/cms/cms-dao/src/main/resources/applicationContext-jdbc.xml
index f9ea1090af7511dc18dcc2019876c82df3b111f4..6a4574c9a2f24a769751da7810557e524f289b31 100644
--- a/cms/cms-dao/src/main/resources/applicationContext-jdbc.xml
+++ b/cms/cms-dao/src/main/resources/applicationContext-jdbc.xml
@@ -61,5 +61,5 @@
 	
 	<!-- 启动注解事务 -->
 	<tx:annotation-driven transaction-manager="transactionManager"/>
-   	
+
 </beans>
\ No newline at end of file
diff --git a/cms/cms-service/src/test/java/com/zheng/cms/service/UserServiceTest.java b/cms/cms-service/src/test/java/com/zheng/cms/service/UserServiceTest.java
index 543dd227eee57cc180fbad971ca7cf87d6550073..ee74e5d859e6771ace4fe581b36cfca6d602ca05 100644
--- a/cms/cms-service/src/test/java/com/zheng/cms/service/UserServiceTest.java
+++ b/cms/cms-service/src/test/java/com/zheng/cms/service/UserServiceTest.java
@@ -2,6 +2,9 @@ package com.zheng.cms.service;
 
 import com.zheng.cms.model.User;
 import com.zheng.cms.model.UserVO;
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.Element;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +20,8 @@ import org.springframework.test.context.transaction.TransactionConfiguration;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration({
 	"classpath:applicationContext.xml",
-	"classpath:applicationContext-jdbc.xml"
+	"classpath:applicationContext-jdbc.xml",
+	"classpath:applicationContext-ehcache.xml"
 })
 @TransactionConfiguration(transactionManager = "transactionManager", defaultRollback = true)
 public class UserServiceTest {
@@ -33,6 +37,27 @@ public class UserServiceTest {
 		// 自动生成接口调用
 		User user = userService.getMapper().selectByPrimaryKey(1);
 		System.out.println(null == user ? "null" :user.getNickname());
+
+		// Create a cache manager
+		final CacheManager cacheManager = CacheManager.getInstance();
+
+		// create the cache called "hello-world"
+		final Cache cache = cacheManager.getCache("ehCache");
+
+		// create a key to map the data to
+		final String key = "key";
+
+		// Create a data element
+		final Element element = new Element(key, "value");
+
+		// Put the element into the data store
+		cache.put(element);
+
+		// Retrieve the data element
+		final Element cacheElement = cache.get(key);
+
+		// Print the value
+		System.out.println(cacheElement.getObjectValue());
 	}
 	
 }
diff --git a/cms/cms-web/src/main/webapp/WEB-INF/web.xml b/cms/cms-web/src/main/webapp/WEB-INF/web.xml
index a5c07cdab27f4545832b2902e7cfaa4aa462047d..5c2b7322177501bb6a93ea968f55c832c680afef 100644
--- a/cms/cms-web/src/main/webapp/WEB-INF/web.xml
+++ b/cms/cms-web/src/main/webapp/WEB-INF/web.xml
@@ -28,7 +28,8 @@
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
 			classpath:applicationContext.xml,
-			classpath:applicationContext-jdbc.xml
+			classpath:applicationContext-jdbc.xml,
+			classpath:applicationContext-ehcache.xml
 		</param-value>
 	</context-param>
 
diff --git a/common/pom.xml b/common/pom.xml
index 4748647f47deb5088c853afd2791d69240f1276f..903218cbc101b55b9b78b52a816fee528775d5cb 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
         <!-- spring -->
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
+            <artifactId>spring-context-support</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
@@ -61,15 +61,11 @@
             <artifactId>pagehelper</artifactId>
             <version>4.1.6</version>
         </dependency>
+        <!-- 缓存 -->
         <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-ehcache</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ehcache</groupId>
+            <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>3.1.3</version>
+            <version>2.10.0</version>
         </dependency>
         <!-- 数据库 -->
         <dependency>
diff --git a/common/src/main/resources/applicationContext-ehcache.xml b/common/src/main/resources/applicationContext-ehcache.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e2e249626b8dffce08abd2c4afb58bfed5a37755
--- /dev/null
+++ b/common/src/main/resources/applicationContext-ehcache.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:cache="http://www.springframework.org/schema/cache"
+	xsi:schemaLocation="
+          http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans.xsd
+		  http://www.springframework.org/schema/cache
+          http://www.springframework.org/schema/cache/spring-cache.xsd">
+
+	<!-- cache管理器配置 -->
+	<bean id="cacheManagerFactory" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+		<property name="configLocation"  value="classpath:ehcache.xml"/>
+	</bean>
+
+	<!-- 支持缓存注解 -->
+	<cache:annotation-driven cache-manager="cacheManager" />
+
+	<!-- 默认是cacheManager -->
+	<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheCacheManager">
+		<property name="cacheManager"  ref="cacheManagerFactory"/>
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/common/src/main/resources/applicationContext.xml b/common/src/main/resources/applicationContext.xml
index 98a4e40142d03bb8ff311bd5c86449a01a8b251e..b4066747324712542cbf08c07c4cd9e3e0ec4b9d 100644
--- a/common/src/main/resources/applicationContext.xml
+++ b/common/src/main/resources/applicationContext.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="
           http://www.springframework.org/schema/beans
           http://www.springframework.org/schema/beans/spring-beans.xsd
-          http://www.springframework.org/schema/tx
-          http://www.springframework.org/schema/tx/spring-tx.xsd
           http://www.springframework.org/schema/context
-          http://www.springframework.org/schema/context/spring-context.xsd
-          http://www.springframework.org/schema/aop
-          http://www.springframework.org/schema/aop/spring-aop.xsd">
+          http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<!-- 装载service -->
 	<context:component-scan base-package="**.service" />
diff --git a/common/src/main/resources/ehcache.xml b/common/src/main/resources/ehcache.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f472c4f842b7e55e601046759bab9796319d020d
--- /dev/null
+++ b/common/src/main/resources/ehcache.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd">
+    <diskStore path="java.io.tmpdir"/>
+    <defaultCache
+            maxEntriesLocalHeap="10000"
+            eternal="false"
+            timeToIdleSeconds="120"
+            timeToLiveSeconds="120"
+            maxEntriesLocalDisk="10000000"
+            diskExpiryThreadIntervalSeconds="120"
+            memoryStoreEvictionPolicy="LRU">
+        <persistence strategy="localTempSwap"/>
+    </defaultCache>
+    <cache
+            name="ehCache"
+            maxEntriesLocalHeap="10000"
+            eternal="false"
+            timeToIdleSeconds="120"
+            timeToLiveSeconds="120"
+            maxEntriesLocalDisk="10000000"
+            diskExpiryThreadIntervalSeconds="120"
+            memoryStoreEvictionPolicy="LRU">
+        <persistence strategy="localTempSwap"/>
+    </cache>
+</ehcache>
+<!--
+name：Cache的唯一标识
+maxElementsInMemory：内存中最大缓存对象数
+maxElementsOnDisk：磁盘中最大缓存对象数，若是0表示无穷大
+eternal：Element是否永久有效，一但设置了，timeout将不起作用
+overflowToDisk：配置此属性，当内存中Element数量达到maxElementsInMemory时，Ehcache将会Element写到磁盘中
+timeToIdleSeconds：设置Element在失效前的允许闲置时间。仅当element不是永久有效时使用，可选属性，默认值是0，也就是可闲置时间无穷大
+timeToLiveSeconds：设置Element在失效前允许存活时间。最大时间介于创建时间和失效时间之间。仅当element不是永久有效时使用，默认是0.，也就是element存活时间无穷大
+diskPersistent：是否缓存虚拟机重启期数据
+diskExpiryThreadIntervalSeconds：磁盘失效线程运行时间间隔，默认是120秒
+diskSpoolBufferSizeMB：这个参数设置DiskStore（磁盘缓存）的缓存区大小。默认是30MB。每个Cache都应该有自己的一个缓冲区
+memoryStoreEvictionPolicy：当达到maxElementsInMemory限制时，Ehcache将会根据指定的策略去清理内存。默认策略是LRU（最近最少使用）。你可以设置为FIFO（先进先出）或是LFU（较少使用）
+-->
\ No newline at end of file