在本地合并冲突

This commit is contained in:
RenKaiGe-Office
2018-05-29 15:36:42 +08:00
parent 7a9853d77f
commit 51456e5554
15 changed files with 757 additions and 131 deletions

View File

@@ -20,8 +20,8 @@ public class DynamicJedisDataBase {
* @param index
* @param redisTemplate
*/
public static void setRedisDataBase(int index, RedisTemplate redisTemplate) {
JedisConnectionFactory connectionFactory = SpringContextHolder.getBean("connectionFactory");
public static void setRedisDataBase1(int index, RedisTemplate redisTemplate) {
JedisConnectionFactory connectionFactory = SpringContextHolder.getBean("connectionFactory"+index);
connectionFactory.setDatabase(index);
redisTemplate.setConnectionFactory(connectionFactory);
}