From 931734244f977a65dd35c6f606afb999d7c3c967 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 11:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/resources/application-dev.yml | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 33a65fe..1ea060c 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -18,9 +18,9 @@
application:
name: screen-manage
redis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp18.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: QxPcRedis_moarl_2320
timeout: 30000
jedis:
pool:
@@ -35,9 +35,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp18.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: QxPcRedis_moarl_2320
timeout: 30000
database: 14
pool:
@@ -55,9 +55,9 @@
filters: stat
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
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk18.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: moral_qx
+ password: QxPcRedis_moarl_2320
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
@@ -106,8 +106,8 @@
retries: 0
servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
groupId:
- insert: insert
- state: state
+ insert: Dev_insert
+ state: Dev_state
mvc:
interceptor:
exclude:
@@ -125,5 +125,8 @@
TOKEN:
KEY:
foh3wi2ooghiCh5
+result:
+ device:
+ list: p5dnd7a0245499,p5dnd7a0391962,HJS00002156B89
--
Gitblit v1.8.0