sdx/wucaixing-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
18980591175
2026-05-23 10:14:45 +08:00
parent d74211fa7e 749f0af2ab
commit cf1fc36963
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/dromara/web/controller/IndexController.java
View File

@@ -28,7 +28,7 @@ public class IndexController {
data.put("app", SpringUtils.getApplicationName()); data.put("app", SpringUtils.getApplicationName());
data.put("message", StringUtils.format("欢迎使用{}后端服务", SpringUtils.getApplicationName())); data.put("message", StringUtils.format("欢迎使用{}后端服务", SpringUtils.getApplicationName()));
data.put("author", "shihongwei(178899525@qq.com)"); data.put("author", "shihongwei(178899525@qq.com)");
data.put("version", "1.0.0"); data.put("version", "1.0.0-wcx");
data.put("time", DateUtils.getTime()); data.put("time", DateUtils.getTime());
return R.ok(data); return R.ok(data);
} }

14
src/main/resources/application-dev.yml
View File

@@ -18,9 +18,11 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://211.149.129.64:33060//hot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # url: jdbc:mysql://211.149.129.64:33060/hot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
url: jdbc:mysql://nzd.xiaoshi98.top:50001/wucaixing-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root username: root
password: Hot20260401 # password: Hot20260401
password: nswi123456
# # 从库数据源 # # 从库数据源
# slave: # slave:
# lazy: true # lazy: true
@@ -71,7 +73,7 @@ spring.data:
# 端口，默认为6379 # 端口，默认为6379
port: 63799 port: 63799
# 数据库索引 # 数据库索引
database: 0 database: 12
# redis 密码必须配置 # redis 密码必须配置
password: test13579 password: test13579
# 连接超时时间 # 连接超时时间
@@ -246,10 +248,10 @@ gotenberg:
--- # app 学习报表验真与外网地址 --- # app 学习报表验真与外网地址
app: app:
web-base-url: ${APP_WEB_BASE_URL:http://192.168.24.153:19090} web-base-url: ${APP_WEB_BASE_URL:https://hott.xiaoshi98.top//prod-api}
verify: verify:
enabled: ${APP_VERIFY_ENABLED:true} enabled: ${APP_VERIFY_ENABLED:true}
secret: ${APP_VERIFY_SECRET:qwerqweqadbada} secret: ${APP_VERIFY_SECRET:@dasfsfasbaf3#q1}
ticket-expire-days: ${APP_VERIFY_EXPIRE_DAYS:1095} ticket-expire-days: ${APP_VERIFY_EXPIRE_DAYS:1095}
snapshot-mode: true snapshot-mode: true
@@ -257,4 +259,4 @@ app:
# 企业配置 # 企业配置
company: company:
# 上线应自动切换生成环境的地址 # 上线应自动切换生成环境的地址
register-url: http://192.168.24.153 register-url: https://hott.xiaoshi98.top

6
src/main/resources/application-prod.yml
View File

@@ -17,7 +17,7 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://192.168.129.64:33060/wucaixing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true url: jdbc:mysql://172.21.143.42:33060/wucaixing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root username: root
password: Hot20260401 password: Hot20260401
# # 从库数据源 # # 从库数据源
@@ -66,7 +66,7 @@ spring:
spring.data: spring.data:
redis: redis:
# 地址 # 地址
host: 192.168.129.64 host: 172.21.143.42
# 端口，默认为6379 # 端口，默认为6379
port: 63799 port: 63799
# 数据库索引 # 数据库索引
@@ -241,7 +241,7 @@ justauth:
--- # Gotenberg 配置 --- # Gotenberg 配置
gotenberg: gotenberg:
base-url: http://192.168.129.64:3000 base-url: http://172.21.143.42:3000
--- # app 学习报表验真与外网地址 --- # app 学习报表验真与外网地址
app: app:

20
src/main/resources/application-test.yml
View File

@@ -17,11 +17,9 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
# url: jdbc:mysql://211.149.129.64:33060/hot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true url: jdbc:mysql://192.168.129.64:33060/wucaixing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
url: jdbc:mysql://nzd.xiaoshi98.top:50001/wucaixing-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root username: root
# password: Hot20260401 password: Hot20260401
password: nswi123456
# # 从库数据源 # # 从库数据源
# slave: # slave:
# lazy: true # lazy: true
@@ -68,13 +66,13 @@ spring:
spring.data: spring.data:
redis: redis:
# 地址 # 地址
host: 127.0.0.1 host: 192.168.129.64
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 63799
# 数据库索引 # 数据库索引
# database: 10 database: 13
# redis 密码必须配置 # redis 密码必须配置
# password: test13579 password: Hot20260401
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
# 是否开启ssl # 是否开启ssl
@@ -243,11 +241,11 @@ justauth:
--- # Gotenberg 配置 --- # Gotenberg 配置
gotenberg: gotenberg:
base-url: http://pdf.xiaoshi98.top base-url: http://192.168.129.64:3000
--- # app 学习报表验真与外网地址 --- # app 学习报表验真与外网地址
app: app:
web-base-url: ${APP_WEB_BASE_URL:https://hott.xiaoshi98.top//prod-api} web-base-url: ${APP_WEB_BASE_URL:https://wcx.hotwj.cn/prod-api}
verify: verify:
enabled: ${APP_VERIFY_ENABLED:true} enabled: ${APP_VERIFY_ENABLED:true}
secret: ${APP_VERIFY_SECRET:@dasfsfasbaf3#q1} secret: ${APP_VERIFY_SECRET:@dasfsfasbaf3#q1}
@@ -257,4 +255,4 @@ app:
# 企业配置 # 企业配置
company: company:
# 上线应自动切换生成环境的地址 # 上线应自动切换生成环境的地址
register-url: https://hott.xiaoshi98.top register-url: https://wcx.hotwj.cn

4
src/main/resources/application.yml
View File

@@ -1,7 +1,7 @@
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为8080 # 服务器的HTTP端口，默认为8080
port: 19090 port: 19089
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
@@ -70,7 +70,7 @@ spring:
# 国际化资源文件路径 # 国际化资源文件路径
basename: i18n/messages basename: i18n/messages
profiles: profiles:
active: test active: dev
# 文件上传 # 文件上传
servlet: servlet:
multipart: multipart: