From 90362d592d28927e5ab56f9b24f97d1f9089b50b Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Mon, 10 Jul 2023 21:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-manage/src/main/resources/application-dev.yml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index e81262e..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
@@ -92,11 +92,11 @@
enable:
auto:
commit: false
- servers: 192.168.0.16:9092,192.168.0.17:9092,192.168.0.18:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
session:
timeout: 6000
zookeeper:
- connect: 192.168.0.16:2181,192.168.0.17:2181,192.168.0.18:2181
+ connect: 172.16.44.65:2181,172.16.44.67:2181,172.16.44.66:2181
producer:
batch:
size: 4096
@@ -104,7 +104,10 @@
memory: 40960
linger: 1
retries: 0
- servers: 192.168.0.16:9092,192.168.0.17:9092,192.168.0.18:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
+ groupId:
+ insert: Dev_insert
+ state: Dev_state
mvc:
interceptor:
exclude:
@@ -114,6 +117,7 @@
- /webjars/**
- /verificationCode/**
- /manageLog/**
+ - /dataReplication/**
AES:
KEY:
--
Gitblit v1.8.0