Pre Merge pull request !582 from AprilWind/dev-monitor-admin

This commit is contained in:
AprilWind 2024-09-11 03:40:03 +00:00 committed by Gitee
commit 7bcfa3ee5f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 18 additions and 12 deletions

View File

@ -69,6 +69,8 @@
<!-- 环境标识,需要与配置文件的名称相对应 --> <!-- 环境标识,需要与配置文件的名称相对应 -->
<profiles.active>local</profiles.active> <profiles.active>local</profiles.active>
<logging.level>info</logging.level> <logging.level>info</logging.level>
<monitor.username>ruoyi</monitor.username>
<monitor.password>123456</monitor.password>
</properties> </properties>
</profile> </profile>
<profile> <profile>
@ -77,6 +79,8 @@
<!-- 环境标识,需要与配置文件的名称相对应 --> <!-- 环境标识,需要与配置文件的名称相对应 -->
<profiles.active>dev</profiles.active> <profiles.active>dev</profiles.active>
<logging.level>info</logging.level> <logging.level>info</logging.level>
<monitor.username>ruoyi</monitor.username>
<monitor.password>123456</monitor.password>
</properties> </properties>
<activation> <activation>
<!-- 默认环境 --> <!-- 默认环境 -->
@ -88,6 +92,8 @@
<properties> <properties>
<profiles.active>prod</profiles.active> <profiles.active>prod</profiles.active>
<logging.level>warn</logging.level> <logging.level>warn</logging.level>
<monitor.username>ruoyi</monitor.username>
<monitor.password>123456</monitor.password>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>

View File

@ -8,8 +8,8 @@ spring.boot.admin.client:
metadata: metadata:
username: ${spring.boot.admin.client.username} username: ${spring.boot.admin.client.username}
userpassword: ${spring.boot.admin.client.password} userpassword: ${spring.boot.admin.client.password}
username: ruoyi username: @monitor.username@
password: 123456 password: @monitor.password@
--- # snail-job 配置 --- # snail-job 配置
snail-job: snail-job:

View File

@ -11,8 +11,8 @@ spring.boot.admin.client:
metadata: metadata:
username: ${spring.boot.admin.client.username} username: ${spring.boot.admin.client.username}
userpassword: ${spring.boot.admin.client.password} userpassword: ${spring.boot.admin.client.password}
username: ruoyi username: @monitor.username@
password: 123456 password: @monitor.password@
--- # snail-job 配置 --- # snail-job 配置
snail-job: snail-job:

View File

@ -13,8 +13,8 @@ logging:
spring: spring:
security: security:
user: user:
name: ruoyi name: @monitor.username@
password: 123456 password: @monitor.password@
boot: boot:
admin: admin:
ui: ui:
@ -44,5 +44,5 @@ spring.boot.admin.client:
metadata: metadata:
username: ${spring.boot.admin.client.username} username: ${spring.boot.admin.client.username}
userpassword: ${spring.boot.admin.client.password} userpassword: ${spring.boot.admin.client.password}
username: ruoyi username: @monitor.username@
password: 123456 password: @monitor.password@

View File

@ -46,5 +46,5 @@ spring.boot.admin.client:
metadata: metadata:
username: ${spring.boot.admin.client.username} username: ${spring.boot.admin.client.username}
userpassword: ${spring.boot.admin.client.password} userpassword: ${spring.boot.admin.client.password}
username: ruoyi username: @monitor.username@
password: 123456 password: @monitor.password@

View File

@ -46,5 +46,5 @@ spring.boot.admin.client:
metadata: metadata:
username: ${spring.boot.admin.client.username} username: ${spring.boot.admin.client.username}
userpassword: ${spring.boot.admin.client.password} userpassword: ${spring.boot.admin.client.password}
username: ruoyi username: @monitor.username@
password: 123456 password: @monitor.password@