From 7af935e6a092193adf309f3a2d700f049b4b63d8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 25 七月 2024 14:11:49 +0800
Subject: [PATCH] 解决冲突
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml | 4 ++--
1 files changed, 2 insertions(+), 2 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 aca21d0..8dc7ccd 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,12 +1,12 @@
spring:
profiles:
- include: global, database
+ include: global, database, database-ym, database-pj, database-sp
#actutor鐨剋eb绔彛
management:
server:
port: ${pipIrr.remote.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
+#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8081
server:
port: ${pipIrr.remote.webPort}
servlet:
--
Gitblit v1.8.0