From 7b5a12d1114b9609ea39bb1b201dfe50bf252c76 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 23 七月 2024 15:34:23 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 87f3780..edea437 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -72,7 +72,7 @@
 
 pipIrr:
     global:
-        dev: false   #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+        dev: true   #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
     mw:
         webPort: 8070
@@ -132,8 +132,27 @@
 
 #閫氳鍗忚
 #protocol: DYJS_2023,DYJS_2024
+mw:
+    #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
+    ym:
+        comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
+    sp:
+        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+    #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
+    rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
+    #寰俊灏忕▼搴忓洖璋冨湴鍧�
+    rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
 
 #涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
 tokennofilter:
     urls:
         - /sso/sso
+        - /remote/comRes/receive
+        - /wx/comRes/receive
+#鑷姩缁熻閰嶇疆
+auto-statistics:
+    #鏈堢粺璁�
+    month:
+        startDay: 1
+        startHour: 0
+        startMinute: 5

--
Gitblit v1.8.0