From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-manage/src/main/resources/application-qa.yml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/resources/application-qa.yml b/screen-manage/src/main/resources/application-qa.yml
index 57fe931..74fe56e 100644
--- a/screen-manage/src/main/resources/application-qa.yml
+++ b/screen-manage/src/main/resources/application-qa.yml
@@ -18,7 +18,7 @@
application:
name: screen-manage
redis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpay158.redis.rds.aliyuncs.com
port: 6379
password: moral_123456
timeout: 30000
@@ -35,7 +35,7 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpay158.redis.rds.aliyuncs.com
port: 6379
password: moral_123456
timeout: 30000
@@ -55,7 +55,7 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://172.16.44.71:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://121.199.44.85:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: moral_123456
test-on-borrow: false
@@ -125,5 +125,7 @@
TOKEN:
KEY:
foh3wi2ooghiCh5
-
+result:
+ device:
+ list: p5dnd7a0245499,p5dnd7a0391962
--
Gitblit v1.8.0