From 3e49ff6a3db6710bc327d99384d4b8fc6d474da4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 27 六月 2024 13:44:09 +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 |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 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 d189a60..9fd4b6a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -68,13 +68,13 @@
         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
+    mw:
         webPort: 8070
         actutorPort: 9070
         idSuffix: 0
@@ -103,3 +103,30 @@
         webPort: 8000
         actutorPort: 9000
         idSuffix: 99
+    sell:
+        webPort: 8084
+        actutorPort: 9084
+        idSuffix: 6
+    project:
+        webPort: 8085
+        actutorPort: 9085
+        idSuffix: 7
+    irrigate:
+        webPort: 8086
+        actutorPort: 9086
+        idSuffix: 8
+    wechat:
+        webPort: 8087
+        actutorPort: 9087
+        idSuffix: 9
+    app:
+        webPort: 8088
+        actutorPort: 9088
+        idSuffix: 10
+#椤圭洰缂栧彿
+#projectCode:
+#    ym: 100
+#    pj: 101
+
+#閫氳鍗忚
+#protocol: DYJS_2023,DYJS_2024
\ No newline at end of file

--
Gitblit v1.8.0