From 60e5554125b334569fb6df238bb48fb30eddf860 Mon Sep 17 00:00:00 2001 From: mcy Date: Wed, 14 Nov 2018 11:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bootstrapServers=E4=B8=BAmqSe?= =?UTF-8?q?rvers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/adapter/support/CanalClientConfig.java | 10 +++++----- .../adapter/launcher/loader/CanalAdapterLoader.java | 4 ++-- .../launcher/src/main/resources/application.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/CanalClientConfig.java b/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/CanalClientConfig.java index 97a7a426..4a93af3d 100644 --- a/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/CanalClientConfig.java +++ b/client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/CanalClientConfig.java @@ -17,7 +17,7 @@ public class CanalClientConfig { private String zookeeperHosts; // 集群模式下的zk地址, 如果配置了单机地址则以单机为准!! - private String bootstrapServers; // kafka or rocket mq 地址 + private String mqServers; // kafka or rocket mq 地址 private Boolean flatMessage = true; // 是否已flatMessage模式传输, 只适用于mq模式 @@ -47,12 +47,12 @@ public class CanalClientConfig { this.zookeeperHosts = zookeeperHosts; } - public String getBootstrapServers() { - return bootstrapServers; + public String getMqServers() { + return mqServers; } - public void setBootstrapServers(String bootstrapServers) { - this.bootstrapServers = bootstrapServers; + public void setMqServers(String mqServers) { + this.mqServers = mqServers; } public List getMqTopics() { diff --git a/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/CanalAdapterLoader.java b/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/CanalAdapterLoader.java index 77567a87..b60d66f0 100644 --- a/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/CanalAdapterLoader.java +++ b/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/CanalAdapterLoader.java @@ -97,7 +97,7 @@ public class CanalAdapterLoader { canalOuterAdapterGroups.add(canalOuterAdapters); if (StringUtils.isBlank(topic.getMqMode()) || "rocketmq".equalsIgnoreCase(topic.getMqMode())) { CanalAdapterRocketMQWorker rocketMQWorker = new CanalAdapterRocketMQWorker(canalClientConfig, - canalClientConfig.getBootstrapServers(), + canalClientConfig.getMqServers(), topic.getTopic(), group.getGroupId(), canalOuterAdapterGroups, @@ -106,7 +106,7 @@ public class CanalAdapterLoader { rocketMQWorker.start(); } else if ("kafka".equalsIgnoreCase(topic.getMqMode())) { CanalAdapterKafkaWorker canalKafkaWorker = new CanalAdapterKafkaWorker(canalClientConfig, - canalClientConfig.getBootstrapServers(), + canalClientConfig.getMqServers(), topic.getTopic(), group.getGroupId(), canalOuterAdapterGroups, diff --git a/client-adapter/launcher/src/main/resources/application.yml b/client-adapter/launcher/src/main/resources/application.yml index 61866595..2943d09c 100644 --- a/client-adapter/launcher/src/main/resources/application.yml +++ b/client-adapter/launcher/src/main/resources/application.yml @@ -14,7 +14,7 @@ spring: canal.conf: canalServerHost: 127.0.0.1:11111 # zookeeperHosts: slave1:2181 -# bootstrapServers: slave1:6667 #or rocketmq +# mqServers: slave1:6667 #or rocketmq # flatMessage: true # srcDataSources: # defaultDS: