From 58bd4f3a3a2a45544203ab605836667c4af38d76 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期一, 11 十二月 2023 15:53:00 +0800
Subject: [PATCH] sqlserver连接

---
 ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java |    6 +-
 ltkj-admin/pom.xml                                                                     |    7 +++
 ltkj-admin/src/test/java/lgTest.java                                                   |   20 ++++------
 ltkj-admin/src/main/resources/application-druid.yml                                    |   11 +++--
 ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml                           |    6 +-
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/SqlTest.java                              |   14 +++++++
 ltkj-admin/src/main/resources/application.yml                                          |   16 ++++----
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java                           |   21 ++++++++++
 8 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/ltkj-admin/pom.xml b/ltkj-admin/pom.xml
index f79d726..c986cb0 100644
--- a/ltkj-admin/pom.xml
+++ b/ltkj-admin/pom.xml
@@ -72,7 +72,12 @@
             <version>1.69</version>
         </dependency>
 
-
+        <!-- sqlserver椹卞姩鍖� -->
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>sqljdbc4</artifactId>
+            <version>4.0</version>
+        </dependency>
 
         <!-- Mysql椹卞姩鍖� -->
         <dependency>
diff --git a/ltkj-admin/src/main/resources/application-druid.yml b/ltkj-admin/src/main/resources/application-druid.yml
index 19c9b01..082579f 100644
--- a/ltkj-admin/src/main/resources/application-druid.yml
+++ b/ltkj-admin/src/main/resources/application-druid.yml
@@ -15,10 +15,11 @@
       # 浠庡簱鏁版嵁婧�
       slave:
         # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
-        enabled: false
-        url:
-        username:
-        password:
+        enabled: true
+        driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        url: jdbc:sqlserver://192.168.0.111:1433;DatabaseName=Testlg
+        username: sa
+        password: admin123
       # 鍒濆杩炴帴鏁�
       initialSize: 5
       # 鏈�灏忚繛鎺ユ睜鏁伴噺
@@ -34,7 +35,7 @@
       # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
       maxEvictableIdleTimeMillis: 900000
       # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
-      validationQuery: SELECT 1 FROM DUAL
+      validationQuery: SELECT 1
       testWhileIdle: true
       testOnBorrow: false
       testOnReturn: false
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index fc0bc3d..ff73d25 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -11,8 +11,8 @@
   # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ltkj/uploadPath锛孡inux閰嶇疆 /home/ltkj/uploadPath锛�
   # 鐢ㄦ埛鎹㈠ご鍍忓悗鐨勫浘鐗囧瓨鍌ㄥ湴鍧�  娴嬭瘯锛欴:\ltkj\uploadPath\avatar\2022\12\14
   #profile: D:/ltkj/uploadPath
-#  profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
-  profile: http://192.168.0.5:5502/uploadPath
+  profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
+#  profile: http://192.168.0.5:5502/uploadPath
 
   # 鑾峰彇ip鍦板潃寮�鍏�
   addressEnabled: true
@@ -73,15 +73,15 @@
   # redis 閰嶇疆
   redis:
     # 鍦板潃
-#    host: 101.42.27.146
-    host: localhost
+    host: 101.42.27.146
+#    host: localhost
     # 绔彛锛岄粯璁や负6379
     port: 6379
     # 鏁版嵁搴撶储寮�
     database: 0
     # 瀵嗙爜
-#    password: 654321
-    password: 123456
+    password: 654321
+#    password: 123456
     # 杩炴帴瓒呮椂鏃堕棿
     timeout: 120s
     lettuce:
@@ -211,8 +211,8 @@
 #绉湪鎶ヨ〃璁块棶鍦板潃
 jimu:
 #  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
-#  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
-  path: http://192.168.0.5:5000/ltkj-admin
+  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
+#  path: http://192.168.0.5:5000/ltkj-admin
 #  path: http://192.168.0.99:8081/ltkj-admin
 #  path: http://192.168.0.101:5011
 
diff --git a/ltkj-admin/src/test/java/lgTest.java b/ltkj-admin/src/test/java/lgTest.java
index 9abb6f8..122334e 100644
--- a/ltkj-admin/src/test/java/lgTest.java
+++ b/ltkj-admin/src/test/java/lgTest.java
@@ -1,4 +1,6 @@
 import com.ltkj.LtkjApplication;
