From 315ec391b2a36a6d796a8726b57b7c2b8908db12 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 10 Jul 2023 14:22:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into qa
---
screen-manage/src/main/resources/application-dev.yml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 16c7e70..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
@@ -105,6 +105,9 @@
linger: 1
retries: 0
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