Merge branch 'main' of git.waypeak.work:martial/martial-master

This commit is contained in:
2025-11-29 15:03:56 +08:00
9 changed files with 771 additions and 6 deletions
+5 -5
View File
@@ -4,16 +4,16 @@ spring:
redis:
##redis 单机环境配置
host: 127.0.0.1
port: 6379
password: 123456
port: 63379
password: RedisSecure2024MartialXyZ789ABC
database: 8
ssl:
enabled: false
datasource:
# MySql
url: jdbc:mysql://127.0.0.1:3306/martial_db?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://127.0.0.1:33066/martial_db?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: 123456
password: WtcSecure901faf1ac4d32e2bPwd
#第三方登陆
social:
@@ -27,7 +27,7 @@ blade:
##是否启用分布式锁
enabled: false
##redis服务地址
address: redis://127.0.0.1:6379
address: redis://127.0.0.1:63379
#本地文件上传
file:
remote-mode: true
+2 -1
View File
@@ -1,6 +1,7 @@
#服务器配置
server:
port: 82
port: 8123
address: 127.0.0.1
undertow:
threads:
# 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程