重构cms

zheng-cms/zheng-cms-admin/src/main/resources/ehcache.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ehcache>
+    <diskStore path="java.io.tmpdir/zheng-cms-admin/ehcache"/>
+    <defaultCache
+            maxElementsInMemory="10000"
+            eternal="false"
+            timeToIdleSeconds="120"
+            timeToLiveSeconds="120"
+            maxElementsOnDisk="10000000"
+            diskExpiryThreadIntervalSeconds="120"
+            memoryStoreEvictionPolicy="LRU">
+        <persistence strategy="localTempSwap"/>
+    </defaultCache>
+    <cache
+            name="zheng-cms-admin-ehcache"
+            eternal="false"
+            timeToIdleSeconds="120"
+            timeToLiveSeconds="300"
+            maxEntriesLocalHeap="10000"
+            maxEntriesLocalDisk="10000000"
+            diskExpiryThreadIntervalSeconds="120"
+            memoryStoreEvictionPolicy="LRU">
+        <persistence strategy="localTempSwap"/>
+    </cache>
+</ehcache>

zheng-cms/zheng-cms-dao/pom.xml

@@ -37,6 +37,10 @@
             </resource>
             <resource>
                 <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>generator.properties</exclude>
+                    <exclude>generatorConfig.xml</exclude>
+                </excludes>
             </resource>
         </resources>
         <plugins>

zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleVOMapper.java → zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/CmsArticleVOMapper.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.dao.mapper;
+package com.zheng.cms.rpc.mapper;
 
 /**
  * 文章VOMapper

zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsArticleVOMapper.xml → zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/CmsArticleVOMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zheng.cms.dao.mapper.CmsArticleVOMapper">
+<mapper namespace="com.zheng.cms.rpc.mapper.CmsArticleVOMapper">
 
 	<!-- 排序上移 -->
 	<select id="up" resultType="int" parameterType="int">

zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryVOMapper.java → zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/CmsCategoryVOMapper.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.dao.mapper;
+package com.zheng.cms.rpc.mapper;
 
 /**
  * 类目VOMapper

zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/CmsTagVOMapper.java → zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/CmsTagVOMapper.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.dao.mapper;
+package com.zheng.cms.rpc.mapper;
 
 /**
  * 标签VOMapper

zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/UserVOMapper.java → zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/UserVOMapper.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.dao.mapper;
+package com.zheng.cms.rpc.mapper;
 
 import com.zheng.cms.dao.model.UserVO;
 

zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/dao/mapper/UserVOMapper.xml → zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/mapper/UserVOMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zheng.cms.dao.mapper.UserVOMapper">
+<mapper namespace="com.zheng.cms.rpc.mapper.UserVOMapper">
 
 	<!-- 结果映射关系 -->
 	<resultMap id="UserResultMap" type="com.zheng.cms.dao.model.UserVO">

zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/impl/UserServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zheng.cms.rpc.service.impl;
 
 import com.zheng.cms.dao.mapper.CmsUserMapper;
-import com.zheng.cms.dao.mapper.UserVOMapper;
+import com.zheng.cms.rpc.mapper.UserVOMapper;
 import com.zheng.cms.dao.model.CmsUser;
 import com.zheng.cms.dao.model.CmsUserExample;
 import com.zheng.cms.dao.model.UserVO;

zheng-cms/zheng-cms-web/src/main/resources/applicationContext-ehcache.xml

@@ -0,0 +1,25 @@
+<?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:annotation-driven cache-manager="cacheManager" />
+
+	<!-- 默认是cacheManager -->
+	<bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheCacheManager">
+		<property name="cacheManager"  ref="cacheManagerFactory"/>
+	</bean>
+
+	<!-- cache管理器配置 -->
+	<bean id="cacheManagerFactory" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+		<property name="configLocation"  value="classpath:ehcache.xml"/>
+		<property name="shared" value="true" />
+	</bean>
+
+</beans>

zheng-cms/zheng-cms-dao/src/main/resources/ehcache.xml → zheng-cms/zheng-cms-web/src/main/resources/ehcache.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ehcache>
-    <diskStore path="java.io.tmpdir/zheng-cms-dao/ehcache"/>
+    <diskStore path="java.io.tmpdir/zheng-cms-web/ehcache"/>
     <defaultCache
             maxElementsInMemory="10000"
             eternal="false"
@@ -12,7 +12,7 @@
         <persistence strategy="localTempSwap"/>
     </defaultCache>
     <cache
-            name="zheng-cms-ehcache"
+            name="zheng-cms-web-ehcache"
             eternal="false"
             timeToIdleSeconds="120"
             timeToLiveSeconds="300"

zheng-cms/zheng-cms-web/src/main/resources/redis.properties

@@ -0,0 +1,7 @@
+master.redis.ip=127.0.0.1
+master.redis.port=6379
+master.redis.password=FNFl9F2O2Skb8yoKM0jhHA==
+master.redis.max_active=500
+master.redis.max_idle=5
+master.redis.max_wait=10000
+master.redis.timeout=10000