From 1e567af8bbdda31ce3342cd41bb40157168b3da9 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 17:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 de87bf5..7369e38 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,18 +1,19 @@
spring:
profiles:
- include: global, database
+ include: global, database, database-ym, database-pj
+user:
+ defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
+ defaultPassword: "abc_123"
#actutor鐨剋eb绔彛
management:
server:
- port: 9080
+ port: ${pipIrr.base.actutorPort}
#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
server:
- port: 8080
+ port: ${pipIrr.base.webPort}
servlet:
context-path: /base #web璁块棶涓婁笅鏂囪矾寰�
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: 1
- #ConfigListener涓簲鐢�
- #configFileNames: config-global.xml,config-demo.xml
+ idSuffix: ${pipIrr.base.idSuffix}
--
Gitblit v1.8.0