From 267077f57b763e60ee14309fde27497956ab36a4 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Tue, 26 Sep 2017 16:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=9F=E4=BA=A7=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/conf/prod/config.properties          | 10 +++
 .../conf/prod/spring/applicationContext.xml   | 61 +++++++++++--------
 2 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/main/conf/prod/config.properties b/src/main/conf/prod/config.properties
index 214dac2a..205b53de 100644
--- a/src/main/conf/prod/config.properties
+++ b/src/main/conf/prod/config.properties
@@ -60,6 +60,16 @@ shiro.redis.port = 6379
 
 #############################	shiro redis	end	###########################################
 
+#############################	cache redis	end	###########################################
+#cachekit redis别名
+cache.redis.name = cache
+#shiro的redis ip
+cache.redis.ip = 192.168.243.128
+#shiro的redis port
+cache.redis.port = 6379
+
+#############################	cache redis	start	#######################################
+
 #############################	config	start	###########################################
 
 #静态资源地址(static/image等推荐放入nginx)
diff --git a/src/main/conf/prod/spring/applicationContext.xml b/src/main/conf/prod/spring/applicationContext.xml
index 05c6f025..fa99262e 100644
--- a/src/main/conf/prod/spring/applicationContext.xml
+++ b/src/main/conf/prod/spring/applicationContext.xml
@@ -93,6 +93,11 @@
         <constructor-arg index="1" value="${shiro.redis.ip}" type="java.lang.String"/>    
         <constructor-arg index="2" value="${shiro.redis.port}" type="int"/>    
 	</bean>
+    <bean id="cacheRedisPool" class="redis.clients.jedis.JedisPool" destroy-method="destroy">
+        <constructor-arg index="0" ref="redisPoolConfig"/>
+        <constructor-arg index="1" value="${cache.redis.ip}" type="java.lang.String"/>
+        <constructor-arg index="2" value="${cache.redis.port}" type="int"/>
+    </bean>
 
 	<!-- 配置redis集群版 -->
 	<!-- <bean id="jedisCluster" class="redis.clients.jedis.JedisCluster">
@@ -126,33 +131,35 @@
 		</constructor-arg>
 	</bean> -->
 
-	<!-- blade框架自定义config -->
     <bean id="bladeConfig" class="org.springblade.core.config.BladeConfig">
-    	<!-- 注入自定义config -->
-		<property name="conf">
-			<bean class="org.springblade.common.config.WebConfig">
-				<property name="defaultCacheFactory">
-					<bean class="org.springblade.core.toolbox.cache.RedisCacheFactory"></bean>
-				</property>
-			</bean>
-		</property>
-		<!-- 注入sqlManagerMap -->
-		<property name="sqlManager">
-			<map>
-				<entry key="master" value-ref="sqlManager" />
-				<!--<entry key="other" value-ref="otherSqlManager" />-->
-			</map>
-		</property>
-		<property name="jedisPool">
-			<map>
-				<entry key="${shiro.redis.name}" value-ref="shiroRedisPool" />
-			</map>
-		</property>
-		<!-- <property name="jedisCluster">
-			<map>
-				<entry key="master" value-ref="jedisCluster" />
-			</map>
-		</property> -->
-	</bean>
+        <!-- 注入自定义config -->
+        <property name="conf">
+            <bean class="org.springblade.common.config.WebConfig">
+                <property name="defaultCacheFactory">
+                    <bean class="org.springblade.core.toolbox.cache.RedisCacheFactory">
+                        <property name="redisName" value="${cache.redis.name}"></property>
+                    </bean>
+                </property>
+            </bean>
+        </property>
+        <!-- 注入sqlManagerMap -->
+        <property name="sqlManager">
+            <map>
+                <entry key="master" value-ref="sqlManager" />
+                <!--<entry key="other" value-ref="otherSqlManager" />-->
+            </map>
+        </property>
+        <property name="jedisPool">
+            <map>
+                <entry key="${shiro.redis.name}" value-ref="shiroRedisPool" />
+                <entry key="${cache.redis.name}" value-ref="cacheRedisPool" />
+            </map>
+        </property>
+        <!-- <property name="jedisCluster">
+            <map>
+                <entry key="master" value-ref="jedisCluster" />
+            </map>
+        </property> -->
+    </bean>
 
 </beans>
\ No newline at end of file