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/DruidConfig.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 796a281..a66a17e 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
@@ -42,6 +42,7 @@
@Slf4j
public class DruidConfig {
+
@Value ("${config.properties}")
private String url;
@@ -259,6 +260,7 @@
}
+
@Bean
// @ConfigurationProperties("spring.datasource.druid.slavepacs")
// @ConditionalOnProperty(prefix = "spring.datasource.druid.slavepacs", name = "enabled", havingValue = "true")
@@ -276,7 +278,7 @@
props.load(fis);
fis.close();
// 杩欓噷鏄祴璇曞啓娉曪紝鍏蜂綋鐨剉alue鍙互閫氳繃璇锋眰鍙傛暟浼犻�掕繃鏉�
- String pacsenabled = props.getProperty("pacsenabled");
+ String pacsenabled = props.getProperty("wsenabled");
if (pacsenabled.equals("false"))
return null;
String pacsdbtype = props.getProperty("wsdbtype");
@@ -308,12 +310,13 @@
private DruidDataSource creatSqlServer(String enabled, String ip,String port,String db,String user,String password) throws SQLException {
+ // -Djdk.tls.client.protocols=TLSv1.2 JVM鍚姩鍙傛暟
DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
Properties properties = new Properties();
properties.setProperty("druid.enabled", enabled);
properties.setProperty("druid.driverClassName","com.microsoft.sqlserver.jdbc.SQLServerDriver");
properties.setProperty("druid.url","jdbc:sqlserver://"+ ip+":"+ port+";DatabaseName="+ db+
- ";encrypt=true;trustServerCertificate=true;sslProtocol=TLSv1.2;");
+ ";trustServerCertificate=true;encrypt=false;characterEncoding=utf8");
properties.setProperty("druid.username", user);
properties.setProperty("druid.password", password);
dataSource.restart(properties);
--
Gitblit v1.8.0