From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-core/src/main/java/com/java110/core/cache/Java110RedisConfig.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/cache/Java110RedisConfig.java b/java110-core/src/main/java/com/java110/core/cache/Java110RedisConfig.java
old mode 100644
new mode 100755
index 6205431..c73a0a1
--- a/java110-core/src/main/java/com/java110/core/cache/Java110RedisConfig.java
+++ b/java110-core/src/main/java/com/java110/core/cache/Java110RedisConfig.java
@@ -1,6 +1,8 @@
package com.java110.core.cache;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching;
@@ -12,13 +14,18 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.util.StringUtils;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
import java.time.Duration;
+/**
+ * Created by wuxw on 2017/7/23.
+ */
@Configuration
-
-@EnableCaching //寮�鍚紦瀛橈紝榛樿鏄痳endis缂撳瓨锛岀户鎵緾achingConfigurerSupport 锛岀洿鎺ラ噸鍐欓噷闈㈢殑鏂规硶
-public class Java110RedisConfig extends CachingConfigurerSupport {
+@EnableCaching
+public class Java110RedisConfig extends CachingConfigurerSupport {
public final static String REDIS_EXPIRE_TIME_KEY = "#key_expire_time";
@@ -28,6 +35,39 @@
@Autowired
private RedisTemplate redisTemplate;
+
+ @Bean(name= "jedisPool")
+ @Autowired
+ public JedisPool jedisPool(@Qualifier("jedis.pool.config") JedisPoolConfig config,
+ @Value("${jedis.pool.host}")String host,
+ @Value("${jedis.pool.port}")int port,
+ @Value("${jedis.pool.timeout}")int timeout,
+ @Value("${jedis.pool.password}") String password) {
+ //娌℃湁閰嶇疆鏀逛负榛樿鍊�
+ if(timeout == 0){
+ timeout = 2000;
+ }
+
+ if(StringUtils.isEmpty(password)) {
+ return new JedisPool(config, host, port,timeout);
+ }else{
+ return new JedisPool(config,host,port,timeout,password);
+ }
+ }
+
+ @Bean(name= "jedis.pool.config")
+ public JedisPoolConfig jedisPoolConfig (@Value("${jedis.pool.config.maxTotal}")int maxTotal,
+ @Value("${jedis.pool.config.maxIdle}")int maxIdle,
+ @Value("${jedis.pool.config.maxWaitMillis}")int maxWaitMillis) {
+ JedisPoolConfig config = new JedisPoolConfig();
+ config.setMaxTotal(maxTotal);
+ config.setMaxIdle(maxIdle);
+ config.setMaxWaitMillis(maxWaitMillis);
+
+ return config;
+ }
+
+
@Override
@Bean
@@ -53,4 +93,6 @@
return configuration;
}
+
+
}
--
Gitblit v1.8.0