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 | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 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..72b6ac0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -70,5 +70,36 @@
default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
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 #姝ゅ鍙槸鍗犱綅锛屽叿浣撹缃湪閫氫俊涓棿浠剁殑config.xml涓缃�
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
--
Gitblit v1.8.0