From b35eadd37354ba8b2c1d17d5a744eef5164ba5ad Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 29 十二月 2023 14:08:07 +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 |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 42 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 ac26181..b1b3f1f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -70,22 +70,52 @@
         default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
 
 pipIrr:
-    demo:
-        webPort: 8000
-        actutorPort: 9000
+    global:
+        dev: true   #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+        dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+    accMw:
+        commandCallback:  http://127.0.0.1:8079/remote/rtu/comCallback
+        webPort: 8070
+        actutorPort: 9070
+        idSuffix: 0
     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
+    sell:
+        webPort: 8084
+        actutorPort: 9084
+        idSuffix: 6
+    project:
+        webPort: 8085
+        actutorPort: 9085
+        idSuffix: 7
+
+#椤圭洰缂栧彿
+projectCode:
+    ym: 100
+    pj: 101
+
+#閫氳鍗忚
+protocol: DYJS_2023,DYJS_2024
\ No newline at end of file

--
Gitblit v1.8.0