From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期五, 27 六月 2025 20:24:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ltkj-framework/src/main/java/com/ltkj/framework/config/RedisConfig.java | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 40 insertions(+), 8 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 c2ba0eb..806ae9e 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,6 +25,12 @@ @EnableCaching @Slf4j public class RedisConfig extends CachingConfigurerSupport { + + @Value ("${config.properties}") + private String url; + + @Value ("${config.path}") + private String path; @Bean @SuppressWarnings(value = {"unchecked", "rawtypes"}) @@ -65,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"); @@ -80,10 +87,35 @@ fileWriter.write("name = 浣犵殑涓绘暟鎹簱杩炴帴鍚嶇О\n"); fileWriter.write("username = 浣犵殑涓绘暟鎹簱杩炴帴鐢ㄦ埛鍚峔n"); fileWriter.write("password = 浣犵殑涓绘暟鎹簱杩炴帴瀵嗙爜\n"); - fileWriter.write("redisIp = 浣犵殑redisIp鍦板潃"); - fileWriter.write("redisProt = 浣犵殑redis绔彛"); - fileWriter.write("redisPassword = 浣犵殑redis瀵嗙爜"); - fileWriter.write(""); + fileWriter.write("hisenabled = 鏄惁寮�鍚� his 浠庡簱鏁版嵁搴撹繛鎺� (浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴 fales)\n"); + fileWriter.write("\n"); + + fileWriter.write("hisip = 浣犵殑 his 鏁版嵁搴撹繛鎺p鍦板潃\n"); + fileWriter.write("hisprot = 浣犵殑 his 鏁版嵁搴撹繛鎺ョ鍙n"); + fileWriter.write("hisname = 浣犵殑 his 鏁版嵁搴撹繛鎺ュ悕绉癨n"); + fileWriter.write("hisusername = 浣犵殑 his 鏁版嵁搴撹繛鎺ョ敤鎴峰悕\n"); + fileWriter.write("hispassword = 浣犵殑 his 鏁版嵁搴撹繛鎺ュ瘑鐮乗n"); + fileWriter.write("\n"); + + fileWriter.write("pacsenabled = 鏄惁寮�鍚痯acs浠庡簱鏁版嵁搴撹繛鎺� (浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴 fales)\n"); + fileWriter.write("pacsip = 浣犵殑pacs鏁版嵁搴撹繛鎺p鍦板潃\n"); + fileWriter.write("pacsprot = 浣犵殑pacs鏁版嵁搴撹繛鎺ョ鍙n"); + fileWriter.write("pacsname = 浣犵殑pacs鏁版嵁搴撹繛鎺ュ悕绉癨n"); + fileWriter.write("pacsusername = 浣犵殑pacs鏁版嵁搴撹繛鎺ョ敤鎴峰悕\n"); + fileWriter.write("pacspassword = 浣犵殑pacs鏁版嵁搴撹繛鎺ュ瘑鐮乗n"); + fileWriter.write("\n"); + + fileWriter.write("lisenabled = 鏄惁寮�鍚� lis 浠庡簱鏁版嵁搴撹繛鎺� (浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴 fales)\n"); + fileWriter.write("lisip = 浣犵殑 lis 鏁版嵁搴撹繛鎺p鍦板潃\n"); + fileWriter.write("lisprot = 浣犵殑 lis 鏁版嵁搴撹繛鎺ョ鍙n"); + fileWriter.write("lisname = 浣犵殑 lis 鏁版嵁搴撹繛鎺ュ悕绉癨n"); + fileWriter.write("lisusername = 浣犵殑 lis 鏁版嵁搴撹繛鎺ョ敤鎴峰悕\n"); + fileWriter.write("lispassword = 浣犵殑 lis 鏁版嵁搴撹繛鎺ュ瘑鐮乗n"); + fileWriter.write("redisIp = 浣犵殑redisIp鍦板潃\n"); + fileWriter.write("redisProt = 浣犵殑redis绔彛\n"); + fileWriter.write("redisIpDatabase = 浣犵殑redis閾炬帴搴揬n"); + fileWriter.write("redisPassword = 浣犵殑redis瀵嗙爜\n"); + fileWriter.write("\n"); fileWriter.close(); log.info("閰嶇疆鏂囦欢鍒涘缓鎴愬姛锛�"); } catch (IOException ioException) { @@ -102,7 +134,7 @@ // 濡傛灉闇�瑕佸瘑鐮侀獙璇侊紝璁剧疆瀵嗙爜 factory.setPassword(props.getProperty("redisPassword")); // 璁剧疆鍏朵粬鍙傛暟锛屽鏁版嵁搴撶储寮曠瓑 - factory.setDatabase(0); + factory.setDatabase(Integer.parseInt(props.getProperty("redisIpDatabase"))); // 鏈�鍚庯紝鍒濆鍖栬繛鎺� factory.afterPropertiesSet(); log.info("redis杩炴帴鎴愬姛!!!"); -- Gitblit v1.8.0