From 171f021009d50ba63d1f74fc7fd8eeabc9ddbb94 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 28 五月 2024 08:27:00 +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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 ba0fd4c..5c588fd 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
@@ -111,7 +111,15 @@
webPort: 8085
actutorPort: 9085
idSuffix: 7
+ irrigate:
+ webPort: 8086
+ actutorPort: 9086
+ idSuffix: 8
-projectCode:
- ym: 1000
- pj: 1001
\ No newline at end of file
+#椤圭洰缂栧彿
+#projectCode:
+# ym: 100
+# pj: 101
+
+#閫氳鍗忚
+#protocol: DYJS_2023,DYJS_2024
\ No newline at end of file
--
Gitblit v1.8.0