From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/resources/application-local.yml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/resources/application-local.yml b/screen-api/src/main/resources/application-local.yml
index a60ee98..fb92f00 100644
--- a/screen-api/src/main/resources/application-local.yml
+++ b/screen-api/src/main/resources/application-local.yml
@@ -17,9 +17,9 @@
application:
name: screen-api
redis:
- host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: QX_moral_2023
timeout: 30000
jedis:
pool:
@@ -34,9 +34,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: QX_moral_2023
timeout: 30000
database: 15
pool:
@@ -53,9 +53,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o2.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: moral_123456
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o13.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: moral_qx
+ password: QX_moral_2023
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
--
Gitblit v1.8.0