dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dyf:b945420446ca901caa52b32f38424fcacefbbf62
Branches Tags
dyf:main dyf:6170 dyf:dyf-device dyf:jingquan dyf:prod dyf:APP权限登录改造
...
compare: dyf:prod
Branches Tags
dyf:6170 dyf:dyf-device dyf:jingquan dyf:main dyf:prod dyf:APP权限登录改造

15 Commits
b945420446 ... prod

Author SHA1 Message Date
daiyongfei
82399cffed Merge branch 'dyf-device' into prod 2025-08-25 14:33:52 +08:00
daiyongfei
5538ac96e5 晶全日志配置 2025-08-06 09:48:00 +08:00
daiyongfei
b703f80355 晶全日志配置 2025-08-06 09:44:52 +08:00
daiyongfei
b3b249ea07 日志配置 2025-08-06 09:20:41 +08:00
daiyongfei
aff424e73b Merge branch 'main' into prod 2025-08-06 09:18:43 +08:00
daiyongfei
dc513a858a Merge branch 'main' into prod 2025-08-04 09:08:34 +08:00
daiyongfei
df5ce7ddd9 Merge branch 'main' into prod 2025-07-31 09:21:10 +08:00
daiyongfei
2174dfdb4d Merge branch 'main' into prod 2025-07-23 19:24:27 +08:00
daiyongfei
2800b89e06 Merge branch 'main' into prod 2025-07-23 10:55:30 +08:00
daiyongfei
637e46c510 Merge branch 'main' into prod 2025-07-21 08:40:34 +08:00
daiyongfei
31c2158c8e Merge branch 'main' into prod 2025-07-19 10:22:33 +08:00
daiyongfei
c7c21dc358 Merge branch 'main' into prod 2025-07-18 15:17:54 +08:00
daiyongfei
a7e0803b00 Merge branch 'main' into prod 2025-07-17 16:42:14 +08:00
daiyongfei
55cacbd322 Merge branch 'main' into prod 2025-07-17 09:24:45 +08:00
daiyongfei
99ec6eaff0 prod 2025-07-15 08:40:20 +08:00
3 changed files with 12 additions and 12 deletions
Expand all files Collapse all files

4
fys-admin/src/main/resources/application-jingquan.yml
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: @monitor.username@ username: ${monitor.username}
password: @monitor.password@ password: ${monitor.password}
--- # snail-job 配置 --- # snail-job 配置
snail-job: snail-job:

4
fys-admin/src/main/resources/application-prod.yml
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: @monitor.username@ username: ${monitor.username}
password: @monitor.password@ password: ${monitor.password}
--- # snail-job 配置 --- # snail-job 配置
snail-job: snail-job:

16
pom.xml
View File

@ -83,10 +83,10 @@
<monitor.username>fys</monitor.username> <monitor.username>fys</monitor.username>
<monitor.password>123456</monitor.password> <monitor.password>123456</monitor.password>
</properties> </properties>
<activation> <!-- <activation> -->
<!-- 默认环境 --> <!-- &lt;!&ndash; 默认环境 &ndash;&gt; -->
<activeByDefault>true</activeByDefault> <!-- <activeByDefault>true</activeByDefault> -->
</activation> <!-- </activation> -->
</profile> </profile>
<profile> <profile>
<id>prod</id> <id>prod</id>
@ -96,10 +96,10 @@
<monitor.username>fys</monitor.username> <monitor.username>fys</monitor.username>
<monitor.password>123456</monitor.password> <monitor.password>123456</monitor.password>
</properties> </properties>
<!-- <activation> --> <activation>
<!-- &lt;!&ndash; 默认环境 &ndash;&gt; --> <!-- 默认环境 -->
<!-- <activeByDefault>true</activeByDefault> --> <activeByDefault>true</activeByDefault>
<!-- </activation> --> </activation>
</profile> </profile>
<profile> <profile>
<id>jingquan</id> <id>jingquan</id>