From 427d87e5572d72d0e3aaa4364e4f53569222e321 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 三月 2025 21:40:05 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml |   19 +------------------
 1 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
index eb80e19..a24b0b5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
@@ -1,20 +1,3 @@
 spring:
     profiles:
-        include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
-user:
-    defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
-    defaultPassword: "abc_123"
-#    defaultPassword: "admin"
-
-#actutor鐨剋eb绔彛
-management:
-    server:
-        port: ${pipIrr.base.actutorPort}
-#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
-server:
-    port: ${pipIrr.base.webPort}
-    servlet:
-        context-path: /base #web璁块棶涓婁笅鏂囪矾寰�
-        context-parameters:
-            #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
-            idSuffix: ${pipIrr.base.idSuffix}
+        include: common-web, global, database, database-ym, database-sp, database-test,database-mj, self

--
Gitblit v1.8.0