From f415ad31e5335837007f02d68b7aa1c2f2307235 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 13:03:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-job/src/main/resources/application-cjl.yml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/screen-job/src/main/resources/application-cjl.yml b/screen-job/src/main/resources/application-cjl.yml
index 804f071..d731ad2 100644
--- a/screen-job/src/main/resources/application-cjl.yml
+++ b/screen-job/src/main/resources/application-cjl.yml
@@ -18,9 +18,9 @@
application:
name: screen-job
redis:
- host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd18.redis.rds.aliyuncs.com
port: 6379
- password: QxPcRedis_moarl_2320
+ password: moral_123456
timeout: 30000
jedis:
pool:
@@ -35,9 +35,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd18.redis.rds.aliyuncs.com
port: 6379
- password: QxPcRedis_moarl_2320
+ password: moral_123456
timeout: 30000
database: 14
pool:
@@ -55,9 +55,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwskso.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwskso01.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: Qx_moralPc_2320
+ password: moral_123456
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
--
Gitblit v1.8.0