From a2bc4745bd298ff2ff6ffb6400819920ff65e9a1 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 28 九月 2023 10:00:18 +0800
Subject: [PATCH] fix(quartz): URL通过配置文件传入

---
 src/main/java/com/integrated/zyyt/ZyytConstant.java |   68 ++++++++++++++++++++++++++++------
 src/main/resources/application-dev.yml              |   11 +++++
 src/main/resources/application-prod.yml             |   12 ++++++
 3 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/integrated/zyyt/ZyytConstant.java b/src/main/java/com/integrated/zyyt/ZyytConstant.java
index 6d016d9..976fc59 100644
--- a/src/main/java/com/integrated/zyyt/ZyytConstant.java
+++ b/src/main/java/com/integrated/zyyt/ZyytConstant.java
@@ -1,6 +1,8 @@
 package com.integrated.zyyt;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 /**
  * 涓偖鏄撻�氬父閲�
@@ -15,33 +17,75 @@
 public class ZyytConstant {
     private static String IP_PORT = "http://10.225.71.10:9090";
 
-//    @Value(value = "${zyyt.ipPort}")
-//    public void setIpPort(String ipPort) {
-//        ZyytConstant.IP_PORT = ipPort;
-//    }
 
-    public static String URL_AUTHON = IP_PORT + "/api/clients/auth";
+    public static String IP_PORT_AUTH;
+
+    @Value(value = "${zyyt.ipPort.auth}")
+    public void setIpPortAuth(String authIpPort) {
+        ZyytConstant.IP_PORT_AUTH = authIpPort;
+        System.out.println("閰嶇疆鏂囦欢涓� 璁よ瘉IP:PORT==>" + IP_PORT_AUTH);
+        if (StringUtils.isEmpty(authIpPort)) {
+            ZyytConstant.IP_PORT_AUTH = IP_PORT;
+            System.out.println("閰嶇疆鏂囦欢涓� 璁よ瘉IP:PORT涓虹┖锛屼娇鐢�==>" + ZyytConstant.IP_PORT);
+        }
+    }
+
+    public static String IP_PORT_SHKDRB;
+
+    @Value(value = "${zyyt.ipPort.shkdrb}")
+    public void setIpPortShkdrb(String shkdrbIpPort) {
+        ZyytConstant.IP_PORT_SHKDRB = shkdrbIpPort;
+        System.out.println("閰嶇疆鏂囦欢涓� 绀句細蹇�掓棩鎶P:PORT==>" + IP_PORT_SHKDRB);
+        if (StringUtils.isEmpty(shkdrbIpPort)) {
+            ZyytConstant.IP_PORT_SHKDRB = IP_PORT;
+            System.out.println("閰嶇疆鏂囦欢涓� 绀句細蹇�掓棩鎶P:PORT涓虹┖锛屼娇鐢�==>" + ZyytConstant.IP_PORT);
+        }
+    }
+
+    public static String IP_PORT_DJTJB;
+
+    @Value(value = "${zyyt.ipPort.djtjb}")
+    public void setIpPortDjtjb(String djtjbIpPort) {
+        ZyytConstant.IP_PORT_DJTJB = djtjbIpPort;
+        System.out.println("閰嶇疆鏂囦欢涓� 绀句細蹇�掓棩鎶P:PORT==>" + IP_PORT_DJTJB);
+        if (StringUtils.isEmpty(djtjbIpPort)) {
+            ZyytConstant.IP_PORT_DJTJB = IP_PORT;
+            System.out.println("閰嶇疆鏂囦欢涓� 浠e瘎缁熻IP:PORT涓虹┖锛屼娇鐢�==>" + ZyytConstant.IP_PORT);
+        }
+    }
+
+    public static String IP_PORT_STATION;
+
+    @Value(value = "${zyyt.ipPort.station}")
+    public void setIpPortStation(String stationIpPort) {
+        ZyytConstant.IP_PORT_STATION = stationIpPort;
+        System.out.println("閰嶇疆鏂囦欢涓� 绔欑偣淇℃伅IP:PORT==>" + IP_PORT_STATION);
+        if (StringUtils.isEmpty(stationIpPort)) {
+            ZyytConstant.IP_PORT_STATION = IP_PORT;
+            System.out.println("閰嶇疆鏂囦欢涓� 绔欑偣淇℃伅IP:PORT涓虹┖锛屼娇鐢�==>" + ZyytConstant.IP_PORT);
+        }
+    }
+
+
+    public static String URL_AUTHON = IP_PORT_AUTH + "/api/clients/auth";
+
     // 鎵规鍙风敓鎴愬墠缂�
     public static String batchNoPrefix = "ZYYT";
 
     //1.绀句細蹇�掓棩鎶ヨ〃 YYZT_T_SHKDRB
-    public static String URL_SHKDRB_QUERY = IP_PORT + "/api/sql-services/ZYE_ZYET_YYZT_T_SHKDRB/query";
+    public static String URL_SHKDRB_QUERY = IP_PORT_SHKDRB + "/api/sql-services/ZYE_ZYET_YYZT_T_SHKDRB/query";
     public static String CLIENT_SHKDRB = "3ad3d605ad6149808e6d7ea9fb26a2e2";
     public static String SECRET_SHKDRB = "7fe76820268a47dc9b1785ded59de33a";
     public static String X_EOS_SOURCESYSKEY_SHKDRB = "ff13e98f32fd4cbeaa66b10278a20f19";
 
     //2.浠e瘎缁熻琛� YYZT_T_DJTJB
-    public static String URL_DJTJB_QUERY = IP_PORT + "/api/sql-services/SJZT_DJTJB_01_01/query";
+    public static String URL_DJTJB_QUERY = IP_PORT_DJTJB + "/api/sql-services/SJZT_DJTJB_01_01/query";
     public static String CLIENT_DJTJB = "65eed619e0094da299f5e45f924e6e78";
     public static String SECRET_DJTJB = "f2ae2fe68e104814a28ae134ad3530de";
     public static String X_EOS_SOURCESYSKEY_DJTJB = "ff13e98f32fd4cbeaa66b10278a20f19";
 
     //3.锛氱珯鐐逛俊鎭〃 STATIONINFO
-    /*public static String URL_STATIONINFO_QUERY = IP_PORT + "/api/sql-services/ZYE_ZYET_STATIONINFO/query";
-    public static String CLIENT_STATIONINFO = "6ffbdfb52cfb481f913608b4e6e99538";
-    public static String SECRET_STATIONINFO = "3288ffdb0d5041c0b61885010d1ef2ad";
-    public static String X_EOS_SOURCESYSKEY_STATIONINFO = "ff13e98f32fd4cbeaa66b10278a20f19";*/
-    public static String URL_STATIONINFO_QUERY = "https://10.225.71.10:9092/api/sql-services/NtdAPgZYysvNFut3WxDgQ/query";
+    public static String URL_STATIONINFO_QUERY = IP_PORT_STATION + "/api/sql-services/NtdAPgZYysvNFut3WxDgQ/query";
     public static String CLIENT_STATIONINFO = "ebe574afde8f409bbd5204d79272c939";
     public static String SECRET_STATIONINFO = "900c4d8df2c14c9899497902655f1107";
     public static String X_EOS_SOURCESYSKEY_STATIONINFO = "ff13e98f32fd4cbeaa66b10278a20f19";
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ec6d79e..5fbe8d6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -36,3 +36,14 @@
   path: D:\tmp
   sftpDownload: C:\ftpData\download
 
+zyyt:
+  ipPort:
+    # 璁よ瘉
+    auth: http://22.33.44.11:9090
+    #绀句細蹇�掓棩鎶�
+    shkdrb: http://11.22.33.44:9090
+    #浠e瘎缁熻琛�
+    djtjb: http://22.33.44.11:9090
+    #绔欑偣淇℃伅琛�
+    station: http://123.123:9090
+
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 5a2cb50..58f918a 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -43,3 +43,15 @@
   batchInsertSize: 1000
 base:
   url: http://10.170.7.27:7000/admin
+
+
+zyyt:
+  ipPort:
+    # 璁よ瘉
+    auth: http://22.33.44.11:9090
+    #绀句細蹇�掓棩鎶�
+    shkdrb: http://11.22.33.44:9090
+    #浠e瘎缁熻琛�
+    djtjb: http://22.33.44.11:9090
+    #绔欑偣淇℃伅琛�
+    station: http://123.123:9090

--
Gitblit v1.9.1