From 088fdd2ed19b6693a44563cf54f97fd5b6fa05f4 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 3 Sep 2024 18:00:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java  | 6 +++---
 .../src/main/resources/bootstrap-sgzb_nw_dev.yml            | 3 ++-
 .../src/main/resources/bootstrap-sgzb_nw_local.yml          | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 4e9c283..c632b38 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -44,13 +44,13 @@ import java.util.stream.Collectors;
 @Slf4j
 public class TmTaskServiceImpl implements TmTaskService {
 
-    @Value("zgzb.intelligentUrl")
+    @Value("${sgzb.intelligentUrl}")
     private String intelligentUrl;
 
-    @Value("zgzb.intelligentAppKey")
+    @Value("${sgzb.intelligentAppKey}")
     private String intelligentAppKey;
 
-    @Value("zgzb.intelligentAesKey")
+    @Value("${sgzb.intelligentAesKey}")
     private String intelligentAesKey;
 
     @Resource
diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_dev.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_dev.yml
index 5a3d167..e8a73e2 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_dev.yml
+++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_dev.yml
@@ -39,6 +39,7 @@ sgzb:
     settlementJobDay: 1
     settlementJobCron: "0 0 1 1 * ?"
   zlptUrl: http://test-rental.zhgkxt.com/proxy/item-center/supply/item/pushNotifications
+  intelligentUrl: http://www.zhgkxt.com/api/clientapi/public/externalApi
   intelligentAppKey: abc123
   intelligentAesKey: abcdefghijklmnop
-  intelligentUrl: http://www.zhgkxt.com/api/clientapi/public/externalApi
+
diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml
index 30f32bd..dc72f69 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml
+++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_nw_local.yml
@@ -39,7 +39,8 @@ sgzb:
     settlementJobDay: 1
     settlementJobCron: "0 0 1 1 * ?"
   zlptUrl: http://test-rental.zhgkxt.com/proxy/item-center/supply/item/pushNotifications
+  intelligentUrl: http://www.zhgkxt.com/api/clientapi/public/externalApi
   intelligentAppKey: abc123
   intelligentAesKey: abcdefghijklmnop
-  intelligentUrl: http://www.zhgkxt.com/api/clientapi/public/externalApi
+