From cebb4511b4f7102570b0151d48779670b32cad62 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 11 十月 2024 08:38:31 +0800
Subject: [PATCH] 2024-10-11

---
 ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java |   61 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
index 393c1c5..f83f875 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java
@@ -1,6 +1,7 @@
 package com.ltkj.framework.config;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
@@ -24,14 +25,43 @@
 @EnableCaching
 @Slf4j
 public class RedisConfig extends CachingConfigurerSupport {
+
+    @Value ("${config.properties}")
+    private String url;
+
+    @Value ("${config.path}")
+    private  String path;
+
+    @Bean
+    @SuppressWarnings(value = {"unchecked", "rawtypes"})
+    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<Object, Object> template = new RedisTemplate<>();
+        template.setConnectionFactory(connectionFactory);
+
+        FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
+
+        // 浣跨敤StringRedisSerializer鏉ュ簭鍒楀寲鍜屽弽搴忓垪鍖杛edis鐨刱ey鍊�
+        template.setKeySerializer(new StringRedisSerializer());
+        template.setValueSerializer(serializer);
+
+        // Hash鐨刱ey涔熼噰鐢⊿tringRedisSerializer鐨勫簭鍒楀寲鏂瑰紡
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setHashValueSerializer(serializer);
+
+        template.afterPropertiesSet();
+        return template;
+    }
+
     @Bean
     public JedisPoolConfig jedisPoolConfig() {
         JedisPoolConfig config = new JedisPoolConfig();
         // 璁剧疆JedisPoolConfig鐨勭浉鍏冲弬鏁帮紝渚嬪鏈�澶ц繛鎺ユ暟銆佹渶澶х┖闂叉椂闂寸瓑
+//        config.setMinIdle(0);
 //        config.setMaxIdle(8);
-//        config.setMaxIdle(0);
 //        config.setMaxTotal(8);
-//        config.setTimeBetweenEvictionRunsMillis(10);
+//        config.setMaxWaitMillis(-1);
+//        config.setTestOnBorrow(true);
+//        config.setTestOnReturn(true);
         return config;
     }
     @Bean
@@ -42,14 +72,14 @@
             FileInputStream fis = null;
             Properties props = new Properties();
             try {
-                fis = new FileInputStream("D:\\ltkjprojectconf\\config.properties");
+                fis = new FileInputStream(url);
             } catch (FileNotFoundException e) {
                 log.info("閰嶇疆鏂囦欢鎵句笉鍒� 绯荤粺姝e湪鍒涘缓锛�");
-                File f = new File("D:\\ltkjprojectconf");
+                File f = new File(path);
                 if(!f.exists()){
                     f.mkdirs();
                 }
-                File file = new File("D:\\ltkjprojectconf\\config.properties");
+                File file = new File(url);
                 try {
                     FileWriter fileWriter = new FileWriter(file);
                     fileWriter.write("ip = 浣犵殑涓绘暟鎹簱杩炴帴ip鍦板潃\n");
@@ -59,6 +89,7 @@
                     fileWriter.write("password = 浣犵殑涓绘暟鎹簱杩炴帴瀵嗙爜\n");
                     fileWriter.write("redisIp = 浣犵殑redisIp鍦板潃");
                     fileWriter.write("redisProt = 浣犵殑redis绔彛");
+                    fileWriter.write("redisIpDatabase = 浣犵殑redis閾炬帴搴�");
                     fileWriter.write("redisPassword = 浣犵殑redis瀵嗙爜");
                     fileWriter.write("");
                     fileWriter.close();
@@ -79,7 +110,7 @@
             // 濡傛灉闇�瑕佸瘑鐮侀獙璇侊紝璁剧疆瀵嗙爜
             factory.setPassword(props.getProperty("redisPassword"));
             // 璁剧疆鍏朵粬鍙傛暟锛屽鏁版嵁搴撶储寮曠瓑
-            factory.setDatabase(0);
+            factory.setDatabase(Integer.parseInt(props.getProperty("redisIpDatabase")));
             // 鏈�鍚庯紝鍒濆鍖栬繛鎺�
             factory.afterPropertiesSet();
             log.info("redis杩炴帴鎴愬姛!!!");
@@ -89,25 +120,7 @@
         }
         return factory;
     }
-    @Bean
-    @SuppressWarnings(value = {"unchecked", "rawtypes"})
-    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
-        RedisTemplate<Object, Object> template = new RedisTemplate<>();
-        template.setConnectionFactory(connectionFactory);
 
-        FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
-
-        // 浣跨敤StringRedisSerializer鏉ュ簭鍒楀寲鍜屽弽搴忓垪鍖杛edis鐨刱ey鍊�
-        template.setKeySerializer(new StringRedisSerializer());
-        template.setValueSerializer(serializer);
-
-        // Hash鐨刱ey涔熼噰鐢⊿tringRedisSerializer鐨勫簭鍒楀寲鏂瑰紡
-        template.setHashKeySerializer(new StringRedisSerializer());
-        template.setHashValueSerializer(serializer);
-
-        template.afterPropertiesSet();
-        return template;
-    }
 
     @Bean
     public DefaultRedisScript<Long> limitScript() {

--
Gitblit v1.8.0