From 78f8dac9fa75c268b863a63c9fe65094c18f3d90 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 25 Nov 2024 17:37:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=94=B9=E9=85=8D=E7=BD=AE=E7=9A=84=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/CommonHttpClient.java  | 48 +++++++++++--------
 src/main/resources/application-dev.yml        |  3 +-
 src/main/resources/application-pro.yml        |  1 +
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java
index f8867fb..1e57461 100644
--- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java
@@ -34,6 +34,7 @@ import com.glxp.mipsdl.util.ResultVOUtils;
 import com.glxp.mipsdl.util.SubmitOrderUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -78,6 +79,11 @@ public abstract class CommonHttpClient implements BaseHttpClient {
     @Autowired
     private SubmitOrderUtil submitOrderUtil;
 
+
+    @Value("${spring.datasource.typeD}")
+    private String typeD;
+
+
     @Override
     public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) {
         String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_CORP_URL), udiwmsUnitRequest);
@@ -324,27 +330,27 @@ public abstract class CommonHttpClient implements BaseHttpClient {
     private DataSource dataSource;
 
     public String getDataSourceType(){
-        Connection conn = null;
-        DatabaseMetaData metaData = null;
-        String databaseProductName = "";
-        try {
-            conn = dataSource.getConnection();
-            metaData = conn.getMetaData();
-            databaseProductName = metaData.getDatabaseProductName();//MySQL //Oracle
-        } catch (SQLException throwables) {
-            throwables.printStackTrace();
-        }finally {
-            // 释放连接资源
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        return databaseProductName;
+//        Connection conn = null;
+//        DatabaseMetaData metaData = null;
+//        String databaseProductName = "";
+//        try {
+//            conn = dataSource.getConnection();
+//            metaData = conn.getMetaData();
+//            databaseProductName = metaData.getDatabaseProductName();//MySQL //Oracle
+//        } catch (SQLException throwables) {
+//            throwables.printStackTrace();
+//        }finally {
+//            // 释放连接资源
+//            if (conn != null) {
+//                try {
+//                    conn.close();
+//                } catch (SQLException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+
+        return typeD;
 
     }
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 7ebbcca..8dd4988 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,11 +1,12 @@
 spring:
   datasource:
+    typeD: MySQL
     dynamic:
       primary: master
       strict: false
       datasource:
         master:
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 60ea25e..fc8d493 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,5 +1,6 @@
 spring:
   datasource:
+    typeD: Oracle
     dynamic:
       primary: master
       strict: false