From fceb8bbdfae23ae3b248327837baab68414d3349 Mon Sep 17 00:00:00 2001
From: kk <1910333201@qq.com>
Date: Wed, 13 Dec 2023 15:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E8=B6=85=E9=95=BF=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml        |  6 ++++--
 .../src/main/resources/application-prod.yml       |  6 ++++--
 .../invoice/utils/elephant/ElephantUtils.java     | 15 +++++++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml
index e912589..716b907 100644
--- a/jianshui-admin/src/main/resources/application-dev.yml
+++ b/jianshui-admin/src/main/resources/application-dev.yml
@@ -91,8 +91,10 @@ ele_check_url: https://openapi.zncspt.com/api/
 elephant_entcode_check: 91370102MA3UD2FG21
 # 文件下载地址
 elephant_invoice_file: http://dev.goldentaxcloud.com/8081/invoice/fileUrl/
-# 大象V6数电平台地址
-ele_v6_url: https://js.ele12.com/order-api
+# 大象V6数电对应平台地址
+ele_url_v6: https://js.ele12.com/order-api
+# 大象纸票服务对应平台地址
+ele_url: https://js.ele12.com/order-api
 #logstash:
 #  host: 43.138.58.64:14560
 #  indexname: jianshui-dev
\ No newline at end of file
diff --git a/jianshui-admin/src/main/resources/application-prod.yml b/jianshui-admin/src/main/resources/application-prod.yml
index 0ae7e0c..5e28740 100644
--- a/jianshui-admin/src/main/resources/application-prod.yml
+++ b/jianshui-admin/src/main/resources/application-prod.yml
@@ -85,8 +85,10 @@ ele_check_url: https://openapi.zncspt.com/api/
 elephant_entcode_check: 91370102MA3UD2FG21
 # 文件下载地址
 elephant_invoice_file: http://dev.goldentaxcloud.com/8081/invoice/fileUrl/
-# 大象V6数电平台地址
-ele_v6_url: https://js.ele12.com/order-api
+# 大象V6数电对应平台地址
+ele_url_v6: https://js.ele12.com/order-api
+# 大象纸票服务对应平台地址
+ele_url: https://js.ele12.com/order-api
 #logstash:
 #  host: 43.138.58.64:14560
 #  indexname: jianshui-prod
\ No newline at end of file
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
index eb4be3b..2ff2b76 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
@@ -61,11 +61,14 @@ import java.util.concurrent.TimeUnit;
 public class ElephantUtils {
 
     // 大象V6地址
-    private static String ELE_V6_URL;
+    private static String ELE_URL_v6;
+    // 大象普通服务
+    private static String ELE_URL;
 
     static {
         Environment environment = SpringUtils.getBean(Environment.class);
-        ELE_V6_URL = environment.getProperty("ele_v6_url");
+        ELE_URL_v6 = environment.getProperty("ele_url_v6");
+        ELE_URL = environment.getProperty("ele_url");
     }
 
 
@@ -298,7 +301,7 @@ public class ElephantUtils {
             url = ElephantConstants.DEV_HOST_LOCAL_V6_JingDongYun;
         }*/
 
-        String url = ELE_V6_URL;
+        String url = ELE_URL;
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("appKey", appkey);
@@ -384,7 +387,7 @@ public class ElephantUtils {
             host = ElephantConstants.DEV_HOST_LOCAL_V6_JingDongYun;
         }*/
 
-        String host = ELE_V6_URL;
+        String host = ELE_URL_v6;
         // 最终接口地址
         String url = host + uri;
 
@@ -468,7 +471,7 @@ public class ElephantUtils {
             host = ElephantConstants.DEV_HOST_LOCAL_V6_JingDongYun;
         }*/
 
-        String host = ELE_V6_URL;
+        String host = ELE_URL;
 
         //kk TODO : 2023/9/5 大象接口迁京东云
         //https://js.ele12.com/
@@ -686,7 +689,7 @@ public class ElephantUtils {
         if (isDevMode) {
             host = ElephantConstants.DEV_HOST_LOCAL_V6_JingDongYun;
         }*/
-        String host = ELE_V6_URL;
+        String host = ELE_URL_v6;
         // 最终接口地址
         String url = host + uri;