Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions main/manager-api/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ spring:
druid:
#MySQL
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/xiaozhi_esp32_server?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
url: jdbc:mysql://turntable.proxy.rlwy.net:38288/railway?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root
password: 123456
password: nrTgFMCdwgjqZFFRXDhDZbCapfPNBxZK
initial-size: 10
max-active: 100
min-idle: 10
Expand All @@ -38,14 +38,6 @@ spring:
multi-statement-allow: true
data:
redis:
host: 127.0.0.1 # Redis服务器地址
port: 6379 # Redis服务器连接端口
password: # Redis服务器连接密码(默认为空)
database: 0 # Redis数据库索引(默认为0)
timeout: 10000ms # 连接超时时间(毫秒)
lettuce:
pool:
max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
max-idle: 8 # 连接池中的最大空闲连接
min-idle: 0 # 连接池中的最小空闲连接
shutdown-timeout: 100ms # 客户端优雅关闭的等待时间
host: shortline.proxy.rlwy.net
port: 54353
password: mClDIOpuKWkawXKBcfhWFDwHHnhuWegp
3 changes: 3 additions & 0 deletions main/manager-api/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
spring.datasource.url=jdbc:mysql://mysql.railway.internal:3306/railway?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
spring.datasource.username=root
spring.datasource.password=nrTgFMCdwgjqZFFRXDhDZbCapfPNBxZK
8 changes: 8 additions & 0 deletions main/manager-api/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ spring:
enabled: true
main:
allow-bean-definition-overriding: true
datasource:
url: jdbc:mysql://turntable.proxy.rlwy.net:38288/railway?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root
password: nrTgFMCdwgjqZFFRXDhDZbCapfPNBxZK
redis:
host: shortline.proxy.rlwy.net
port: 54353
password: mClDIOpuKWkawXKBcfhWFDwHHnhuWegp

knife4j:
enable: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,10 @@ databaseChangeLog:
encoding: utf8
path: classpath:db/changelog/202506261637.sql
- changeSet:


id: 202507051233

author: marlonz
changes:
- sqlFile:
Expand Down