From 835ac4c14a2ae8d17578e2b7bbbaa54d5a12f40a Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 15 一月 2024 17:01:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml |   50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 49 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 61b092b..edd8936 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -68,7 +68,55 @@
         lazy-load-trigger-methods: ""  # 闃绘尅涓嶇浉骞茬殑鎿嶄綔瑙﹀彂锛屽疄鐜版噿鍔犺浇
         cache-enabled: true  #鎵撳紑鍏ㄥ眬缂撳瓨寮�鍏筹紙浜岀骇鐜锛夛紝榛樿鍊兼槸true
         default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
+    type-handlers-package: com.dy.pipIrrGlobal.pojoBa.MySqlJsonHandler
 
 pipIrr:
+    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
+        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: 8081
+        actutorPort: 9081
+        idSuffix: 3
+    statistics:
+        webPort: 8082
+        actutorPort: 9082
+        idSuffix: 4
+    gis:
+        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