From b6d93e08adb11e7f4584173d9d44dbc7c7508e9f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 27 十一月 2023 17:50:23 +0800
Subject: [PATCH] 测试冲突

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 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 1af34b2..72b6ac0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -73,22 +73,33 @@
     global:
         dev: true   #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
-    demo:
-        webPort: 8000
-        actutorPort: 9000
+    accMw:
+        commandCallback:  http://127.0.0.1:8079/remote/rtu/comCallback
+        webPort: 8070
+        actutorPort: 9070
+        idSuffix: 0 #姝ゅ鍙槸鍗犱綅锛屽叿浣撹缃湪閫氫俊涓棿浠剁殑config.xml涓缃�
     sso:
-        checkUrl: http://127.0.0.1:8888/sso/sso/ssoCheck
-        webPort: 8080
-        actutorPort: 9080
+        checkUrl: http://127.0.0.1:8079/sso/sso/ssoCheck
+        webPort: 8079
+        actutorPort: 9079
+        idSuffix: 1
     base:
         webPort: 8080
         actutorPort: 9080
+        idSuffix: 2
     remote:
-        webPort: 8080
-        actutorPort: 9080
+        webPort: 8081
+        actutorPort: 9081
+        idSuffix: 3
     statistics:
-        webPort: 8080
-        actutorPort: 9080
+        webPort: 8082
+        actutorPort: 9082
+        idSuffix: 4
     gis:
-        webPort: 8080
-        actutorPort: 9080
\ No newline at end of file
+        webPort: 8083
+        actutorPort: 9083
+        idSuffix: 5
+    demo:
+        webPort: 8000
+        actutorPort: 9000
+        idSuffix: 99

--
Gitblit v1.8.0