+import com.ltkj.hosp.domain.SqlTest;
+import com.ltkj.hosp.mapper.TestMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -7,6 +9,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -20,20 +23,13 @@
 @Slf4j
 @EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
 public class lgTest {
+
+    @Resource
+    private TestMapper testMapper;
     @Test
     public void lige() {
-//        List<String> a=new ArrayList<>();
-//        a.add("ozImg61ibpygYZNRWLqtrdpoICh4");
-////        a.add("ozImg66H5FbsXzzAHto5Ue_SN5W4");
-////        a.add("ozImg64_ViFuhCWvnwLtMWyUCz7g");
-////        a.add("ozImg61ibpygYZNRWLqtrdpoICh4");
-//
-//        for (String s : a) {
-//            WxUtil.sendSubscribeMessage(s);
-//        }
-        //String openid = "o524m6a1xomIOW5fymo7WmE-z3Dg";//闇�瑕佽鐢ㄦ埛宸茬粡鎺堟潈杩囪璁㈤槄娑堟伅鎵嶈兘鍙戦��
-
-
+        final SqlTest list = testMapper.getList();
+        System.out.println(list);
     }
 
     public static void main(String[] args) {
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java
index 2a7490f..ff4d6d2 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/properties/DruidProperties.java
@@ -32,8 +32,8 @@
     @Value("${spring.datasource.druid.maxEvictableIdleTimeMillis}")
     private int maxEvictableIdleTimeMillis;
 
-    @Value("${spring.datasource.druid.validationQuery}")
-    private String validationQuery;
+//    @Value("${spring.datasource.druid.validationQuery}")
+//    private String validationQuery;
 
     @Value("${spring.datasource.druid.testWhileIdle}")
     private boolean testWhileIdle;
@@ -63,7 +63,7 @@
         /**
          * 鐢ㄦ潵妫�娴嬭繛鎺ユ槸鍚︽湁鏁堢殑sql锛岃姹傛槸涓�涓煡璇㈣鍙ワ紝甯哥敤select 'x'銆傚鏋渧alidationQuery涓簄ull锛宼estOnBorrow銆乼estOnReturn銆乼estWhileIdle閮戒笉浼氳捣浣滅敤銆�
          */
-        datasource.setValidationQuery(validationQuery);
+//        datasource.setValidationQuery(validationQuery);
         /** 寤鸿閰嶇疆涓簍rue锛屼笉褰卞搷鎬ц兘锛屽苟涓斾繚璇佸畨鍏ㄦ�с�傜敵璇疯繛鎺ョ殑鏃跺�欐娴嬶紝濡傛灉绌洪棽鏃堕棿澶т簬timeBetweenEvictionRunsMillis锛屾墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堛�� */
         datasource.setTestWhileIdle(testWhileIdle);
         /** 鐢宠杩炴帴鏃舵墽琛寁alidationQuery妫�娴嬭繛鎺ユ槸鍚︽湁鏁堬紝鍋氫簡杩欎釜閰嶇疆浼氶檷浣庢�ц兘銆� */
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/SqlTest.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/SqlTest.java
new file mode 100644
index 0000000..f923489
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/SqlTest.java
@@ -0,0 +1,14 @@
+package com.ltkj.hosp.domain;
+
+import lombok.Data;
+
+/**
+ * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
+ * @Author: lige
+ * @Date: 2023/12/11 14:55
+ */
+@Data
+public class SqlTest {
+    private String id;
+    private String address;
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
new file mode 100644
index 0000000..d19e750
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -0,0 +1,21 @@
+package com.ltkj.hosp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.common.annotation.DataSource;
+import com.ltkj.common.enums.DataSourceType;
+import com.ltkj.hosp.domain.SqlTest;
+import com.ltkj.hosp.domain.TjAdvice;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
+ * @Author: lige
+ * @Date: 2023/12/11 14:51
+ */
+@Mapper
+public interface TestMapper extends BaseMapper<SqlTest> {
+    @DataSource(value = DataSourceType.SLAVE)
+    @Select("select * from City where id=1")
+    public SqlTest getList();
+}
diff --git a/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml b/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml
index a14de93..4ecd4f8 100644
--- a/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/mall/MallOrderMapper.xml
@@ -239,9 +239,9 @@
             <if test="startTime != null and endTime !=null ">
                 and  create_time between #{startTime} and #{endTime}
             </if>
-            <if test="getType != null ">
-                and get_type = #{getType}
-            </if>
+<!--            <if test="getType != null ">-->
+<!--                and get_type = #{getType}-->
+<!--            </if>-->
         </where>
         order by update_time desc
     </select>

--
Gitblit v1.8.0