From 272937df8a186e487bf422f73a061b2d919b23fa Mon Sep 17 00:00:00 2001 From: yamunarathod Date: Tue, 12 Aug 2025 16:50:35 +0530 Subject: [PATCH 1/2] jhfb --- main/manager-api/src/main/resources/application-dev.yml | 4 ++-- main/manager-api/src/main/resources/application.properties | 3 +++ main/manager-api/src/main/resources/application.yml | 4 ++++ .../src/main/resources/db/changelog/db.changelog-master.yaml | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 main/manager-api/src/main/resources/application.properties diff --git a/main/manager-api/src/main/resources/application-dev.yml b/main/manager-api/src/main/resources/application-dev.yml index 1c86f288e..26b3bdae8 100644 --- a/main/manager-api/src/main/resources/application-dev.yml +++ b/main/manager-api/src/main/resources/application-dev.yml @@ -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 diff --git a/main/manager-api/src/main/resources/application.properties b/main/manager-api/src/main/resources/application.properties new file mode 100644 index 000000000..b37876c14 --- /dev/null +++ b/main/manager-api/src/main/resources/application.properties @@ -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 \ No newline at end of file diff --git a/main/manager-api/src/main/resources/application.yml b/main/manager-api/src/main/resources/application.yml index 3daf48a14..31b126e2a 100644 --- a/main/manager-api/src/main/resources/application.yml +++ b/main/manager-api/src/main/resources/application.yml @@ -26,6 +26,10 @@ 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 knife4j: enable: true diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml index ffc60bdbb..25873dcf3 100755 --- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml @@ -240,6 +240,7 @@ databaseChangeLog: - sqlFile: encoding: utf8 path: classpath:db/changelog/202506261637.sql + - changeSet: id: 202506152342 author: marlonz changes: From e928f743aa04db6846f5fc084d61bfde2955cb90 Mon Sep 17 00:00:00 2001 From: yamunarathod Date: Tue, 12 Aug 2025 18:32:09 +0530 Subject: [PATCH 2/2] completely working --- .../src/main/resources/application-dev.yml | 14 +++----------- .../manager-api/src/main/resources/application.yml | 4 ++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/main/manager-api/src/main/resources/application-dev.yml b/main/manager-api/src/main/resources/application-dev.yml index 26b3bdae8..b6d0ca422 100644 --- a/main/manager-api/src/main/resources/application-dev.yml +++ b/main/manager-api/src/main/resources/application-dev.yml @@ -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 diff --git a/main/manager-api/src/main/resources/application.yml b/main/manager-api/src/main/resources/application.yml index 31b126e2a..85fa21916 100644 --- a/main/manager-api/src/main/resources/application.yml +++ b/main/manager-api/src/main/resources/application.yml @@ -30,6 +30,10 @@ spring: 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