From 4e18d7800ac72857d52b1b5631bc5c41d0f4e6f4 Mon Sep 17 00:00:00 2001 From: mcy Date: Tue, 30 Oct 2018 09:08:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../otter/canal/client/adapter/hbase/HbaseAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/HbaseAdapter.java b/client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/HbaseAdapter.java index e97035ed..52b3da23 100644 --- a/client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/HbaseAdapter.java +++ b/client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/HbaseAdapter.java @@ -62,10 +62,10 @@ public class HbaseAdapter implements OuterAdapter { } } - Map propertites = configuration.getProperties(); + Map properties = configuration.getProperties(); Configuration hbaseConfig = HBaseConfiguration.create(); - propertites.forEach(hbaseConfig::set); + properties.forEach(hbaseConfig::set); conn = ConnectionFactory.createConnection(hbaseConfig); hbaseTemplate = new HbaseTemplate(conn); hbaseSyncService = new HbaseSyncService(hbaseTemplate); From 82b8b56aa3f969f495ca53a954e83ac55f896ec0 Mon Sep 17 00:00:00 2001 From: mcy Date: Tue, 30 Oct 2018 09:10:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?partition=E9=BB=98=E8=AE=A4=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployer/src/main/resources/mq.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployer/src/main/resources/mq.yml b/deployer/src/main/resources/mq.yml index 019d2123..1797bd9b 100644 --- a/deployer/src/main/resources/mq.yml +++ b/deployer/src/main/resources/mq.yml @@ -1,4 +1,4 @@ -servers: localhost:9876 #for rocketmq: means the nameserver +servers: slave1:6667 #for rocketmq: means the nameserver retries: 0 batchSize: 16384 lingerMs: 1 @@ -13,7 +13,7 @@ flatMessage: true canalDestinations: - canalDestination: example topic: example - partition: 1 + partition: # #对应topic分区数量 # partitionsNum: 3 # partitionHash: From ed1feb9502e19bfc854b2d82a32253ab469b1449 Mon Sep 17 00:00:00 2001 From: mcy Date: Wed, 31 Oct 2018 16:58:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?application.yml=E4=B8=8D=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=BF=9Bjar,=20=E8=A7=A3=E5=86=B3jar=E4=B8=AD=E7=9A=84applicat?= =?UTF-8?q?ion.yml=E5=92=8Cconfig=E4=B8=AD=E7=9A=84=E4=BC=9A=E5=90=88?= =?UTF-8?q?=E5=B9=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client-adapter/launcher/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/client-adapter/launcher/pom.xml b/client-adapter/launcher/pom.xml index 1a79ed21..708e1471 100644 --- a/client-adapter/launcher/pom.xml +++ b/client-adapter/launcher/pom.xml @@ -166,6 +166,14 @@ + + + src/main/resources + + application.yml + + +