From 43d81456014338d53aefc3ec81a9eafa38bf8a3f Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 02 Nov 2017 05:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/redis.xml | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/redis.xml b/src/main/resources/redis.xml
index 3b6cfed..2f6e99e 100644
--- a/src/main/resources/redis.xml
+++ b/src/main/resources/redis.xml
@@ -2,18 +2,12 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
xmlns:context="http://www.springframework.org/schema/context"
- xmlns:mvc="http://www.springframework.org/schema/mvc"
- xmlns:cache="http://www.springframework.org/schema/cache"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-4.2.xsd
- http://www.springframework.org/schema/mvc
- http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd
- http://www.springframework.org/schema/cache
- http://www.springframework.org/schema/cache/spring-cache-4.2.xsd">
+ http://www.springframework.org/schema/context/spring-context-4.2.xsd">
- <context:property-placeholder location="classpath:redis-config.properties" />
+ <!--<context:property-placeholder location="classpath:redis-config.properties" />-->
<bean id="poolConfig" class="redis.clients.jedis.JedisPoolConfig">
<property name="maxIdle" value="${redis.maxIdle}" />
@@ -29,6 +23,11 @@
<bean id="redisTemplate" class="org.springframework.data.redis.core.RedisTemplate">
<property name="connectionFactory" ref="jedisConnectionFactory" />
<property name="defaultSerializer" ref="stringRedisSerializer" />
+
+ <property name="keySerializer" ref="stringRedisSerializer" />
+ <property name="valueSerializer" ref="stringRedisSerializer" />
+ <property name="hashKeySerializer" ref="stringRedisSerializer" />
+ <property name="hashValueSerializer" ref="stringRedisSerializer" />
</bean>
</beans>
\ No newline at end of file
--
Gitblit v1.8.0