From c8aa05fd65cc788abc0f44494338b04993e3b4be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Sep 2021 15:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/resources/application-dev.yml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index e4c4c74..e299b0c 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -92,7 +92,7 @@
enable:
auto:
commit: false
- servers: 192.168.0.191:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
session:
timeout: 6000
zookeeper:
@@ -104,7 +104,10 @@
memory: 40960
linger: 1
retries: 0
- servers: 72.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
+ groupId:
+ second-data: Dev_SecondsDataGroup
+ cruiser-data: Dev_CruiserDataGroup
mvc:
interceptor:
exclude:
--
Gitblit v1.8.0