From 48d5fe7eaad22768e6c64711c50c485e8176f6f9 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 20 六月 2025 14:23:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
index 7a0fb67..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
@@ -1,16 +1,3 @@
 spring:
     profiles:
-        include: global, database, database-ym, database-sp, database-test
-
-#actutor鐨剋eb绔彛
-management:
-    server:
-        port: ${pipIrr.app.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8088
-server:
-    port: ${pipIrr.app.webPort}
-    servlet:
-        context-path: /app #web璁块棶涓婁笅鏂囪矾寰�
-        context-parameters:
-            #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
-            idSuffix: ${pipIrr.app.idSuffix}
+        include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self

--
Gitblit v1.8.0