From 6f12948893fcc846dfb32aa861c473a842edcd56 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:46:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/resources/application-dev.yml | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 4a6899a..e81262e 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -92,12 +92,9 @@
enable:
auto:
commit: false
- group:
- id: test
servers: 192.168.0.16:9092,192.168.0.17:9092,192.168.0.18:9092
session:
timeout: 6000
- topic: test_topic
zookeeper:
connect: 192.168.0.16:2181,192.168.0.17:2181,192.168.0.18:2181
producer:
--
Gitblit v1.8.0