From bfae0be9c3980b6ec09f86bcb543bb8960927e14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 13 Jul 2023 08:24:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/resources/application-dev.yml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index ae6cbd3..8619aca 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -17,9 +17,9 @@
application:
name: screen-api
redis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: QX_moral_2023
timeout: 30000
jedis:
pool:
@@ -34,9 +34,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: QX_moral_2023
timeout: 30000
database: 15
pool:
@@ -54,9 +54,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk05.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: moral_qx
- password: moral_qx_12345
+ password: QX_moral_2023
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
--
Gitblit v1.8.0