From 08b52ba6e8930958456ed58a1d39805caa7fe014 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Wed, 12 Jul 2023 20:24:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into dev
---
screen-manage/src/main/resources/application-dev.yml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 62d8fcf..9e9ca36 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -20,7 +20,7 @@
redis:
host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: moral_qx_12345
timeout: 30000
jedis:
pool:
@@ -37,7 +37,7 @@
tokenRedis:
host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: moral_qx_12345
timeout: 30000
database: 14
pool:
@@ -56,8 +56,8 @@
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
- username: root
- password: moral_123456
+ username: moral_qx
+ password: moral_qx_12345
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
--
Gitblit v1.8.0