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 |    3 ++-
 1 files changed, 2 insertions(+), 1 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 892b157..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
@@ -310,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+
-                ";&characterEncoding=utf8;encrypt=false");
+                ";trustServerCertificate=true;encrypt=false;characterEncoding=utf8");
         properties.setProperty("druid.username", user);
         properties.setProperty("druid.password", password);
         dataSource.restart(properties);

--
Gitblit v1.8.0