From 0857b855609b1735a1583d69f8289a2d26950419 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 23 五月 2024 11:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
index 08ac119..a3e69d7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
@@ -1,18 +1,18 @@
spring:
profiles:
- include: global, database
+ include: global, database, database-ym, database-pj
#actutor鐨剋eb绔彛
management:
server:
port: ${pipIrr.remote.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8081
server:
port: ${pipIrr.remote.webPort}
servlet:
context-path: /remote #web璁块棶涓婁笅鏂囪矾寰�
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: 2
+ idSuffix: ${pipIrr.remote.idSuffix}
#ConfigListener涓簲鐢�
#configFileNames: config-global.xml,config-demo.xml
--
Gitblit v1.8.0