From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/resources/application-qa.yml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/resources/application-qa.yml b/screen-manage/src/main/resources/application-qa.yml
index 20c8564..d7ed599 100644
--- a/screen-manage/src/main/resources/application-qa.yml
+++ b/screen-manage/src/main/resources/application-qa.yml
@@ -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
@@ -92,11 +92,11 @@
enable:
auto:
commit: false
- servers: 47.99.145.48:9092,47.111.116.38:9092,47.111.124.159:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
session:
timeout: 6000
zookeeper:
- connect: 47.99.145.48:2181,47.111.116.38:2181,47.111.124.159:2181
+ connect: 172.16.44.65:2181,172.16.44.67:2181,172.16.44.66:2181
producer:
batch:
size: 4096
@@ -104,7 +104,7 @@
memory: 40960
linger: 1
retries: 0
- servers: 47.99.145.48:9092,47.111.116.38:9092,47.111.124.159:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
groupId:
insert: Dev_insert
state: Dev_state
@@ -125,5 +125,7 @@
TOKEN:
KEY:
foh3wi2ooghiCh5
-
+result:
+ device:
+ list: p5dnd7a0245499,p5dnd7a0391962
--
Gitblit v1.8.0