From ec2bd151a3220b34eb7e33d43d25908b45ff349c Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期一, 24 二月 2025 17:59:08 +0800 Subject: [PATCH] sql记录 --- ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java | 94 +++------------------------------------------- 1 files changed, 7 insertions(+), 87 deletions(-) diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java index df79300..7065424 100644 --- a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java +++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; +import javax.annotation.Resource; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -13,12 +14,14 @@ import javax.servlet.ServletResponse; import javax.sql.DataSource; -import com.ltkj.db.HospDynamicDataSource; import com.ltkj.framework.config.properties.DruidProperties; import com.ltkj.framework.datasource.DynamicDataSource; +import com.ltkj.system.service.ISysConfigService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -35,7 +38,7 @@ * * @author ltkj */ -@Configuration +//@Configuration @Slf4j public class DruidConfig { @@ -45,28 +48,6 @@ @Value ("${config.path}") private String path; - - - private static final String DEFAULT_DATA_SOURCE_KEY = "default"; // 涓诲簱鐨勬爣璇� - private final Map<String, DataSource> dataSourceCache = new HashMap<>(); // 鏁版嵁婧愮紦瀛� - - - // 浠� application.yml 涓鍙栦富搴撶殑閰嶇疆 -// @Value("${spring.datasource.url}") - private String primaryUrl; - - private String primaryPort; - - // @Value("${spring.datasource.username}") - private String primaryUsername; - - // @Value("${spring.datasource.password}") - private String primaryPassword; - - // @Value("${dbUrl}") - private String dbUrl; - - private String dbName; @Bean @@ -278,6 +259,8 @@ return druidProperties.dataSource(dataSource); } + + @Bean // @ConfigurationProperties("spring.datasource.druid.slavepacs") // @ConditionalOnProperty(prefix = "spring.datasource.druid.slavepacs", name = "enabled", havingValue = "true") @@ -360,69 +343,6 @@ properties.setProperty("druid.username",user); properties.setProperty("druid.password",password); dataSource.restart(properties); - return dataSource; - } - -// @Bean(name = "hospDynamicDataSources") -// public DataSource hospDynamicDataSources() { -// HospDynamicDataSource dynamicDataSource = new HospDynamicDataSource(); -// FileInputStream fis = null; -// Properties props = new Properties(); -// try { -// fis = new FileInputStream(url); -// props.load(fis); -// fis.close(); -// dbUrl = props.getProperty("ip"); -// dbName = props.getProperty("name"); -// primaryPassword = props.getProperty("password"); -// primaryPort = props.getProperty("prot"); -// primaryUsername = props.getProperty("username"); -// } catch (IOException e) { -// throw new RuntimeException("璇诲彇閰嶇疆鏂囦欢澶辫触", e); -// } -// String url = "jdbc:mysql://" + dbUrl + ":" + primaryPort + "/" + dbName; -// // 鍒濆鍖栭粯璁ゆ暟鎹簮涓轰富搴� -// dynamicDataSource.addTargetDataSource(DEFAULT_DATA_SOURCE_KEY, createDataSource(url, primaryUsername, primaryPassword)); -// -// dynamicDataSource.setDefaultTargetDataSource(dynamicDataSource.getTargetDataSources().get(DEFAULT_DATA_SOURCE_KEY)); // 璁剧疆榛樿鏁版嵁婧� -// return dynamicDataSource; -// } - - // 鏍规嵁鐢ㄦ埛 ID 鍔ㄦ�佽幏鍙栨暟鎹簮 - public void addDataSource(String dbName) { - FileInputStream fis = null; - Properties props = new Properties(); - try { - fis = new FileInputStream(url); - props.load(fis); - fis.close(); - dbUrl = props.getProperty("ip"); - primaryPassword = props.getProperty("password"); - primaryPort = props.getProperty("prot"); - primaryUsername = props.getProperty("username"); - } catch (IOException e) { - throw new RuntimeException("璇诲彇閰嶇疆鏂囦欢澶辫触", e); - } - - // 妫�鏌ョ紦瀛樹腑鏄惁宸茬粡瀛樺湪璇ユ暟鎹簮 - if (!dataSourceCache.containsKey(dbName)) { - synchronized (this) { - String url = "jdbc:mysql://" + dbUrl + ":" + primaryPort + "/" + dbName; - DataSource dataSource = createDataSource(url, primaryUsername, primaryPassword); - dataSourceCache.put(dbName, dataSource); - - DynamicDataSource dynamicDataSource = dataSource(dataSource); - dynamicDataSource.addTargetDataSource(dbName, dataSource); - } - } - } - - // 鍔ㄦ�佸垱寤烘暟鎹簮 - private DataSource createDataSource(String url, String username, String password) { - DruidDataSource dataSource = new DruidDataSource(); - dataSource.setUrl(url); - dataSource.setUsername(username); - dataSource.setPassword(password); return dataSource; } -- Gitblit v1.8.0