From 29918ba877731850d001fb2d1a3f3774698241c1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 10 七月 2021 18:14:18 +0800
Subject: [PATCH] 礼金bug修复
---
service-lijin/src/main/java/com/ks/lijin/config/RedisConfig.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/service-lijin/src/main/java/com/ks/lijin/config/RedisConfig.java b/service-lijin/src/main/java/com/ks/lijin/config/RedisConfig.java
index d109b49..4c0de90 100644
--- a/service-lijin/src/main/java/com/ks/lijin/config/RedisConfig.java
+++ b/service-lijin/src/main/java/com/ks/lijin/config/RedisConfig.java
@@ -3,7 +3,6 @@
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -13,10 +12,33 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.yeshi.utils.StringUtil;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
@Configuration
public class RedisConfig {
+
+ @Value("${spring.redis.host}")
+ private String addr;
+ @Value("${spring.redis.port}")
+ private int port;
+ @Value("${spring.redis.timeout}")
+ private String timeout;
+ @Value("${spring.redis.password}")
+ private String auth;
+ @Value("${spring.redis.database}")
+ private int database;
+ @Value("${spring.redis.jedis.pool.max-total}")
+ private int maxTotal;
+ @Value("${spring.redis.jedis.pool.max-idle}")
+ private int maxIdle;
+ @Value("${spring.redis.jedis.pool.test_on_borrow}")
+ private boolean testOnBorrow;
+
+
Logger log = LoggerFactory.getLogger(RedisConfig.class);
+
@Bean
public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
RedisTemplate<String, Object> template = new RedisTemplate<>();
@@ -38,4 +60,14 @@
template.afterPropertiesSet();
return template;
}
+
+
+ @Bean
+ public JedisPool jedisPool() {
+ JedisPoolConfig poolConfig = new JedisPoolConfig();
+ poolConfig.setMaxTotal(maxTotal);
+ poolConfig.setMaxIdle(maxIdle);
+ poolConfig.setTestOnBorrow(testOnBorrow);
+ return new JedisPool(poolConfig, addr, port, Integer.parseInt(timeout.replace("ms", "").trim()), auth, database);
+ }
}
--
Gitblit v1.8.0