Merge pull request #1496 from rewerma/master

远程配置代码整理

client-adapter/common/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>canal.client-adapter</artifactId>
         <groupId>com.alibaba.otter</groupId>
@@ -26,6 +27,16 @@
             <artifactId>druid</artifactId>
             <version>1.1.9</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>5.0.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.19</version>
+        </dependency>
     </dependencies>
 
 </project>

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/OuterAdapter.java

@@ -2,6 +2,7 @@ package com.alibaba.otter.canal.client.adapter;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import com.alibaba.otter.canal.client.adapter.support.Dml;
 import com.alibaba.otter.canal.client.adapter.support.EtlResult;
@@ -21,8 +22,9 @@ public interface OuterAdapter {
      * 外部适配器初始化接口
      *
      * @param configuration 外部适配器配置信息
+     * @param envProperties 环境变量的配置属性
      */
-    void init(OuterAdapterConfig configuration);
+    void init(OuterAdapterConfig configuration, Properties envProperties);
 
     /**
      * 往适配器中同步数据
@@ -38,7 +40,7 @@ public interface OuterAdapter {
 
     /**
      * Etl操作
-     * 
+     *
      * @param task 任务名, 对应配置名
      * @param params etl筛选条件
      */
@@ -48,7 +50,7 @@ public interface OuterAdapter {
 
     /**
      * 计算总数
-     * 
+     *
      * @param task 任务名, 对应配置名
      * @return 总数
      */
@@ -58,7 +60,7 @@ public interface OuterAdapter {
 
     /**
      * 通过task获取对应的destination
-     * 
+     *
      * @param task 任务名, 对应配置名
      * @return destination
      */

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/YmlConfigBinder.java

@@ -0,0 +1,156 @@
+package com.alibaba.otter.canal.client.adapter.config;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.springframework.util.PropertyPlaceholderHelper;
+import org.springframework.util.StringUtils;
+
+import com.alibaba.otter.canal.client.adapter.config.bind.PropertiesConfigurationFactory;
+import com.alibaba.otter.canal.client.adapter.config.common.*;
+
+/**
+ * 将yaml内容绑定到指定对象, 遵循spring yml的绑定规范
+ *
+ * @author reweerma 2019-2-1 上午9:14:02
+ * @version 1.0.0
+ */
+public class YmlConfigBinder {
+
+    /**
+     * 将当前内容绑定到指定对象
+     *
+     * @param content yml内容
+     * @param clazz 指定对象类型
+     * @return 对象
+     */
+    public static <T> T bindYmlToObj(String content, Class<T> clazz) {
+        return bindYmlToObj(null, content, clazz, null);
+    }
+
+    /**
+     * 将当前内容绑定到指定对象并指定内容编码格式
+     *
+     * @param content yml内容
+     * @param clazz 指定对象类型
+     * @param charset yml内容编码格式
+     * @return 对象
+     */
+    public static <T> T bindYmlToObj(String content, Class<T> clazz, String charset) {
+        return bindYmlToObj(null, content, clazz, charset);
+    }
+
+    /**
+     * 将当前内容指定前缀部分绑定到指定对象
+     *
+     * @param prefix 指定前缀
+     * @param content yml内容
+     * @param clazz 指定对象类型
+     * @return 对象
+     */
+    public static <T> T bindYmlToObj(String prefix, String content, Class<T> clazz) {
+        return bindYmlToObj(prefix, content, clazz, null);
+    }
+
+    /**
+     * 将当前内容指定前缀部分绑定到指定对象并指定内容编码格式
+     *
+     * @param prefix 指定前缀
+     * @param content yml内容
+     * @param clazz 指定对象类型
+     * @param charset yml内容编码格式
+     * @return 对象
+     */
+    public static <T> T bindYmlToObj(String prefix, String content, Class<T> clazz, String charset) {
+        return bindYmlToObj(prefix, content, clazz, charset, null);
+    }
+
+    /**
+     * 将当前内容指定前缀部分绑定到指定对象并用环境变量中的属性替换占位符, 例: 当前内容有属性 zkServers:
+     * ${zookeeper.servers} 在envProperties中有属性 zookeeper.servers:
+     * 192.168.0.1:2181,192.168.0.1:2181,192.168.0.1:2181 则当前内容 zkServers 会被替换为
+     * zkServers: 192.168.0.1:2181,192.168.0.1:2181,192.168.0.1:2181 注: 假设绑定的类中
+     * zkServers 属性是 List<String> 对象, 则会自动映射成List
+     *
+     * @param prefix 指定前缀
+     * @param content yml内容
+     * @param clazz 指定对象类型
+     * @param charset yml内容编码格式
+     * @return 对象
+     */
+    public static <T> T bindYmlToObj(String prefix, String content, Class<T> clazz, String charset,
+                                     Properties baseProperties) {
+        try {
+            byte[] contentBytes;
+            if (charset == null) {
+                contentBytes = content.getBytes();
+            } else {
+                contentBytes = content.getBytes(charset);
+            }
+            YamlPropertySourceLoader propertySourceLoader = new YamlPropertySourceLoader();
+            Resource configResource = new ByteArrayResource(contentBytes);
+            PropertySource<?> propertySource = propertySourceLoader.load("manualBindConfig", configResource, null);
+
+            if (propertySource == null) {
+                return null;
+            }
+
+            Properties properties = new Properties();
+            Map<String, Object> propertiesRes = new LinkedHashMap<>();
+            if (!StringUtils.isEmpty(prefix) && !prefix.endsWith(".")) {
+                prefix = prefix + ".";
+            }
+
+            properties.putAll((Map<?, ?>) propertySource.getSource());
+
+            if (baseProperties != null) {
+                baseProperties.putAll(properties);
+                properties = baseProperties;
+            }
+
+            for (Object o : ((Map<?, ?>) propertySource.getSource()).entrySet()) {
+                Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
+                String key = (String) entry.getKey();
+                Object value = entry.getValue();
+
+                if (prefix != null) {
+                    if (key != null && key.startsWith(prefix)) {
+                        key = key.substring(prefix.length());
+                    } else {
+                        continue;
+                    }
+                }
+
+                if (value != null && value.toString().contains("${")) {
+                    PropertyPlaceholderHelper propertyPlaceholderHelper = new PropertyPlaceholderHelper("${", "}");
+                    value = propertyPlaceholderHelper.replacePlaceholders(value.toString(), properties);
+                }
+
+                propertiesRes.put(key, value);
+            }
+
+            if (propertiesRes.isEmpty()) {
+                return null;
+            }
+
+            propertySource = new MapPropertySource(propertySource.getName(), propertiesRes);
+
+            T target = clazz.newInstance();
+
+            MutablePropertySources propertySources = new MutablePropertySources();
+            propertySources.addFirst(propertySource);
+
+            PropertiesConfigurationFactory<Object> factory = new PropertiesConfigurationFactory<Object>(target);
+            factory.setPropertySources(propertySources);
+            factory.setIgnoreInvalidFields(true);
+            factory.setIgnoreUnknownFields(true);
+
+            factory.bindPropertiesToTarget();
+
+            return target;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/DefaultPropertyNamePatternsMatcher.java

@@ -0,0 +1,97 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * {@link PropertyNamePatternsMatcher} that matches when a property name exactly
+ * matches one of the given names, or starts with one of the given names
+ * followed by a delimiter. This implementation is optimized for frequent calls.
+ *
+ * @author Phillip Webb
+ * @since 1.2.0
+ */
+class DefaultPropertyNamePatternsMatcher implements PropertyNamePatternsMatcher {
+
+    private final char[]   delimiters;
+
+    private final boolean  ignoreCase;
+
+    private final String[] names;
+
+    protected DefaultPropertyNamePatternsMatcher(char[] delimiters, String... names){
+        this(delimiters, false, names);
+    }
+
+    protected DefaultPropertyNamePatternsMatcher(char[] delimiters, boolean ignoreCase, String... names){
+        this(delimiters, ignoreCase, new HashSet<String>(Arrays.asList(names)));
+    }
+
+    DefaultPropertyNamePatternsMatcher(char[] delimiters, boolean ignoreCase, Set<String> names){
+        this.delimiters = delimiters;
+        this.ignoreCase = ignoreCase;
+        this.names = names.toArray(new String[names.size()]);
+    }
+
+    @Override
+    public boolean matches(String propertyName) {
+        char[] propertyNameChars = propertyName.toCharArray();
+        boolean[] match = new boolean[this.names.length];
+        boolean noneMatched = true;
+        for (int i = 0; i < this.names.length; i++) {
+            if (this.names[i].length() <= propertyNameChars.length) {
+                match[i] = true;
+                noneMatched = false;
+            }
+        }
+        if (noneMatched) {
+            return false;
+        }
+        for (int charIndex = 0; charIndex < propertyNameChars.length; charIndex++) {
+            for (int nameIndex = 0; nameIndex < this.names.length; nameIndex++) {
+                if (match[nameIndex]) {
+                    match[nameIndex] = false;
+                    if (charIndex < this.names[nameIndex].length()) {
+                        if (isCharMatch(this.names[nameIndex].charAt(charIndex), propertyNameChars[charIndex])) {
+                            match[nameIndex] = true;
+                            noneMatched = false;
+                        }
+                    } else {
+                        char charAfter = propertyNameChars[this.names[nameIndex].length()];
+                        if (isDelimiter(charAfter)) {
+                            match[nameIndex] = true;
+                            noneMatched = false;
+                        }
+                    }
+                }
+            }
+            if (noneMatched) {
+                return false;
+            }
+        }
+        for (int i = 0; i < match.length; i++) {
+            if (match[i]) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isCharMatch(char c1, char c2) {
+        if (this.ignoreCase) {
+            return Character.toLowerCase(c1) == Character.toLowerCase(c2);
+        }
+        return c1 == c2;
+    }
+
+    private boolean isDelimiter(char c) {
+        for (char delimiter : this.delimiters) {
+            if (c == delimiter) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/InetAddressEditor.java

@@ -0,0 +1,31 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import java.beans.PropertyEditorSupport;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * {@link PropertyNamePatternsMatcher} that matches when a property name exactly
+ * matches one of the given names, or starts with one of the given names
+ * followed by a delimiter. This implementation is optimized for frequent calls.
+ *
+ * @author Phillip Webb
+ * @since 1.2.0
+ */
+class InetAddressEditor extends PropertyEditorSupport {
+
+    @Override
+    public String getAsText() {
+        return ((InetAddress) getValue()).getHostAddress();
+    }
+
+    @Override
+    public void setAsText(String text) throws IllegalArgumentException {
+        try {
+            setValue(InetAddress.getByName(text));
+        } catch (UnknownHostException ex) {
+            throw new IllegalArgumentException("Cannot locate host", ex);
+        }
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/OriginCapablePropertyValue.java

@@ -0,0 +1,52 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import org.springframework.beans.PropertyValue;
+
+import com.alibaba.otter.canal.client.adapter.config.common.PropertySource;
+
+/**
+ * A {@link PropertyValue} that can provide information about its origin.
+ *
+ * @author Andy Wilkinson
+ */
+class OriginCapablePropertyValue extends PropertyValue {
+
+    private static final String  ATTRIBUTE_PROPERTY_ORIGIN = "propertyOrigin";
+
+    private final PropertyOrigin origin;
+
+    OriginCapablePropertyValue(PropertyValue propertyValue){
+        this(propertyValue.getName(),
+            propertyValue.getValue(),
+            (PropertyOrigin) propertyValue.getAttribute(ATTRIBUTE_PROPERTY_ORIGIN));
+    }
+
+    OriginCapablePropertyValue(String name, Object value, String originName, PropertySource<?> originSource){
+        this(name, value, new PropertyOrigin(originSource, originName));
+    }
+
+    OriginCapablePropertyValue(String name, Object value, PropertyOrigin origin){
+        super(name, value);
+        this.origin = origin;
+        setAttribute(ATTRIBUTE_PROPERTY_ORIGIN, origin);
+    }
+
+    public PropertyOrigin getOrigin() {
+        return this.origin;
+    }
+
+    @Override
+    public String toString() {
+        String name = (this.origin != null ? this.origin.getName() : this.getName());
+        String source = (this.origin.getSource() != null ? this.origin.getSource().getName() : "unknown");
+        return "'" + name + "' from '" + source + "'";
+    }
+
+    public static PropertyOrigin getOrigin(PropertyValue propertyValue) {
+        if (propertyValue instanceof OriginCapablePropertyValue) {
+            return ((OriginCapablePropertyValue) propertyValue).getOrigin();
+        }
+        return new OriginCapablePropertyValue(propertyValue).getOrigin();
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/PatternPropertyNamePatternsMatcher.java

@@ -0,0 +1,27 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import java.util.Collection;
+
+import org.springframework.util.PatternMatchUtils;
+
+/**
+ * {@link PropertyNamePatternsMatcher} that delegates to
+ * {@link PatternMatchUtils#simpleMatch(String[], String)}.
+ *
+ * @author Phillip Webb
+ * @since 1.2.0
+ */
+class PatternPropertyNamePatternsMatcher implements PropertyNamePatternsMatcher {
+
+    private final String[] patterns;
+
+    PatternPropertyNamePatternsMatcher(Collection<String> patterns){
+        this.patterns = (patterns != null ? patterns.toArray(new String[patterns.size()]) : new String[] {});
+    }
+
+    @Override
+    public boolean matches(String propertyName) {
+        return PatternMatchUtils.simpleMatch(this.patterns, propertyName);
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/PropertiesConfigurationFactory.java

@@ -0,0 +1,356 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import java.beans.PropertyDescriptor;
+import java.util.*;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.PropertyValues;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.support.ResourceEditorRegistrar;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.MessageSource;
+import org.springframework.context.MessageSourceAware;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.*;
+
+import com.alibaba.otter.canal.client.adapter.config.common.PropertySources;
+
+/**
+ * Validate some {@link Properties} (or optionally
+ * {@link org.springframework.core.env.PropertySources}) by binding them to an
+ * object of a specified type and then optionally running a {@link Validator}
+ * over it.
+ *
+ * @param <T> the target type
+ * @author Dave Syer
+ */
+public class PropertiesConfigurationFactory<T> implements FactoryBean<T>, ApplicationContextAware, MessageSourceAware, InitializingBean {
+
+    private static final char[] EXACT_DELIMITERS       = { '_', '.', '[' };
+
+    private static final char[] TARGET_NAME_DELIMITERS = { '_', '.' };
+
+    private static final Log    logger                 = LogFactory.getLog(PropertiesConfigurationFactory.class);
+
+    private boolean             ignoreUnknownFields    = true;
+
+    private boolean             ignoreInvalidFields;
+
+    private boolean             exceptionIfInvalid     = true;
+
+    private PropertySources     propertySources;
+
+    private final T             target;
+
+    private Validator           validator;
+
+    private ApplicationContext  applicationContext;
+
+    private MessageSource       messageSource;
+
+    private boolean             hasBeenBound           = false;
+
+    private boolean             ignoreNestedProperties = false;
+
+    private String              targetName;
+
+    private ConversionService   conversionService;
+
+    private boolean             resolvePlaceholders    = true;
+
+    /**
+     * Create a new {@link PropertiesConfigurationFactory} instance.
+     *
+     * @param target the target object to bind too
+     * @see #PropertiesConfigurationFactory(Class)
+     */
+    public PropertiesConfigurationFactory(T target){
+        Assert.notNull(target, "target must not be null");
+        this.target = target;
+    }
+
+    /**
+     * Create a new {@link PropertiesConfigurationFactory} instance.
+     *
+     * @param type the target type
+     * @see #PropertiesConfigurationFactory(Class)
+     */
+    @SuppressWarnings("unchecked")
+    public PropertiesConfigurationFactory(Class<?> type){
+        Assert.notNull(type, "type must not be null");
+        this.target = (T) BeanUtils.instantiate(type);
+    }
+
+    /**
+     * Flag to disable binding of nested properties (i.e. those with period
+     * separators in their paths). Can be useful to disable this if the name prefix
+     * is empty and you don't want to ignore unknown fields.
+     *
+     * @param ignoreNestedProperties the flag to set (default false)
+     */
+    public void setIgnoreNestedProperties(boolean ignoreNestedProperties) {
+        this.ignoreNestedProperties = ignoreNestedProperties;
+    }
+
+    /**
+     * Set whether to ignore unknown fields, that is, whether to ignore bind
+     * parameters that do not have corresponding fields in the target object.
+     * <p>
+     * Default is "true". Turn this off to enforce that all bind parameters must
+     * have a matching field in the target object.
+     *
+     * @param ignoreUnknownFields if unknown fields should be ignored
+     */
+    public void setIgnoreUnknownFields(boolean ignoreUnknownFields) {
+        this.ignoreUnknownFields = ignoreUnknownFields;
+    }
+
+    /**
+     * Set whether to ignore invalid fields, that is, whether to ignore bind
+     * parameters that have corresponding fields in the target object which are not
+     * accessible (for example because of null values in the nested path).
+     * <p>
+     * Default is "false". Turn this on to ignore bind parameters for nested objects
+     * in non-existing parts of the target object graph.
+     *
+     * @param ignoreInvalidFields if invalid fields should be ignored
+     */
+    public void setIgnoreInvalidFields(boolean ignoreInvalidFields) {
+        this.ignoreInvalidFields = ignoreInvalidFields;
+    }
+
+    /**
+     * Set the target name.
+     *
+     * @param targetName the target name
+     */
+    public void setTargetName(String targetName) {
+        this.targetName = targetName;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) {
+        this.applicationContext = applicationContext;
+    }
+
+    /**
+     * Set the message source.
+     *
+     * @param messageSource the message source
+     */
+    @Override
+    public void setMessageSource(MessageSource messageSource) {
+        this.messageSource = messageSource;
+    }
+
+    /**
+     * Set the property sources.
+     *
+     * @param propertySources the property sources
+     */
+    public void setPropertySources(PropertySources propertySources) {
+        this.propertySources = propertySources;
+    }
+
+    /**
+     * Set the conversion service.
+     *
+     * @param conversionService the conversion service
+     */
+    public void setConversionService(ConversionService conversionService) {
+        this.conversionService = conversionService;
+    }
+
+    /**
+     * Set the validator.
+     *
+     * @param validator the validator
+     */
+    public void setValidator(Validator validator) {
+        this.validator = validator;
+    }
+
+    /**
+     * Set a flag to indicate that an exception should be raised if a Validator is
+     * available and validation fails.
+     *
+     * @param exceptionIfInvalid the flag to set
+     * @deprecated as of 1.5, do not specify a {@link Validator} if validation
+     * should not occur
+     */
+    @Deprecated
+    public void setExceptionIfInvalid(boolean exceptionIfInvalid) {
+        this.exceptionIfInvalid = exceptionIfInvalid;
+    }
+
+    /**
+     * Flag to indicate that placeholders should be replaced during binding. Default
+     * is true.
+     *
+     * @param resolvePlaceholders flag value
+     */
+    public void setResolvePlaceholders(boolean resolvePlaceholders) {
+        this.resolvePlaceholders = resolvePlaceholders;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        bindPropertiesToTarget();
+    }
+
+    @Override
+    public Class<?> getObjectType() {
+        if (this.target == null) {
+            return Object.class;
+        }
+        return this.target.getClass();
+    }
+
+    @Override
+    public boolean isSingleton() {
+        return true;
+    }
+
+    @Override
+    public T getObject() throws Exception {
+        if (!this.hasBeenBound) {
+            bindPropertiesToTarget();
+        }
+        return this.target;
+    }
+
+    public void bindPropertiesToTarget() throws BindException {
+        Assert.state(this.propertySources != null, "PropertySources should not be null");
+        try {
+            if (logger.isTraceEnabled()) {
+                logger.trace("Property Sources: " + this.propertySources);
+
+            }
+            this.hasBeenBound = true;
+            doBindPropertiesToTarget();
+        } catch (BindException ex) {
+            if (this.exceptionIfInvalid) {
+                throw ex;
+            }
+            logger.error("Failed to load Properties validation bean. " + "Your Properties may be invalid.", ex);
+        }
+    }
+
+    private void doBindPropertiesToTarget() throws BindException {
+        RelaxedDataBinder dataBinder = (this.targetName != null ? new RelaxedDataBinder(this.target,
+            this.targetName) : new RelaxedDataBinder(this.target));
+        if (this.validator != null && this.validator.supports(dataBinder.getTarget().getClass())) {
+            dataBinder.setValidator(this.validator);
+        }
+        if (this.conversionService != null) {
+            dataBinder.setConversionService(this.conversionService);
+        }
+        dataBinder.setAutoGrowCollectionLimit(Integer.MAX_VALUE);
+        dataBinder.setIgnoreNestedProperties(this.ignoreNestedProperties);
+        dataBinder.setIgnoreInvalidFields(this.ignoreInvalidFields);
+        dataBinder.setIgnoreUnknownFields(this.ignoreUnknownFields);
+        customizeBinder(dataBinder);
+        if (this.applicationContext != null) {
+            ResourceEditorRegistrar resourceEditorRegistrar = new ResourceEditorRegistrar(this.applicationContext,
+                this.applicationContext.getEnvironment());
+            resourceEditorRegistrar.registerCustomEditors(dataBinder);
+        }
+        Iterable<String> relaxedTargetNames = getRelaxedTargetNames();
+        Set<String> names = getNames(relaxedTargetNames);
+        PropertyValues propertyValues = getPropertySourcesPropertyValues(names, relaxedTargetNames);
+        dataBinder.bind(propertyValues);
+        if (this.validator != null) {
+            dataBinder.validate();
+        }
+        checkForBindingErrors(dataBinder);
+    }
+
+    private Iterable<String> getRelaxedTargetNames() {
+        return (this.target != null
+                && StringUtils.hasLength(this.targetName) ? new RelaxedNames(this.targetName) : null);
+    }
+
+    private Set<String> getNames(Iterable<String> prefixes) {
+        Set<String> names = new LinkedHashSet<String>();
+        if (this.target != null) {
+            PropertyDescriptor[] descriptors = BeanUtils.getPropertyDescriptors(this.target.getClass());
+            for (PropertyDescriptor descriptor : descriptors) {
+                String name = descriptor.getName();
+                if (!name.equals("class")) {
+                    RelaxedNames relaxedNames = RelaxedNames.forCamelCase(name);
+                    if (prefixes == null) {
+                        for (String relaxedName : relaxedNames) {
+                            names.add(relaxedName);
+                        }
+                    } else {
+                        for (String prefix : prefixes) {
+                            for (String relaxedName : relaxedNames) {
+                                names.add(prefix + "." + relaxedName);
+                                names.add(prefix + "_" + relaxedName);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return names;
+    }
+
+    private PropertyValues getPropertySourcesPropertyValues(Set<String> names, Iterable<String> relaxedTargetNames) {
+        PropertyNamePatternsMatcher includes = getPropertyNamePatternsMatcher(names, relaxedTargetNames);
+        return new PropertySourcesPropertyValues(this.propertySources, names, includes, this.resolvePlaceholders);
+    }
+
+    private PropertyNamePatternsMatcher getPropertyNamePatternsMatcher(Set<String> names,
+                                                                       Iterable<String> relaxedTargetNames) {
+        if (this.ignoreUnknownFields && !isMapTarget()) {
+            // Since unknown fields are ignored we can filter them out early to save
+            // unnecessary calls to the PropertySource.
+            return new DefaultPropertyNamePatternsMatcher(EXACT_DELIMITERS, true, names);
+        }
+        if (relaxedTargetNames != null) {
+            // We can filter properties to those starting with the target name, but
+            // we can't do a complete filter since we need to trigger the
+            // unknown fields check
+            Set<String> relaxedNames = new HashSet<String>();
+            for (String relaxedTargetName : relaxedTargetNames) {
+                relaxedNames.add(relaxedTargetName);
+            }
+            return new DefaultPropertyNamePatternsMatcher(TARGET_NAME_DELIMITERS, true, relaxedNames);
+        }
+        // Not ideal, we basically can't filter anything
+        return PropertyNamePatternsMatcher.ALL;
+    }
+
+    private boolean isMapTarget() {
+        return this.target != null && Map.class.isAssignableFrom(this.target.getClass());
+    }
+
+    private void checkForBindingErrors(RelaxedDataBinder dataBinder) throws BindException {
+        BindingResult errors = dataBinder.getBindingResult();
+        if (errors.hasErrors()) {
+            logger.error("Properties configuration failed validation");
+            for (ObjectError error : errors.getAllErrors()) {
+                logger.error(this.messageSource != null ? this.messageSource.getMessage(error, Locale.getDefault())
+                                                          + " (" + error + ")" : error);
+            }
+            if (this.exceptionIfInvalid) {
+                throw new BindException(errors);
+            }
+        }
+    }
+
+    /**
+     * Customize the data binder.
+     *
+     * @param dataBinder the data binder that will be used to bind and validate
+     */
+    protected void customizeBinder(DataBinder dataBinder) {
+    }
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/PropertyNamePatternsMatcher.java

@@ -0,0 +1,38 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+/**
+ * Strategy interface used to check if a property name matches specific
+ * criteria.
+ *
+ * @author Phillip Webb
+ * @since 1.2.0
+ */
+interface PropertyNamePatternsMatcher {
+
+    PropertyNamePatternsMatcher ALL  = new PropertyNamePatternsMatcher() {
+
+                                         @Override
+                                         public boolean matches(String propertyName) {
+                                             return true;
+                                         }
+
+                                     };
+
+    PropertyNamePatternsMatcher NONE = new PropertyNamePatternsMatcher() {
+
+                                         @Override
+                                         public boolean matches(String propertyName) {
+                                             return false;
+                                         }
+
+                                     };
+
+    /**
+     * Return {@code true} of the property name matches.
+     *
+     * @param propertyName the property name
+     * @return {@code true} if the property name matches
+     */
+    boolean matches(String propertyName);
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/PropertyOrigin.java

@@ -0,0 +1,30 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import com.alibaba.otter.canal.client.adapter.config.common.PropertySource;
+
+/**
+ * The origin of a property, specifically its source and its name before any
+ * prefix was removed.
+ *
+ * @author Andy Wilkinson
+ * @since 1.3.0
+ */
+public class PropertyOrigin {
+
+    private final PropertySource<?> source;
+
+    private final String            name;
+
+    PropertyOrigin(PropertySource<?> source, String name){
+        this.name = name;
+        this.source = source;
+    }
+
+    public PropertySource<?> getSource() {
+        return this.source;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/PropertySourcesPropertyResolver.java

@@ -0,0 +1,164 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import org.springframework.core.convert.ConversionException;
+import org.springframework.core.env.AbstractEnvironment;
+import org.springframework.core.env.AbstractPropertyResolver;
+import org.springframework.core.env.PropertyResolver;
+import org.springframework.util.ClassUtils;
+
+import com.alibaba.otter.canal.client.adapter.config.common.PropertySource;
+import com.alibaba.otter.canal.client.adapter.config.common.PropertySources;
+
+/**
+ * {@link PropertyResolver} implementation that resolves property values against
+ * an underlying set of {@link PropertySources}.
+ *
+ * @author Chris Beams
+ * @author Juergen Hoeller
+ * @see PropertySource
+ * @see PropertySources
+ * @see AbstractEnvironment
+ * @since 3.1
+ */
+public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
+
+    private final PropertySources propertySources;
+
+    /**
+     * Create a new resolver against the given property sources.
+     *
+     * @param propertySources the set of {@link PropertySource} objects to use
+     */
+    public PropertySourcesPropertyResolver(PropertySources propertySources){
+        this.propertySources = propertySources;
+    }
+
+    @Override
+    public boolean containsProperty(String key) {
+        if (this.propertySources != null) {
+            for (PropertySource<?> propertySource : this.propertySources) {
+                if (propertySource.containsProperty(key)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getProperty(String key) {
+        return getProperty(key, String.class, true);
+    }
+
+    @Override
+    public <T> T getProperty(String key, Class<T> targetValueType) {
+        return getProperty(key, targetValueType, true);
+    }
+
+    @Override
+    protected String getPropertyAsRawString(String key) {
+        return getProperty(key, String.class, false);
+    }
+
+    protected <T> T getProperty(String key, Class<T> targetValueType, boolean resolveNestedPlaceholders) {
+        if (this.propertySources != null) {
+            for (PropertySource<?> propertySource : this.propertySources) {
+                if (logger.isTraceEnabled()) {
+                    logger
+                        .trace("Searching for key '" + key + "' in PropertySource '" + propertySource.getName() + "'");
+                }
+                Object value = propertySource.getProperty(key);
+                if (value != null) {
+                    if (resolveNestedPlaceholders && value instanceof String) {
+                        value = resolveNestedPlaceholders((String) value);
+                    }
+                    logKeyFound(key, propertySource, value);
+                    return convertValueIfNecessary(value, targetValueType);
+                }
+            }
+        }
+        if (logger.isDebugEnabled()) {
+            logger.debug("Could not find key '" + key + "' in any property source");
+        }
+        return null;
+    }
+
+    @Deprecated
+    public <T> Class<T> getPropertyAsClass(String key, Class<T> targetValueType) {
+        if (this.propertySources != null) {
+            for (PropertySource<?> propertySource : this.propertySources) {
+                if (logger.isTraceEnabled()) {
+                    logger.trace(String.format("Searching for key '%s' in [%s]", key, propertySource.getName()));
+                }
+                Object value = propertySource.getProperty(key);
+                if (value != null) {
+                    logKeyFound(key, propertySource, value);
+                    Class<?> clazz;
+                    if (value instanceof String) {
+                        try {
+                            clazz = ClassUtils.forName((String) value, null);
+                        } catch (Exception ex) {
+                            throw new PropertySourcesPropertyResolver.ClassConversionException((String) value,
+                                targetValueType,
+                                ex);
+                        }
+                    } else if (value instanceof Class) {
+                        clazz = (Class<?>) value;
+                    } else {
+                        clazz = value.getClass();
+                    }
+                    if (!targetValueType.isAssignableFrom(clazz)) {
+                        throw new PropertySourcesPropertyResolver.ClassConversionException(clazz, targetValueType);
+                    }
+                    @SuppressWarnings("unchecked")
+                    Class<T> targetClass = (Class<T>) clazz;
+                    return targetClass;
+                }
+            }
+        }
+        if (logger.isDebugEnabled()) {
+            logger.debug(String.format("Could not find key '%s' in any property source", key));
+        }
+        return null;
+    }
+
+    /**
+     * Log the given key as found in the given {@link PropertySource}, resulting in
+     * the given value.
+     * <p>
+     * The default implementation writes a debug log message with key and source. As
+     * of 4.3.3, this does not log the value anymore in order to avoid accidental
+     * logging of sensitive settings. Subclasses may override this method to change
+     * the log level and/or log message, including the property's value if desired.
+     *
+     * @param key the key found
+     * @param propertySource the {@code PropertySource} that the key has been found
+     *     in
+     * @param value the corresponding value
+     * @since 4.3.1
+     */
+    protected void logKeyFound(String key, PropertySource<?> propertySource, Object value) {
+        if (logger.isDebugEnabled()) {
+            logger.debug("Found key '" + key + "' in PropertySource '" + propertySource.getName()
+                         + "' with value of type " + value.getClass().getSimpleName());
+        }
+    }
+
+    @SuppressWarnings("serial")
+    @Deprecated
+    private static class ClassConversionException extends ConversionException {
+
+        public ClassConversionException(Class<?> actual, Class<?> expected){
+            super(String
+                .format("Actual type %s is not assignable to expected type %s", actual.getName(), expected.getName()));
+        }
+
+        public ClassConversionException(String actual, Class<?> expected, Exception ex){
+            super(
+                String
+                    .format("Could not find/load class %s during attempt to convert to %s", actual, expected.getName()),
+                ex);
+        }
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/PropertySourcesPropertyValues.java

@@ -0,0 +1,233 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
+
+import org.springframework.beans.MutablePropertyValues;
+import org.springframework.beans.PropertyValue;
+import org.springframework.beans.PropertyValues;
+import org.springframework.util.Assert;
+import org.springframework.validation.DataBinder;
+
+import com.alibaba.otter.canal.client.adapter.config.common.CompositePropertySource;
+import com.alibaba.otter.canal.client.adapter.config.common.EnumerablePropertySource;
+import com.alibaba.otter.canal.client.adapter.config.common.PropertySource;
+import com.alibaba.otter.canal.client.adapter.config.common.PropertySources;
+
+/**
+ * A {@link PropertyValues} implementation backed by a {@link PropertySources},
+ * bridging the two abstractions and allowing (for instance) a regular
+ * {@link DataBinder} to be used with the latter.
+ *
+ * @author Dave Syer
+ * @author Phillip Webb
+ */
+public class PropertySourcesPropertyValues implements PropertyValues {
+
+    private static final Pattern                               COLLECTION_PROPERTY = Pattern
+        .compile("\\[(\\d+)\\](\\.\\S+)?");
+
+    private final PropertySources                              propertySources;
+
+    private final Collection<String>                           nonEnumerableFallbackNames;
+
+    private final PropertyNamePatternsMatcher                  includes;
+
+    private final Map<String, PropertyValue>                   propertyValues      = new LinkedHashMap<String, PropertyValue>();
+
+    private final ConcurrentHashMap<String, PropertySource<?>> collectionOwners    = new ConcurrentHashMap<String, PropertySource<?>>();
+
+    private final boolean                                      resolvePlaceholders;
+
+    /**
+     * Create a new PropertyValues from the given PropertySources.
+     *
+     * @param propertySources a PropertySources instance
+     */
+    public PropertySourcesPropertyValues(PropertySources propertySources){
+        this(propertySources, true);
+    }
+
+    /**
+     * Create a new PropertyValues from the given PropertySources that will
+     * optionally resolve placeholders.
+     *
+     * @param propertySources a PropertySources instance
+     * @param resolvePlaceholders {@code true} if placeholders should be resolved.
+     * @since 1.5.2
+     */
+    public PropertySourcesPropertyValues(PropertySources propertySources, boolean resolvePlaceholders){
+        this(propertySources, (Collection<String>) null, PropertyNamePatternsMatcher.ALL, resolvePlaceholders);
+    }
+
+    /**
+     * Create a new PropertyValues from the given PropertySources.
+     *
+     * @param propertySources a PropertySources instance
+     * @param includePatterns property name patterns to include from system
+     *     properties and environment variables
+     * @param nonEnumerableFallbackNames the property names to try in lieu of an
+     *     {@link EnumerablePropertySource}.
+     */
+    public PropertySourcesPropertyValues(PropertySources propertySources, Collection<String> includePatterns,
+                                         Collection<String> nonEnumerableFallbackNames){
+        this(propertySources,
+            nonEnumerableFallbackNames,
+            new PatternPropertyNamePatternsMatcher(includePatterns),
+            true);
+    }
+
+    /**
+     * Create a new PropertyValues from the given PropertySources.
+     *
+     * @param propertySources a PropertySources instance
+     * @param nonEnumerableFallbackNames the property names to try in lieu of an
+     *     {@link EnumerablePropertySource}.
+     * @param includes the property name patterns to include
+     * @param resolvePlaceholders flag to indicate the placeholders should be
+     *     resolved
+     */
+    PropertySourcesPropertyValues(PropertySources propertySources, Collection<String> nonEnumerableFallbackNames,
+                                  PropertyNamePatternsMatcher includes, boolean resolvePlaceholders){
+        Assert.notNull(propertySources, "PropertySources must not be null");
+        Assert.notNull(includes, "Includes must not be null");
+        this.propertySources = propertySources;
+        this.nonEnumerableFallbackNames = nonEnumerableFallbackNames;
+        this.includes = includes;
+        this.resolvePlaceholders = resolvePlaceholders;
+        PropertySourcesPropertyResolver resolver = new PropertySourcesPropertyResolver(propertySources);
+        for (PropertySource<?> source : propertySources) {
+            processPropertySource(source, resolver);
+        }
+    }
+
+    private void processPropertySource(PropertySource<?> source, PropertySourcesPropertyResolver resolver) {
+        if (source instanceof CompositePropertySource) {
+            processCompositePropertySource((CompositePropertySource) source, resolver);
+        } else if (source instanceof EnumerablePropertySource) {
+            processEnumerablePropertySource((EnumerablePropertySource<?>) source, resolver, this.includes);
+        } else {
+            processNonEnumerablePropertySource(source, resolver);
+        }
+    }
+
+    private void processCompositePropertySource(CompositePropertySource source,
+                                                PropertySourcesPropertyResolver resolver) {
+        for (PropertySource<?> nested : source.getPropertySources()) {
+            processPropertySource(nested, resolver);
+        }
+    }
+
+    private void processEnumerablePropertySource(EnumerablePropertySource<?> source,
+                                                 PropertySourcesPropertyResolver resolver,
+                                                 PropertyNamePatternsMatcher includes) {
+        if (source.getPropertyNames().length > 0) {
+            for (String propertyName : source.getPropertyNames()) {
+                if (includes.matches(propertyName)) {
+                    Object value = getEnumerableProperty(source, resolver, propertyName);
+                    putIfAbsent(propertyName, value, source);
+                }
+            }
+        }
+    }
+
+    private Object getEnumerableProperty(EnumerablePropertySource<?> source, PropertySourcesPropertyResolver resolver,
+                                         String propertyName) {
+        try {
+            if (this.resolvePlaceholders) {
+                return resolver.getProperty(propertyName, Object.class);
+            }
+        } catch (RuntimeException ex) {
+            // Probably could not resolve placeholders, ignore it here
+        }
+        return source.getProperty(propertyName);
+    }
+
+    private void processNonEnumerablePropertySource(PropertySource<?> source,
+                                                    PropertySourcesPropertyResolver resolver) {
+        // We can only do exact matches for non-enumerable property names, but
+        // that's better than nothing...
+        if (this.nonEnumerableFallbackNames == null) {
+            return;
+        }
+        for (String propertyName : this.nonEnumerableFallbackNames) {
+            if (!source.containsProperty(propertyName)) {
+                continue;
+            }
+            Object value = null;
+            try {
+                value = resolver.getProperty(propertyName, Object.class);
+            } catch (RuntimeException ex) {
+                // Probably could not convert to Object, weird, but ignorable
+            }
+            if (value == null) {
+                value = source.getProperty(propertyName.toUpperCase(Locale.ENGLISH));
+            }
+            putIfAbsent(propertyName, value, source);
+        }
+    }
+
+    @Override
+    public PropertyValue[] getPropertyValues() {
+        Collection<PropertyValue> values = this.propertyValues.values();
+        return values.toArray(new PropertyValue[values.size()]);
+    }
+
+    @Override
+    public PropertyValue getPropertyValue(String propertyName) {
+        PropertyValue propertyValue = this.propertyValues.get(propertyName);
+        if (propertyValue != null) {
+            return propertyValue;
+        }
+        for (PropertySource<?> source : this.propertySources) {
+            Object value = source.getProperty(propertyName);
+            propertyValue = putIfAbsent(propertyName, value, source);
+            if (propertyValue != null) {
+                return propertyValue;
+            }
+        }
+        return null;
+    }
+
+    private PropertyValue putIfAbsent(String propertyName, Object value, PropertySource<?> source) {
+        if (value != null && !this.propertyValues.containsKey(propertyName)) {
+            PropertySource<?> collectionOwner = this.collectionOwners
+                .putIfAbsent(COLLECTION_PROPERTY.matcher(propertyName).replaceAll("[]"), source);
+            if (collectionOwner == null || collectionOwner == source) {
+                PropertyValue propertyValue = new OriginCapablePropertyValue(propertyName, value, propertyName, source);
+                this.propertyValues.put(propertyName, propertyValue);
+                return propertyValue;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public PropertyValues changesSince(PropertyValues old) {
+        MutablePropertyValues changes = new MutablePropertyValues();
+        // for each property value in the new set
+        for (PropertyValue newValue : getPropertyValues()) {
+            // if there wasn't an old one, add it
+            PropertyValue oldValue = old.getPropertyValue(newValue.getName());
+            if (oldValue == null || !oldValue.equals(newValue)) {
+                changes.addPropertyValue(newValue);
+            }
+        }
+        return changes;
+    }
+
+    @Override
+    public boolean contains(String propertyName) {
+        return getPropertyValue(propertyName) != null;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return this.propertyValues.isEmpty();
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/RelaxedConversionService.java

@@ -0,0 +1,127 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import java.util.EnumSet;
+import java.util.Locale;
+import java.util.Set;
+
+import org.springframework.core.convert.ConversionFailedException;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.converter.ConverterFactory;
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.util.Assert;
+
+/**
+ * Internal {@link ConversionService} used by {@link RelaxedDataBinder} to
+ * support additional relaxed conversion.
+ *
+ * @author Phillip Webb
+ * @author Stephane Nicoll
+ * @since 1.1.0
+ */
+class RelaxedConversionService implements ConversionService {
+
+    private final ConversionService        conversionService;
+
+    private final GenericConversionService additionalConverters;
+
+    /**
+     * Create a new {@link RelaxedConversionService} instance.
+     *
+     * @param conversionService and option root conversion service
+     */
+    RelaxedConversionService(ConversionService conversionService){
+        this.conversionService = conversionService;
+        this.additionalConverters = new GenericConversionService();
+        DefaultConversionService.addCollectionConverters(this.additionalConverters);
+        this.additionalConverters
+            .addConverterFactory(new RelaxedConversionService.StringToEnumIgnoringCaseConverterFactory());
+        this.additionalConverters.addConverter(new StringToCharArrayConverter());
+    }
+
+    @Override
+    public boolean canConvert(Class<?> sourceType, Class<?> targetType) {
+        return (this.conversionService != null && this.conversionService.canConvert(sourceType, targetType))
+               || this.additionalConverters.canConvert(sourceType, targetType);
+    }
+
+    @Override
+    public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType) {
+        return (this.conversionService != null && this.conversionService.canConvert(sourceType, targetType))
+               || this.additionalConverters.canConvert(sourceType, targetType);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> T convert(Object source, Class<T> targetType) {
+        Assert.notNull(targetType, "The targetType to convert to cannot be null");
+        return (T) convert(source, TypeDescriptor.forObject(source), TypeDescriptor.valueOf(targetType));
+    }
+
+    @Override
+    public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
+        if (this.conversionService != null) {
+            try {
+                return this.conversionService.convert(source, sourceType, targetType);
+            } catch (ConversionFailedException ex) {
+                // Ignore and try the additional converters
+            }
+        }
+        return this.additionalConverters.convert(source, sourceType, targetType);
+    }
+
+    /**
+     * Clone of Spring's package private StringToEnumConverterFactory, but ignoring
+     * the case of the source.
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    private static class StringToEnumIgnoringCaseConverterFactory implements ConverterFactory<String, Enum> {
+
+        @Override
+        public <T extends Enum> Converter<String, T> getConverter(Class<T> targetType) {
+            Class<?> enumType = targetType;
+            while (enumType != null && !enumType.isEnum()) {
+                enumType = enumType.getSuperclass();
+            }
+            Assert.notNull(enumType, "The target type " + targetType.getName() + " does not refer to an enum");
+            return new RelaxedConversionService.StringToEnumIgnoringCaseConverterFactory.StringToEnum(enumType);
+        }
+
+        private class StringToEnum<T extends Enum> implements Converter<String, T> {
+
+            private final Class<T> enumType;
+
+            StringToEnum(Class<T> enumType){
+                this.enumType = enumType;
+            }
+
+            @Override
+            public T convert(String source) {
+                if (source.isEmpty()) {
+                    // It's an empty enum identifier: reset the enum value to null.
+                    return null;
+                }
+                source = source.trim();
+                for (T candidate : (Set<T>) EnumSet.allOf(this.enumType)) {
+                    RelaxedNames names = new RelaxedNames(
+                        candidate.name().replace('_', '-').toLowerCase(Locale.ENGLISH));
+                    for (String name : names) {
+                        if (name.equals(source)) {
+                            return candidate;
+                        }
+                    }
+                    if (candidate.name().equalsIgnoreCase(source)) {
+                        return candidate;
+                    }
+                }
+                throw new IllegalArgumentException(
+                    "No enum constant " + this.enumType.getCanonicalName() + "." + source);
+            }
+
+        }
+
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/RelaxedDataBinder.java

@@ -0,0 +1,729 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import java.beans.PropertyEditor;
+import java.net.InetAddress;
+import java.util.*;
+
+import org.springframework.beans.*;
+import org.springframework.beans.propertyeditors.FileEditor;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.AbstractPropertyBindingResult;
+import org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.validation.DataBinder;
+
+/**
+ * Binder implementation that allows caller to bind to maps and also allows
+ * property names to match a bit loosely (if underscores or dashes are removed
+ * and replaced with camel case for example).
+ *
+ * @author Dave Syer
+ * @author Phillip Webb
+ * @author Stephane Nicoll
+ * @author Andy Wilkinson
+ * @see RelaxedNames
+ */
+public class RelaxedDataBinder extends DataBinder {
+
+    private static final Set<Class<?>> EXCLUDED_EDITORS;
+
+    static {
+        Set<Class<?>> excluded = new HashSet<Class<?>>();
+        excluded.add(FileEditor.class);
+        EXCLUDED_EDITORS = Collections.unmodifiableSet(excluded);
+    }
+
+    private static final Object           BLANK       = new Object();
+
+    private String                        namePrefix;
+
+    private boolean                       ignoreNestedProperties;
+
+    private MultiValueMap<String, String> nameAliases = new LinkedMultiValueMap<String, String>();
+
+    /**
+     * Create a new {@link RelaxedDataBinder} instance.
+     *
+     * @param target the target into which properties are bound
+     */
+    public RelaxedDataBinder(Object target){
+        super(wrapTarget(target));
+    }
+
+    /**
+     * Create a new {@link RelaxedDataBinder} instance.
+     *
+     * @param target the target into which properties are bound
+     * @param namePrefix An optional prefix to be used when reading properties
+     */
+    public RelaxedDataBinder(Object target, String namePrefix){
+        super(wrapTarget(target), (StringUtils.hasLength(namePrefix) ? namePrefix : DEFAULT_OBJECT_NAME));
+        this.namePrefix = cleanNamePrefix(namePrefix);
+    }
+
+    private String cleanNamePrefix(String namePrefix) {
+        if (!StringUtils.hasLength(namePrefix)) {
+            return null;
+        }
+        return (namePrefix.endsWith(".") ? namePrefix : namePrefix + ".");
+    }
+
+    /**
+     * Flag to disable binding of nested properties (i.e. those with period
+     * separators in their paths). Can be useful to disable this if the name prefix
+     * is empty and you don't want to ignore unknown fields.
+     *
+     * @param ignoreNestedProperties the flag to set (default false)
+     */
+    public void setIgnoreNestedProperties(boolean ignoreNestedProperties) {
+        this.ignoreNestedProperties = ignoreNestedProperties;
+    }
+
+    /**
+     * Set name aliases.
+     *
+     * @param aliases a map of property name to aliases
+     */
+    public void setNameAliases(Map<String, List<String>> aliases) {
+        this.nameAliases = new LinkedMultiValueMap<String, String>(aliases);
+    }
+
+    /**
+     * Add aliases to the {@link DataBinder}.
+     *
+     * @param name the property name to alias
+     * @param alias aliases for the property names
+     * @return this instance
+     */
+    public RelaxedDataBinder withAlias(String name, String... alias) {
+        for (String value : alias) {
+            this.nameAliases.add(name, value);
+        }
+        return this;
+    }
+
+    @Override
+    protected void doBind(MutablePropertyValues propertyValues) {
+        super.doBind(modifyProperties(propertyValues, getTarget()));
+    }
+
+    /**
+     * Modify the property values so that period separated property paths are valid
+     * for map keys. Also creates new maps for properties of map type that are null
+     * (assuming all maps are potentially nested). The standard bracket {@code[...]}
+     * dereferencing is also accepted.
+     *
+     * @param propertyValues the property values
+     * @param target the target object
+     * @return modified property values
+     */
+    private MutablePropertyValues modifyProperties(MutablePropertyValues propertyValues, Object target) {
+        propertyValues = getPropertyValuesForNamePrefix(propertyValues);
+        if (target instanceof RelaxedDataBinder.MapHolder) {
+            propertyValues = addMapPrefix(propertyValues);
+        }
+        BeanWrapper wrapper = new BeanWrapperImpl(target);
+        wrapper.setConversionService(new RelaxedConversionService(getConversionService()));
+        wrapper.setAutoGrowNestedPaths(true);
+        List<PropertyValue> sortedValues = new ArrayList<PropertyValue>();
+        Set<String> modifiedNames = new HashSet<String>();
+        List<String> sortedNames = getSortedPropertyNames(propertyValues);
+        for (String name : sortedNames) {
+            PropertyValue propertyValue = propertyValues.getPropertyValue(name);
+            PropertyValue modifiedProperty = modifyProperty(wrapper, propertyValue);
+            if (modifiedNames.add(modifiedProperty.getName())) {
+                sortedValues.add(modifiedProperty);
+            }
+        }
+        return new MutablePropertyValues(sortedValues);
+    }
+
+    private List<String> getSortedPropertyNames(MutablePropertyValues propertyValues) {
+        List<String> names = new LinkedList<String>();
+        for (PropertyValue propertyValue : propertyValues.getPropertyValueList()) {
+            names.add(propertyValue.getName());
+        }
+        sortPropertyNames(names);
+        return names;
+    }
+
+    /**
+     * Sort by name so that parent properties get processed first (e.g. 'foo.bar'
+     * before 'foo.bar.spam'). Don't use Collections.sort() because the order might
+     * be significant for other property names (it shouldn't be but who knows what
+     * people might be relying on, e.g. HSQL has a JDBCXADataSource where
+     * "databaseName" is a synonym for "url").
+     *
+     * @param names the names to sort
+     */
+    private void sortPropertyNames(List<String> names) {
+        for (String name : new ArrayList<String>(names)) {
+            int propertyIndex = names.indexOf(name);
+            RelaxedDataBinder.BeanPath path = new RelaxedDataBinder.BeanPath(name);
+            for (String prefix : path.prefixes()) {
+                int prefixIndex = names.indexOf(prefix);
+                if (prefixIndex >= propertyIndex) {
+                    // The child property has a parent in the list in the wrong order
+                    names.remove(name);
+                    names.add(prefixIndex, name);
+                }
+            }
+        }
+    }
+
+    private MutablePropertyValues addMapPrefix(MutablePropertyValues propertyValues) {
+        MutablePropertyValues rtn = new MutablePropertyValues();
+        for (PropertyValue pv : propertyValues.getPropertyValues()) {
+            rtn.add("map." + pv.getName(), pv.getValue());
+        }
+        return rtn;
+    }
+
+    private MutablePropertyValues getPropertyValuesForNamePrefix(MutablePropertyValues propertyValues) {
+        if (!StringUtils.hasText(this.namePrefix) && !this.ignoreNestedProperties) {
+            return propertyValues;
+        }
+        MutablePropertyValues rtn = new MutablePropertyValues();
+        for (PropertyValue value : propertyValues.getPropertyValues()) {
+            String name = value.getName();
+            for (String prefix : new RelaxedNames(stripLastDot(this.namePrefix))) {
+                for (String separator : new String[] { ".", "_" }) {
+                    String candidate = (StringUtils.hasLength(prefix) ? prefix + separator : prefix);
+                    if (name.startsWith(candidate)) {
+                        name = name.substring(candidate.length());
+                        if (!(this.ignoreNestedProperties && name.contains("."))) {
+                            PropertyOrigin propertyOrigin = OriginCapablePropertyValue.getOrigin(value);
+                            rtn.addPropertyValue(
+                                new OriginCapablePropertyValue(name, value.getValue(), propertyOrigin));
+                        }
+                    }
+                }
+            }
+        }
+        return rtn;
+    }
+
+    private String stripLastDot(String string) {
+        if (StringUtils.hasLength(string) && string.endsWith(".")) {
+            string = string.substring(0, string.length() - 1);
+        }
+        return string;
+    }
+
+    private PropertyValue modifyProperty(BeanWrapper target, PropertyValue propertyValue) {
+        String name = propertyValue.getName();
+        String normalizedName = normalizePath(target, name);
+        if (!normalizedName.equals(name)) {
+            return new PropertyValue(normalizedName, propertyValue.getValue());
+        }
+        return propertyValue;
+    }
+
+    /**
+     * Normalize a bean property path to a format understood by a BeanWrapper. This
+     * is used so that
+     * <ul>
+     * <li>Fuzzy matching can be employed for bean property names</li>
+     * <li>Period separators can be used instead of indexing ([...]) for map
+     * keys</li>
+     * </ul>
+     *
+     * @param wrapper a bean wrapper for the object to bind
+     * @param path the bean path to bind
+     * @return a transformed path with correct bean wrapper syntax
+     */
+    protected String normalizePath(BeanWrapper wrapper, String path) {
+        return initializePath(wrapper, new RelaxedDataBinder.BeanPath(path), 0);
+    }
+
+    @Override
+    protected AbstractPropertyBindingResult createBeanPropertyBindingResult() {
+        return new RelaxedDataBinder.RelaxedBeanPropertyBindingResult(getTarget(),
+            getObjectName(),
+            isAutoGrowNestedPaths(),
+            getAutoGrowCollectionLimit(),
+            getConversionService());
+    }
+
+    private String initializePath(BeanWrapper wrapper, RelaxedDataBinder.BeanPath path, int index) {
+        String prefix = path.prefix(index);
+        String key = path.name(index);
+        if (path.isProperty(index)) {
+            key = getActualPropertyName(wrapper, prefix, key);
+            path.rename(index, key);
+        }
+        if (path.name(++index) == null) {
+            return path.toString();
+        }
+        String name = path.prefix(index);
+        TypeDescriptor descriptor = wrapper.getPropertyTypeDescriptor(name);
+        if (descriptor == null || descriptor.isMap()) {
+            if (isMapValueStringType(descriptor) || isBlanked(wrapper, name, path.name(index))) {
+                path.collapseKeys(index);
+            }
+            path.mapIndex(index);
+            extendMapIfNecessary(wrapper, path, index);
+        } else if (descriptor.isCollection()) {
+            extendCollectionIfNecessary(wrapper, path, index);
+        } else if (descriptor.getType().equals(Object.class)) {
+            if (isBlanked(wrapper, name, path.name(index))) {
+                path.collapseKeys(index);
+            }
+            path.mapIndex(index);
+            if (path.isLastNode(index)) {
+                wrapper.setPropertyValue(path.toString(), BLANK);
+            } else {
+                String next = path.prefix(index + 1);
+                if (wrapper.getPropertyValue(next) == null) {
+                    wrapper.setPropertyValue(next, new LinkedHashMap<String, Object>());
+                }
+            }
+        }
+        return initializePath(wrapper, path, index);
+    }
+
+    private boolean isMapValueStringType(TypeDescriptor descriptor) {
+        if (descriptor == null || descriptor.getMapValueTypeDescriptor() == null) {
+            return false;
+        }
+        if (Properties.class.isAssignableFrom(descriptor.getObjectType())) {
+            // Properties is declared as Map<Object,Object> but we know it's really
+            // Map<String,String>
+            return true;
+        }
+        Class<?> valueType = descriptor.getMapValueTypeDescriptor().getObjectType();
+        return (valueType != null && CharSequence.class.isAssignableFrom(valueType));
+    }
+
+    @SuppressWarnings("rawtypes")
+    private boolean isBlanked(BeanWrapper wrapper, String propertyName, String key) {
+        Object value = (wrapper.isReadableProperty(propertyName) ? wrapper.getPropertyValue(propertyName) : null);
+        if (value instanceof Map) {
+            if (((Map) value).get(key) == BLANK) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void extendCollectionIfNecessary(BeanWrapper wrapper, RelaxedDataBinder.BeanPath path, int index) {
+        String name = path.prefix(index);
+        TypeDescriptor elementDescriptor = wrapper.getPropertyTypeDescriptor(name).getElementTypeDescriptor();
+        if (!elementDescriptor.isMap() && !elementDescriptor.isCollection()
+            && !elementDescriptor.getType().equals(Object.class)) {
+            return;
+        }
+        Object extend = new LinkedHashMap<String, Object>();
+        if (!elementDescriptor.isMap() && path.isArrayIndex(index)) {
+            extend = new ArrayList<Object>();
+        }
+        wrapper.setPropertyValue(path.prefix(index + 1), extend);
+    }
+
+    private void extendMapIfNecessary(BeanWrapper wrapper, RelaxedDataBinder.BeanPath path, int index) {
+        String name = path.prefix(index);
+        TypeDescriptor parent = wrapper.getPropertyTypeDescriptor(name);
+        if (parent == null) {
+            return;
+        }
+        TypeDescriptor descriptor = parent.getMapValueTypeDescriptor();
+        if (descriptor == null) {
+            descriptor = TypeDescriptor.valueOf(Object.class);
+        }
+        if (!descriptor.isMap() && !descriptor.isCollection() && !descriptor.getType().equals(Object.class)) {
+            return;
+        }
+        String extensionName = path.prefix(index + 1);
+        if (wrapper.isReadableProperty(extensionName)) {
+            Object currentValue = wrapper.getPropertyValue(extensionName);
+            if ((descriptor.isCollection() && currentValue instanceof Collection)
+                || (!descriptor.isCollection() && currentValue instanceof Map)) {
+                return;
+            }
+        }
+        Object extend = new LinkedHashMap<String, Object>();
+        if (descriptor.isCollection()) {
+            extend = new ArrayList<Object>();
+        }
+        if (descriptor.getType().equals(Object.class) && path.isLastNode(index)) {
+            extend = BLANK;
+        }
+        wrapper.setPropertyValue(extensionName, extend);
+    }
+
+    private String getActualPropertyName(BeanWrapper target, String prefix, String name) {
+        String propertyName = resolvePropertyName(target, prefix, name);
+        if (propertyName == null) {
+            propertyName = resolveNestedPropertyName(target, prefix, name);
+        }
+        return (propertyName != null ? propertyName : name);
+    }
+
+    private String resolveNestedPropertyName(BeanWrapper target, String prefix, String name) {
+        StringBuilder candidate = new StringBuilder();
+        for (String field : name.split("[_\\-\\.]")) {
+            candidate.append(candidate.length() > 0 ? "." : "");
+            candidate.append(field);
+            String nested = resolvePropertyName(target, prefix, candidate.toString());
+            if (nested != null) {
+                Class<?> type = target.getPropertyType(nested);
+                if ((type != null) && Map.class.isAssignableFrom(type)) {
+                    // Special case for map property (gh-3836).
+                    return nested + "[" + name.substring(candidate.length() + 1) + "]";
+                }
+                String propertyName = resolvePropertyName(target,
+                    joinString(prefix, nested),
+                    name.substring(candidate.length() + 1));
+                if (propertyName != null) {
+                    return joinString(nested, propertyName);
+                }
+            }
+        }
+        return null;
+    }
+
+    private String resolvePropertyName(BeanWrapper target, String prefix, String name) {
+        Iterable<String> names = getNameAndAliases(name);
+        for (String nameOrAlias : names) {
+            for (String candidate : new RelaxedNames(nameOrAlias)) {
+                try {
+                    if (target.getPropertyType(joinString(prefix, candidate)) != null) {
+                        return candidate;
+                    }
+                } catch (InvalidPropertyException ex) {
+                    // swallow and continue
+                }
+            }
+        }
+        return null;
+    }
+
+    private String joinString(String prefix, String name) {
+        return (StringUtils.hasLength(prefix) ? prefix + "." + name : name);
+    }
+
+    private Iterable<String> getNameAndAliases(String name) {
+        List<String> aliases = this.nameAliases.get(name);
+        if (aliases == null) {
+            return Collections.singleton(name);
+        }
+        List<String> nameAndAliases = new ArrayList<String>(aliases.size() + 1);
+        nameAndAliases.add(name);
+        nameAndAliases.addAll(aliases);
+        return nameAndAliases;
+    }
+
+    private static Object wrapTarget(Object target) {
+        if (target instanceof Map) {
+            @SuppressWarnings("unchecked")
+            Map<String, Object> map = (Map<String, Object>) target;
+            target = new RelaxedDataBinder.MapHolder(map);
+        }
+        return target;
+    }
+
+    @Override
+    public void registerCustomEditor(Class<?> requiredType, PropertyEditor propertyEditor) {
+        if (propertyEditor == null || !EXCLUDED_EDITORS.contains(propertyEditor.getClass())) {
+            super.registerCustomEditor(requiredType, propertyEditor);
+        }
+    }
+
+    @Override
+    public void registerCustomEditor(Class<?> requiredType, String field, PropertyEditor propertyEditor) {
+        if (propertyEditor == null || !EXCLUDED_EDITORS.contains(propertyEditor.getClass())) {
+            super.registerCustomEditor(requiredType, field, propertyEditor);
+        }
+    }
+
+    /**
+     * Holder to allow Map targets to be bound.
+     */
+    static class MapHolder {
+
+        private Map<String, Object> map;
+
+        MapHolder(Map<String, Object> map){
+            this.map = map;
+        }
+
+        public void setMap(Map<String, Object> map) {
+            this.map = map;
+        }
+
+        public Map<String, Object> getMap() {
+            return this.map;
+        }
+
+    }
+
+    /**
+     * A path though properties of a bean.
+     */
+    private static class BeanPath {
+
+        private List<PathNode> nodes;
+
+        BeanPath(String path){
+            this.nodes = splitPath(path);
+        }
+
+        public List<String> prefixes() {
+            List<String> prefixes = new ArrayList<String>();
+            for (int index = 1; index < this.nodes.size(); index++) {
+                prefixes.add(prefix(index));
+            }
+            return prefixes;
+        }
+
+        public boolean isLastNode(int index) {
+            return index >= this.nodes.size() - 1;
+        }
+
+        private List<PathNode> splitPath(String path) {
+            List<PathNode> nodes = new ArrayList<PathNode>();
+            String current = extractIndexedPaths(path, nodes);
+            for (String name : StringUtils.delimitedListToStringArray(current, ".")) {
+                if (StringUtils.hasText(name)) {
+                    nodes.add(new RelaxedDataBinder.BeanPath.PropertyNode(name));
+                }
+            }
+            return nodes;
+        }
+
+        private String extractIndexedPaths(String path, List<PathNode> nodes) {
+            int startRef = path.indexOf("[");
+            String current = path;
+            while (startRef >= 0) {
+                if (startRef > 0) {
+                    nodes.addAll(splitPath(current.substring(0, startRef)));
+                }
+                int endRef = current.indexOf("]", startRef);
+                if (endRef > 0) {
+                    String sub = current.substring(startRef + 1, endRef);
+                    if (sub.matches("[0-9]+")) {
+                        nodes.add(new RelaxedDataBinder.BeanPath.ArrayIndexNode(sub));
+                    } else {
+                        nodes.add(new RelaxedDataBinder.BeanPath.MapIndexNode(sub));
+                    }
+                }
+                current = current.substring(endRef + 1);
+                startRef = current.indexOf("[");
+            }
+            return current;
+        }
+
+        public void collapseKeys(int index) {
+            List<PathNode> revised = new ArrayList<PathNode>();
+            for (int i = 0; i < index; i++) {
+                revised.add(this.nodes.get(i));
+            }
+            StringBuilder builder = new StringBuilder();
+            for (int i = index; i < this.nodes.size(); i++) {
+                if (i > index) {
+                    builder.append(".");
+                }
+                builder.append(this.nodes.get(i).name);
+            }
+            revised.add(new RelaxedDataBinder.BeanPath.PropertyNode(builder.toString()));
+            this.nodes = revised;
+        }
+
+        public void mapIndex(int index) {
+            RelaxedDataBinder.BeanPath.PathNode node = this.nodes.get(index);
+            if (node instanceof RelaxedDataBinder.BeanPath.PropertyNode) {
+                node = ((RelaxedDataBinder.BeanPath.PropertyNode) node).mapIndex();
+            }
+            this.nodes.set(index, node);
+        }
+
+        public String prefix(int index) {
+            return range(0, index);
+        }
+
+        public void rename(int index, String name) {
+            this.nodes.get(index).name = name;
+        }
+
+        public String name(int index) {
+            if (index < this.nodes.size()) {
+                return this.nodes.get(index).name;
+            }
+            return null;
+        }
+
+        private String range(int start, int end) {
+            StringBuilder builder = new StringBuilder();
+            for (int i = start; i < end; i++) {
+                RelaxedDataBinder.BeanPath.PathNode node = this.nodes.get(i);
+                builder.append(node);
+            }
+            if (builder.toString().startsWith(("."))) {
+                builder.replace(0, 1, "");
+            }
+            return builder.toString();
+        }
+
+        public boolean isArrayIndex(int index) {
+            return this.nodes.get(index) instanceof RelaxedDataBinder.BeanPath.ArrayIndexNode;
+        }
+
+        public boolean isProperty(int index) {
+            return this.nodes.get(index) instanceof RelaxedDataBinder.BeanPath.PropertyNode;
+        }
+
+        @Override
+        public String toString() {
+            return prefix(this.nodes.size());
+        }
+
+        private static class PathNode {
+
+            protected String name;
+
+            PathNode(String name){
+                this.name = name;
+            }
+
+        }
+
+        private static class ArrayIndexNode extends RelaxedDataBinder.BeanPath.PathNode {
+
+            ArrayIndexNode(String name){
+                super(name);
+            }
+
+            @Override
+            public String toString() {
+                return "[" + this.name + "]";
+            }
+
+        }
+
+        private static class MapIndexNode extends RelaxedDataBinder.BeanPath.PathNode {
+
+            MapIndexNode(String name){
+                super(name);
+            }
+
+            @Override
+            public String toString() {
+                return "[" + this.name + "]";
+            }
+
+        }
+
+        private static class PropertyNode extends RelaxedDataBinder.BeanPath.PathNode {
+
+            PropertyNode(String name){
+                super(name);
+            }
+
+            public RelaxedDataBinder.BeanPath.MapIndexNode mapIndex() {
+                return new RelaxedDataBinder.BeanPath.MapIndexNode(this.name);
+            }
+
+            @Override
+            public String toString() {
+                return "." + this.name;
+            }
+
+        }
+
+    }
+
+    /**
+     * Extended version of {@link BeanPropertyBindingResult} to support relaxed
+     * binding.
+     */
+    private static class RelaxedBeanPropertyBindingResult extends BeanPropertyBindingResult {
+
+        private RelaxedConversionService conversionService;
+
+        RelaxedBeanPropertyBindingResult(Object target, String objectName, boolean autoGrowNestedPaths,
+                                         int autoGrowCollectionLimit, ConversionService conversionService){
+            super(target, objectName, autoGrowNestedPaths, autoGrowCollectionLimit);
+            this.conversionService = new RelaxedConversionService(conversionService);
+        }
+
+        @Override
+        protected BeanWrapper createBeanWrapper() {
+            BeanWrapper beanWrapper = new RelaxedDataBinder.RelaxedBeanWrapper(getTarget());
+            beanWrapper.setConversionService(this.conversionService);
+            beanWrapper.registerCustomEditor(InetAddress.class, new InetAddressEditor());
+            return beanWrapper;
+        }
+
+    }
+
+    /**
+     * Extended version of {@link BeanWrapperImpl} to support relaxed binding.
+     */
+    private static class RelaxedBeanWrapper extends BeanWrapperImpl {
+
+        private static final Set<String> BENIGN_PROPERTY_SOURCE_NAMES;
+
+        static {
+            Set<String> names = new HashSet<String>();
+            names.add(StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME);
+            names.add(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME);
+            BENIGN_PROPERTY_SOURCE_NAMES = Collections.unmodifiableSet(names);
+        }
+
+        RelaxedBeanWrapper(Object target){
+            super(target);
+        }
+
+        @Override
+        public void setPropertyValue(PropertyValue pv) throws BeansException {
+            try {
+                super.setPropertyValue(pv);
+            } catch (NotWritablePropertyException ex) {
+                PropertyOrigin origin = OriginCapablePropertyValue.getOrigin(pv);
+                if (isBenign(origin)) {
+                    logger.debug("Ignoring benign property binding failure", ex);
+                    return;
+                }
+                if (origin == null) {
+                    throw ex;
+                }
+                throw new RelaxedBindingNotWritablePropertyException(ex, origin);
+            }
+        }
+
+        private boolean isBenign(PropertyOrigin origin) {
+            String name = (origin != null ? origin.getSource().getName() : null);
+            return BENIGN_PROPERTY_SOURCE_NAMES.contains(name);
+        }
+
+    }
+
+    public static class RelaxedBindingNotWritablePropertyException extends NotWritablePropertyException {
+
+        private final String         message;
+
+        private final PropertyOrigin propertyOrigin;
+
+        RelaxedBindingNotWritablePropertyException(NotWritablePropertyException ex, PropertyOrigin propertyOrigin){
+            super(ex.getBeanClass(), ex.getPropertyName());
+            this.propertyOrigin = propertyOrigin;
+            this.message = "Failed to bind '" + propertyOrigin.getName() + "' from '"
+                           + propertyOrigin.getSource().getName() + "' to '" + ex.getPropertyName() + "' property on '"
+                           + ex.getBeanClass().getName() + "'";
+        }
+
+        @Override
+        public String getMessage() {
+            return this.message;
+        }
+
+        public PropertyOrigin getPropertyOrigin() {
+            return this.propertyOrigin;
+        }
+
+    }
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/RelaxedNames.java

@@ -0,0 +1,241 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Locale;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * Generates relaxed name variations from a given source.
+ *
+ * @author Phillip Webb
+ * @author Dave Syer
+ * @see RelaxedDataBinder
+ */
+public final class RelaxedNames implements Iterable<String> {
+
+    private static final Pattern CAMEL_CASE_PATTERN              = Pattern.compile("([^A-Z-])([A-Z])");
+
+    private static final Pattern SEPARATED_TO_CAMEL_CASE_PATTERN = Pattern.compile("[_\\-.]");
+
+    private final String         name;
+
+    private final Set<String>    values                          = new LinkedHashSet<String>();
+
+    /**
+     * Create a new {@link RelaxedNames} instance.
+     *
+     * @param name the source name. For the maximum number of variations specify the
+     *     name using dashed notation (e.g. {@literal my-property-name}
+     */
+    public RelaxedNames(String name){
+        this.name = (name != null ? name : "");
+        initialize(RelaxedNames.this.name, this.values);
+    }
+
+    @Override
+    public Iterator<String> iterator() {
+        return this.values.iterator();
+    }
+
+    private void initialize(String name, Set<String> values) {
+        if (values.contains(name)) {
+            return;
+        }
+        for (RelaxedNames.Variation variation : RelaxedNames.Variation.values()) {
+            for (RelaxedNames.Manipulation manipulation : RelaxedNames.Manipulation.values()) {
+                String result = name;
+                result = manipulation.apply(result);
+                result = variation.apply(result);
+                values.add(result);
+                initialize(result, values);
+            }
+        }
+    }
+
+    /**
+     * Name variations.
+     */
+    enum Variation {
+
+                    NONE {
+
+                        @Override
+                        public String apply(String value) {
+                            return value;
+                        }
+
+                    },
+
+                    LOWERCASE {
+
+                        @Override
+                        public String apply(String value) {
+                            return (value.isEmpty() ? value : value.toLowerCase(Locale.ENGLISH));
+                        }
+
+                    },
+
+                    UPPERCASE {
+
+                        @Override
+                        public String apply(String value) {
+                            return (value.isEmpty() ? value : value.toUpperCase(Locale.ENGLISH));
+                        }
+
+                    };
+
+        public abstract String apply(String value);
+
+    }
+
+    /**
+     * Name manipulations.
+     */
+    enum Manipulation {
+
+                       NONE {
+
+                           @Override
+                           public String apply(String value) {
+                               return value;
+                           }
+
+                       },
+
+                       HYPHEN_TO_UNDERSCORE {
+
+                           @Override
+                           public String apply(String value) {
+                               return (value.indexOf('-') != -1 ? value.replace('-', '_') : value);
+                           }
+
+                       },
+
+                       UNDERSCORE_TO_PERIOD {
+
+                           @Override
+                           public String apply(String value) {
+                               return (value.indexOf('_') != -1 ? value.replace('_', '.') : value);
+                           }
+
+                       },
+
+                       PERIOD_TO_UNDERSCORE {
+
+                           @Override
+                           public String apply(String value) {
+                               return (value.indexOf('.') != -1 ? value.replace('.', '_') : value);
+                           }
+
+                       },
+
+                       CAMELCASE_TO_UNDERSCORE {
+
+                           @Override
+                           public String apply(String value) {
+                               if (value.isEmpty()) {
+                                   return value;
+                               }
+                               Matcher matcher = CAMEL_CASE_PATTERN.matcher(value);
+                               if (!matcher.find()) {
+                                   return value;
+                               }
+                               matcher = matcher.reset();
+                               StringBuffer result = new StringBuffer();
+                               while (matcher.find()) {
+                                   matcher.appendReplacement(result,
+                                       matcher.group(1) + '_' + StringUtils.uncapitalize(matcher.group(2)));
+                               }
+                               matcher.appendTail(result);
+                               return result.toString();
+                           }
+
+                       },
+
+                       CAMELCASE_TO_HYPHEN {
+
+                           @Override
+                           public String apply(String value) {
+                               if (value.isEmpty()) {
+                                   return value;
+                               }
+                               Matcher matcher = CAMEL_CASE_PATTERN.matcher(value);
+                               if (!matcher.find()) {
+                                   return value;
+                               }
+                               matcher = matcher.reset();
+                               StringBuffer result = new StringBuffer();
+                               while (matcher.find()) {
+                                   matcher.appendReplacement(result,
+                                       matcher.group(1) + '-' + StringUtils.uncapitalize(matcher.group(2)));
+                               }
+                               matcher.appendTail(result);
+                               return result.toString();
+                           }
+
+                       },
+
+                       SEPARATED_TO_CAMELCASE {
+
+                           @Override
+                           public String apply(String value) {
+                               return separatedToCamelCase(value, false);
+                           }
+
+                       },
+
+                       CASE_INSENSITIVE_SEPARATED_TO_CAMELCASE {
+
+                           @Override
+                           public String apply(String value) {
+                               return separatedToCamelCase(value, true);
+                           }
+
+                       };
+
+        private static final char[] SUFFIXES = new char[] { '_', '-', '.' };
+
+        public abstract String apply(String value);
+
+        private static String separatedToCamelCase(String value, boolean caseInsensitive) {
+            if (value.isEmpty()) {
+                return value;
+            }
+            StringBuilder builder = new StringBuilder();
+            for (String field : SEPARATED_TO_CAMEL_CASE_PATTERN.split(value)) {
+                field = (caseInsensitive ? field.toLowerCase(Locale.ENGLISH) : field);
+                builder.append(builder.length() != 0 ? StringUtils.capitalize(field) : field);
+            }
+            char lastChar = value.charAt(value.length() - 1);
+            for (char suffix : SUFFIXES) {
+                if (lastChar == suffix) {
+                    builder.append(suffix);
+                    break;
+                }
+            }
+            return builder.toString();
+        }
+
+    }
+
+    /**
+     * Return a {@link RelaxedNames} for the given source camelCase source name.
+     *
+     * @param name the source name in camelCase
+     * @return the relaxed names
+     */
+    public static RelaxedNames forCamelCase(String name) {
+        StringBuilder result = new StringBuilder();
+        for (char c : name.toCharArray()) {
+            result.append(Character.isUpperCase(c) && result.length() > 0
+                          && result.charAt(result.length() - 1) != '-' ? "-" + Character.toLowerCase(c) : c);
+        }
+        return new RelaxedNames(result.toString());
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/bind/StringToCharArrayConverter.java

@@ -0,0 +1,17 @@
+package com.alibaba.otter.canal.client.adapter.config.bind;
+
+import org.springframework.core.convert.converter.Converter;
+
+/**
+ * Converts a String to a Char Array.
+ *
+ * @author Phillip Webb
+ */
+class StringToCharArrayConverter implements Converter<String, char[]> {
+
+    @Override
+    public char[] convert(String source) {
+        return source.toCharArray();
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/AbstractResource.java

@@ -0,0 +1,203 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import org.springframework.util.Assert;
+import org.springframework.util.ResourceUtils;
+
+/**
+ * Convenience base class for {@link Resource} implementations, pre-implementing
+ * typical behavior.
+ * <p>
+ * The "exists" method will check whether a File or InputStream can be opened;
+ * "isOpen" will always return false; "getURL" and "getFile" throw an exception;
+ * and "toString" will return the description.
+ *
+ * @author Juergen Hoeller
+ * @since 28.12.2003
+ */
+public abstract class AbstractResource implements Resource {
+
+    /**
+     * This implementation checks whether a File can be opened, falling back to
+     * whether an InputStream can be opened. This will cover both directories and
+     * content resources.
+     */
+    @Override
+    public boolean exists() {
+        // Try file existence: can we find the file in the file system?
+        try {
+            return getFile().exists();
+        } catch (IOException ex) {
+            // Fall back to stream existence: can we open the stream?
+            try {
+                InputStream is = getInputStream();
+                is.close();
+                return true;
+            } catch (Throwable isEx) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * This implementation always returns {@code true}.
+     */
+    @Override
+    public boolean isReadable() {
+        return true;
+    }
+
+    /**
+     * This implementation always returns {@code false}.
+     */
+    @Override
+    public boolean isOpen() {
+        return false;
+    }
+
+    /**
+     * This implementation throws a FileNotFoundException, assuming that the
+     * resource cannot be resolved to a URL.
+     */
+    @Override
+    public URL getURL() throws IOException {
+        throw new FileNotFoundException(getDescription() + " cannot be resolved to URL");
+    }
+
+    /**
+     * This implementation builds a URI based on the URL returned by
+     * {@link #getURL()}.
+     */
+    @Override
+    public URI getURI() throws IOException {
+        URL url = getURL();
+        try {
+            return ResourceUtils.toURI(url);
+        } catch (URISyntaxException ex) {
+            throw new RuntimeException("Invalid URI [" + url + "]", ex);
+        }
+    }
+
+    /**
+     * This implementation throws a FileNotFoundException, assuming that the
+     * resource cannot be resolved to an absolute file path.
+     */
+    @Override
+    public File getFile() throws IOException {
+        throw new FileNotFoundException(getDescription() + " cannot be resolved to absolute file path");
+    }
+
+    /**
+     * This implementation reads the entire InputStream to calculate the content
+     * length. Subclasses will almost always be able to provide a more optimal
+     * version of this, e.g. checking a File length.
+     *
+     * @see #getInputStream()
+     */
+    @Override
+    public long contentLength() throws IOException {
+        InputStream is = getInputStream();
+        Assert.state(is != null, "Resource InputStream must not be null");
+        try {
+            long size = 0;
+            byte[] buf = new byte[255];
+            int read;
+            while ((read = is.read(buf)) != -1) {
+                size += read;
+            }
+            return size;
+        } finally {
+            try {
+                is.close();
+            } catch (IOException ex) {
+            }
+        }
+    }
+
+    /**
+     * This implementation checks the timestamp of the underlying File, if
+     * available.
+     *
+     * @see #getFileForLastModifiedCheck()
+     */
+    @Override
+    public long lastModified() throws IOException {
+        long lastModified = getFileForLastModifiedCheck().lastModified();
+        if (lastModified == 0L) {
+            throw new FileNotFoundException(
+                getDescription() + " cannot be resolved in the file system for resolving its last-modified timestamp");
+        }
+        return lastModified;
+    }
+
+    /**
+     * Determine the File to use for timestamp checking.
+     * <p>
+     * The default implementation delegates to {@link #getFile()}.
+     *
+     * @return the File to use for timestamp checking (never {@code null})
+     * @throws FileNotFoundException if the resource cannot be resolved as an
+     *     absolute file path, i.e. is not available in a file system
+     * @throws IOException in case of general resolution/reading failures
+     */
+    protected File getFileForLastModifiedCheck() throws IOException {
+        return getFile();
+    }
+
+    /**
+     * This implementation throws a FileNotFoundException, assuming that relative
+     * resources cannot be created for this resource.
+     */
+    @Override
+    public org.springframework.core.io.Resource createRelative(String relativePath) throws IOException {
+        throw new FileNotFoundException("Cannot create a relative resource for " + getDescription());
+    }
+
+    /**
+     * This implementation always returns {@code null}, assuming that this resource
+     * type does not have a filename.
+     */
+    @Override
+    public String getFilename() {
+        return null;
+    }
+
+    /**
+     * This implementation returns the description of this resource.
+     *
+     * @see #getDescription()
+     */
+    @Override
+    public String toString() {
+        return getDescription();
+    }
+
+    /**
+     * This implementation compares description strings.
+     *
+     * @see #getDescription()
+     */
+    @Override
+    public boolean equals(Object obj) {
+        return (obj == this
+                || (obj instanceof org.springframework.core.io.Resource
+                    && ((org.springframework.core.io.Resource) obj).getDescription().equals(getDescription())));
+    }
+
+    /**
+     * This implementation returns the description's hash code.
+     *
+     * @see #getDescription()
+     */
+    @Override
+    public int hashCode() {
+        return getDescription().hashCode();
+    }
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/ByteArrayResource.java

@@ -0,0 +1,117 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.Resource;
+import org.springframework.util.Assert;
+
+/**
+ * {@link Resource} implementation for a given byte array.
+ * <p>
+ * Creates a {@link ByteArrayInputStream} for the given byte array.
+ * <p>
+ * Useful for loading content from any given byte array, without having to
+ * resort to a single-use {@link InputStreamResource}. Particularly useful for
+ * creating mail attachments from local content, where JavaMail needs to be able
+ * to read the stream multiple times.
+ *
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @see ByteArrayInputStream
+ * @see InputStreamResource
+ * @since 1.2.3
+ */
+public class ByteArrayResource extends AbstractResource {
+
+    private final byte[] byteArray;
+
+    private final String description;
+
+    /**
+     * Create a new {@code ByteArrayResource}.
+     *
+     * @param byteArray the byte array to wrap
+     */
+    public ByteArrayResource(byte[] byteArray){
+        this(byteArray, "resource loaded from byte array");
+    }
+
+    /**
+     * Create a new {@code ByteArrayResource} with a description.
+     *
+     * @param byteArray the byte array to wrap
+     * @param description where the byte array comes from
+     */
+    public ByteArrayResource(byte[] byteArray, String description){
+        Assert.notNull(byteArray, "Byte array must not be null");
+        this.byteArray = byteArray;
+        this.description = (description != null ? description : "");
+    }
+
+    /**
+     * Return the underlying byte array.
+     */
+    public final byte[] getByteArray() {
+        return this.byteArray;
+    }
+
+    /**
+     * This implementation always returns {@code true}.
+     */
+    @Override
+    public boolean exists() {
+        return true;
+    }
+
+    /**
+     * This implementation returns the length of the underlying byte array.
+     */
+    @Override
+    public long contentLength() {
+        return this.byteArray.length;
+    }
+
+    /**
+     * This implementation returns a ByteArrayInputStream for the underlying byte
+     * array.
+     *
+     * @see ByteArrayInputStream
+     */
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return new ByteArrayInputStream(this.byteArray);
+    }
+
+    /**
+     * This implementation returns a description that includes the passed-in
+     * {@code description}, if any.
+     */
+    @Override
+    public String getDescription() {
+        return "Byte array resource [" + this.description + "]";
+    }
+
+    /**
+     * This implementation compares the underlying byte array.
+     *
+     * @see Arrays#equals(byte[], byte[])
+     */
+    @Override
+    public boolean equals(Object obj) {
+        return (obj == this || (obj instanceof org.springframework.core.io.ByteArrayResource
+                                && Arrays.equals(((ByteArrayResource) obj).byteArray, this.byteArray)));
+    }
+
+    /**
+     * This implementation returns the hash code based on the underlying byte array.
+     */
+    @Override
+    public int hashCode() {
+        return (byte[].class.hashCode() * 29 * this.byteArray.length);
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/CompositePropertySource.java

@@ -0,0 +1,107 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.util.*;
+
+import org.springframework.util.StringUtils;
+
+/**
+ * Composite {@link PropertySource} implementation that iterates over a set of
+ * {@link PropertySource} instances. Necessary in cases where multiple property
+ * sources share the same name, e.g. when multiple values are supplied to
+ * {@code @PropertySource}.
+ * <p>
+ * As of Spring 4.1.2, this class extends {@link EnumerablePropertySource}
+ * instead of plain {@link PropertySource}, exposing {@link #getPropertyNames()}
+ * based on the accumulated property names from all contained sources (as far as
+ * possible).
+ *
+ * @author Chris Beams
+ * @author Juergen Hoeller
+ * @author Phillip Webb
+ * @since 3.1.1
+ */
+public class CompositePropertySource extends EnumerablePropertySource<Object> {
+
+    private final Set<PropertySource<?>> propertySources = new LinkedHashSet<PropertySource<?>>();
+
+    /**
+     * Create a new {@code CompositePropertySource}.
+     *
+     * @param name the name of the property source
+     */
+    public CompositePropertySource(String name){
+        super(name);
+    }
+
+    @Override
+    public Object getProperty(String name) {
+        for (PropertySource<?> propertySource : this.propertySources) {
+            Object candidate = propertySource.getProperty(name);
+            if (candidate != null) {
+                return candidate;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean containsProperty(String name) {
+        for (PropertySource<?> propertySource : this.propertySources) {
+            if (propertySource.containsProperty(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String[] getPropertyNames() {
+        Set<String> names = new LinkedHashSet<String>();
+        for (PropertySource<?> propertySource : this.propertySources) {
+            if (!(propertySource instanceof EnumerablePropertySource)) {
+                throw new IllegalStateException(
+                    "Failed to enumerate property names due to non-enumerable property source: " + propertySource);
+            }
+            names.addAll(Arrays.asList(((EnumerablePropertySource<?>) propertySource).getPropertyNames()));
+        }
+        return StringUtils.toStringArray(names);
+    }
+
+    /**
+     * Add the given {@link PropertySource} to the end of the chain.
+     *
+     * @param propertySource the PropertySource to add
+     */
+    public void addPropertySource(PropertySource<?> propertySource) {
+        this.propertySources.add(propertySource);
+    }
+
+    /**
+     * Add the given {@link PropertySource} to the start of the chain.
+     *
+     * @param propertySource the PropertySource to add
+     * @since 4.1
+     */
+    public void addFirstPropertySource(PropertySource<?> propertySource) {
+        List<PropertySource<?>> existing = new ArrayList<PropertySource<?>>(this.propertySources);
+        this.propertySources.clear();
+        this.propertySources.add(propertySource);
+        this.propertySources.addAll(existing);
+    }
+
+    /**
+     * Return all property sources that this composite source holds.
+     *
+     * @since 4.1.1
+     */
+    public Collection<PropertySource<?>> getPropertySources() {
+        return this.propertySources;
+    }
+
+    @Override
+    public String toString() {
+        return String
+            .format("%s [name='%s', propertySources=%s]", getClass().getSimpleName(), this.name, this.propertySources);
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/EnumerablePropertySource.java

@@ -0,0 +1,58 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import org.springframework.util.ObjectUtils;
+
+/**
+ * A {@link PropertySource} implementation capable of interrogating its
+ * underlying source object to enumerate all possible property name/value pairs.
+ * Exposes the {@link #getPropertyNames()} method to allow callers to introspect
+ * available properties without having to access the underlying source object.
+ * This also facilitates a more efficient implementation of
+ * {@link #containsProperty(String)}, in that it can call
+ * {@link #getPropertyNames()} and iterate through the returned array rather
+ * than attempting a call to {@link #getProperty(String)} which may be more
+ * expensive. Implementations may consider caching the result of
+ * {@link #getPropertyNames()} to fully exploit this performance opportunity.
+ * <p>
+ * Most framework-provided {@code PropertySource} implementations are
+ * enumerable; a counter-example would be {@code JndiPropertySource} where, due
+ * to the nature of JNDI it is not possible to determine all possible property
+ * names at any given time; rather it is only possible to try to access a
+ * property (via {@link #getProperty(String)}) in order to evaluate whether it
+ * is present or not.
+ *
+ * @author Chris Beams
+ * @author Juergen Hoeller
+ * @since 3.1
+ */
+public abstract class EnumerablePropertySource<T> extends PropertySource<T> {
+
+    public EnumerablePropertySource(String name, T source){
+        super(name, source);
+    }
+
+    protected EnumerablePropertySource(String name){
+        super(name);
+    }
+
+    /**
+     * Return whether this {@code PropertySource} contains a property with the given
+     * name.
+     * <p>
+     * This implementation checks for the presence of the given name within the
+     * {@link #getPropertyNames()} array.
+     *
+     * @param name the name of the property to find
+     */
+    @Override
+    public boolean containsProperty(String name) {
+        return ObjectUtils.containsElement(getPropertyNames(), name);
+    }
+
+    /**
+     * Return the names of all properties contained by the {@linkplain #getSource()
+     * source} object (never {@code null}).
+     */
+    public abstract String[] getPropertyNames();
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/MapPropertySource.java

@@ -0,0 +1,38 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.util.Map;
+
+import org.springframework.core.env.PropertiesPropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.util.StringUtils;
+
+/**
+ * {@link PropertySource} that reads keys and values from a {@code Map} object.
+ *
+ * @author Chris Beams
+ * @author Juergen Hoeller
+ * @since 3.1
+ * @see PropertiesPropertySource
+ */
+public class MapPropertySource extends EnumerablePropertySource<Map<String, Object>> {
+
+    public MapPropertySource(String name, Map<String, Object> source){
+        super(name, source);
+    }
+
+    @Override
+    public Object getProperty(String name) {
+        return this.source.get(name);
+    }
+
+    @Override
+    public boolean containsProperty(String name) {
+        return this.source.containsKey(name);
+    }
+
+    @Override
+    public String[] getPropertyNames() {
+        return StringUtils.toStringArray(this.source.keySet());
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/MutablePropertySources.java

@@ -0,0 +1,221 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.core.env.PropertyResolver;
+import org.springframework.core.env.PropertySourcesPropertyResolver;
+
+/**
+ * Default implementation of the {@link PropertySources} interface. Allows
+ * manipulation of contained property sources and provides a constructor for
+ * copying an existing {@code PropertySources} instance.
+ * <p>
+ * Where <em>precedence</em> is mentioned in methods such as {@link #addFirst}
+ * and {@link #addLast}, this is with regard to the order in which property
+ * sources will be searched when resolving a given property with a
+ * {@link PropertyResolver}.
+ *
+ * @author Chris Beams
+ * @author Juergen Hoeller
+ * @see PropertySourcesPropertyResolver
+ * @since 3.1
+ */
+public class MutablePropertySources implements PropertySources {
+
+    private final Log                     logger;
+
+    private final List<PropertySource<?>> propertySourceList = new CopyOnWriteArrayList<PropertySource<?>>();
+
+    /**
+     * Create a new {@link MutablePropertySources}
+     * object.
+     */
+    public MutablePropertySources(){
+        this.logger = LogFactory.getLog(getClass());
+    }
+
+    /**
+     * Create a new {@code MutablePropertySources} from the given propertySources
+     * object, preserving the original order of contained {@code PropertySource}
+     * objects.
+     */
+    public MutablePropertySources(PropertySources propertySources){
+        this();
+        for (PropertySource<?> propertySource : propertySources) {
+            addLast(propertySource);
+        }
+    }
+
+    /**
+     * Create a new {@link MutablePropertySources}
+     * object and inherit the given logger, usually from an enclosing
+     * {@link Environment}.
+     */
+    MutablePropertySources(Log logger){
+        this.logger = logger;
+    }
+
+    @Override
+    public boolean contains(String name) {
+        return this.propertySourceList.contains(PropertySource.named(name));
+    }
+
+    @Override
+    public PropertySource<?> get(String name) {
+        int index = this.propertySourceList.indexOf(PropertySource.named(name));
+        return (index != -1 ? this.propertySourceList.get(index) : null);
+    }
+
+    @Override
+    public Iterator<PropertySource<?>> iterator() {
+        return this.propertySourceList.iterator();
+    }
+
+    /**
+     * Add the given property source object with highest precedence.
+     */
+    public void addFirst(PropertySource<?> propertySource) {
+        if (logger.isDebugEnabled()) {
+            logger.debug("Adding PropertySource '" + propertySource.getName() + "' with highest search precedence");
+        }
+        removeIfPresent(propertySource);
+        this.propertySourceList.add(0, propertySource);
+    }
+
+    /**
+     * Add the given property source object with lowest precedence.
+     */
+    public void addLast(PropertySource<?> propertySource) {
+        if (logger.isDebugEnabled()) {
+            logger.debug("Adding PropertySource '" + propertySource.getName() + "' with lowest search precedence");
+        }
+        removeIfPresent(propertySource);
+        this.propertySourceList.add(propertySource);
+    }
+
+    /**
+     * Add the given property source object with precedence immediately higher than
+     * the named relative property source.
+     */
+    public void addBefore(String relativePropertySourceName, PropertySource<?> propertySource) {
+        if (logger.isDebugEnabled()) {
+            logger.debug("Adding PropertySource '" + propertySource.getName()
+                         + "' with search precedence immediately higher than '" + relativePropertySourceName + "'");
+        }
+        assertLegalRelativeAddition(relativePropertySourceName, propertySource);
+        removeIfPresent(propertySource);
+        int index = assertPresentAndGetIndex(relativePropertySourceName);
+        addAtIndex(index, propertySource);
+    }
+
+    /**
+     * Add the given property source object with precedence immediately lower than
+     * the named relative property source.
+     */
+    public void addAfter(String relativePropertySourceName, PropertySource<?> propertySource) {
+        if (logger.isDebugEnabled()) {
+            logger.debug("Adding PropertySource '" + propertySource.getName()
+                         + "' with search precedence immediately lower than '" + relativePropertySourceName + "'");
+        }
+        assertLegalRelativeAddition(relativePropertySourceName, propertySource);
+        removeIfPresent(propertySource);
+        int index = assertPresentAndGetIndex(relativePropertySourceName);
+        addAtIndex(index + 1, propertySource);
+    }
+
+    /**
+     * Return the precedence of the given property source, {@code -1} if not found.
+     */
+    public int precedenceOf(PropertySource<?> propertySource) {
+        return this.propertySourceList.indexOf(propertySource);
+    }
+
+    /**
+     * Remove and return the property source with the given name, {@code null} if
+     * not found.
+     *
+     * @param name the name of the property source to find and remove
+     */
+    public PropertySource<?> remove(String name) {
+        if (logger.isDebugEnabled()) {
+            logger.debug("Removing PropertySource '" + name + "'");
+        }
+        int index = this.propertySourceList.indexOf(PropertySource.named(name));
+        return (index != -1 ? this.propertySourceList.remove(index) : null);
+    }
+
+    /**
+     * Replace the property source with the given name with the given property
+     * source object.
+     *
+     * @param name the name of the property source to find and replace
+     * @param propertySource the replacement property source
+     * @throws IllegalArgumentException if no property source with the given name is
+     *     present
+     * @see #contains
+     */
+    public void replace(String name, PropertySource<?> propertySource) {
+        if (logger.isDebugEnabled()) {
+            logger.debug("Replacing PropertySource '" + name + "' with '" + propertySource.getName() + "'");
+        }
+        int index = assertPresentAndGetIndex(name);
+        this.propertySourceList.set(index, propertySource);
+    }
+
+    /**
+     * Return the number of {@link PropertySource} objects contained.
+     */
+    public int size() {
+        return this.propertySourceList.size();
+    }
+
+    @Override
+    public String toString() {
+        return this.propertySourceList.toString();
+    }
+
+    /**
+     * Ensure that the given property source is not being added relative to itself.
+     */
+    protected void assertLegalRelativeAddition(String relativePropertySourceName, PropertySource<?> propertySource) {
+        String newPropertySourceName = propertySource.getName();
+        if (relativePropertySourceName.equals(newPropertySourceName)) {
+            throw new IllegalArgumentException(
+                "PropertySource named '" + newPropertySourceName + "' cannot be added relative to itself");
+        }
+    }
+
+    /**
+     * Remove the given property source if it is present.
+     */
+    protected void removeIfPresent(PropertySource<?> propertySource) {
+        this.propertySourceList.remove(propertySource);
+    }
+
+    /**
+     * Add the given property source at a particular index in the list.
+     */
+    private void addAtIndex(int index, PropertySource<?> propertySource) {
+        removeIfPresent(propertySource);
+        this.propertySourceList.add(index, propertySource);
+    }
+
+    /**
+     * Assert that the named property source is present and return its index.
+     *
+     * @param name {@linkplain PropertySource#getName() name of the property source}
+     *     to find
+     * @throws IllegalArgumentException if the named property source is not present
+     */
+    private int assertPresentAndGetIndex(String name) {
+        int index = this.propertySourceList.indexOf(PropertySource.named(name));
+        if (index == -1) {
+            throw new IllegalArgumentException("PropertySource named '" + name + "' does not exist");
+        }
+        return index;
+    }
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/PropertiesPropertySource.java

@@ -0,0 +1,34 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.util.Map;
+import java.util.Properties;
+
+import org.springframework.core.env.PropertySource;
+
+/**
+ * {@link PropertySource} implementation that extracts properties from a
+ * {@link Properties} object.
+ * <p>
+ * Note that because a {@code Properties} object is technically an
+ * {@code <Object, Object>} {@link java.util.Hashtable Hashtable}, one may
+ * contain non-{@code String} keys or values. This implementation, however is
+ * restricted to accessing only {@code String}-based keys and values, in the
+ * same fashion as {@link Properties#getProperty} and
+ * {@link Properties#setProperty}.
+ *
+ * @author Chris Beams
+ * @author Juergen Hoeller
+ * @since 3.1
+ */
+public class PropertiesPropertySource extends MapPropertySource {
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public PropertiesPropertySource(String name, Properties source){
+        super(name, (Map) source);
+    }
+
+    protected PropertiesPropertySource(String name, Map<String, Object> source){
+        super(name, source);
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/PropertySource.java

@@ -0,0 +1,239 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Abstract base class representing a source of name/value property pairs. The
+ * underlying {@linkplain #getSource() source object} may be of any type
+ * {@code T} that encapsulates properties. Examples include
+ * {@link java.util.Properties} objects, {@link java.util.Map} objects,
+ * {@code ServletContext} and {@code ServletConfig} objects (for access to init
+ * parameters). Explore the {@code PropertySource} type hierarchy to see
+ * provided implementations.
+ * <p>
+ * {@code PropertySource} objects are not typically used in isolation, but
+ * rather through a {@link PropertySources} object, which aggregates property
+ * sources and in conjunction with a {@link PropertyResolver} implementation
+ * that can perform precedence-based searches across the set of
+ * {@code PropertySources}.
+ * <p>
+ * {@code PropertySource} identity is determined not based on the content of
+ * encapsulated properties, but rather based on the {@link #getName() name} of
+ * the {@code PropertySource} alone. This is useful for manipulating
+ * {@code PropertySource} objects when in collection contexts. See operations in
+ * {@link MutablePropertySources} as well as the {@link #named(String)} and
+ * {@link #toString()} methods for details.
+ * <p>
+ * Note that when working
+ * with @{@link org.springframework.context.annotation.Configuration
+ * Configuration} classes that the @{@link PropertySource PropertySource}
+ * annotation provides a convenient and declarative way of adding property
+ * sources to the enclosing {@code Environment}.
+ *
+ * @author Chris Beams
+ * @since 3.1
+ * @see PropertySources
+ * @see MutablePropertySources
+ * @see PropertySource
+ */
+public abstract class PropertySource<T> {
+
+    protected final Log    logger = LogFactory.getLog(getClass());
+
+    protected final String name;
+
+    protected final T      source;
+
+    /**
+     * Create a new {@code PropertySource} with the given name and source object.
+     */
+    public PropertySource(String name, T source){
+        Assert.hasText(name, "Property source name must contain at least one character");
+        Assert.notNull(source, "Property source must not be null");
+        this.name = name;
+        this.source = source;
+    }
+
+    /**
+     * Create a new {@code PropertySource} with the given name and with a new
+     * {@code Object} instance as the underlying source.
+     * <p>
+     * Often useful in testing scenarios when creating anonymous implementations
+     * that never query an actual source but rather return hard-coded values.
+     */
+    @SuppressWarnings("unchecked")
+    public PropertySource(String name){
+        this(name, (T) new Object());
+    }
+
+    /**
+     * Return the name of this {@code PropertySource}
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * Return the underlying source object for this {@code PropertySource}.
+     */
+    public T getSource() {
+        return this.source;
+    }
+
+    /**
+     * Return whether this {@code PropertySource} contains the given name.
+     * <p>
+     * This implementation simply checks for a {@code null} return value from
+     * {@link #getProperty(String)}. Subclasses may wish to implement a more
+     * efficient algorithm if possible.
+     *
+     * @param name the property name to find
+     */
+    public boolean containsProperty(String name) {
+        return (getProperty(name) != null);
+    }
+
+    /**
+     * Return the value associated with the given name, or {@code null} if not
+     * found.
+     *
+     * @param name the property to find
+     */
+    public abstract Object getProperty(String name);
+
+    /**
+     * This {@code PropertySource} object is equal to the given object if:
+     * <ul>
+     * <li>they are the same instance
+     * <li>the {@code name} properties for both objects are equal
+     * </ul>
+     * <p>
+     * No properties other than {@code name} are evaluated.
+     */
+    @Override
+    public boolean equals(Object obj) {
+        return (this == obj || (obj instanceof PropertySource
+                                && ObjectUtils.nullSafeEquals(this.name, ((PropertySource<?>) obj).name)));
+    }
+
+    /**
+     * Return a hash code derived from the {@code name} property of this
+     * {@code PropertySource} object.
+     */
+    @Override
+    public int hashCode() {
+        return ObjectUtils.nullSafeHashCode(this.name);
+    }
+
+    /**
+     * Produce concise output (type and name) if the current log level does not
+     * include debug. If debug is enabled, produce verbose output including the hash
+     * code of the PropertySource instance and every name/value property pair.
+     * <p>
+     * This variable verbosity is useful as a property source such as system
+     * properties or environment variables may contain an arbitrary number of
+     * property pairs, potentially leading to difficult to read exception and log
+     * messages.
+     *
+     * @see Log#isDebugEnabled()
+     */
+    @Override
+    public String toString() {
+        if (logger.isDebugEnabled()) {
+            return getClass().getSimpleName() + "@" + System.identityHashCode(this) + " {name='" + this.name
+                   + "', properties=" + this.source + "}";
+        } else {
+            return getClass().getSimpleName() + " {name='" + this.name + "'}";
+        }
+    }
+
+    /**
+     * Return a {@code PropertySource} implementation intended for collection
+     * comparison purposes only.
+     * <p>
+     * Primarily for internal use, but given a collection of {@code PropertySource}
+     * objects, may be used as follows:
+     *
+     * <pre class="code">
+     *
+     * {
+     *     &#64;code
+     *     List<PropertySource<?>> sources = new ArrayList<PropertySource<?>>();
+     *     sources.add(new MapPropertySource("sourceA", mapA));
+     *     sources.add(new MapPropertySource("sourceB", mapB));
+     *     assert sources.contains(PropertySource.named("sourceA"));
+     *     assert sources.contains(PropertySource.named("sourceB"));
+     *     assert !sources.contains(PropertySource.named("sourceC"));
+     * }
+     * </pre>
+     *
+     * The returned {@code PropertySource} will throw
+     * {@code UnsupportedOperationException} if any methods other than
+     * {@code equals(Object)}, {@code hashCode()}, and {@code toString()} are
+     * called.
+     *
+     * @param name the name of the comparison {@code PropertySource} to be created
+     *     and returned.
+     */
+    public static PropertySource<?> named(String name) {
+        return new ComparisonPropertySource(name);
+    }
+
+    /**
+     * {@code PropertySource} to be used as a placeholder in cases where an actual
+     * property source cannot be eagerly initialized at application context creation
+     * time. For example, a {@code ServletContext}-based property source must wait
+     * until the {@code ServletContext} object is available to its enclosing
+     * {@code ApplicationContext}. In such cases, a stub should be used to hold the
+     * intended default position/order of the property source, then be replaced
+     * during context refresh.
+     *
+     * @see org.springframework.web.context.support.StandardServletEnvironment
+     * @see org.springframework.web.context.support.ServletContextPropertySource
+     */
+    public static class StubPropertySource extends PropertySource<Object> {
+
+        public StubPropertySource(String name){
+            super(name, new Object());
+        }
+
+        /**
+         * Always returns {@code null}.
+         */
+        @Override
+        public String getProperty(String name) {
+            return null;
+        }
+    }
+
+    /**
+     * @see PropertySource#named(String)
+     */
+    static class ComparisonPropertySource extends StubPropertySource {
+
+        private static final String USAGE_ERROR = "ComparisonPropertySource instances are for use with collection comparison only";
+
+        public ComparisonPropertySource(String name){
+            super(name);
+        }
+
+        @Override
+        public Object getSource() {
+            throw new UnsupportedOperationException(USAGE_ERROR);
+        }
+
+        @Override
+        public boolean containsProperty(String name) {
+            throw new UnsupportedOperationException(USAGE_ERROR);
+        }
+
+        @Override
+        public String getProperty(String name) {
+            throw new UnsupportedOperationException(USAGE_ERROR);
+        }
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/PropertySourceLoader.java

@@ -0,0 +1,35 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.io.IOException;
+
+import org.springframework.core.io.support.SpringFactoriesLoader;
+
+/**
+ * Strategy interface located via {@link SpringFactoriesLoader} and used to load
+ * a {@link PropertySource}.
+ *
+ * @author Dave Syer
+ * @author Phillip Webb
+ */
+public interface PropertySourceLoader {
+
+    /**
+     * Returns the file extensions that the loader supports (excluding the '.').
+     *
+     * @return the file extensions
+     */
+    String[] getFileExtensions();
+
+    /**
+     * Load the resource into a property source.
+     *
+     * @param name the name of the property source
+     * @param resource the resource to load
+     * @param profile the name of the profile to load or {@code null}. The profile
+     *     can be used to load multi-document files (such as YAML). Simple property
+     *     formats should {@code null} when asked to load a profile.
+     * @return a property source or {@code null}
+     * @throws IOException if the source cannot be loaded
+     */
+    PropertySource<?> load(String name, Resource resource, String profile) throws IOException;
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/PropertySources.java

@@ -0,0 +1,25 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+/**
+ * Holder containing one or more {@link PropertySource} objects.
+ *
+ * @author Chris Beams
+ * @since 3.1
+ */
+public interface PropertySources extends Iterable<PropertySource<?>> {
+
+    /**
+     * Return whether a property source with the given name is contained.
+     *
+     * @param name the {@linkplain PropertySource#getName() name of the property source} to find
+     */
+    boolean contains(String name);
+
+    /**
+     * Return the property source with the given name, {@code null} if not found.
+     *
+     * @param name the {@linkplain PropertySource#getName() name of the property source} to find
+     */
+    PropertySource<?> get(String name);
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/Resource.java

@@ -0,0 +1,57 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+
+import org.springframework.core.io.*;
+import org.springframework.core.io.ByteArrayResource;
+
+/**
+ * Interface for a resource descriptor that abstracts from the actual type of
+ * underlying resource, such as a file or class path resource.
+ * <p>
+ * An InputStream can be opened for every resource if it exists in physical
+ * form, but a URL or File handle can just be returned for certain resources.
+ * The actual behavior is implementation-specific.
+ *
+ * @author Juergen Hoeller
+ * @since 28.12.2003
+ * @see #getInputStream()
+ * @see #getURL()
+ * @see #getURI()
+ * @see #getFile()
+ * @see WritableResource
+ * @see ContextResource
+ * @see UrlResource
+ * @see ClassPathResource
+ * @see FileSystemResource
+ * @see PathResource
+ * @see ByteArrayResource
+ * @see InputStreamResource
+ */
+public interface Resource extends InputStreamSource {
+
+    boolean exists();
+
+    boolean isReadable();
+
+    boolean isOpen();
+
+    URL getURL() throws IOException;
+
+    URI getURI() throws IOException;
+
+    File getFile() throws IOException;
+
+    long contentLength() throws IOException;
+
+    long lastModified() throws IOException;
+
+    org.springframework.core.io.Resource createRelative(String var1) throws IOException;
+
+    String getFilename();
+
+    String getDescription();
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/SpringProfileDocumentMatcher.java

@@ -0,0 +1,182 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.util.*;
+
+import org.springframework.core.env.Environment;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * {@link YamlProcessor.DocumentMatcher} backed by
+ * {@link Environment#getActiveProfiles()}. A YAML document may define a
+ * "spring.profiles" element as a comma-separated list of Spring profile names,
+ * optionally negated using the {@code !} character. If both negated and
+ * non-negated profiles are specified for a single document, at least one
+ * non-negated profile must match and no negated profiles may match.
+ *
+ * @author Dave Syer
+ * @author Matt Benson
+ * @author Phillip Webb
+ * @author Andy Wilkinson
+ */
+public class SpringProfileDocumentMatcher implements YamlProcessor.DocumentMatcher {
+
+    private String[] activeProfiles = new String[0];
+
+    public SpringProfileDocumentMatcher(){
+    }
+
+    public SpringProfileDocumentMatcher(String... profiles){
+        addActiveProfiles(profiles);
+    }
+
+    public void addActiveProfiles(String... profiles) {
+        LinkedHashSet<String> set = new LinkedHashSet<String>(Arrays.asList(this.activeProfiles));
+        Collections.addAll(set, profiles);
+        this.activeProfiles = set.toArray(new String[set.size()]);
+    }
+
+    @Override
+    public YamlProcessor.MatchStatus matches(Properties properties) {
+        List<String> profiles = extractSpringProfiles(properties);
+        ProfilesMatcher profilesMatcher = getProfilesMatcher();
+        Set<String> negative = extractProfiles(profiles, ProfileType.NEGATIVE);
+        Set<String> positive = extractProfiles(profiles, ProfileType.POSITIVE);
+        if (!CollectionUtils.isEmpty(negative)) {
+            if (profilesMatcher.matches(negative) == YamlProcessor.MatchStatus.FOUND) {
+                return YamlProcessor.MatchStatus.NOT_FOUND;
+            }
+            if (CollectionUtils.isEmpty(positive)) {
+                return YamlProcessor.MatchStatus.FOUND;
+            }
+        }
+        return profilesMatcher.matches(positive);
+    }
+
+    private List<String> extractSpringProfiles(Properties properties) {
+        SpringProperties springProperties = new SpringProperties();
+        MutablePropertySources propertySources = new MutablePropertySources();
+        propertySources.addFirst(new PropertiesPropertySource("profiles", properties));
+        // PropertyValues propertyValues = new PropertySourcesPropertyValues(
+        // propertySources);
+        // new RelaxedDataBinder(springProperties, "spring").bind(propertyValues);
+        // TODO
+        List<String> profiles = springProperties.getProfiles();
+        return profiles;
+    }
+
+    private ProfilesMatcher getProfilesMatcher() {
+        return (this.activeProfiles.length != 0 ? new ActiveProfilesMatcher(
+            new HashSet<String>(Arrays.asList(this.activeProfiles))) : new EmptyProfilesMatcher());
+    }
+
+    private Set<String> extractProfiles(List<String> profiles, ProfileType type) {
+        if (CollectionUtils.isEmpty(profiles)) {
+            return null;
+        }
+        Set<String> extractedProfiles = new HashSet<String>();
+        for (String candidate : profiles) {
+            ProfileType candidateType = ProfileType.POSITIVE;
+            if (candidate.startsWith("!")) {
+                candidateType = ProfileType.NEGATIVE;
+            }
+            if (candidateType == type) {
+                extractedProfiles.add(type != ProfileType.POSITIVE ? candidate.substring(1) : candidate);
+            }
+        }
+        return extractedProfiles;
+    }
+
+    /**
+     * Profile match types.
+     */
+    enum ProfileType {
+
+                      POSITIVE, NEGATIVE
+
+    }
+
+    /**
+     * Base class for profile matchers.
+     */
+    private abstract static class ProfilesMatcher {
+
+        public final YamlProcessor.MatchStatus matches(Set<String> profiles) {
+            if (CollectionUtils.isEmpty(profiles)) {
+                return YamlProcessor.MatchStatus.ABSTAIN;
+            }
+            return doMatches(profiles);
+        }
+
+        protected abstract YamlProcessor.MatchStatus doMatches(Set<String> profiles);
+
+    }
+
+    /**
+     * {@link ProfilesMatcher} that matches when a value in {@code spring.profiles}
+     * is also in {@code spring.profiles.active}.
+     */
+    private static class ActiveProfilesMatcher extends ProfilesMatcher {
+
+        private final Set<String> activeProfiles;
+
+        ActiveProfilesMatcher(Set<String> activeProfiles){
+            this.activeProfiles = activeProfiles;
+        }
+
+        @Override
+        protected YamlProcessor.MatchStatus doMatches(Set<String> profiles) {
+            if (profiles.isEmpty()) {
+                return YamlProcessor.MatchStatus.NOT_FOUND;
+            }
+            for (String activeProfile : this.activeProfiles) {
+                if (profiles.contains(activeProfile)) {
+                    return YamlProcessor.MatchStatus.FOUND;
+                }
+            }
+            return YamlProcessor.MatchStatus.NOT_FOUND;
+        }
+
+    }
+
+    /**
+     * {@link ProfilesMatcher} that matches when {@code
+     * spring.profiles} is empty or contains a value with no text.
+     *
+     * @see StringUtils#hasText(String)
+     */
+    private static class EmptyProfilesMatcher extends ProfilesMatcher {
+
+        @Override
+        public YamlProcessor.MatchStatus doMatches(Set<String> springProfiles) {
+            if (springProfiles.isEmpty()) {
+                return YamlProcessor.MatchStatus.FOUND;
+            }
+            for (String profile : springProfiles) {
+                if (!StringUtils.hasText(profile)) {
+                    return YamlProcessor.MatchStatus.FOUND;
+                }
+            }
+            return YamlProcessor.MatchStatus.NOT_FOUND;
+        }
+
+    }
+
+    /**
+     * Class for binding {@code spring.profiles} property.
+     */
+    static class SpringProperties {
+
+        private List<String> profiles = new ArrayList<String>();
+
+        public List<String> getProfiles() {
+            return this.profiles;
+        }
+
+        public void setProfiles(List<String> profiles) {
+            this.profiles = profiles;
+        }
+
+    }
+
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/YamlProcessor.java

@@ -0,0 +1,419 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.*;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.util.Assert;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.nodes.MappingNode;
+import org.yaml.snakeyaml.parser.ParserException;
+import org.yaml.snakeyaml.reader.UnicodeReader;
+
+/**
+ * Base class for YAML factories.
+ *
+ * @author Dave Syer
+ * @author Juergen Hoeller
+ * @since 4.1
+ */
+public abstract class YamlProcessor {
+
+    private final Log             logger           = LogFactory.getLog(getClass());
+
+    private ResolutionMethod      resolutionMethod = ResolutionMethod.OVERRIDE;
+
+    private Resource[]            resources        = new Resource[0];
+
+    private List<DocumentMatcher> documentMatchers = Collections.emptyList();
+
+    private boolean               matchDefault     = true;
+
+    /**
+     * A map of document matchers allowing callers to selectively use only some of
+     * the documents in a YAML resource. In YAML documents are separated by
+     * <code>---<code> lines, and each document is converted to properties before
+     * the match is made. E.g.
+     *
+     * <pre class="code">
+     * environment: dev
+     * url: http://dev.bar.com
+     * name: Developer Setup
+     * ---
+     * environment: prod
+     * url:http://foo.bar.com
+     * name: My Cool App
+     * </pre>
+     *
+     * when mapped with
+     *
+     * <pre class="code">
+     * setDocumentMatchers(properties -> ("prod"
+     *     .equals(properties.getProperty("environment")) ? MatchStatus.FOUND : MatchStatus.NOT_FOUND));
+     * </pre>
+     *
+     * would end up as
+     *
+     * <pre class="code">
+     * environment=prod
+     * url=http://foo.bar.com
+     * name=My Cool App
+     * </pre>
+     */
+    public void setDocumentMatchers(DocumentMatcher... matchers) {
+        this.documentMatchers = Arrays.asList(matchers);
+    }
+
+    /**
+     * Flag indicating that a document for which all the
+     * {@link #setDocumentMatchers(DocumentMatcher...) document matchers} abstain
+     * will nevertheless match. Default is {@code true}.
+     */
+    public void setMatchDefault(boolean matchDefault) {
+        this.matchDefault = matchDefault;
+    }
+
+    /**
+     * Method to use for resolving resources. Each resource will be converted to a
+     * Map, so this property is used to decide which map entries to keep in the
+     * final output from this factory. Default is {@link ResolutionMethod#OVERRIDE}.
+     */
+    public void setResolutionMethod(ResolutionMethod resolutionMethod) {
+        Assert.notNull(resolutionMethod, "ResolutionMethod must not be null");
+        this.resolutionMethod = resolutionMethod;
+    }
+
+    /**
+     * Set locations of YAML {@link Resource resources} to be loaded.
+     *
+     * @see ResolutionMethod
+     */
+    public void setResources(Resource... resources) {
+        this.resources = resources;
+    }
+
+    /**
+     * Provide an opportunity for subclasses to process the Yaml parsed from the
+     * supplied resources. Each resource is parsed in turn and the documents inside
+     * checked against the {@link #setDocumentMatchers(DocumentMatcher...)
+     * matchers}. If a document matches it is passed into the callback, along with
+     * its representation as Properties. Depending on the
+     * {@link #setResolutionMethod(ResolutionMethod)} not all of the documents will
+     * be parsed.
+     *
+     * @param callback a callback to delegate to once matching documents are found
+     * @see #createYaml()
+     */
+    protected void process(MatchCallback callback) {
+        Yaml yaml = createYaml();
+        for (Resource resource : this.resources) {
+            boolean found = process(callback, yaml, resource);
+            if (this.resolutionMethod == ResolutionMethod.FIRST_FOUND && found) {
+                return;
+            }
+        }
+    }
+
+    /**
+     * Create the {@link Yaml} instance to use.
+     */
+    protected Yaml createYaml() {
+        return new Yaml(new StrictMapAppenderConstructor());
+    }
+
+    private boolean process(MatchCallback callback, Yaml yaml, Resource resource) {
+        int count = 0;
+        try {
+            if (logger.isDebugEnabled()) {
+                logger.debug("Loading from YAML: " + resource);
+            }
+            Reader reader = new UnicodeReader(resource.getInputStream());
+            try {
+                for (Object object : yaml.loadAll(reader)) {
+                    if (object != null && process(asMap(object), callback)) {
+                        count++;
+                        if (this.resolutionMethod == ResolutionMethod.FIRST_FOUND) {
+                            break;
+                        }
+                    }
+                }
+                if (logger.isDebugEnabled()) {
+                    logger.debug(
+                        "Loaded " + count + " document" + (count > 1 ? "s" : "") + " from YAML resource: " + resource);
+                }
+            } finally {
+                reader.close();
+            }
+        } catch (IOException ex) {
+            handleProcessError(resource, ex);
+        }
+        return (count > 0);
+    }
+
+    private void handleProcessError(Resource resource, IOException ex) {
+        if (this.resolutionMethod != ResolutionMethod.FIRST_FOUND
+            && this.resolutionMethod != ResolutionMethod.OVERRIDE_AND_IGNORE) {
+            throw new IllegalStateException(ex);
+        }
+        if (logger.isWarnEnabled()) {
+            logger.warn("Could not load map from " + resource + ": " + ex.getMessage());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Map<String, Object> asMap(Object object) {
+        // YAML can have numbers as keys
+        Map<String, Object> result = new LinkedHashMap<String, Object>();
+        if (!(object instanceof Map)) {
+            // A document can be a text literal
+            result.put("document", object);
+            return result;
+        }
+
+        Map<Object, Object> map = (Map<Object, Object>) object;
+        for (Map.Entry<Object, Object> entry : map.entrySet()) {
+            Object value = entry.getValue();
+            if (value instanceof Map) {
+                value = asMap(value);
+            }
+            Object key = entry.getKey();
+            if (key instanceof CharSequence) {
+                result.put(key.toString(), value);
+            } else {
+                // It has to be a map key in this case
+                result.put("[" + key.toString() + "]", value);
+            }
+        }
+        return result;
+    }
+
+    private boolean process(Map<String, Object> map, MatchCallback callback) {
+        Properties properties = new Properties() {
+
+            @Override
+            public String getProperty(String key) {
+                Object value = get(key);
+                return (value != null ? value.toString() : null);
+            }
+        };
+        properties.putAll(getFlattenedMap(map));
+
+        if (this.documentMatchers.isEmpty()) {
+            if (logger.isDebugEnabled()) {
+                logger.debug("Merging document (no matchers set): " + map);
+            }
+            callback.process(properties, map);
+            return true;
+        }
+
+        MatchStatus result = MatchStatus.ABSTAIN;
+        for (DocumentMatcher matcher : this.documentMatchers) {
+            MatchStatus match = matcher.matches(properties);
+            result = MatchStatus.getMostSpecific(match, result);
+            if (match == MatchStatus.FOUND) {
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Matched document with document matcher: " + properties);
+                }
+                callback.process(properties, map);
+                return true;
+            }
+        }
+
+        if (result == MatchStatus.ABSTAIN && this.matchDefault) {
+            if (logger.isDebugEnabled()) {
+                logger.debug("Matched document with default matcher: " + map);
+            }
+            callback.process(properties, map);
+            return true;
+        }
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("Unmatched document: " + map);
+        }
+        return false;
+    }
+
+    /**
+     * Return a flattened version of the given map, recursively following any nested
+     * Map or Collection values. Entries from the resulting map retain the same
+     * order as the source. When called with the Map from a {@link MatchCallback}
+     * the result will contain the same values as the {@link MatchCallback}
+     * Properties.
+     *
+     * @param source the source map
+     * @return a flattened map
+     * @since 4.1.3
+     */
+    protected final Map<String, Object> getFlattenedMap(Map<String, Object> source) {
+        Map<String, Object> result = new LinkedHashMap<String, Object>();
+        buildFlattenedMap(result, source, null);
+        return result;
+    }
+
+    private static boolean containsText(CharSequence str) {
+        int strLen = str.length();
+        for (int i = 0; i < strLen; i++) {
+            if (!Character.isWhitespace(str.charAt(i))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void buildFlattenedMap(Map<String, Object> result, Map<String, Object> source, String path) {
+        for (Map.Entry<String, Object> entry : source.entrySet()) {
+            String key = entry.getKey();
+            if (path != null && !path.isEmpty() && containsText(path)) {
+                if (key.startsWith("[")) {
+                    key = path + key;
+                } else {
+                    key = path + '.' + key;
+                }
+            }
+            Object value = entry.getValue();
+            if (value instanceof String) {
+                result.put(key, value);
+            } else if (value instanceof Map) {
+                // Need a compound key
+                @SuppressWarnings("unchecked")
+                Map<String, Object> map = (Map<String, Object>) value;
+                buildFlattenedMap(result, map, key);
+            } else if (value instanceof Collection) {
+                // Need a compound key
+                @SuppressWarnings("unchecked")
+                Collection<Object> collection = (Collection<Object>) value;
+                int count = 0;
+                for (Object object : collection) {
+                    buildFlattenedMap(result, Collections.singletonMap("[" + (count++) + "]", object), key);
+                }
+            } else {
+                result.put(key, (value != null ? value : ""));
+            }
+        }
+    }
+
+    /**
+     * Callback interface used to process the YAML parsing results.
+     */
+    public interface MatchCallback {
+
+        /**
+         * Process the given representation of the parsing results.
+         *
+         * @param properties the properties to process (as a flattened representation
+         *     with indexed keys in case of a collection or map)
+         * @param map the result map (preserving the original value structure in the
+         *     YAML document)
+         */
+        void process(Properties properties, Map<String, Object> map);
+    }
+
+    /**
+     * Strategy interface used to test if properties match.
+     */
+    public interface DocumentMatcher {
+
+        /**
+         * Test if the given properties match.
+         *
+         * @param properties the properties to test
+         * @return the status of the match
+         */
+        MatchStatus matches(Properties properties);
+    }
+
+    /**
+     * Status returned from {@link DocumentMatcher#matches(Properties)}
+     */
+    public enum MatchStatus {
+
+                             /**
+                              * A match was found.
+                              */
+                             FOUND,
+
+                             /**
+                              * No match was found.
+                              */
+                             NOT_FOUND,
+
+                             /**
+                              * The matcher should not be considered.
+                              */
+                             ABSTAIN;
+
+        /**
+         * Compare two {@link MatchStatus} items, returning the most specific status.
+         */
+        public static MatchStatus getMostSpecific(MatchStatus a, MatchStatus b) {
+            return (a.ordinal() < b.ordinal() ? a : b);
+        }
+    }
+
+    /**
+     * Method to use for resolving resources.
+     */
+    public enum ResolutionMethod {
+
+                                  /**
+                                   * Replace values from earlier in the list.
+                                   */
+                                  OVERRIDE,
+
+                                  /**
+                                   * Replace values from earlier in the list, ignoring any failures.
+                                   */
+                                  OVERRIDE_AND_IGNORE,
+
+                                  /**
+                                   * Take the first resource in the list that exists and use just that.
+                                   */
+                                  FIRST_FOUND
+    }
+
+    /**
+     * A specialized {@link Constructor} that checks for duplicate keys.
+     */
+    protected static class StrictMapAppenderConstructor extends Constructor {
+
+        // Declared as public for use in subclasses
+        public StrictMapAppenderConstructor(){
+            super();
+        }
+
+        @Override
+        protected Map<Object, Object> constructMapping(MappingNode node) {
+            try {
+                return super.constructMapping(node);
+            } catch (IllegalStateException ex) {
+                throw new ParserException("while parsing MappingNode",
+                    node.getStartMark(),
+                    ex.getMessage(),
+                    node.getEndMark());
+            }
+        }
+
+        @Override
+        protected Map<Object, Object> createDefaultMap() {
+            final Map<Object, Object> delegate = super.createDefaultMap();
+            return new AbstractMap<Object, Object>() {
+
+                @Override
+                public Object put(Object key, Object value) {
+                    if (delegate.containsKey(key)) {
+                        throw new IllegalStateException("Duplicate key: " + key);
+                    }
+                    return delegate.put(key, value);
+                }
+
+                @Override
+                public Set<Entry<Object, Object>> entrySet() {
+                    return delegate.entrySet();
+                }
+            };
+        }
+    }
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/config/common/YamlPropertySourceLoader.java

@@ -0,0 +1,87 @@
+package com.alibaba.otter.canal.client.adapter.config.common;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.regex.Pattern;
+
+import org.springframework.util.ClassUtils;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.nodes.Tag;
+import org.yaml.snakeyaml.representer.Representer;
+import org.yaml.snakeyaml.resolver.Resolver;
+
+/**
+ * Strategy to load '.yml' (or '.yaml') files into a {@link PropertySource}.
+ *
+ * @author Dave Syer
+ * @author Phillip Webb
+ * @author Andy Wilkinson
+ */
+public class YamlPropertySourceLoader implements PropertySourceLoader {
+
+    @Override
+    public String[] getFileExtensions() {
+        return new String[] { "yml", "yaml" };
+    }
+
+    @Override
+    public PropertySource<?> load(String name, Resource resource, String profile) throws IOException {
+        if (ClassUtils.isPresent("org.yaml.snakeyaml.Yaml", null)) {
+            Processor processor = new Processor(resource, profile);
+            Map<String, Object> source = processor.process();
+            if (!source.isEmpty()) {
+                return new MapPropertySource(name, source);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * {@link YamlProcessor} to create a {@link Map} containing the property values.
+     * Similar to {@link YamlPropertiesFactoryBean} but retains the order of
+     * entries.
+     */
+    private static class Processor extends YamlProcessor {
+
+        Processor(Resource resource, String profile){
+            if (profile == null) {
+                setMatchDefault(true);
+                setDocumentMatchers(new SpringProfileDocumentMatcher());
+            } else {
+                setMatchDefault(false);
+                setDocumentMatchers(new SpringProfileDocumentMatcher(profile));
+            }
+            setResources(resource);
+        }
+
+        @Override
+        protected Yaml createYaml() {
+            return new Yaml(new StrictMapAppenderConstructor(), new Representer(), new DumperOptions(), new Resolver() {
+
+                @Override
+                public void addImplicitResolver(Tag tag, Pattern regexp, String first) {
+                    if (tag == Tag.TIMESTAMP) {
+                        return;
+                    }
+                    super.addImplicitResolver(tag, regexp, first);
+                }
+            });
+        }
+
+        public Map<String, Object> process() {
+            final Map<String, Object> result = new LinkedHashMap<String, Object>();
+            process(new MatchCallback() {
+
+                @Override
+                public void process(Properties properties, Map<String, Object> map) {
+                    result.putAll(getFlattenedMap(map));
+                }
+            });
+            return result;
+        }
+
+    }
+}

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/Dml.java

@@ -15,6 +15,7 @@ public class Dml implements Serializable {
     private static final long         serialVersionUID = 2611556444074013268L;
 
     private String                    destination;                            // 对应canal的实例或者MQ的topic
+    private String                    groupId;                                // 对应mq的group id
     private String                    database;                               // 数据库或schema
     private String                    table;                                  // 表名
     private List<String>              pkNames;
@@ -36,6 +37,14 @@ public class Dml implements Serializable {
         this.destination = destination;
     }
 
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
     public String getDatabase() {
         return database;
     }

client-adapter/common/src/main/java/com/alibaba/otter/canal/client/adapter/support/MessageUtil.java

@@ -14,7 +14,7 @@ import com.alibaba.otter.canal.protocol.Message;
  */
 public class MessageUtil {
 
-    public static List<Dml> parse4Dml(String destination, Message message) {
+    public static List<Dml> parse4Dml(String destination, String groupId, Message message) {
         if (message == null) {
             return null;
         }
@@ -38,10 +38,12 @@ public class MessageUtil {
 
             final Dml dml = new Dml();
             dml.setDestination(destination);
+            dml.setGroupId(groupId);
             dml.setDatabase(entry.getHeader().getSchemaName());
             dml.setTable(entry.getHeader().getTableName());
             dml.setType(eventType.toString());
             dml.setEs(entry.getHeader().getExecuteTime());
+            dml.setIsDdl(rowChange.getIsDdl());
             dml.setTs(System.currentTimeMillis());
             dml.setSql(rowChange.getSql());
             dmls.add(dml);
@@ -118,10 +120,10 @@ public class MessageUtil {
         return dmls;
     }
 
-    public static List<Dml> flatMessage2Dml(String destination, List<FlatMessage> flatMessages) {
+    public static List<Dml> flatMessage2Dml(String destination, String groupId, List<FlatMessage> flatMessages) {
         List<Dml> dmls = new ArrayList<Dml>(flatMessages.size());
         for (FlatMessage flatMessage : flatMessages) {
-            Dml dml = flatMessage2Dml(destination, flatMessage);
+            Dml dml = flatMessage2Dml(destination, groupId, flatMessage);
             if (dml != null) {
                 dmls.add(dml);
             }
@@ -130,12 +132,13 @@ public class MessageUtil {
         return dmls;
     }
 
-    public static Dml flatMessage2Dml(String destination, FlatMessage flatMessage) {
+    public static Dml flatMessage2Dml(String destination, String groupId, FlatMessage flatMessage) {
         if (flatMessage == null) {
             return null;
         }
         Dml dml = new Dml();
         dml.setDestination(destination);
+        dml.setGroupId(groupId);
         dml.setDatabase(flatMessage.getDatabase());
         dml.setTable(flatMessage.getTable());
         dml.setPkNames(flatMessage.getPkNames());

client-adapter/elasticsearch/pom.xml

@@ -18,12 +18,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.19</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.alibaba.fastsql</groupId>
             <artifactId>fastsql</artifactId>
@@ -92,4 +86,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/ESAdapter.java

@@ -1,16 +1,17 @@
 package com.alibaba.otter.canal.client.adapter.es;
 
 import java.net.InetAddress;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.sql.DataSource;
 
+import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
@@ -28,11 +29,7 @@ import com.alibaba.otter.canal.client.adapter.es.monitor.ESConfigMonitor;
 import com.alibaba.otter.canal.client.adapter.es.service.ESEtlService;
 import com.alibaba.otter.canal.client.adapter.es.service.ESSyncService;
 import com.alibaba.otter.canal.client.adapter.es.support.ESTemplate;
-import com.alibaba.otter.canal.client.adapter.support.DatasourceConfig;
+import com.alibaba.otter.canal.client.adapter.support.*;
-import com.alibaba.otter.canal.client.adapter.support.Dml;
-import com.alibaba.otter.canal.client.adapter.support.EtlResult;
-import com.alibaba.otter.canal.client.adapter.support.OuterAdapterConfig;
-import com.alibaba.otter.canal.client.adapter.support.SPI;
 
 /**
  * ES外部适配器
@@ -52,6 +49,8 @@ public class ESAdapter implements OuterAdapter {
 
     private ESConfigMonitor                        esConfigMonitor;
 
+    private Properties                             envProperties;
+
     public TransportClient getTransportClient() {
         return transportClient;
     }
@@ -69,9 +68,10 @@ public class ESAdapter implements OuterAdapter {
     }
 
     @Override
-    public void init(OuterAdapterConfig configuration) {
+    public void init(OuterAdapterConfig configuration, Properties envProperties) {
         try {
-            Map<String, ESSyncConfig> esSyncConfigTmp = ESSyncConfigLoader.load();
+            this.envProperties = envProperties;
+            Map<String, ESSyncConfig> esSyncConfigTmp = ESSyncConfigLoader.load(envProperties);
             // 过滤不匹配的key的配置
             esSyncConfigTmp.forEach((key, config) -> {
                 if ((config.getOuterAdapterKey() == null && configuration.getKey() == null)
@@ -99,8 +99,21 @@ public class ESAdapter implements OuterAdapter {
                 String schema = matcher.group(2);
 
                 schemaItem.getAliasTableItems().values().forEach(tableItem -> {
-                    Map<String, ESSyncConfig> esSyncConfigMap = dbTableEsSyncConfig
+                    Map<String, ESSyncConfig> esSyncConfigMap;
-                        .computeIfAbsent(schema + "-" + tableItem.getTableName(), k -> new HashMap<>());
+                    if (envProperties != null
+                        && !"tcp".equalsIgnoreCase(envProperties.getProperty("canal.conf.mode"))) {
+                        esSyncConfigMap = dbTableEsSyncConfig
+                            .computeIfAbsent(StringUtils.trimToEmpty(config.getDestination()) + "-"
+                                             + StringUtils.trimToEmpty(config.getGroupId()) + "_" + schema + "-"
+                                             + tableItem.getTableName(),
+                                k -> new ConcurrentHashMap<>());
+                    } else {
+                        esSyncConfigMap = dbTableEsSyncConfig
+                            .computeIfAbsent(StringUtils.trimToEmpty(config.getDestination()) + "_" + schema + "-"
+                                             + tableItem.getTableName(),
+                                k -> new ConcurrentHashMap<>());
+                    }
+
                     esSyncConfigMap.put(configName, config);
                 });
             }
@@ -138,8 +151,17 @@ public class ESAdapter implements OuterAdapter {
     public void sync(Dml dml) {
         String database = dml.getDatabase();
         String table = dml.getTable();
-        Map<String, ESSyncConfig> configMap = dbTableEsSyncConfig.get(database + "-" + table);
+        Map<String, ESSyncConfig> configMap;
-        if (configMap != null) {
+        if (envProperties != null && !"tcp".equalsIgnoreCase(envProperties.getProperty("canal.conf.mode"))) {
+            configMap = dbTableEsSyncConfig
+                .get(StringUtils.trimToEmpty(dml.getDestination()) + "-" + StringUtils.trimToEmpty(dml.getGroupId())
+                     + "_" + database + "-" + table);
+        } else {
+            configMap = dbTableEsSyncConfig
+                .get(StringUtils.trimToEmpty(dml.getDestination()) + "_" + database + "-" + table);
+        }
+
+        if (configMap != null && !configMap.values().isEmpty()) {
             esSyncService.sync(configMap.values(), dml);
         }
     }
@@ -208,6 +230,9 @@ public class ESAdapter implements OuterAdapter {
 
     @Override
     public void destroy() {
+        if (esConfigMonitor != null) {
+            esConfigMonitor.destroy();
+        }
         if (transportClient != null) {
             transportClient.close();
         }
@@ -215,10 +240,6 @@ public class ESAdapter implements OuterAdapter {
 
     @Override
     public String getDestination(String task) {
-        if (esConfigMonitor != null) {
-            esConfigMonitor.destroy();
-        }
-
         ESSyncConfig config = esSyncConfig.get(task);
         if (config != null) {
             return config.getDestination();

client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/config/ESSyncConfig.java

@@ -17,6 +17,8 @@ public class ESSyncConfig {
 
     private String    outerAdapterKey; // adapter key
 
+    private String    groupId;         // group id
+
     private String    destination;     // canal destination
 
     private ESMapping esMapping;
@@ -52,6 +54,14 @@ public class ESSyncConfig {
         this.outerAdapterKey = outerAdapterKey;
     }
 
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
     public String getDestination() {
         return destination;
     }

client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/config/ESSyncConfigLoader.java

@@ -2,12 +2,12 @@ package com.alibaba.otter.canal.client.adapter.es.config;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Properties;
 
-import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.Yaml;
 
+import com.alibaba.otter.canal.client.adapter.config.YmlConfigBinder;
 import com.alibaba.otter.canal.client.adapter.support.MappingConfigsLoader;
 
 /**
@@ -20,17 +20,17 @@ public class ESSyncConfigLoader {
 
     private static Logger logger = LoggerFactory.getLogger(ESSyncConfigLoader.class);
 
-    @SuppressWarnings("unchecked")
+    public static synchronized Map<String, ESSyncConfig> load(Properties envProperties) {
-    public static synchronized Map<String, ESSyncConfig> load() {
         logger.info("## Start loading es mapping config ... ");
 
         Map<String, ESSyncConfig> esSyncConfig = new LinkedHashMap<>();
 
         Map<String, String> configContentMap = MappingConfigsLoader.loadConfigs("es");
         configContentMap.forEach((fileName, content) -> {
-            Map configMap = new Yaml().loadAs(content, Map.class); // yml自带的对象反射不是很稳定
+            ESSyncConfig config = YmlConfigBinder.bindYmlToObj(null, content, ESSyncConfig.class, null, envProperties);
-            JSONObject configJson = new JSONObject(configMap);
+            if (config == null) {
-            ESSyncConfig config = configJson.toJavaObject(ESSyncConfig.class);
+                return;
+            }
             try {
                 config.validate();
             } catch (Exception e) {

client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/config/SchemaItem.java

@@ -1,422 +1,422 @@
-package com.alibaba.otter.canal.client.adapter.es.config;
+package com.alibaba.otter.canal.client.adapter.es.config;
-
+
-import java.util.ArrayList;
+import java.util.ArrayList;
-import java.util.LinkedHashMap;
+import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.List;
-import java.util.Map;
+import java.util.Map;
-
+
-import com.alibaba.otter.canal.client.adapter.es.config.ESSyncConfig.ESMapping;
+import com.alibaba.otter.canal.client.adapter.es.config.ESSyncConfig.ESMapping;
-
+
-/**
+/**
- * ES 映射配置视图
+ * ES 映射配置视图
- *
+ *
- * @author rewerma 2018-11-01
+ * @author rewerma 2018-11-01
- * @version 1.0.0
+ * @version 1.0.0
- */
+ */
-public class SchemaItem {
+public class SchemaItem {
-
+
-    private Map<String, TableItem>                aliasTableItems = new LinkedHashMap<>(); // 别名对应表名
+    private Map<String, TableItem>                aliasTableItems = new LinkedHashMap<>(); // 别名对应表名
-    private Map<String, FieldItem>                selectFields    = new LinkedHashMap<>(); // 查询字段
+    private Map<String, FieldItem>                selectFields    = new LinkedHashMap<>(); // 查询字段
-    private String                                sql;
+    private String                                sql;
-
+
-    private volatile Map<String, List<TableItem>> tableItemAliases;
+    private volatile Map<String, List<TableItem>> tableItemAliases;
-    private volatile Map<String, List<FieldItem>> columnFields;
+    private volatile Map<String, List<FieldItem>> columnFields;
-    private volatile Boolean                      allFieldsSimple;
+    private volatile Boolean                      allFieldsSimple;
-
+
-    public void init() {
+    public void init() {
-        this.getTableItemAliases();
+        this.getTableItemAliases();
-        this.getColumnFields();
+        this.getColumnFields();
-        this.isAllFieldsSimple();
+        this.isAllFieldsSimple();
-        aliasTableItems.values().forEach(tableItem -> {
+        aliasTableItems.values().forEach(tableItem -> {
-            tableItem.getRelationTableFields();
+            tableItem.getRelationTableFields();
-            tableItem.getRelationSelectFieldItems();
+            tableItem.getRelationSelectFieldItems();
-        });
+        });
-    }
+    }
-
+
-    public Map<String, TableItem> getAliasTableItems() {
+    public Map<String, TableItem> getAliasTableItems() {
-        return aliasTableItems;
+        return aliasTableItems;
-    }
+    }
-
+
-    public void setAliasTableItems(Map<String, TableItem> aliasTableItems) {
+    public void setAliasTableItems(Map<String, TableItem> aliasTableItems) {
-        this.aliasTableItems = aliasTableItems;
+        this.aliasTableItems = aliasTableItems;
-    }
+    }
-
+
-    public String getSql() {
+    public String getSql() {
-        return sql;
+        return sql;
-    }
+    }
-
+
-    public void setSql(String sql) {
+    public void setSql(String sql) {
-        this.sql = sql;
+        this.sql = sql;
-    }
+    }
-
+
-    public Map<String, FieldItem> getSelectFields() {
+    public Map<String, FieldItem> getSelectFields() {
-        return selectFields;
+        return selectFields;
-    }
+    }
-
+
-    public void setSelectFields(Map<String, FieldItem> selectFields) {
+    public void setSelectFields(Map<String, FieldItem> selectFields) {
-        this.selectFields = selectFields;
+        this.selectFields = selectFields;
-    }
+    }
-
+
-    public Map<String, List<TableItem>> getTableItemAliases() {
+    public Map<String, List<TableItem>> getTableItemAliases() {
-        if (tableItemAliases == null) {
+        if (tableItemAliases == null) {
-            synchronized (SchemaItem.class) {
+            synchronized (SchemaItem.class) {
-                if (tableItemAliases == null) {
+                if (tableItemAliases == null) {
-                    tableItemAliases = new LinkedHashMap<>();
+                    tableItemAliases = new LinkedHashMap<>();
-                    aliasTableItems.forEach((alias, tableItem) -> {
+                    aliasTableItems.forEach((alias, tableItem) -> {
-                        List<TableItem> aliases = tableItemAliases
+                        List<TableItem> aliases = tableItemAliases
-                            .computeIfAbsent(tableItem.getTableName().toLowerCase(), k -> new ArrayList<>());
+                            .computeIfAbsent(tableItem.getTableName().toLowerCase(), k -> new ArrayList<>());
-                        aliases.add(tableItem);
+                        aliases.add(tableItem);
-                    });
+                    });
-                }
+                }
-            }
+            }
-        }
+        }
-        return tableItemAliases;
+        return tableItemAliases;
-    }
+    }
-
+
-    public Map<String, List<FieldItem>> getColumnFields() {
+    public Map<String, List<FieldItem>> getColumnFields() {
-        if (columnFields == null) {
+        if (columnFields == null) {
-            synchronized (SchemaItem.class) {
+            synchronized (SchemaItem.class) {
-                if (columnFields == null) {
+                if (columnFields == null) {
-                    columnFields = new LinkedHashMap<>();
+                    columnFields = new LinkedHashMap<>();
-                    getSelectFields()
+                    getSelectFields()
-                        .forEach((fieldName, fieldItem) -> fieldItem.getColumnItems().forEach(columnItem -> {
+                        .forEach((fieldName, fieldItem) -> fieldItem.getColumnItems().forEach(columnItem -> {
-                            TableItem tableItem = getAliasTableItems().get(columnItem.getOwner());
+                            // TableItem tableItem = getAliasTableItems().get(columnItem.getOwner());
-                            // if (!tableItem.isSubQuery()) {
+                            // if (!tableItem.isSubQuery()) {
-                            List<FieldItem> fieldItems = columnFields.computeIfAbsent(
+                            List<FieldItem> fieldItems = columnFields.computeIfAbsent(
-                                columnItem.getOwner() + "." + columnItem.getColumnName(),
+                                columnItem.getOwner() + "." + columnItem.getColumnName(),
-                                k -> new ArrayList<>());
+                                k -> new ArrayList<>());
-                            fieldItems.add(fieldItem);
+                            fieldItems.add(fieldItem);
-                            // } else {
+                            // } else {
-                            // tableItem.getSubQueryFields().forEach(subQueryField -> {
+                            // tableItem.getSubQueryFields().forEach(subQueryField -> {
-                            // List<FieldItem> fieldItems = columnFields.computeIfAbsent(
+                            // List<FieldItem> fieldItems = columnFields.computeIfAbsent(
-                            // columnItem.getOwner() + "." + subQueryField.getColumn().getColumnName(),
+                            // columnItem.getOwner() + "." + subQueryField.getColumn().getColumnName(),
-                            // k -> new ArrayList<>());
+                            // k -> new ArrayList<>());
-                            // fieldItems.add(fieldItem);
+                            // fieldItems.add(fieldItem);
-                            // });
+                            // });
-                            // }
+                            // }
-                        }));
+                        }));
-                }
+                }
-            }
+            }
-        }
+        }
-        return columnFields;
+        return columnFields;
-    }
+    }
-
+
-    public boolean isAllFieldsSimple() {
+    public boolean isAllFieldsSimple() {
-        if (allFieldsSimple == null) {
+        if (allFieldsSimple == null) {
-            synchronized (SchemaItem.class) {
+            synchronized (SchemaItem.class) {
-                if (allFieldsSimple == null) {
+                if (allFieldsSimple == null) {
-                    allFieldsSimple = true;
+                    allFieldsSimple = true;
-
+
-                    for (FieldItem fieldItem : getSelectFields().values()) {
+                    for (FieldItem fieldItem : getSelectFields().values()) {
-                        if (fieldItem.isMethod() || fieldItem.isBinaryOp()) {
+                        if (fieldItem.isMethod() || fieldItem.isBinaryOp()) {
-                            allFieldsSimple = false;
+                            allFieldsSimple = false;
-                            break;
+                            break;
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-
+
-        return allFieldsSimple;
+        return allFieldsSimple;
-    }
+    }
-
+
-    public TableItem getMainTable() {
+    public TableItem getMainTable() {
-        if (!aliasTableItems.isEmpty()) {
+        if (!aliasTableItems.isEmpty()) {
-            return aliasTableItems.values().iterator().next();
+            return aliasTableItems.values().iterator().next();
-        } else {
+        } else {
-            return null;
+            return null;
-        }
+        }
-    }
+    }
-
+
-    public FieldItem getIdFieldItem(ESMapping mapping) {
+    public FieldItem getIdFieldItem(ESMapping mapping) {
-        if (mapping.get_id() != null) {
+        if (mapping.get_id() != null) {
-            return getSelectFields().get(mapping.get_id());
+            return getSelectFields().get(mapping.get_id());
-        } else {
+        } else {
-            return getSelectFields().get(mapping.getPk());
+            return getSelectFields().get(mapping.getPk());
-        }
+        }
-    }
+    }
-
+
-    public static class TableItem {
+    public static class TableItem {
-
+
-        private SchemaItem                               schemaItem;
+        private SchemaItem                               schemaItem;
-
+
-        private String                                   schema;
+        private String                                   schema;
-        private String                                   tableName;
+        private String                                   tableName;
-        private String                                   alias;
+        private String                                   alias;
-        private String                                   subQuerySql;
+        private String                                   subQuerySql;
-        private List<FieldItem>                          subQueryFields = new ArrayList<>();
+        private List<FieldItem>                          subQueryFields = new ArrayList<>();
-        private List<RelationFieldsPair>                 relationFields = new ArrayList<>();
+        private List<RelationFieldsPair>                 relationFields = new ArrayList<>();
-
+
-        private boolean                                  main;
+        private boolean                                  main;
-        private boolean                                  subQuery;
+        private boolean                                  subQuery;
-
+
-        private volatile Map<FieldItem, List<FieldItem>> relationTableFields;               // 当前表关联条件字段对应主表查询字段
+        private volatile Map<FieldItem, List<FieldItem>> relationTableFields;               // 当前表关联条件字段对应主表查询字段
-        private volatile List<FieldItem>                 relationSelectFieldItems;          // 子表所在主表的查询字段
+        private volatile List<FieldItem>                 relationSelectFieldItems;          // 子表所在主表的查询字段
-
+
-        public TableItem(SchemaItem schemaItem){
+        public TableItem(SchemaItem schemaItem){
-            this.schemaItem = schemaItem;
+            this.schemaItem = schemaItem;
-        }
+        }
-
+
-        public SchemaItem getSchemaItem() {
+        public SchemaItem getSchemaItem() {
-            return schemaItem;
+            return schemaItem;
-        }
+        }
-
+
-        public void setSchemaItem(SchemaItem schemaItem) {
+        public void setSchemaItem(SchemaItem schemaItem) {
-            this.schemaItem = schemaItem;
+            this.schemaItem = schemaItem;
-        }
+        }
-
+
-        public String getSchema() {
+        public String getSchema() {
-            return schema;
+            return schema;
-        }
+        }
-
+
-        public void setSchema(String schema) {
+        public void setSchema(String schema) {
-            this.schema = schema;
+            this.schema = schema;
-        }
+        }
-
+
-        public String getTableName() {
+        public String getTableName() {
-            return tableName;
+            return tableName;
-        }
+        }
-
+
-        public void setTableName(String tableName) {
+        public void setTableName(String tableName) {
-            this.tableName = tableName;
+            this.tableName = tableName;
-        }
+        }
-
+
-        public String getAlias() {
+        public String getAlias() {
-            return alias;
+            return alias;
-        }
+        }
-
+
-        public void setAlias(String alias) {
+        public void setAlias(String alias) {
-            this.alias = alias;
+            this.alias = alias;
-        }
+        }
-
+
-        public String getSubQuerySql() {
+        public String getSubQuerySql() {
-            return subQuerySql;
+            return subQuerySql;
-        }
+        }
-
+
-        public void setSubQuerySql(String subQuerySql) {
+        public void setSubQuerySql(String subQuerySql) {
-            this.subQuerySql = subQuerySql;
+            this.subQuerySql = subQuerySql;
-        }
+        }
-
+
-        public boolean isMain() {
+        public boolean isMain() {
-            return main;
+            return main;
-        }
+        }
-
+
-        public void setMain(boolean main) {
+        public void setMain(boolean main) {
-            this.main = main;
+            this.main = main;
-        }
+        }
-
+
-        public boolean isSubQuery() {
+        public boolean isSubQuery() {
-            return subQuery;
+            return subQuery;
-        }
+        }
-
+
-        public void setSubQuery(boolean subQuery) {
+        public void setSubQuery(boolean subQuery) {
-            this.subQuery = subQuery;
+            this.subQuery = subQuery;
-        }
+        }
-
+
-        public List<FieldItem> getSubQueryFields() {
+        public List<FieldItem> getSubQueryFields() {
-            return subQueryFields;
+            return subQueryFields;
-        }
+        }
-
+
-        public void setSubQueryFields(List<FieldItem> subQueryFields) {
+        public void setSubQueryFields(List<FieldItem> subQueryFields) {
-            this.subQueryFields = subQueryFields;
+            this.subQueryFields = subQueryFields;
-        }
+        }
-
+
-        public List<RelationFieldsPair> getRelationFields() {
+        public List<RelationFieldsPair> getRelationFields() {
-            return relationFields;
+            return relationFields;
-        }
+        }
-
+
-        public void setRelationFields(List<RelationFieldsPair> relationFields) {
+        public void setRelationFields(List<RelationFieldsPair> relationFields) {
-            this.relationFields = relationFields;
+            this.relationFields = relationFields;
-        }
+        }
-
+
-        public Map<FieldItem, List<FieldItem>> getRelationTableFields() {
+        public Map<FieldItem, List<FieldItem>> getRelationTableFields() {
-            if (relationTableFields == null) {
+            if (relationTableFields == null) {
-                synchronized (SchemaItem.class) {
+                synchronized (SchemaItem.class) {
-                    if (relationTableFields == null) {
+                    if (relationTableFields == null) {
-                        relationTableFields = new LinkedHashMap<>();
+                        relationTableFields = new LinkedHashMap<>();
-
+
-                        getRelationFields().forEach(relationFieldsPair -> {
+                        getRelationFields().forEach(relationFieldsPair -> {
-                            FieldItem leftFieldItem = relationFieldsPair.getLeftFieldItem();
+                            FieldItem leftFieldItem = relationFieldsPair.getLeftFieldItem();
-                            FieldItem rightFieldItem = relationFieldsPair.getRightFieldItem();
+                            FieldItem rightFieldItem = relationFieldsPair.getRightFieldItem();
-                            FieldItem currentTableRelField = null;
+                            FieldItem currentTableRelField = null;
-                            if (getAlias().equals(leftFieldItem.getOwner())) {
+                            if (getAlias().equals(leftFieldItem.getOwner())) {
-                                currentTableRelField = leftFieldItem;
+                                currentTableRelField = leftFieldItem;
-                            } else if (getAlias().equals(rightFieldItem.getOwner())) {
+                            } else if (getAlias().equals(rightFieldItem.getOwner())) {
-                                currentTableRelField = rightFieldItem;
+                                currentTableRelField = rightFieldItem;
-                            }
+                            }
-
+
-                            if (currentTableRelField != null) {
+                            if (currentTableRelField != null) {
-                                List<FieldItem> selectFieldItem = getSchemaItem().getColumnFields()
+                                List<FieldItem> selectFieldItem = getSchemaItem().getColumnFields()
-                                    .get(leftFieldItem.getOwner() + "." + leftFieldItem.getColumn().getColumnName());
+                                    .get(leftFieldItem.getOwner() + "." + leftFieldItem.getColumn().getColumnName());
-                                if (selectFieldItem != null && !selectFieldItem.isEmpty()) {
+                                if (selectFieldItem != null && !selectFieldItem.isEmpty()) {
-                                    relationTableFields.put(currentTableRelField, selectFieldItem);
+                                    relationTableFields.put(currentTableRelField, selectFieldItem);
-                                } else {
+                                } else {
-                                    selectFieldItem = getSchemaItem().getColumnFields()
+                                    selectFieldItem = getSchemaItem().getColumnFields()
-                                        .get(rightFieldItem.getOwner() + "."
+                                        .get(rightFieldItem.getOwner() + "."
-                                             + rightFieldItem.getColumn().getColumnName());
+                                             + rightFieldItem.getColumn().getColumnName());
-                                    if (selectFieldItem != null && !selectFieldItem.isEmpty()) {
+                                    if (selectFieldItem != null && !selectFieldItem.isEmpty()) {
-                                        relationTableFields.put(currentTableRelField, selectFieldItem);
+                                        relationTableFields.put(currentTableRelField, selectFieldItem);
-                                    } else {
+                                    } else {
-                                        throw new UnsupportedOperationException(
+                                        throw new UnsupportedOperationException(
-                                            "Relation condition column must in select columns.");
+                                            "Relation condition column must in select columns.");
-                                    }
+                                    }
-                                }
+                                }
-                            }
+                            }
-                        });
+                        });
-                    }
+                    }
-                }
+                }
-            }
+            }
-            return relationTableFields;
+            return relationTableFields;
-        }
+        }
-
+
-        public List<FieldItem> getRelationSelectFieldItems() {
+        public List<FieldItem> getRelationSelectFieldItems() {
-            if (relationSelectFieldItems == null) {
+            if (relationSelectFieldItems == null) {
-                synchronized (SchemaItem.class) {
+                synchronized (SchemaItem.class) {
-                    if (relationSelectFieldItems == null) {
+                    if (relationSelectFieldItems == null) {
-                        relationSelectFieldItems = new ArrayList<>();
+                        relationSelectFieldItems = new ArrayList<>();
-                        for (FieldItem fieldItem : schemaItem.getSelectFields().values()) {
+                        for (FieldItem fieldItem : schemaItem.getSelectFields().values()) {
-                            if (fieldItem.getOwners().contains(getAlias())) {
+                            if (fieldItem.getOwners().contains(getAlias())) {
-                                relationSelectFieldItems.add(fieldItem);
+                                relationSelectFieldItems.add(fieldItem);
-                            }
+                            }
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-            return relationSelectFieldItems;
+            return relationSelectFieldItems;
-        }
+        }
-    }
+    }
-
+
-    public static class RelationFieldsPair {
+    public static class RelationFieldsPair {
-
+
-        private FieldItem leftFieldItem;
+        private FieldItem leftFieldItem;
-        private FieldItem rightFieldItem;
+        private FieldItem rightFieldItem;
-
+
-        public RelationFieldsPair(FieldItem leftFieldItem, FieldItem rightFieldItem){
+        public RelationFieldsPair(FieldItem leftFieldItem, FieldItem rightFieldItem){
-            this.leftFieldItem = leftFieldItem;
+            this.leftFieldItem = leftFieldItem;
-            this.rightFieldItem = rightFieldItem;
+            this.rightFieldItem = rightFieldItem;
-        }
+        }
-
+
-        public FieldItem getLeftFieldItem() {
+        public FieldItem getLeftFieldItem() {
-            return leftFieldItem;
+            return leftFieldItem;
-        }
+        }
-
+
-        public void setLeftFieldItem(FieldItem leftFieldItem) {
+        public void setLeftFieldItem(FieldItem leftFieldItem) {
-            this.leftFieldItem = leftFieldItem;
+            this.leftFieldItem = leftFieldItem;
-        }
+        }
-
+
-        public FieldItem getRightFieldItem() {
+        public FieldItem getRightFieldItem() {
-            return rightFieldItem;
+            return rightFieldItem;
-        }
+        }
-
+
-        public void setRightFieldItem(FieldItem rightFieldItem) {
+        public void setRightFieldItem(FieldItem rightFieldItem) {
-            this.rightFieldItem = rightFieldItem;
+            this.rightFieldItem = rightFieldItem;
-        }
+        }
-    }
+    }
-
+
-    public static class FieldItem {
+    public static class FieldItem {
-
+
-        private String           fieldName;
+        private String           fieldName;
-        private List<ColumnItem> columnItems = new ArrayList<>();
+        private List<ColumnItem> columnItems = new ArrayList<>();
-        private List<String>     owners      = new ArrayList<>();
+        private List<String>     owners      = new ArrayList<>();
-
+
-        private boolean          method;
+        private boolean          method;
-        private boolean          binaryOp;
+        private boolean          binaryOp;
-
+
-        public String getFieldName() {
+        public String getFieldName() {
-            return fieldName;
+            return fieldName;
-        }
+        }
-
+
-        public void setFieldName(String fieldName) {
+        public void setFieldName(String fieldName) {
-            this.fieldName = fieldName;
+            this.fieldName = fieldName;
-        }
+        }
-
+
-        public List<ColumnItem> getColumnItems() {
+        public List<ColumnItem> getColumnItems() {
-            return columnItems;
+            return columnItems;
-        }
+        }
-
+
-        public void setColumnItems(List<ColumnItem> columnItems) {
+        public void setColumnItems(List<ColumnItem> columnItems) {
-            this.columnItems = columnItems;
+            this.columnItems = columnItems;
-        }
+        }
-
+
-        public boolean isMethod() {
+        public boolean isMethod() {
-            return method;
+            return method;
-        }
+        }
-
+
-        public void setMethod(boolean method) {
+        public void setMethod(boolean method) {
-            this.method = method;
+            this.method = method;
-        }
+        }
-
+
-        public boolean isBinaryOp() {
+        public boolean isBinaryOp() {
-            return binaryOp;
+            return binaryOp;
-        }
+        }
-
+
-        public void setBinaryOp(boolean binaryOp) {
+        public void setBinaryOp(boolean binaryOp) {
-            this.binaryOp = binaryOp;
+            this.binaryOp = binaryOp;
-        }
+        }
-
+
-        public List<String> getOwners() {
+        public List<String> getOwners() {
-            return owners;
+            return owners;
-        }
+        }
-
+
-        public void setOwners(List<String> owners) {
+        public void setOwners(List<String> owners) {
-            this.owners = owners;
+            this.owners = owners;
-        }
+        }
-
+
-        public void addColumn(ColumnItem columnItem) {
+        public void addColumn(ColumnItem columnItem) {
-            columnItems.add(columnItem);
+            columnItems.add(columnItem);
-        }
+        }
-
+
-        public ColumnItem getColumn() {
+        public ColumnItem getColumn() {
-            if (!columnItems.isEmpty()) {
+            if (!columnItems.isEmpty()) {
-                return columnItems.get(0);
+                return columnItems.get(0);
-            } else {
+            } else {
-                return null;
+                return null;
-            }
+            }
-        }
+        }
-
+
-        public String getOwner() {
+        public String getOwner() {
-            if (!owners.isEmpty()) {
+            if (!owners.isEmpty()) {
-                return owners.get(0);
+                return owners.get(0);
-            } else {
+            } else {
-                return null;
+                return null;
-            }
+            }
-        }
+        }
-
+
-        @Override
+        @Override
-        public boolean equals(Object o) {
+        public boolean equals(Object o) {
-            if (this == o) return true;
+            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
+            if (o == null || getClass() != o.getClass()) return false;
-
+
-            FieldItem fieldItem = (FieldItem) o;
+            FieldItem fieldItem = (FieldItem) o;
-
+
-            return fieldName != null ? fieldName.equals(fieldItem.fieldName) : fieldItem.fieldName == null;
+            return fieldName != null ? fieldName.equals(fieldItem.fieldName) : fieldItem.fieldName == null;
-        }
+        }
-
+
-        @Override
+        @Override
-        public int hashCode() {
+        public int hashCode() {
-            return fieldName != null ? fieldName.hashCode() : 0;
+            return fieldName != null ? fieldName.hashCode() : 0;
-        }
+        }
-    }
+    }
-
+
-    public static class ColumnItem {
+    public static class ColumnItem {
-
+
-        private String owner;
+        private String owner;
-        private String columnName;
+        private String columnName;
-
+
-        public String getOwner() {
+        public String getOwner() {
-            return owner;
+            return owner;
-        }
+        }
-
+
-        public void setOwner(String owner) {
+        public void setOwner(String owner) {
-            this.owner = owner;
+            this.owner = owner;
-        }
+        }
-
+
-        public String getColumnName() {
+        public String getColumnName() {
-            return columnName;
+            return columnName;
-        }
+        }
-
+
-        public void setColumnName(String columnName) {
+        public void setColumnName(String columnName) {
-            this.columnName = columnName;
+            this.columnName = columnName;
-        }
+        }
-    }
+    }
-}
+}

client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/support/ESTemplate.java

@@ -58,7 +58,7 @@ public class ESTemplate {
 
     /**
      * 插入数据
-     * 
+     *
      * @param mapping
      * @param pkVal
      * @param esFieldData
@@ -88,7 +88,7 @@ public class ESTemplate {
 
     /**
      * 根据主键更新数据
-     * 
+     *
      * @param mapping
      * @param pkVal
      * @param esFieldData
@@ -191,7 +191,7 @@ public class ESTemplate {
         StringBuilder sb = new StringBuilder();
         esFieldData.forEach((key, value) -> {
             if (value instanceof Map) {
-                HashMap mapValue = (HashMap) value;
+                Map<?, ?> mapValue = (Map<?, ?>) value;
                 if (mapValue.containsKey("lon") && mapValue.containsKey("lat") && mapValue.size() == 2) {
                     sb.append("ctx._source")
                         .append("['")
@@ -461,7 +461,7 @@ public class ESTemplate {
                 resultIdVal = getValFromData(mapping, dmlData, fieldItem.getFieldName(), columnName);
             }
 
-            if (dmlOld.get(columnName) != null && !mapping.getSkips().contains(fieldItem.getFieldName())) {
+            if (dmlOld.containsKey(columnName) && !mapping.getSkips().contains(fieldItem.getFieldName())) {
                 esFieldData.put(fieldItem.getFieldName(),
                     getValFromData(mapping, dmlData, fieldItem.getFieldName(), columnName));
             }

client-adapter/elasticsearch/src/main/resources/es/mytest_user.yml

@@ -1,15 +1,14 @@
 dataSourceKey: defaultDS
 destination: example
+groupId: g1
 esMapping:
   _index: mytest_user
   _type: _doc
   _id: _id
 #  pk: id
   sql: "select a.id as _id, a.name as _name, a.role_id as _role_id, b.role_name as _role_name,
-        a.c_time as _c_time, c.labels as _labels from user a
+        a.c_time as _c_time from user a
-        left join role b on b.id=a.role_id
+        left join role b on b.id=a.role_id"
-        left join (select user_id, group_concat(label order by id desc separator ';') as labels from label
-        group by user_id) c on c.user_id=a.id"
 #  objFields:
 #    _labels: array:;
   etlCondition: "where a.c_time>='{0}'"

client-adapter/elasticsearch/src/test/java/com/alibaba/otter/canal/client/adapter/es/test/ConfigLoadTest.java

@@ -21,7 +21,7 @@ public class ConfigLoadTest {
 
     @Test
     public void testLoad() {
-        Map<String, ESSyncConfig> configMap = ESSyncConfigLoader.load();
+        Map<String, ESSyncConfig> configMap = ESSyncConfigLoader.load(null);
         ESSyncConfig config = configMap.get("mytest_user.yml");
         Assert.assertNotNull(config);
         Assert.assertEquals("defaultDS", config.getDataSourceKey());

client-adapter/elasticsearch/src/test/java/com/alibaba/otter/canal/client/adapter/es/test/sync/Common.java

@@ -26,7 +26,7 @@ public class Common {
         outerAdapterConfig.setProperties(properties);
 
         ESAdapter esAdapter = new ESAdapter();
-        esAdapter.init(outerAdapterConfig);
+        esAdapter.init(outerAdapterConfig, null);
         return esAdapter;
     }
 

client-adapter/hbase/pom.xml

@@ -17,12 +17,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.19</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-client</artifactId>

client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/HbaseAdapter.java

@@ -1,10 +1,7 @@
 package com.alibaba.otter.canal.client.adapter.hbase;
 
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.sql.DataSource;
@@ -49,6 +46,8 @@ public class HbaseAdapter implements OuterAdapter {
 
     private HbaseConfigMonitor                      configMonitor;
 
+    private Properties                              envProperties;
+
     public Map<String, MappingConfig> getHbaseMapping() {
         return hbaseMapping;
     }
@@ -58,9 +57,10 @@ public class HbaseAdapter implements OuterAdapter {
     }
 
     @Override
-    public void init(OuterAdapterConfig configuration) {
+    public void init(OuterAdapterConfig configuration, Properties envProperties) {
         try {
-            Map<String, MappingConfig> hbaseMappingTmp = MappingConfigLoader.load();
+            this.envProperties = envProperties;
+            Map<String, MappingConfig> hbaseMappingTmp = MappingConfigLoader.load(envProperties);
             // 过滤不匹配的key的配置
             hbaseMappingTmp.forEach((key, mappingConfig) -> {
                 if ((mappingConfig.getOuterAdapterKey() == null && configuration.getKey() == null)
@@ -72,10 +72,19 @@ public class HbaseAdapter implements OuterAdapter {
             for (Map.Entry<String, MappingConfig> entry : hbaseMapping.entrySet()) {
                 String configName = entry.getKey();
                 MappingConfig mappingConfig = entry.getValue();
-                String k = StringUtils.trimToEmpty(mappingConfig.getDestination()) + "."
+                String k;
-                           + mappingConfig.getHbaseMapping().getDatabase() + "."
+                if (envProperties != null && !"tcp".equalsIgnoreCase(envProperties.getProperty("canal.conf.mode"))) {
-                           + mappingConfig.getHbaseMapping().getTable();
+                    k = StringUtils.trimToEmpty(mappingConfig.getDestination()) + "-"
-                Map<String, MappingConfig> configMap = mappingConfigCache.computeIfAbsent(k, k1 -> new HashMap<>());
+                        + StringUtils.trimToEmpty(mappingConfig.getGroupId()) + "_"
+                        + mappingConfig.getHbaseMapping().getDatabase() + "-"
+                        + mappingConfig.getHbaseMapping().getTable();
+                } else {
+                    k = StringUtils.trimToEmpty(mappingConfig.getDestination()) + "_"
+                        + mappingConfig.getHbaseMapping().getDatabase() + "-"
+                        + mappingConfig.getHbaseMapping().getTable();
+                }
+                Map<String, MappingConfig> configMap = mappingConfigCache.computeIfAbsent(k,
+                    k1 -> new ConcurrentHashMap<>());
                 configMap.put(configName, mappingConfig);
             }
 
@@ -107,11 +116,29 @@ public class HbaseAdapter implements OuterAdapter {
             return;
         }
         String destination = StringUtils.trimToEmpty(dml.getDestination());
+        String groupId = StringUtils.trimToEmpty(dml.getGroupId());
         String database = dml.getDatabase();
         String table = dml.getTable();
-        Map<String, MappingConfig> configMap = mappingConfigCache.get(destination + "." + database + "." + table);
+        Map<String, MappingConfig> configMap;
+        if (envProperties != null && !"tcp".equalsIgnoreCase(envProperties.getProperty("canal.conf.mode"))) {
+            configMap = mappingConfigCache.get(destination + "-" + groupId + "_" + database + "-" + table);
+        } else {
+            configMap = mappingConfigCache.get(destination + "_" + database + "-" + table);
+        }
         if (configMap != null) {
-            configMap.values().forEach(config -> hbaseSyncService.sync(config, dml));
+            List<MappingConfig> configs = new ArrayList<>();
+            configMap.values().forEach(config -> {
+                if (StringUtils.isNotEmpty(config.getGroupId())) {
+                    if (config.getGroupId().equals(dml.getGroupId())) {
+                        configs.add(config);
+                    }
+                } else {
+                    configs.add(config);
+                }
+            });
+            if (!configs.isEmpty()) {
+                configs.forEach(config -> hbaseSyncService.sync(config, dml));
+            }
         }
     }
 

client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/config/MappingConfig.java

@@ -14,6 +14,8 @@ public class MappingConfig {
 
     private String       outerAdapterKey; // adapter key
 
+    private String       groupId;         // groupId
+
     private String       destination;     // canal实例或MQ的topic
 
     private HbaseMapping hbaseMapping;    // hbase映射配置
@@ -26,6 +28,14 @@ public class MappingConfig {
         this.dataSourceKey = dataSourceKey;
     }
 
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
     public String getOuterAdapterKey() {
         return outerAdapterKey;
     }

client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/config/MappingConfigLoader.java

@@ -2,12 +2,12 @@ package com.alibaba.otter.canal.client.adapter.hbase.config;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Properties;
 
-import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.Yaml;
 
+import com.alibaba.otter.canal.client.adapter.config.YmlConfigBinder;
 import com.alibaba.otter.canal.client.adapter.support.MappingConfigsLoader;
 
 /**
@@ -25,17 +25,18 @@ public class MappingConfigLoader {
      *
      * @return 配置名/配置文件名--对象
      */
-    @SuppressWarnings("unchecked")
+    public static Map<String, MappingConfig> load(Properties envProperties) {
-    public static Map<String, MappingConfig> load() {
         logger.info("## Start loading hbase mapping config ... ");
 
         Map<String, MappingConfig> result = new LinkedHashMap<>();
 
         Map<String, String> configContentMap = MappingConfigsLoader.loadConfigs("hbase");
         configContentMap.forEach((fileName, content) -> {
-            Map configMap = new Yaml().loadAs(content, Map.class); // yml自带的对象反射不是很稳定
+            MappingConfig config = YmlConfigBinder
-            JSONObject configJson = new JSONObject(configMap);
+                .bindYmlToObj(null, content, MappingConfig.class, null, envProperties);
-            MappingConfig config = configJson.toJavaObject(MappingConfig.class);
+            if (config == null) {
+                return;
+            }
             try {
                 config.validate();
             } catch (Exception e) {

client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/service/HbaseEtlService.java

@@ -1,392 +1,397 @@
-package com.alibaba.otter.canal.client.adapter.hbase.service;
+package com.alibaba.otter.canal.client.adapter.hbase.service;
-
+
-import java.sql.*;
+import java.sql.ResultSetMetaData;
-import java.text.SimpleDateFormat;
+import java.sql.Timestamp;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.ArrayList;
-import java.util.List;
+import java.util.Date;
-import java.util.concurrent.ExecutorService;
+import java.util.List;
-import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
+import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
+import java.util.concurrent.atomic.AtomicLong;
-
+
-import javax.sql.DataSource;
+import javax.sql.DataSource;
-
+
-import com.alibaba.otter.canal.client.adapter.support.Util;
+import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.Bytes;
+import org.slf4j.Logger;
-import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.slf4j.LoggerFactory;
+
-
+import com.alibaba.otter.canal.client.adapter.hbase.config.MappingConfig;
-import com.alibaba.otter.canal.client.adapter.hbase.config.MappingConfig;
+import com.alibaba.otter.canal.client.adapter.hbase.support.HRow;
-import com.alibaba.otter.canal.client.adapter.hbase.support.*;
+import com.alibaba.otter.canal.client.adapter.hbase.support.HbaseTemplate;
-import com.alibaba.otter.canal.client.adapter.support.EtlResult;
+import com.alibaba.otter.canal.client.adapter.hbase.support.PhType;
-import com.alibaba.otter.canal.client.adapter.support.JdbcTypeUtil;
+import com.alibaba.otter.canal.client.adapter.hbase.support.PhTypeUtil;
-import com.google.common.base.Joiner;
+import com.alibaba.otter.canal.client.adapter.hbase.support.Type;
-
+import com.alibaba.otter.canal.client.adapter.hbase.support.TypeUtil;
-/**
+import com.alibaba.otter.canal.client.adapter.support.EtlResult;
- * HBase ETL 操作业务类
+import com.alibaba.otter.canal.client.adapter.support.JdbcTypeUtil;
- *
+import com.alibaba.otter.canal.client.adapter.support.Util;
- * @author rewerma @ 2018-10-20
+import com.google.common.base.Joiner;
- * @version 1.0.0
+
- */
+/**
-public class HbaseEtlService {
+ * HBase ETL 操作业务类
-
+ *
-    private static Logger logger = LoggerFactory.getLogger(HbaseEtlService.class);
+ * @author rewerma @ 2018-10-20
-
+ * @version 1.0.0
-
+ */
-    /**
+public class HbaseEtlService {
-     * 建表
+
-     * 
+    private static Logger logger = LoggerFactory.getLogger(HbaseEtlService.class);
-     * @param hbaseTemplate
+
-     * @param config
+
-     */
+    /**
-    public static void createTable(HbaseTemplate hbaseTemplate, MappingConfig config) {
+     * 建表
-        try {
+     * 
-            // 判断hbase表是否存在，不存在则建表
+     * @param hbaseTemplate
-            MappingConfig.HbaseMapping hbaseMapping = config.getHbaseMapping();
+     * @param config
-            if (!hbaseTemplate.tableExists(hbaseMapping.getHbaseTable())) {
+     */
-                hbaseTemplate.createTable(hbaseMapping.getHbaseTable(), hbaseMapping.getFamily());
+    public static void createTable(HbaseTemplate hbaseTemplate, MappingConfig config) {
-            }
+        try {
-        } catch (Exception e) {
+            // 判断hbase表是否存在，不存在则建表
-            logger.error(e.getMessage(), e);
+            MappingConfig.HbaseMapping hbaseMapping = config.getHbaseMapping();
-            throw new RuntimeException(e);
+            if (!hbaseTemplate.tableExists(hbaseMapping.getHbaseTable())) {
-        }
+                hbaseTemplate.createTable(hbaseMapping.getHbaseTable(), hbaseMapping.getFamily());
-    }
+            }
-
+        } catch (Exception e) {
-    /**
+            logger.error(e.getMessage(), e);
-     * 导入数据
+            throw new RuntimeException(e);
-     * 
+        }
-     * @param ds 数据源
+    }
-     * @param hbaseTemplate hbaseTemplate
+
-     * @param config 配置
+    /**
-     * @param params 筛选条件
+     * 导入数据
-     * @return 导入结果
+     * 
-     */
+     * @param ds 数据源
-    public static EtlResult importData(DataSource ds, HbaseTemplate hbaseTemplate, MappingConfig config,
+     * @param hbaseTemplate hbaseTemplate
-                                       List<String> params) {
+     * @param config 配置
-        EtlResult etlResult = new EtlResult();
+     * @param params 筛选条件
-        AtomicLong successCount = new AtomicLong();
+     * @return 导入结果
-        List<String> errMsg = new ArrayList<>();
+     */
-        String hbaseTable = "";
+    public static EtlResult importData(DataSource ds, HbaseTemplate hbaseTemplate, MappingConfig config,
-        try {
+                                       List<String> params) {
-            if (config == null) {
+        EtlResult etlResult = new EtlResult();
-                logger.error("Config is null!");
+        AtomicLong successCount = new AtomicLong();
-                etlResult.setSucceeded(false);
+        List<String> errMsg = new ArrayList<>();
-                etlResult.setErrorMessage("Config is null!");
+        String hbaseTable = "";
-                return etlResult;
+        try {
-            }
+            if (config == null) {
-            MappingConfig.HbaseMapping hbaseMapping = config.getHbaseMapping();
+                logger.error("Config is null!");
-            hbaseTable = hbaseMapping.getHbaseTable();
+                etlResult.setSucceeded(false);
-
+                etlResult.setErrorMessage("Config is null!");
-            long start = System.currentTimeMillis();
+                return etlResult;
-
+            }
-            if (params != null && params.size() == 1 && "rebuild".equalsIgnoreCase(params.get(0))) {
+            MappingConfig.HbaseMapping hbaseMapping = config.getHbaseMapping();
-                logger.info(hbaseMapping.getHbaseTable() + " rebuild is starting!");
+            hbaseTable = hbaseMapping.getHbaseTable();
-                // 如果表存在则删除
+
-                if (hbaseTemplate.tableExists(hbaseMapping.getHbaseTable())) {
+            long start = System.currentTimeMillis();
-                    hbaseTemplate.disableTable(hbaseMapping.getHbaseTable());
+
-                    hbaseTemplate.deleteTable(hbaseMapping.getHbaseTable());
+            if (params != null && params.size() == 1 && "rebuild".equalsIgnoreCase(params.get(0))) {
-                }
+                logger.info(hbaseMapping.getHbaseTable() + " rebuild is starting!");
-                params = null;
+                // 如果表存在则删除
-            } else {
+                if (hbaseTemplate.tableExists(hbaseMapping.getHbaseTable())) {
-                logger.info(hbaseMapping.getHbaseTable() + " etl is starting!");
+                    hbaseTemplate.disableTable(hbaseMapping.getHbaseTable());
-            }
+                    hbaseTemplate.deleteTable(hbaseMapping.getHbaseTable());
-            createTable(hbaseTemplate, config);
+                }
-
+                params = null;
-            // 拼接sql
+            } else {
-            String sql = "SELECT * FROM " + config.getHbaseMapping().getDatabase() + "." + hbaseMapping.getTable();
+                logger.info(hbaseMapping.getHbaseTable() + " etl is starting!");
-
+            }
-            // 拼接条件
+            createTable(hbaseTemplate, config);
-            if (params != null && params.size() == 1 && hbaseMapping.getEtlCondition() == null) {
+
-                AtomicBoolean stExists = new AtomicBoolean(false);
+            // 拼接sql
-                // 验证是否有SYS_TIME字段
+            String sql = "SELECT * FROM " + config.getHbaseMapping().getDatabase() + "." + hbaseMapping.getTable();
-                Util.sqlRS(ds, sql, rs -> {
+
-                    try {
+            // 拼接条件
-                        ResultSetMetaData rsmd = rs.getMetaData();
+            if (params != null && params.size() == 1 && hbaseMapping.getEtlCondition() == null) {
-                        int cnt = rsmd.getColumnCount();
+                AtomicBoolean stExists = new AtomicBoolean(false);
-                        for (int i = 1; i <= cnt; i++) {
+                // 验证是否有SYS_TIME字段
-                            String columnName = rsmd.getColumnName(i);
+                Util.sqlRS(ds, sql, rs -> {
-                            if ("SYS_TIME".equalsIgnoreCase(columnName)) {
+                    try {
-                                stExists.set(true);
+                        ResultSetMetaData rsmd = rs.getMetaData();
-                                break;
+                        int cnt = rsmd.getColumnCount();
-                            }
+                        for (int i = 1; i <= cnt; i++) {
-                        }
+                            String columnName = rsmd.getColumnName(i);
-                    } catch (Exception e) {
+                            if ("SYS_TIME".equalsIgnoreCase(columnName)) {
-                        // ignore
+                                stExists.set(true);
-                    }
+                                break;
-                    return null;
+                            }
-                });
+                        }
-                if (stExists.get()) {
+                    } catch (Exception e) {
-                    sql += " WHERE SYS_TIME >= '" + params.get(0) + "' ";
+                        // ignore
-                }
+                    }
-            } else if (hbaseMapping.getEtlCondition() != null && params != null) {
+                    return null;
-                String etlCondition = hbaseMapping.getEtlCondition();
+                });
-                int size = params.size();
+                if (stExists.get()) {
-                for (int i = 0; i < size; i++) {
+                    sql += " WHERE SYS_TIME >= '" + params.get(0) + "' ";
-                    etlCondition = etlCondition.replace("{" + i + "}", params.get(i));
+                }
-                }
+            } else if (hbaseMapping.getEtlCondition() != null && params != null) {
-
+                String etlCondition = hbaseMapping.getEtlCondition();
-                sql += " " + etlCondition;
+                int size = params.size();
-            }
+                for (int i = 0; i < size; i++) {
-
+                    etlCondition = etlCondition.replace("{" + i + "}", params.get(i));
-            // 获取总数
+                }
-            String countSql = "SELECT COUNT(1) FROM ( " + sql + ") _CNT ";
+
-            long cnt = (Long) Util.sqlRS(ds, countSql, rs -> {
+                sql += " " + etlCondition;
-                Long count = null;
+            }
-                try {
+
-                    if (rs.next()) {
+            // 获取总数
-                        count = ((Number) rs.getObject(1)).longValue();
+            String countSql = "SELECT COUNT(1) FROM ( " + sql + ") _CNT ";
-                    }
+            long cnt = (Long) Util.sqlRS(ds, countSql, rs -> {
-                } catch (Exception e) {
+                Long count = null;
-                    logger.error(e.getMessage(), e);
+                try {
-                }
+                    if (rs.next()) {
-                return count == null ? 0 : count;
+                        count = ((Number) rs.getObject(1)).longValue();
-            });
+                    }
-
+                } catch (Exception e) {
-            // 当大于1万条记录时开启多线程
+                    logger.error(e.getMessage(), e);
-            if (cnt >= 10000) {
+                }
-                int threadCount = 3;
+                return count == null ? 0 : count;
-                long perThreadCnt = cnt / threadCount;
+            });
-                ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+
-                List<Future<Boolean>> futures = new ArrayList<>(threadCount);
+            // 当大于1万条记录时开启多线程
-                for (int i = 0; i < threadCount; i++) {
+            if (cnt >= 10000) {
-                    long offset = i * perThreadCnt;
+                int threadCount = 3;
-                    Long size = null;
+                long perThreadCnt = cnt / threadCount;
-                    if (i != threadCount - 1) {
+                ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-                        size = perThreadCnt;
+                List<Future<Boolean>> futures = new ArrayList<>(threadCount);
-                    }
+                for (int i = 0; i < threadCount; i++) {
-                    String sqlFinal;
+                    long offset = i * perThreadCnt;
-                    if (size != null) {
+                    Long size = null;
-                        sqlFinal = sql + " LIMIT " + offset + "," + size;
+                    if (i != threadCount - 1) {
-                    } else {
+                        size = perThreadCnt;
-                        sqlFinal = sql + " LIMIT " + offset + "," + cnt;
+                    }
-                    }
+                    String sqlFinal;
-                    Future<Boolean> future = executor.submit(
+                    if (size != null) {
-                        () -> executeSqlImport(ds, sqlFinal, hbaseMapping, hbaseTemplate, successCount, errMsg));
+                        sqlFinal = sql + " LIMIT " + offset + "," + size;
-                    futures.add(future);
+                    } else {
-                }
+                        sqlFinal = sql + " LIMIT " + offset + "," + cnt;
-
+                    }
-                for (Future<Boolean> future : futures) {
+                    Future<Boolean> future = executor.submit(
-                    future.get();
+                        () -> executeSqlImport(ds, sqlFinal, hbaseMapping, hbaseTemplate, successCount, errMsg));
-                }
+                    futures.add(future);
-
+                }
-                executor.shutdown();
+
-            } else {
+                for (Future<Boolean> future : futures) {
-                executeSqlImport(ds, sql, hbaseMapping, hbaseTemplate, successCount, errMsg);
+                    future.get();
-            }
+                }
-
+
-            logger.info(hbaseMapping.getHbaseTable() + " etl completed in: "
+                executor.shutdown();
-                        + (System.currentTimeMillis() - start) / 1000 + "s!");
+            } else {
-
+                executeSqlImport(ds, sql, hbaseMapping, hbaseTemplate, successCount, errMsg);
-            etlResult.setResultMessage("导入HBase表 " + hbaseMapping.getHbaseTable() + " 数据：" + successCount.get() + " 条");
+            }
-        } catch (Exception e) {
+
-            logger.error(e.getMessage(), e);
+            logger.info(hbaseMapping.getHbaseTable() + " etl completed in: "
-            errMsg.add(hbaseTable + " etl failed! ==>" + e.getMessage());
+                        + (System.currentTimeMillis() - start) / 1000 + "s!");
-        }
+
-
+            etlResult.setResultMessage("导入HBase表 " + hbaseMapping.getHbaseTable() + " 数据：" + successCount.get() + " 条");
-        if (errMsg.isEmpty()) {
+        } catch (Exception e) {
-            etlResult.setSucceeded(true);
+            logger.error(e.getMessage(), e);
-        } else {
+            errMsg.add(hbaseTable + " etl failed! ==>" + e.getMessage());
-            etlResult.setErrorMessage(Joiner.on("\n").join(errMsg));
+        }
-        }
+
-        return etlResult;
+        if (errMsg.isEmpty()) {
-    }
+            etlResult.setSucceeded(true);
-
+        } else {
-    /**
+            etlResult.setErrorMessage(Joiner.on("\n").join(errMsg));
-     * 执行导入
+        }
-     * 
+        return etlResult;
-     * @param ds
+    }
-     * @param sql
+
-     * @param hbaseMapping
+    /**
-     * @param hbaseTemplate
+     * 执行导入
-     * @param successCount
+     * 
-     * @param errMsg
+     * @param ds
-     * @return
+     * @param sql
-     */
+     * @param hbaseMapping
-    private static boolean executeSqlImport(DataSource ds, String sql, MappingConfig.HbaseMapping hbaseMapping,
+     * @param hbaseTemplate
-                                            HbaseTemplate hbaseTemplate, AtomicLong successCount, List<String> errMsg) {
+     * @param successCount
-        try {
+     * @param errMsg
-            Util.sqlRS(ds, sql, rs -> {
+     * @return
-                int i = 1;
+     */
-
+    private static boolean executeSqlImport(DataSource ds, String sql, MappingConfig.HbaseMapping hbaseMapping,
-                try {
+                                            HbaseTemplate hbaseTemplate, AtomicLong successCount, List<String> errMsg) {
-                    boolean complete = false;
+        try {
-                    List<HRow> rows = new ArrayList<>();
+            Util.sqlRS(ds, sql, rs -> {
-                    String[] rowKeyColumns = null;
+                int i = 1;
-                    if (hbaseMapping.getRowKey() != null) {
+
-                        rowKeyColumns = hbaseMapping.getRowKey().trim().split(",");
+                try {
-                    }
+                    boolean complete = false;
-                    while (rs.next()) {
+                    List<HRow> rows = new ArrayList<>();
-                        int cc = rs.getMetaData().getColumnCount();
+                    String[] rowKeyColumns = null;
-                        int[] jdbcTypes = new int[cc];
+                    if (hbaseMapping.getRowKey() != null) {
-                        Class<?>[] classes = new Class[cc];
+                        rowKeyColumns = hbaseMapping.getRowKey().trim().split(",");
-                        for (int j = 1; j <= cc; j++) {
+                    }
-                            int jdbcType = rs.getMetaData().getColumnType(j);
+                    while (rs.next()) {
-                            jdbcTypes[j - 1] = jdbcType;
+                        int cc = rs.getMetaData().getColumnCount();
-                            classes[j - 1] = JdbcTypeUtil.jdbcType2javaType(jdbcType);
+                        int[] jdbcTypes = new int[cc];
-                        }
+                        Class<?>[] classes = new Class[cc];
-                        HRow row = new HRow();
+                        for (int j = 1; j <= cc; j++) {
-
+                            int jdbcType = rs.getMetaData().getColumnType(j);
-                        if (rowKeyColumns != null) {
+                            jdbcTypes[j - 1] = jdbcType;
-                            // 取rowKey字段拼接
+                            classes[j - 1] = JdbcTypeUtil.jdbcType2javaType(jdbcType);
-                            StringBuilder rowKeyVale = new StringBuilder();
+                        }
-                            for (String rowKeyColumnName : rowKeyColumns) {
+                        HRow row = new HRow();
-                                Object obj = rs.getObject(rowKeyColumnName);
+
-                                if (obj != null) {
+                        if (rowKeyColumns != null) {
-                                    rowKeyVale.append(obj.toString());
+                            // 取rowKey字段拼接
-                                }
+                            StringBuilder rowKeyVale = new StringBuilder();
-                                rowKeyVale.append("|");
+                            for (String rowKeyColumnName : rowKeyColumns) {
-                            }
+                                Object obj = rs.getObject(rowKeyColumnName);
-                            int len = rowKeyVale.length();
+                                if (obj != null) {
-                            if (len > 0) {
+                                    rowKeyVale.append(obj.toString());
-                                rowKeyVale.delete(len - 1, len);
+                                }
-                            }
+                                rowKeyVale.append("|");
-                            row.setRowKey(Bytes.toBytes(rowKeyVale.toString()));
+                            }
-                        }
+                            int len = rowKeyVale.length();
-
+                            if (len > 0) {
-                        for (int j = 1; j <= cc; j++) {
+                                rowKeyVale.delete(len - 1, len);
-                            String columnName = rs.getMetaData().getColumnName(j);
+                            }
-
+                            row.setRowKey(Bytes.toBytes(rowKeyVale.toString()));
-                            Object val = JdbcTypeUtil.getRSData(rs, columnName, jdbcTypes[j - 1]);
+                        }
-                            if (val == null) {
+
-                                continue;
+                        for (int j = 1; j <= cc; j++) {
-                            }
+                            String columnName = rs.getMetaData().getColumnName(j);
-
+
-                            MappingConfig.ColumnItem columnItem = hbaseMapping.getColumnItems().get(columnName);
+                            Object val = JdbcTypeUtil.getRSData(rs, columnName, jdbcTypes[j - 1]);
-                            // 没有配置映射
+                            if (val == null) {
-                            if (columnItem == null) {
+                                continue;
-                                String family = hbaseMapping.getFamily();
+                            }
-                                String qualifile = columnName;
+
-                                if (hbaseMapping.isUppercaseQualifier()) {
+                            MappingConfig.ColumnItem columnItem = hbaseMapping.getColumnItems().get(columnName);
-                                    qualifile = qualifile.toUpperCase();
+                            // 没有配置映射
-                                }
+                            if (columnItem == null) {
-                                if (MappingConfig.Mode.STRING == hbaseMapping.getMode()) {
+                                String family = hbaseMapping.getFamily();
-                                    if (hbaseMapping.getRowKey() == null && j == 1) {
+                                String qualifile = columnName;
-                                        row.setRowKey(Bytes.toBytes(val.toString()));
+                                if (hbaseMapping.isUppercaseQualifier()) {
-                                    } else {
+                                    qualifile = qualifile.toUpperCase();
-                                        row.addCell(family, qualifile, Bytes.toBytes(val.toString()));
+                                }
-                                    }
+                                if (MappingConfig.Mode.STRING == hbaseMapping.getMode()) {
-                                } else if (MappingConfig.Mode.NATIVE == hbaseMapping.getMode()) {
+                                    if (hbaseMapping.getRowKey() == null && j == 1) {
-                                    Type type = Type.getType(classes[j - 1]);
+                                        row.setRowKey(Bytes.toBytes(val.toString()));
-                                    if (hbaseMapping.getRowKey() == null && j == 1) {
+                                    } else {
-                                        row.setRowKey(TypeUtil.toBytes(val, type));
+                                        row.addCell(family, qualifile, Bytes.toBytes(val.toString()));
-                                    } else {
+                                    }
-                                        row.addCell(family, qualifile, TypeUtil.toBytes(val, type));
+                                } else if (MappingConfig.Mode.NATIVE == hbaseMapping.getMode()) {
-                                    }
+                                    Type type = Type.getType(classes[j - 1]);
-                                } else if (MappingConfig.Mode.PHOENIX == hbaseMapping.getMode()) {
+                                    if (hbaseMapping.getRowKey() == null && j == 1) {
-                                    PhType phType = PhType.getType(classes[j - 1]);
+                                        row.setRowKey(TypeUtil.toBytes(val, type));
-                                    if (hbaseMapping.getRowKey() == null && j == 1) {
+                                    } else {
-                                        row.setRowKey(PhTypeUtil.toBytes(val, phType));
+                                        row.addCell(family, qualifile, TypeUtil.toBytes(val, type));
-                                    } else {
+                                    }
-                                        row.addCell(family, qualifile, PhTypeUtil.toBytes(val, phType));
+                                } else if (MappingConfig.Mode.PHOENIX == hbaseMapping.getMode()) {
-                                    }
+                                    PhType phType = PhType.getType(classes[j - 1]);
-                                }
+                                    if (hbaseMapping.getRowKey() == null && j == 1) {
-                            } else {
+                                        row.setRowKey(PhTypeUtil.toBytes(val, phType));
-                                // 如果不需要类型转换
+                                    } else {
-                                if (columnItem.getType() == null || "".equals(columnItem.getType())) {
+                                        row.addCell(family, qualifile, PhTypeUtil.toBytes(val, phType));
-                                    if (val instanceof java.sql.Date) {
+                                    }
-                                        SimpleDateFormat dateFmt = new SimpleDateFormat("yyyy-MM-dd");
+                                }
-                                        val = dateFmt.format((Date) val);
+                            } else {
-                                    } else if (val instanceof Timestamp) {
+                                // 如果不需要类型转换
-                                        SimpleDateFormat datetimeFmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                                if (columnItem.getType() == null || "".equals(columnItem.getType())) {
-                                        val = datetimeFmt.format((Date) val);
+                                    if (val instanceof java.sql.Date) {
-                                    }
+                                        SimpleDateFormat dateFmt = new SimpleDateFormat("yyyy-MM-dd");
-
+                                        val = dateFmt.format((Date) val);
-                                    byte[] valBytes = Bytes.toBytes(val.toString());
+                                    } else if (val instanceof Timestamp) {
-                                    if (columnItem.isRowKey()) {
+                                        SimpleDateFormat datetimeFmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                                        if (columnItem.getRowKeyLen() != null) {
+                                        val = datetimeFmt.format((Date) val);
-                                            valBytes = Bytes.toBytes(limitLenNum(columnItem.getRowKeyLen(), val));
+                                    }
-                                            row.setRowKey(valBytes);
+
-                                        } else {
+                                    byte[] valBytes = Bytes.toBytes(val.toString());
-                                            row.setRowKey(valBytes);
+                                    if (columnItem.isRowKey()) {
-                                        }
+                                        if (columnItem.getRowKeyLen() != null) {
-                                    } else {
+                                            valBytes = Bytes.toBytes(limitLenNum(columnItem.getRowKeyLen(), val));
-                                        row.addCell(columnItem.getFamily(), columnItem.getQualifier(), valBytes);
+                                            row.setRowKey(valBytes);
-                                    }
+                                        } else {
-                                } else {
+                                            row.setRowKey(valBytes);
-                                    if (MappingConfig.Mode.STRING == hbaseMapping.getMode()) {
+                                        }
-                                        byte[] valBytes = Bytes.toBytes(val.toString());
+                                    } else {
-                                        if (columnItem.isRowKey()) {
+                                        row.addCell(columnItem.getFamily(), columnItem.getQualifier(), valBytes);
-                                            if (columnItem.getRowKeyLen() != null) {
+                                    }
-                                                valBytes = Bytes.toBytes(limitLenNum(columnItem.getRowKeyLen(), val));
+                                } else {
-                                            }
+                                    if (MappingConfig.Mode.STRING == hbaseMapping.getMode()) {
-                                            row.setRowKey(valBytes);
+                                        byte[] valBytes = Bytes.toBytes(val.toString());
-                                        } else {
+                                        if (columnItem.isRowKey()) {
-                                            row.addCell(columnItem.getFamily(), columnItem.getQualifier(), valBytes);
+                                            if (columnItem.getRowKeyLen() != null) {
-                                        }
+                                                valBytes = Bytes.toBytes(limitLenNum(columnItem.getRowKeyLen(), val));
-                                    } else if (MappingConfig.Mode.NATIVE == hbaseMapping.getMode()) {
+                                            }
-                                        Type type = Type.getType(columnItem.getType());
+                                            row.setRowKey(valBytes);
-                                        if (columnItem.isRowKey()) {
+                                        } else {
-                                            if (columnItem.getRowKeyLen() != null) {
+                                            row.addCell(columnItem.getFamily(), columnItem.getQualifier(), valBytes);
-                                                String v = limitLenNum(columnItem.getRowKeyLen(), val);
+                                        }
-                                                row.setRowKey(Bytes.toBytes(v));
+                                    } else if (MappingConfig.Mode.NATIVE == hbaseMapping.getMode()) {
-                                            } else {
+                                        Type type = Type.getType(columnItem.getType());
-                                                row.setRowKey(TypeUtil.toBytes(val, type));
+                                        if (columnItem.isRowKey()) {
-                                            }
+                                            if (columnItem.getRowKeyLen() != null) {
-                                        } else {
+                                                String v = limitLenNum(columnItem.getRowKeyLen(), val);
-                                            row.addCell(columnItem.getFamily(),
+                                                row.setRowKey(Bytes.toBytes(v));
-                                                columnItem.getQualifier(),
+                                            } else {
-                                                TypeUtil.toBytes(val, type));
+                                                row.setRowKey(TypeUtil.toBytes(val, type));
-                                        }
+                                            }
-                                    } else if (MappingConfig.Mode.PHOENIX == hbaseMapping.getMode()) {
+                                        } else {
-                                        PhType phType = PhType.getType(columnItem.getType());
+                                            row.addCell(columnItem.getFamily(),
-                                        if (columnItem.isRowKey()) {
+                                                columnItem.getQualifier(),
-                                            row.setRowKey(PhTypeUtil.toBytes(val, phType));
+                                                TypeUtil.toBytes(val, type));
-                                        } else {
+                                        }
-                                            row.addCell(columnItem.getFamily(),
+                                    } else if (MappingConfig.Mode.PHOENIX == hbaseMapping.getMode()) {
-                                                columnItem.getQualifier(),
+                                        PhType phType = PhType.getType(columnItem.getType());
-                                                PhTypeUtil.toBytes(val, phType));
+                                        if (columnItem.isRowKey()) {
-                                        }
+                                            row.setRowKey(PhTypeUtil.toBytes(val, phType));
-                                    }
+                                        } else {
-                                }
+                                            row.addCell(columnItem.getFamily(),
-                            }
+                                                columnItem.getQualifier(),
-                        }
+                                                PhTypeUtil.toBytes(val, phType));
-
+                                        }
-                        if (row.getRowKey() == null) throw new RuntimeException("RowKey 值为空");
+                                    }
-
+                                }
-                        rows.add(row);
+                            }
-                        complete = false;
+                        }
-                        if (i % hbaseMapping.getCommitBatch() == 0 && !rows.isEmpty()) {
+
-                            hbaseTemplate.puts(hbaseMapping.getHbaseTable(), rows);
+                        if (row.getRowKey() == null) throw new RuntimeException("RowKey 值为空");
-                            rows.clear();
+
-                            complete = true;
+                        rows.add(row);
-                        }
+                        complete = false;
-                        i++;
+                        if (i % hbaseMapping.getCommitBatch() == 0 && !rows.isEmpty()) {
-                        successCount.incrementAndGet();
+                            hbaseTemplate.puts(hbaseMapping.getHbaseTable(), rows);
-                        if (logger.isDebugEnabled()) {
+                            rows.clear();
-                            logger.debug("successful import count:" + successCount.get());
+                            complete = true;
-                        }
+                        }
-                    }
+                        i++;
-
+                        successCount.incrementAndGet();
-                    if (!complete && !rows.isEmpty()) {
+                        if (logger.isDebugEnabled()) {
-                        hbaseTemplate.puts(hbaseMapping.getHbaseTable(), rows);
+                            logger.debug("successful import count:" + successCount.get());
-                    }
+                        }
-
+                    }
-                } catch (Exception e) {
+
-                    logger.error(hbaseMapping.getHbaseTable() + " etl failed! ==>" + e.getMessage(), e);
+                    if (!complete && !rows.isEmpty()) {
-                    errMsg.add(hbaseMapping.getHbaseTable() + " etl failed! ==>" + e.getMessage());
+                        hbaseTemplate.puts(hbaseMapping.getHbaseTable(), rows);
-                    // throw new RuntimeException(e);
+                    }
-                }
+
-                return i;
+                } catch (Exception e) {
-            });
+                    logger.error(hbaseMapping.getHbaseTable() + " etl failed! ==>" + e.getMessage(), e);
-            return true;
+                    errMsg.add(hbaseMapping.getHbaseTable() + " etl failed! ==>" + e.getMessage());
-        } catch (Exception e) {
+                    // throw new RuntimeException(e);
-            logger.error(e.getMessage(), e);
+                }
-            return false;
+                return i;
-        }
+            });
-    }
+            return true;
-
+        } catch (Exception e) {
-    private static String limitLenNum(int len, Object val) {
+            logger.error(e.getMessage(), e);
-        if (val == null) {
+            return false;
-            return null;
+        }
-        }
+    }
-        if (val instanceof Number) {
+
-            return String.format("%0" + len + "d", (Number) ((Number) val).longValue());
+    private static String limitLenNum(int len, Object val) {
-        } else if (val instanceof String) {
+        if (val == null) {
-            return String.format("%0" + len + "d", Long.parseLong((String) val));
+            return null;
-        }
+        }
-        return null;
+        if (val instanceof Number) {
-    }
+            return String.format("%0" + len + "d", (Number) ((Number) val).longValue());
-}
+        } else if (val instanceof String) {
+            return String.format("%0" + len + "d", Long.parseLong((String) val));
+        }
+        return null;
+    }
+}

client-adapter/hbase/src/main/resources/hbase/mytest_person2.yml

@@ -1,5 +1,6 @@
 dataSourceKey: defaultDS
 destination: example
+groupId: g1
 hbaseMapping:
   mode: STRING  #NATIVE   #PHOENIX
   database: mytest  # 数据库名
@@ -57,4 +58,4 @@ hbaseMapping:
 # $UNSIGNED_TIMESTAMP       对应PHOENIX里的UNSIGNED_TIMESTAMP     12字节
 # $VARCHAR                  对应PHOENIX里的VARCHAR                动态长度
 # $VARBINARY                对应PHOENIX里的VARBINARY              动态长度
-# $DECIMAL                  对应PHOENIX里的DECIMAL                动态长度
+# $DECIMAL                  对应PHOENIX里的DECIMAL                动态长度

client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/AbstractCanalAdapterWorker.java

@@ -31,6 +31,7 @@ public abstract class AbstractCanalAdapterWorker {
     protected final Logger                    logger  = LoggerFactory.getLogger(this.getClass());
 
     protected String                          canalDestination;                                                // canal实例
+    protected String                          groupId = null;                                                  // groupId
     protected List<List<OuterAdapter>>        canalOuterAdapters;                                              // 外部适配器
     protected CanalClientConfig               canalClientConfig;                                               // 配置
     protected ExecutorService                 groupInnerExecutorService;                                       // 组内工作线程池
@@ -56,7 +57,7 @@ public abstract class AbstractCanalAdapterWorker {
                     // 组内适配器穿行运行，尽量不要配置组内适配器
                     adapters.forEach(adapter -> {
                         long begin = System.currentTimeMillis();
-                        List<Dml> dmls = MessageUtil.parse4Dml(canalDestination, message);
+                        List<Dml> dmls = MessageUtil.parse4Dml(canalDestination, groupId, message);
                         if (dmls != null) {
                             batchSync(dmls, adapter);
 
@@ -101,7 +102,7 @@ public abstract class AbstractCanalAdapterWorker {
                     // 组内适配器穿行运行，尽量不要配置组内适配器
                     outerAdapters.forEach(adapter -> {
                         long begin = System.currentTimeMillis();
-                        List<Dml> dmls = MessageUtil.flatMessage2Dml(canalDestination, flatMessages);
+                        List<Dml> dmls = MessageUtil.flatMessage2Dml(canalDestination, groupId, flatMessages);
                         batchSync(dmls, adapter);
 
                         if (logger.isDebugEnabled()) {

client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/CanalAdapterKafkaWorker.java

@@ -28,7 +28,8 @@ public class CanalAdapterKafkaWorker extends AbstractCanalAdapterWorker {
         super(canalOuterAdapters);
         this.canalClientConfig = canalClientConfig;
         this.topic = topic;
-        this.canalDestination = topic;
+        super.canalDestination = topic;
+        super.groupId = groupId;
         this.flatMessage = flatMessage;
         this.connector = new KafkaCanalConnector(bootstrapServers,
             topic,
@@ -45,10 +46,12 @@ public class CanalAdapterKafkaWorker extends AbstractCanalAdapterWorker {
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
+                // ignore
             }
         }
         ExecutorService workerExecutor = Executors.newSingleThreadExecutor();
-        int retry = canalClientConfig.getRetries() == null || canalClientConfig.getRetries() == 0 ? 1 : canalClientConfig.getRetries();
+        int retry = canalClientConfig.getRetries() == null
+                    || canalClientConfig.getRetries() == 0 ? 1 : canalClientConfig.getRetries();
         long timeout = canalClientConfig.getTimeout() == null ? 30000 : canalClientConfig.getTimeout(); // 默认超时30秒
 
         while (running) {

client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/CanalAdapterLoader.java

@@ -1,198 +1,216 @@
-package com.alibaba.otter.canal.adapter.launcher.loader;
+package com.alibaba.otter.canal.adapter.launcher.loader;
-
+
-import java.net.InetSocketAddress;
+import java.net.InetSocketAddress;
-import java.net.SocketAddress;
+import java.net.SocketAddress;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
+import java.util.concurrent.ExecutorService;
-import java.util.List;
+import java.util.concurrent.Executors;
-import java.util.Map;
+import java.util.concurrent.Future;
-import java.util.concurrent.ExecutorService;
+
-import java.util.concurrent.Executors;
+import org.apache.commons.lang.StringUtils;
-import java.util.concurrent.Future;
+import org.slf4j.Logger;
-
+import org.slf4j.LoggerFactory;
-import org.apache.commons.lang.StringUtils;
+import org.springframework.core.env.EnumerablePropertySource;
-import org.slf4j.Logger;
+import org.springframework.core.env.Environment;
-import org.slf4j.LoggerFactory;
+import org.springframework.core.env.PropertySource;
-
+import org.springframework.core.env.StandardEnvironment;
-import com.alibaba.otter.canal.client.adapter.OuterAdapter;
+
-import com.alibaba.otter.canal.client.adapter.support.CanalClientConfig;
+import com.alibaba.otter.canal.adapter.launcher.config.SpringContext;
-import com.alibaba.otter.canal.client.adapter.support.ExtensionLoader;
+import com.alibaba.otter.canal.client.adapter.OuterAdapter;
-import com.alibaba.otter.canal.client.adapter.support.OuterAdapterConfig;
+import com.alibaba.otter.canal.client.adapter.support.CanalClientConfig;
-
+import com.alibaba.otter.canal.client.adapter.support.ExtensionLoader;
-/**
+import com.alibaba.otter.canal.client.adapter.support.OuterAdapterConfig;
- * 外部适配器的加载器
+
- *
+/**
- * @version 1.0.0
+ * 外部适配器的加载器
- */
+ *
-public class CanalAdapterLoader {
+ * @version 1.0.0
-
+ */
-    private static final Logger                     logger        = LoggerFactory.getLogger(CanalAdapterLoader.class);
+public class CanalAdapterLoader {
-
+
-    private CanalClientConfig                       canalClientConfig;
+    private static final Logger                     logger        = LoggerFactory.getLogger(CanalAdapterLoader.class);
-
+
-    private Map<String, CanalAdapterWorker>         canalWorkers  = new HashMap<>();
+    private CanalClientConfig                       canalClientConfig;
-
+
-    private Map<String, AbstractCanalAdapterWorker> canalMQWorker = new HashMap<>();
+    private Map<String, CanalAdapterWorker>         canalWorkers  = new HashMap<>();
-
+
-    private ExtensionLoader<OuterAdapter>           loader;
+    private Map<String, AbstractCanalAdapterWorker> canalMQWorker = new HashMap<>();
-
+
-    public CanalAdapterLoader(CanalClientConfig canalClientConfig){
+    private ExtensionLoader<OuterAdapter>           loader;
-        this.canalClientConfig = canalClientConfig;
+
-    }
+    public CanalAdapterLoader(CanalClientConfig canalClientConfig){
-
+        this.canalClientConfig = canalClientConfig;
-    /**
+    }
-     * 初始化canal-client
+
-     */
+    /**
-    public void init() {
+     * 初始化canal-client
-        loader = ExtensionLoader.getExtensionLoader(OuterAdapter.class);
+     */
-
+    public void init() {
-        String canalServerHost = this.canalClientConfig.getCanalServerHost();
+        loader = ExtensionLoader.getExtensionLoader(OuterAdapter.class);
-        SocketAddress sa = null;
+
-        if (canalServerHost != null) {
+        String canalServerHost = this.canalClientConfig.getCanalServerHost();
-            String[] ipPort = canalServerHost.split(":");
+        SocketAddress sa = null;
-            sa = new InetSocketAddress(ipPort[0], Integer.parseInt(ipPort[1]));
+        if (canalServerHost != null) {
-        }
+            String[] ipPort = canalServerHost.split(":");
-        String zkHosts = this.canalClientConfig.getZookeeperHosts();
+            sa = new InetSocketAddress(ipPort[0], Integer.parseInt(ipPort[1]));
-
+        }
-        if ("tcp".equalsIgnoreCase(canalClientConfig.getMode())) {
+        String zkHosts = this.canalClientConfig.getZookeeperHosts();
-            // 初始化canal-client的适配器
+
-            for (CanalClientConfig.CanalAdapter canalAdapter : canalClientConfig.getCanalAdapters()) {
+        if ("tcp".equalsIgnoreCase(canalClientConfig.getMode())) {
-                List<List<OuterAdapter>> canalOuterAdapterGroups = new ArrayList<>();
+            // 初始化canal-client的适配器
-
+            for (CanalClientConfig.CanalAdapter canalAdapter : canalClientConfig.getCanalAdapters()) {
-                for (CanalClientConfig.Group connectorGroup : canalAdapter.getGroups()) {
+                List<List<OuterAdapter>> canalOuterAdapterGroups = new ArrayList<>();
-                    List<OuterAdapter> canalOutConnectors = new ArrayList<>();
+
-                    for (OuterAdapterConfig c : connectorGroup.getOuterAdapters()) {
+                for (CanalClientConfig.Group connectorGroup : canalAdapter.getGroups()) {
-                        loadConnector(c, canalOutConnectors);
+                    List<OuterAdapter> canalOutConnectors = new ArrayList<>();
-                    }
+                    for (OuterAdapterConfig c : connectorGroup.getOuterAdapters()) {
-                    canalOuterAdapterGroups.add(canalOutConnectors);
+                        loadAdapter(c, canalOutConnectors);
-                }
+                    }
-                CanalAdapterWorker worker;
+                    canalOuterAdapterGroups.add(canalOutConnectors);
-                if (sa != null) {
+                }
-                    worker = new CanalAdapterWorker(canalClientConfig,
+                CanalAdapterWorker worker;
-                        canalAdapter.getInstance(),
+                if (sa != null) {
-                        sa,
+                    worker = new CanalAdapterWorker(canalClientConfig,
-                        canalOuterAdapterGroups);
+                        canalAdapter.getInstance(),
-                } else if (zkHosts != null) {
+                        sa,
-                    worker = new CanalAdapterWorker(canalClientConfig,
+                        canalOuterAdapterGroups);
-                        canalAdapter.getInstance(),
+                } else if (zkHosts != null) {
-                        zkHosts,
+                    worker = new CanalAdapterWorker(canalClientConfig,
-                        canalOuterAdapterGroups);
+                        canalAdapter.getInstance(),
-                } else {
+                        zkHosts,
-                    throw new RuntimeException("No canal server connector found");
+                        canalOuterAdapterGroups);
-                }
+                } else {
-                canalWorkers.put(canalAdapter.getInstance(), worker);
+                    throw new RuntimeException("No canal server connector found");
-                worker.start();
+                }
-                logger.info("Start adapter for canal instance: {} succeed", canalAdapter.getInstance());
+                canalWorkers.put(canalAdapter.getInstance(), worker);
-            }
+                worker.start();
-        } else if ("kafka".equalsIgnoreCase(canalClientConfig.getMode())) {
+                logger.info("Start adapter for canal instance: {} succeed", canalAdapter.getInstance());
-            // 初始化canal-client-kafka的适配器
+            }
-            for (CanalClientConfig.CanalAdapter canalAdapter : canalClientConfig.getCanalAdapters()) {
+        } else if ("kafka".equalsIgnoreCase(canalClientConfig.getMode())) {
-                for (CanalClientConfig.Group group : canalAdapter.getGroups()) {
+            // 初始化canal-client-kafka的适配器
-                    List<List<OuterAdapter>> canalOuterAdapterGroups = new ArrayList<>();
+            for (CanalClientConfig.CanalAdapter canalAdapter : canalClientConfig.getCanalAdapters()) {
-                    List<OuterAdapter> canalOuterAdapters = new ArrayList<>();
+                for (CanalClientConfig.Group group : canalAdapter.getGroups()) {
-                    for (OuterAdapterConfig config : group.getOuterAdapters()) {
+                    List<List<OuterAdapter>> canalOuterAdapterGroups = new ArrayList<>();
-                        loadConnector(config, canalOuterAdapters);
+                    List<OuterAdapter> canalOuterAdapters = new ArrayList<>();
-                    }
+                    for (OuterAdapterConfig config : group.getOuterAdapters()) {
-                    canalOuterAdapterGroups.add(canalOuterAdapters);
+                        loadAdapter(config, canalOuterAdapters);
-
+                    }
-                    CanalAdapterKafkaWorker canalKafkaWorker = new CanalAdapterKafkaWorker(canalClientConfig,
+                    canalOuterAdapterGroups.add(canalOuterAdapters);
-                        canalClientConfig.getMqServers(),
+
-                        canalAdapter.getInstance(),
+                    CanalAdapterKafkaWorker canalKafkaWorker = new CanalAdapterKafkaWorker(canalClientConfig,
-                        group.getGroupId(),
+                        canalClientConfig.getMqServers(),
-                        canalOuterAdapterGroups,
+                        canalAdapter.getInstance(),
-                        canalClientConfig.getFlatMessage());
+                        group.getGroupId(),
-                    canalMQWorker.put(canalAdapter.getInstance() + "-kafka-" + group.getGroupId(), canalKafkaWorker);
+                        canalOuterAdapterGroups,
-                    canalKafkaWorker.start();
+                        canalClientConfig.getFlatMessage());
-                    logger.info("Start adapter for canal-client mq topic: {} succeed", canalAdapter.getInstance() + "-"
+                    canalMQWorker.put(canalAdapter.getInstance() + "-kafka-" + group.getGroupId(), canalKafkaWorker);
-                                                                                       + group.getGroupId());
+                    canalKafkaWorker.start();
-                }
+                    logger.info("Start adapter for canal-client mq topic: {} succeed",
-            }
+                        canalAdapter.getInstance() + "-" + group.getGroupId());
-        } else if ("rocketMQ".equalsIgnoreCase(canalClientConfig.getMode())) {
+                }
-            // 初始化canal-client-rocketMQ的适配器
+            }
-            for (CanalClientConfig.CanalAdapter canalAdapter : canalClientConfig.getCanalAdapters()) {
+        } else if ("rocketMQ".equalsIgnoreCase(canalClientConfig.getMode())) {
-                for (CanalClientConfig.Group group : canalAdapter.getGroups()) {
+            // 初始化canal-client-rocketMQ的适配器
-                    List<List<OuterAdapter>> canalOuterAdapterGroups = new ArrayList<>();
+            for (CanalClientConfig.CanalAdapter canalAdapter : canalClientConfig.getCanalAdapters()) {
-                    List<OuterAdapter> canalOuterAdapters = new ArrayList<>();
+                for (CanalClientConfig.Group group : canalAdapter.getGroups()) {
-                    for (OuterAdapterConfig config : group.getOuterAdapters()) {
+                    List<List<OuterAdapter>> canalOuterAdapterGroups = new ArrayList<>();
-                        loadConnector(config, canalOuterAdapters);
+                    List<OuterAdapter> canalOuterAdapters = new ArrayList<>();
-                    }
+                    for (OuterAdapterConfig config : group.getOuterAdapters()) {
-                    canalOuterAdapterGroups.add(canalOuterAdapters);
+                        loadAdapter(config, canalOuterAdapters);
-                    CanalAdapterRocketMQWorker rocketMQWorker = new CanalAdapterRocketMQWorker(canalClientConfig,
+                    }
-                        canalClientConfig.getMqServers(),
+                    canalOuterAdapterGroups.add(canalOuterAdapters);
-                        canalAdapter.getInstance(),
+                    CanalAdapterRocketMQWorker rocketMQWorker = new CanalAdapterRocketMQWorker(canalClientConfig,
-                        group.getGroupId(),
+                        canalClientConfig.getMqServers(),
-                        canalOuterAdapterGroups,
+                        canalAdapter.getInstance(),
-                        canalClientConfig.getAccessKey(),
+                        group.getGroupId(),
-                        canalClientConfig.getSecretKey(),
+                        canalOuterAdapterGroups,
-                        canalClientConfig.getFlatMessage());
+                        canalClientConfig.getAccessKey(),
-                    canalMQWorker.put(canalAdapter.getInstance() + "-rocketmq-" + group.getGroupId(), rocketMQWorker);
+                        canalClientConfig.getSecretKey(),
-                    rocketMQWorker.start();
+                        canalClientConfig.getFlatMessage());
-
+                    canalMQWorker.put(canalAdapter.getInstance() + "-rocketmq-" + group.getGroupId(), rocketMQWorker);
-                    logger.info("Start adapter for canal-client mq topic: {} succeed", canalAdapter.getInstance() + "-"
+                    rocketMQWorker.start();
-                                                                                       + group.getGroupId());
+
-                }
+                    logger.info("Start adapter for canal-client mq topic: {} succeed",
-            }
+                        canalAdapter.getInstance() + "-" + group.getGroupId());
-        }
+                }
-    }
+            }
-
+        }
-    private void loadConnector(OuterAdapterConfig config, List<OuterAdapter> canalOutConnectors) {
+    }
-        try {
+
-            OuterAdapter adapter;
+    private void loadAdapter(OuterAdapterConfig config, List<OuterAdapter> canalOutConnectors) {
-            adapter = loader.getExtension(config.getName(), StringUtils.trimToEmpty(config.getKey()));
+        try {
-
+            OuterAdapter adapter;
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
+            adapter = loader.getExtension(config.getName(), StringUtils.trimToEmpty(config.getKey()));
-            // 替换ClassLoader
+
-            Thread.currentThread().setContextClassLoader(adapter.getClass().getClassLoader());
+            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            adapter.init(config);
+            // 替换ClassLoader
-            Thread.currentThread().setContextClassLoader(cl);
+            Thread.currentThread().setContextClassLoader(adapter.getClass().getClassLoader());
-            canalOutConnectors.add(adapter);
+            Environment env = (Environment) SpringContext.getBean(Environment.class);
-            logger.info("Load canal adapter: {} succeed", config.getName());
+            Properties evnProperties = null;
-        } catch (Exception e) {
+            if (env instanceof StandardEnvironment) {
-            logger.error("Load canal adapter: {} failed", config.getName(), e);
+                evnProperties = new Properties();
-        }
+                for (PropertySource<?> propertySource : ((StandardEnvironment) env).getPropertySources()) {
-    }
+                    if (propertySource instanceof EnumerablePropertySource) {
-
+                        String[] names = ((EnumerablePropertySource<?>) propertySource).getPropertyNames();
-    /**
+                        for (String name : names) {
-     * 销毁所有适配器 为防止canal实例太多造成销毁阻塞, 并行销毁
+                            Object val = propertySource.getProperty(name);
-     */
+                            if (val != null) {
-    public void destroy() {
+                                evnProperties.put(name, val);
-        if (!canalWorkers.isEmpty()) {
+                            }
-            ExecutorService stopExecutorService = Executors.newFixedThreadPool(canalWorkers.size());
+                        }
-            List<Future<Boolean>> futures = new ArrayList<>();
+                    }
-            for (CanalAdapterWorker canalAdapterWorker : canalWorkers.values()) {
+                }
-                futures.add(stopExecutorService.submit(() -> {
+            }
-                    canalAdapterWorker.stop();
+            adapter.init(config, evnProperties);
-                    return true;
+            Thread.currentThread().setContextClassLoader(cl);
-                }));
+            canalOutConnectors.add(adapter);
-            }
+            logger.info("Load canal adapter: {} succeed", config.getName());
-            futures.forEach(future -> {
+        } catch (Exception e) {
-                try {
+            logger.error("Load canal adapter: {} failed", config.getName(), e);
-                    future.get();
+        }
-                } catch (Exception e) {
+    }
-                    // ignore
+
-                }
+    /**
-            });
+     * 销毁所有适配器 为防止canal实例太多造成销毁阻塞, 并行销毁
-            stopExecutorService.shutdown();
+     */
-        }
+    public void destroy() {
-
+        if (!canalWorkers.isEmpty()) {
-        if (!canalMQWorker.isEmpty()) {
+            ExecutorService stopExecutorService = Executors.newFixedThreadPool(canalWorkers.size());
-            ExecutorService stopMQWorkerService = Executors.newFixedThreadPool(canalMQWorker.size());
+            List<Future<Boolean>> futures = new ArrayList<>();
-            List<Future<Boolean>> futures = new ArrayList<>();
+            for (CanalAdapterWorker canalAdapterWorker : canalWorkers.values()) {
-            for (AbstractCanalAdapterWorker canalAdapterMQWorker : canalMQWorker.values()) {
+                futures.add(stopExecutorService.submit(() -> {
-                futures.add(stopMQWorkerService.submit(() -> {
+                    canalAdapterWorker.stop();
-                    canalAdapterMQWorker.stop();
+                    return true;
-                    return true;
+                }));
-                }));
+            }
-            }
+            futures.forEach(future -> {
-            futures.forEach(future -> {
+                try {
-                try {
+                    future.get();
-                    future.get();
+                } catch (Exception e) {
-                } catch (Exception e) {
+                    // ignore
-                    // ignore
+                }
-                }
+            });
-            });
+            stopExecutorService.shutdown();
-            stopMQWorkerService.shutdown();
+        }
-        }
+
-        logger.info("All canal adapters destroyed");
+        if (!canalMQWorker.isEmpty()) {
-    }
+            ExecutorService stopMQWorkerService = Executors.newFixedThreadPool(canalMQWorker.size());
-}
+            List<Future<Boolean>> futures = new ArrayList<>();
+            for (AbstractCanalAdapterWorker canalAdapterMQWorker : canalMQWorker.values()) {
+                futures.add(stopMQWorkerService.submit(() -> {
+                    canalAdapterMQWorker.stop();
+                    return true;
+                }));
+            }
+            futures.forEach(future -> {
+                try {
+                    future.get();
+                } catch (Exception e) {
+                    // ignore
+                }
+            });
+            stopMQWorkerService.shutdown();
+        }
+        logger.info("All canal adapters destroyed");
+    }
+}

client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/CanalAdapterRocketMQWorker.java

@@ -28,7 +28,8 @@ public class CanalAdapterRocketMQWorker extends AbstractCanalAdapterWorker {
         this.canalClientConfig = canalClientConfig;
         this.topic = topic;
         this.flatMessage = flatMessage;
-        this.canalDestination = topic;
+        super.canalDestination = topic;
+        super.groupId = groupId;
         this.connector = new RocketMQCanalConnector(nameServers,
             topic,
             groupId,

client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/monitor/remote/DbRemoteConfigLoader.java

@@ -1,323 +1,246 @@
-package com.alibaba.otter.canal.adapter.launcher.monitor.remote;
+package com.alibaba.otter.canal.adapter.launcher.monitor.remote;
-
+
-import java.io.File;
+import java.io.FileWriter;
-import java.io.FileWriter;
+import java.sql.Connection;
-import java.sql.Connection;
+import java.sql.ResultSet;
-import java.sql.ResultSet;
+import java.sql.SQLException;
-import java.sql.SQLException;
+import java.sql.Statement;
-import java.sql.Statement;
+import java.util.ArrayList;
-import java.util.ArrayList;
+import java.util.HashMap;
-import java.util.HashMap;
+import java.util.List;
-import java.util.List;
+import java.util.Map;
-import java.util.Map;
+import java.util.concurrent.Executors;
-import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeUnit;
+
-
+import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
-import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.slf4j.LoggerFactory;
+
-
+import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.otter.canal.common.utils.CommonUtils;
-import com.alibaba.otter.canal.common.utils.NamedThreadFactory;
+import com.alibaba.otter.canal.common.utils.NamedThreadFactory;
-import com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
-import com.google.common.collect.MapMaker;
+import com.google.common.collect.MapMaker;
-
+
-/**
+/**
- * 基于数据库的远程配置装载器
+ * 基于数据库的远程配置装载器
- *
+ *
- * @author rewerma 2019-01-25 下午05:20:16
+ * @author rewerma 2019-01-25 下午05:20:16
- * @version 1.0.0
+ * @version 1.0.0
- */
+ */
-public class DbRemoteConfigLoader implements RemoteConfigLoader {
+public class DbRemoteConfigLoader implements RemoteConfigLoader {
-
+
-    private static final Logger      logger                 = LoggerFactory.getLogger(DbRemoteConfigLoader.class);
+    private static final Logger      logger                 = LoggerFactory.getLogger(DbRemoteConfigLoader.class);
-
+
-    private DruidDataSource          dataSource;
+    private DruidDataSource          dataSource;
-
+
-    private static volatile long     currentConfigTimestamp = 0;
+    private static volatile long     currentConfigTimestamp = 0;
-    private Map<String, ConfigItem>  remoteAdapterConfigs   = new MapMaker().makeMap();
+    private Map<String, ConfigItem>  remoteAdapterConfigs   = new MapMaker().makeMap();
-
+
-    private ScheduledExecutorService executor               = Executors.newScheduledThreadPool(2,
+    private ScheduledExecutorService executor               = Executors.newScheduledThreadPool(2,
-        new NamedThreadFactory("remote-adapter-config-scan"));
+        new NamedThreadFactory("remote-adapter-config-scan"));
-
+
-    private RemoteAdapterMonitor     remoteAdapterMonitor   = new RemoteAdapterMonitorImpl();
+    private RemoteAdapterMonitor     remoteAdapterMonitor   = new RemoteAdapterMonitorImpl();
-
+
-    public DbRemoteConfigLoader(String driverName, String jdbcUrl, String jdbcUsername, String jdbcPassword){
+    public DbRemoteConfigLoader(String driverName, String jdbcUrl, String jdbcUsername, String jdbcPassword){
-        dataSource = new DruidDataSource();
+        dataSource = new DruidDataSource();
-        if (StringUtils.isEmpty(driverName)) {
+        if (StringUtils.isEmpty(driverName)) {
-            driverName = "com.mysql.jdbc.Driver";
+            driverName = "com.mysql.jdbc.Driver";
-        }
+        }
-        dataSource.setDriverClassName(driverName);
+        dataSource.setDriverClassName(driverName);
-        dataSource.setUrl(jdbcUrl);
+        dataSource.setUrl(jdbcUrl);
-        dataSource.setUsername(jdbcUsername);
+        dataSource.setUsername(jdbcUsername);
-        dataSource.setPassword(jdbcPassword);
+        dataSource.setPassword(jdbcPassword);
-        dataSource.setInitialSize(1);
+        dataSource.setInitialSize(1);
-        dataSource.setMinIdle(1);
+        dataSource.setMinIdle(1);
-        dataSource.setMaxActive(1);
+        dataSource.setMaxActive(1);
-        dataSource.setMaxWait(60000);
+        dataSource.setMaxWait(60000);
-        dataSource.setTimeBetweenEvictionRunsMillis(60000);
+        dataSource.setTimeBetweenEvictionRunsMillis(60000);
-        dataSource.setMinEvictableIdleTimeMillis(300000);
+        dataSource.setMinEvictableIdleTimeMillis(300000);
-        try {
+        try {
-            dataSource.init();
+            dataSource.init();
-        } catch (SQLException e) {
+        } catch (SQLException e) {
-            throw new RuntimeException(e.getMessage(), e);
+            throw new RuntimeException(e.getMessage(), e);
-        }
+        }
-    }
+    }
-
+
-    /**
+    /**
-     * 加载远程application.yml配置
+     * 加载远程application.yml配置
-     */
+     */
-    @Override
+    @Override
-    public void loadRemoteConfig() {
+    public void loadRemoteConfig() {
-        try {
+        try {
-            // 加载远程adapter配置
+            // 加载远程adapter配置
-            ConfigItem configItem = getRemoteAdapterConfig();
+            ConfigItem configItem = getRemoteAdapterConfig();
-            if (configItem != null) {
+            if (configItem != null) {
-                if (configItem.getModifiedTime() != currentConfigTimestamp) {
+                if (configItem.getModifiedTime() != currentConfigTimestamp) {
-                    currentConfigTimestamp = configItem.getModifiedTime();
+                    currentConfigTimestamp = configItem.getModifiedTime();
-                    overrideLocalCanalConfig(configItem.getContent());
+                    overrideLocalCanalConfig(configItem.getContent());
-                    logger.info("## Loaded remote adapter config: application.yml");
+                    logger.info("## Loaded remote adapter config: application.yml");
-                }
+                }
-            }
+            }
-        } catch (Exception e) {
+        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
+            logger.error(e.getMessage(), e);
-        }
+        }
-    }
+    }
-
+
-    /**
+    /**
-     * 获取远程application.yml配置
+     * 获取远程application.yml配置
-     *
+     *
-     * @return 配置对象
+     * @return 配置对象
-     */
+     */
-    private ConfigItem getRemoteAdapterConfig() {
+    private ConfigItem getRemoteAdapterConfig() {
-        String sql = "select name, content, modified_time from canal_config where id=2";
+        String sql = "select name, content, modified_time from canal_config where id=2";
-        try (Connection conn = dataSource.getConnection();
+        try (Connection conn = dataSource.getConnection();
-                Statement stmt = conn.createStatement();
+                Statement stmt = conn.createStatement();
-                ResultSet rs = stmt.executeQuery(sql)) {
+                ResultSet rs = stmt.executeQuery(sql)) {
-            if (rs.next()) {
+            if (rs.next()) {
-                ConfigItem configItem = new ConfigItem();
+                ConfigItem configItem = new ConfigItem();
-                configItem.setId(2L);
+                configItem.setId(2L);
-                configItem.setName(rs.getString("name"));
+                configItem.setName(rs.getString("name"));
-                configItem.setContent(rs.getString("content"));
+                configItem.setContent(rs.getString("content"));
-                configItem.setModifiedTime(rs.getTimestamp("modified_time").getTime());
+                configItem.setModifiedTime(rs.getTimestamp("modified_time").getTime());
-                return configItem;
+                return configItem;
-            }
+            }
-        } catch (Exception e) {
+        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
+            logger.error(e.getMessage(), e);
-        }
+        }
-        return null;
+        return null;
-    }
+    }
-
+
-    /**
+    /**
-     * 覆盖本地application.yml文件
+     * 覆盖本地application.yml文件
-     *
+     *
-     * @param content 文件内容
+     * @param content 文件内容
-     */
+     */
-    private void overrideLocalCanalConfig(String content) {
+    private void overrideLocalCanalConfig(String content) {
-        try (FileWriter writer = new FileWriter(getConfPath() + "application.yml")) {
+        try (FileWriter writer = new FileWriter(CommonUtils.getConfPath() + "application.yml")) {
-            writer.write(content);
+            writer.write(content);
-            writer.flush();
+            writer.flush();
-        } catch (Exception e) {
+        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
+            logger.error(e.getMessage(), e);
-        }
+        }
-    }
+    }
-
+
-    /**
+    /**
-     * 加载adapter配置
+     * 加载adapter配置
-     */
+     */
-    @Override
+    @Override
-    public void loadRemoteAdapterConfigs() {
+    public void loadRemoteAdapterConfigs() {
-        try {
+        try {
-            // 加载远程adapter配置
+            // 加载远程adapter配置
-            loadModifiedAdapterConfigs();
+            loadModifiedAdapterConfigs();
-        } catch (Exception e) {
+        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
+            logger.error(e.getMessage(), e);
-        }
+        }
-    }
+    }
-
+
-    /**
+    /**
-     * 加载有变动的adapter配置
+     * 加载有变动的adapter配置
-     */
+     */
-    @SuppressWarnings("unchecked")
+    private void loadModifiedAdapterConfigs() {
-    private void loadModifiedAdapterConfigs() {
+        Map<String, ConfigItem> remoteConfigStatus = new HashMap<>();
-        Map<String, ConfigItem>[] res = new Map[2];
+        String sql = "select id, category, name, modified_time from canal_adapter_config";
-        Map<String, ConfigItem> remoteConfigStatus = new HashMap<>();
+        try (Connection conn = dataSource.getConnection();
-        String sql = "select id, category, name, modified_time from canal_adapter_config";
+                Statement stmt = conn.createStatement();
-        try (Connection conn = dataSource.getConnection();
+                ResultSet rs = stmt.executeQuery(sql)) {
-                Statement stmt = conn.createStatement();
+            while (rs.next()) {
-                ResultSet rs = stmt.executeQuery(sql)) {
+                ConfigItem configItem = new ConfigItem();
-            while (rs.next()) {
+                configItem.setId(rs.getLong("id"));
-                ConfigItem configItem = new ConfigItem();
+                configItem.setCategory(rs.getString("category"));
-                configItem.setId(rs.getLong("id"));
+                configItem.setName(rs.getString("name"));
-                configItem.setCategory(rs.getString("category"));
+                configItem.setModifiedTime(rs.getTimestamp("modified_time").getTime());
-                configItem.setName(rs.getString("name"));
+                remoteConfigStatus.put(configItem.getCategory() + "/" + configItem.getName(), configItem);
-                configItem.setModifiedTime(rs.getTimestamp("modified_time").getTime());
+            }
-                remoteConfigStatus.put(configItem.getCategory() + "/" + configItem.getName(), configItem);
+        } catch (Exception e) {
-            }
+            logger.error(e.getMessage(), e);
-        } catch (Exception e) {
+        }
-            logger.error(e.getMessage(), e);
+
-        }
+        if (!remoteConfigStatus.isEmpty()) {
-
+            List<Long> changedIds = new ArrayList<>();
-        if (!remoteConfigStatus.isEmpty()) {
+
-            List<Long> changedIds = new ArrayList<>();
+            for (ConfigItem remoteConfigStat : remoteConfigStatus.values()) {
-
+                ConfigItem currentConfig = remoteAdapterConfigs
-            for (ConfigItem remoteConfigStat : remoteConfigStatus.values()) {
+                    .get(remoteConfigStat.getCategory() + "/" + remoteConfigStat.getName());
-                ConfigItem currentConfig = remoteAdapterConfigs
+                if (currentConfig == null) {
-                    .get(remoteConfigStat.getCategory() + "/" + remoteConfigStat.getName());
+                    // 新增
-                if (currentConfig == null) {
+                    changedIds.add(remoteConfigStat.getId());
-                    // 新增
+                } else {
-                    changedIds.add(remoteConfigStat.getId());
+                    // 修改
-                } else {
+                    if (currentConfig.getModifiedTime() != remoteConfigStat.getModifiedTime()) {
-                    // 修改
+                        changedIds.add(remoteConfigStat.getId());
-                    if (currentConfig.getModifiedTime() != remoteConfigStat.getModifiedTime()) {
+                    }
-                        changedIds.add(remoteConfigStat.getId());
+                }
-                    }
+            }
-                }
+            if (!changedIds.isEmpty()) {
-            }
+                String contentsSql = "select id, category, name, content, modified_time from canal_adapter_config  where id in ("
-            if (!changedIds.isEmpty()) {
+                                     + Joiner.on(",").join(changedIds) + ")";
-                String contentsSql = "select id, category, name, content, modified_time from canal_adapter_config  where id in ("
+                try (Connection conn = dataSource.getConnection();
-                                     + Joiner.on(",").join(changedIds) + ")";
+                        Statement stmt = conn.createStatement();
-                try (Connection conn = dataSource.getConnection();
+                        ResultSet rs = stmt.executeQuery(contentsSql)) {
-                        Statement stmt = conn.createStatement();
+                    while (rs.next()) {
-                        ResultSet rs = stmt.executeQuery(contentsSql)) {
+                        ConfigItem configItemNew = new ConfigItem();
-                    while (rs.next()) {
+                        configItemNew.setId(rs.getLong("id"));
-                        ConfigItem configItemNew = new ConfigItem();
+                        configItemNew.setCategory(rs.getString("category"));
-                        configItemNew.setId(rs.getLong("id"));
+                        configItemNew.setName(rs.getString("name"));
-                        configItemNew.setCategory(rs.getString("category"));
+                        configItemNew.setContent(rs.getString("content"));
-                        configItemNew.setName(rs.getString("name"));
+                        configItemNew.setModifiedTime(rs.getTimestamp("modified_time").getTime());
-                        configItemNew.setContent(rs.getString("content"));
+
-                        configItemNew.setModifiedTime(rs.getTimestamp("modified_time").getTime());
+                        remoteAdapterConfigs.put(configItemNew.getCategory() + "/" + configItemNew.getName(),
-
+                            configItemNew);
-                        remoteAdapterConfigs.put(configItemNew.getCategory() + "/" + configItemNew.getName(),
+                        remoteAdapterMonitor.onModify(configItemNew);
-                            configItemNew);
+                    }
-                        remoteAdapterMonitor.onModify(configItemNew);
+
-                    }
+                } catch (Exception e) {
-
+                    logger.error(e.getMessage(), e);
-                } catch (Exception e) {
+                }
-                    logger.error(e.getMessage(), e);
+            }
-                }
+        }
-            }
+
-        }
+        for (ConfigItem configItem : remoteAdapterConfigs.values()) {
-
+            if (!remoteConfigStatus.containsKey(configItem.getCategory() + "/" + configItem.getName())) {
-        for (ConfigItem configItem : remoteAdapterConfigs.values()) {
+                // 删除
-            if (!remoteConfigStatus.containsKey(configItem.getCategory() + "/" + configItem.getName())) {
+                remoteAdapterConfigs.remove(configItem.getCategory() + "/" + configItem.getName());
-                // 删除
+                remoteAdapterMonitor.onDelete(configItem.getCategory() + "/" + configItem.getName());
-                remoteAdapterConfigs.remove(configItem.getCategory() + "/" + configItem.getName());
+            }
-                remoteAdapterMonitor.onDelete(configItem.getCategory() + "/" + configItem.getName());
+        }
-            }
+    }
-        }
+
-    }
+    /**
-
+     * 启动监听数据库变化
-    private static boolean deleteDir(File dirFile) {
+     */
-        if (!dirFile.exists()) {
+    @Override
-            return false;
+    public void startMonitor() {
-        }
+        // 监听application.yml变化
-
+        executor.scheduleWithFixedDelay(() -> {
-        if (dirFile.isFile()) {
+            try {
-            return dirFile.delete();
+                loadRemoteConfig();
-        } else {
+            } catch (Throwable e) {
-            File[] files = dirFile.listFiles();
+                logger.error("scan remote application.yml failed", e);
-            if (files == null || files.length == 0) {
+            }
-                return dirFile.delete();
+        }, 10, 3, TimeUnit.SECONDS);
-            }
+
-            for (File file : files) {
+        // 监听adapter变化
-                deleteDir(file);
+        executor.scheduleWithFixedDelay(() -> {
-            }
+            try {
-        }
+                loadRemoteAdapterConfigs();
-
+            } catch (Throwable e) {
-        return dirFile.delete();
+                logger.error("scan remote adapter configs failed", e);
-    }
+            }
-
+        }, 10, 3, TimeUnit.SECONDS);
-    /**
+    }
-     * 获取conf文件夹所在路径
+
-     *
+    /**
-     * @return 路径地址
+     * 销毁
-     */
+     */
-    private String getConfPath() {
+    @Override
-        String classpath = this.getClass().getResource("/").getPath();
+    public void destroy() {
-        String confPath = classpath + "../conf/";
+        executor.shutdownNow();
-        if (new File(confPath).exists()) {
+        try {
-            return confPath;
+            dataSource.close();
-        } else {
+        } catch (Exception e) {
-            return classpath;
+            logger.error(e.getMessage(), e);
-        }
+        }
-    }
+    }
-
+}
-    /**
-     * 启动监听数据库变化
-     */
-    @Override
-    public void startMonitor() {
-        // 监听application.yml变化
-        executor.scheduleWithFixedDelay(() -> {
-            try {
-                loadRemoteConfig();
-            } catch (Throwable e) {
-                logger.error("scan remote application.yml failed", e);
-            }
-        }, 10, 3, TimeUnit.SECONDS);
-
-        // 监听adapter变化
-        executor.scheduleWithFixedDelay(() -> {
-            try {
-                loadRemoteAdapterConfigs();
-            } catch (Throwable e) {
-                logger.error("scan remote adapter configs failed", e);
-            }
-        }, 10, 3, TimeUnit.SECONDS);
-    }
-
-    /**
-     * 销毁
-     */
-    @Override
-    public void destroy() {
-        executor.shutdownNow();
-        try {
-            dataSource.close();
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-        }
-    }
-
-    private class RemoteAdapterMonitorImpl implements RemoteAdapterMonitor {
-
-        @Override
-        public void onAdd(ConfigItem configItem) {
-            this.onModify(configItem);
-        }
-
-        @Override
-        public void onModify(ConfigItem configItem) {
-            String confPath = getConfPath();
-            String category = configItem.getCategory();
-            File categoryDir = new File(confPath + category);
-            if (!categoryDir.isDirectory()) {
-                boolean mkDirs = categoryDir.mkdirs();
-                if (!mkDirs) {
-                    logger.info("## Create adapter category dir error: {}", category);
-                    return;
-                }
-            }
-            String name = configItem.getName();
-            try (FileWriter writer = new FileWriter(
-                    confPath + category + "/" + configItem.getName())) {
-                writer.write(configItem.getContent());
-                writer.flush();
-                logger.info("## Loaded remote adapter config: {}/{}", category, name);
-            } catch (Exception e) {
-                logger.error(e.getMessage(), e);
-            }
-        }
-
-        @Override
-        public void onDelete(String name) {
-            File file = new File(getConfPath() + name);
-            if (file.exists()) {
-                deleteDir(file);
-                logger.info("## Deleted and reloaded remote adapter config: {}", name);
-            }
-        }
-    }
-}

client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/monitor/remote/RemoteAdapterMonitorImpl.java

@@ -0,0 +1,56 @@
+package com.alibaba.otter.canal.adapter.launcher.monitor.remote;
+
+import com.alibaba.otter.canal.common.utils.CommonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileWriter;
+
+/**
+ * 远程配置监听器实现
+ *
+ * @author rewerma 2019-01-25 下午05:20:16
+ * @version 1.0.0
+ */
+public class RemoteAdapterMonitorImpl implements RemoteAdapterMonitor {
+
+    private static final Logger logger = LoggerFactory.getLogger(RemoteAdapterMonitorImpl.class);
+
+    @Override
+    public void onAdd(ConfigItem configItem) {
+        this.onModify(configItem);
+    }
+
+    @Override
+    public void onModify(ConfigItem configItem) {
+        String confPath = CommonUtils.getConfPath();
+        String category = configItem.getCategory();
+        File categoryDir = new File(confPath + category);
+        if (!categoryDir.isDirectory()) {
+            boolean mkDirs = categoryDir.mkdirs();
+            if (!mkDirs) {
+                logger.info("## Create adapter category dir error: {}", category);
+                return;
+            }
+        }
+        String name = configItem.getName();
+        try (FileWriter writer = new FileWriter(confPath + category + "/" + configItem.getName())) {
+            writer.write(configItem.getContent());
+            writer.flush();
+            logger.info("## Loaded remote adapter config: {}/{}", category, name);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void onDelete(String name) {
+        File file = new File(CommonUtils.getConfPath() + name);
+        if (file.exists()) {
+            CommonUtils.deleteDir(file);
+            logger.info("## Deleted and reloaded remote adapter config: {}", name);
+        }
+    }
+
+}

client-adapter/logger/src/main/java/com/alibaba/otter/canal/client/adapter/logger/LoggerAdapterExample.java

@@ -1,6 +1,7 @@
 package com.alibaba.otter.canal.client.adapter.logger;
 
 import java.util.List;
+import java.util.Properties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,7 +26,7 @@ public class LoggerAdapterExample implements OuterAdapter {
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Override
-    public void init(OuterAdapterConfig configuration) {
+    public void init(OuterAdapterConfig configuration, Properties envProperties) {
 
     }
 

client-adapter/rdb/pom.xml

@@ -18,13 +18,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.19</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/RdbAdapter.java

@@ -5,10 +5,8 @@ import java.sql.SQLException;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 
 import javax.sql.DataSource;
 
@@ -27,12 +25,7 @@ import com.alibaba.otter.canal.client.adapter.rdb.service.RdbEtlService;
 import com.alibaba.otter.canal.client.adapter.rdb.service.RdbMirrorDbSyncService;
 import com.alibaba.otter.canal.client.adapter.rdb.service.RdbSyncService;
 import com.alibaba.otter.canal.client.adapter.rdb.support.SyncUtil;
-import com.alibaba.otter.canal.client.adapter.support.DatasourceConfig;
+import com.alibaba.otter.canal.client.adapter.support.*;
-import com.alibaba.otter.canal.client.adapter.support.Dml;
-import com.alibaba.otter.canal.client.adapter.support.EtlResult;
-import com.alibaba.otter.canal.client.adapter.support.OuterAdapterConfig;
-import com.alibaba.otter.canal.client.adapter.support.SPI;
-import com.alibaba.otter.canal.client.adapter.support.Util;
 
 /**
  * RDB适配器实现类
@@ -56,6 +49,8 @@ public class RdbAdapter implements OuterAdapter {
 
     private RdbConfigMonitor                        rdbConfigMonitor;
 
+    private Properties                              envProperties;
+
     public Map<String, MappingConfig> getRdbMapping() {
         return rdbMapping;
     }
@@ -74,8 +69,9 @@ public class RdbAdapter implements OuterAdapter {
      * @param configuration 外部适配器配置信息
      */
     @Override
-    public void init(OuterAdapterConfig configuration) {
+    public void init(OuterAdapterConfig configuration, Properties envProperties) {
-        Map<String, MappingConfig> rdbMappingTmp = ConfigLoader.load();
+        this.envProperties = envProperties;
+        Map<String, MappingConfig> rdbMappingTmp = ConfigLoader.load(envProperties);
         // 过滤不匹配的key的配置
         rdbMappingTmp.forEach((key, mappingConfig) -> {
             if ((mappingConfig.getOuterAdapterKey() == null && configuration.getKey() == null)
@@ -93,9 +89,15 @@ public class RdbAdapter implements OuterAdapter {
             String configName = entry.getKey();
             MappingConfig mappingConfig = entry.getValue();
             if (!mappingConfig.getDbMapping().getMirrorDb()) {
-                String key = StringUtils.trimToEmpty(mappingConfig.getDestination()) + "."
+                String key;
-                             + mappingConfig.getDbMapping().getDatabase() + "."
+                if (envProperties != null && !"tcp".equalsIgnoreCase(envProperties.getProperty("canal.conf.mode"))) {
-                             + mappingConfig.getDbMapping().getTable();
+                    key = StringUtils.trimToEmpty(mappingConfig.getDestination()) + "-"
+                          + StringUtils.trimToEmpty(mappingConfig.getGroupId()) + "_"
+                          + mappingConfig.getDbMapping().getDatabase() + "-" + mappingConfig.getDbMapping().getTable();
+                } else {
+                    key = StringUtils.trimToEmpty(mappingConfig.getDestination()) + "_"
+                          + mappingConfig.getDbMapping().getDatabase() + "-" + mappingConfig.getDbMapping().getTable();
+                }
                 Map<String, MappingConfig> configMap = mappingConfigCache.computeIfAbsent(key,
                     k1 -> new ConcurrentHashMap<>());
                 configMap.put(configName, mappingConfig);
@@ -158,7 +160,7 @@ public class RdbAdapter implements OuterAdapter {
             return;
         }
         try {
-            rdbSyncService.sync(mappingConfigCache, dmls);
+            rdbSyncService.sync(mappingConfigCache, dmls, envProperties);
             rdbMirrorDbSyncService.sync(dmls);
         } catch (Exception e) {
             throw new RuntimeException(e);

client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/config/ConfigLoader.java

@@ -1,50 +1,51 @@
-package com.alibaba.otter.canal.client.adapter.rdb.config;
+package com.alibaba.otter.canal.client.adapter.rdb.config;
-
+
-import java.util.LinkedHashMap;
+import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.Map;
-
+import java.util.Properties;
-import com.alibaba.fastjson.JSONObject;
+
-import org.slf4j.Logger;
+import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.Yaml;
+
-
+import com.alibaba.otter.canal.client.adapter.config.YmlConfigBinder;
-import com.alibaba.otter.canal.client.adapter.support.MappingConfigsLoader;
+import com.alibaba.otter.canal.client.adapter.support.MappingConfigsLoader;
-
+
-/**
+/**
- * RDB表映射配置加载器
+ * RDB表映射配置加载器
- *
+ *
- * @author rewerma 2018-11-07 下午02:41:34
+ * @author rewerma 2018-11-07 下午02:41:34
- * @version 1.0.0
+ * @version 1.0.0
- */
+ */
-public class ConfigLoader {
+public class ConfigLoader {
-
+
-    private static Logger logger = LoggerFactory.getLogger(ConfigLoader.class);
+    private static Logger logger = LoggerFactory.getLogger(ConfigLoader.class);
-
+
-    /**
+    /**
-     * 加载RDB表映射配置
+     * 加载RDB表映射配置
-     *
+     *
-     * @return 配置名/配置文件名--对象
+     * @return 配置名/配置文件名--对象
-     */
+     */
-    @SuppressWarnings("unchecked")
+    public static Map<String, MappingConfig> load(Properties envProperties) {
-    public static Map<String, MappingConfig> load() {
+        logger.info("## Start loading rdb mapping config ... ");
-        logger.info("## Start loading rdb mapping config ... ");
+
-
+        Map<String, MappingConfig> result = new LinkedHashMap<>();
-        Map<String, MappingConfig> result = new LinkedHashMap<>();
+
-
+        Map<String, String> configContentMap = MappingConfigsLoader.loadConfigs("rdb");
-        Map<String, String> configContentMap = MappingConfigsLoader.loadConfigs("rdb");
+        configContentMap.forEach((fileName, content) -> {
-        configContentMap.forEach((fileName, content) -> {
+            MappingConfig config = YmlConfigBinder
-            Map configMap = new Yaml().loadAs(content, Map.class); // yml自带的对象反射不是很稳定
+                .bindYmlToObj(null, content, MappingConfig.class, null, envProperties);
-            JSONObject configJson = new JSONObject(configMap);
+            if (config == null) {
-            MappingConfig config = configJson.toJavaObject(MappingConfig.class);
+                return;
-            try {
+            }
-                config.validate();
+            try {
-            } catch (Exception e) {
+                config.validate();
-                throw new RuntimeException("ERROR Config: " + fileName + " " + e.getMessage(), e);
+            } catch (Exception e) {
-            }
+                throw new RuntimeException("ERROR Config: " + fileName + " " + e.getMessage(), e);
-            result.put(fileName, config);
+            }
-        });
+            result.put(fileName, config);
-
+        });
-        logger.info("## Rdb mapping config loaded");
+
-        return result;
+        logger.info("## Rdb mapping config loaded");
-    }
+        return result;
-}
+    }
+}

client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/config/MappingConfig.java

@@ -17,6 +17,8 @@ public class MappingConfig {
 
     private String    destination;     // canal实例或MQ的topic
 
+    private String    groupId;         // groupId
+
     private String    outerAdapterKey; // 对应适配器的key
 
     private Boolean   concurrent;      // 是否并行同步
@@ -31,6 +33,14 @@ public class MappingConfig {
         this.dataSourceKey = dataSourceKey;
     }
 
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
     public String getOuterAdapterKey() {
         return outerAdapterKey;
     }

client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/config/MirrorDbConfig.java

@@ -7,7 +7,7 @@ public class MirrorDbConfig {
 
     private String             fileName;
     private MappingConfig      mappingConfig;
-    Map<String, MappingConfig> tableConfig = new ConcurrentHashMap<>();
+    private Map<String, MappingConfig> tableConfig = new ConcurrentHashMap<>();
 
     public static MirrorDbConfig create(String fileName, MappingConfig mappingConfig) {
         return new MirrorDbConfig(fileName, mappingConfig);

client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/monitor/RdbConfigMonitor.java

@@ -1,170 +1,169 @@
-package com.alibaba.otter.canal.client.adapter.rdb.monitor;
+package com.alibaba.otter.canal.client.adapter.rdb.monitor;
-
+
-import java.io.File;
+import java.io.File;
-import java.util.HashMap;
+import java.util.HashMap;
-import java.util.Map;
+import java.util.Map;
-
+
-import com.alibaba.otter.canal.client.adapter.rdb.config.MirrorDbConfig;
+import org.apache.commons.io.filefilter.FileFilterUtils;
-import org.apache.commons.io.filefilter.FileFilterUtils;
+import org.apache.commons.io.monitor.FileAlterationListenerAdaptor;
-import org.apache.commons.io.monitor.FileAlterationListenerAdaptor;
+import org.apache.commons.io.monitor.FileAlterationMonitor;
-import org.apache.commons.io.monitor.FileAlterationMonitor;
+import org.apache.commons.io.monitor.FileAlterationObserver;
-import org.apache.commons.io.monitor.FileAlterationObserver;
+import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
-import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.Yaml;
+
-
+import com.alibaba.otter.canal.client.adapter.rdb.RdbAdapter;
-import com.alibaba.otter.canal.client.adapter.rdb.RdbAdapter;
+import com.alibaba.otter.canal.client.adapter.rdb.config.MappingConfig;
-import com.alibaba.otter.canal.client.adapter.rdb.config.MappingConfig;
+import com.alibaba.otter.canal.client.adapter.rdb.config.MirrorDbConfig;
-import com.alibaba.otter.canal.client.adapter.rdb.config.MirrorDbConfig;
+import com.alibaba.otter.canal.client.adapter.support.MappingConfigsLoader;
-import com.alibaba.otter.canal.client.adapter.support.MappingConfigsLoader;
+import com.alibaba.otter.canal.client.adapter.support.Util;
-import com.alibaba.otter.canal.client.adapter.support.Util;
+
-
+public class RdbConfigMonitor {
-public class RdbConfigMonitor {
+
-
+    private static final Logger   logger      = LoggerFactory.getLogger(RdbConfigMonitor.class);
-    private static final Logger   logger      = LoggerFactory.getLogger(RdbConfigMonitor.class);
+
-
+    private static final String   adapterName = "rdb";
-    private static final String   adapterName = "rdb";
+
-
+    private String                key;
-    private String                key;
+
-
+    private RdbAdapter            rdbAdapter;
-    private RdbAdapter            rdbAdapter;
+
-
+    private FileAlterationMonitor fileMonitor;
-    private FileAlterationMonitor fileMonitor;
+
-
+    public void init(String key, RdbAdapter rdbAdapter) {
-    public void init(String key, RdbAdapter rdbAdapter) {
+        this.key = key;
-        this.key = key;
+        this.rdbAdapter = rdbAdapter;
-        this.rdbAdapter = rdbAdapter;
+        File confDir = Util.getConfDirPath(adapterName);
-        File confDir = Util.getConfDirPath(adapterName);
+        try {
-        try {
+            FileAlterationObserver observer = new FileAlterationObserver(confDir,
-            FileAlterationObserver observer = new FileAlterationObserver(confDir,
+                FileFilterUtils.and(FileFilterUtils.fileFileFilter(), FileFilterUtils.suffixFileFilter("yml")));
-                FileFilterUtils.and(FileFilterUtils.fileFileFilter(), FileFilterUtils.suffixFileFilter("yml")));
+            FileListener listener = new FileListener();
-            FileListener listener = new FileListener();
+            observer.addListener(listener);
-            observer.addListener(listener);
+            fileMonitor = new FileAlterationMonitor(3000, observer);
-            fileMonitor = new FileAlterationMonitor(3000, observer);
+            fileMonitor.start();
-            fileMonitor.start();
+
-
+        } catch (Exception e) {
-        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
-            logger.error(e.getMessage(), e);
+        }
-        }
+    }
-    }
+
-
+    public void destroy() {
-    public void destroy() {
+        try {
-        try {
+            fileMonitor.stop();
-            fileMonitor.stop();
+        } catch (Exception e) {
-        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
-            logger.error(e.getMessage(), e);
+        }
-        }
+    }
-    }
+
-
+    private class FileListener extends FileAlterationListenerAdaptor {
-    private class FileListener extends FileAlterationListenerAdaptor {
+
-
+        @Override
-        @Override
+        public void onFileCreate(File file) {
-        public void onFileCreate(File file) {
+            super.onFileCreate(file);
-            super.onFileCreate(file);
+            try {
-            try {
+                // 加载新增的配置文件
-                // 加载新增的配置文件
+                String configContent = MappingConfigsLoader.loadConfig(adapterName + File.separator + file.getName());
-                String configContent = MappingConfigsLoader.loadConfig(adapterName + File.separator + file.getName());
+                MappingConfig config = new Yaml().loadAs(configContent, MappingConfig.class);
-                MappingConfig config = new Yaml().loadAs(configContent, MappingConfig.class);
+                config.validate();
-                config.validate();
+                if ((key == null && config.getOuterAdapterKey() == null)
-                if ((key == null && config.getOuterAdapterKey() == null)
+                    || (key != null && key.equals(config.getOuterAdapterKey()))) {
-                    || (key != null && key.equals(config.getOuterAdapterKey()))) {
+                    addConfigToCache(file, config);
-                    addConfigToCache(file, config);
+
-
+                    logger.info("Add a new rdb mapping config: {} to canal adapter", file.getName());
-                    logger.info("Add a new rdb mapping config: {} to canal adapter", file.getName());
+                }
-                }
+            } catch (Exception e) {
-            } catch (Exception e) {
+                logger.error(e.getMessage(), e);
-                logger.error(e.getMessage(), e);
+            }
-            }
+        }
-        }
+
-
+        @Override
-        @Override
+        public void onFileChange(File file) {
-        public void onFileChange(File file) {
+            super.onFileChange(file);
-            super.onFileChange(file);
+
-
+            try {
-            try {
+                if (rdbAdapter.getRdbMapping().containsKey(file.getName())) {
-                if (rdbAdapter.getRdbMapping().containsKey(file.getName())) {
+                    // 加载配置文件
-                    // 加载配置文件
+                    String configContent = MappingConfigsLoader
-                    String configContent = MappingConfigsLoader
+                        .loadConfig(adapterName + File.separator + file.getName());
-                        .loadConfig(adapterName + File.separator + file.getName());
+                    if (configContent == null) {
-                    if (configContent == null) {
+                        onFileDelete(file);
-                        onFileDelete(file);
+                        return;
-                        return;
+                    }
-                    }
+                    MappingConfig config = new Yaml().loadAs(configContent, MappingConfig.class);
-                    MappingConfig config = new Yaml().loadAs(configContent, MappingConfig.class);
+                    config.validate();
-                    config.validate();
+                    if ((key == null && config.getOuterAdapterKey() == null)
-                    if ((key == null && config.getOuterAdapterKey() == null)
+                        || (key != null && key.equals(config.getOuterAdapterKey()))) {
-                        || (key != null && key.equals(config.getOuterAdapterKey()))) {
+                        if (rdbAdapter.getRdbMapping().containsKey(file.getName())) {
-                        if (rdbAdapter.getRdbMapping().containsKey(file.getName())) {
+                            deleteConfigFromCache(file);
-                            deleteConfigFromCache(file);
+                        }
-                        }
+                        addConfigToCache(file, config);
-                        addConfigToCache(file, config);
+                    } else {
-                    } else {
+                        // 不能修改outerAdapterKey
-                        // 不能修改outerAdapterKey
+                        throw new RuntimeException("Outer adapter key not allowed modify");
-                        throw new RuntimeException("Outer adapter key not allowed modify");
+                    }
-                    }
+                    logger.info("Change a rdb mapping config: {} of canal adapter", file.getName());
-                    logger.info("Change a rdb mapping config: {} of canal adapter", file.getName());
+                }
-                }
+            } catch (Exception e) {
-            } catch (Exception e) {
+                logger.error(e.getMessage(), e);
-                logger.error(e.getMessage(), e);
+            }
-            }
+        }
-        }
+
-
+        @Override
-        @Override
+        public void onFileDelete(File file) {
-        public void onFileDelete(File file) {
+            super.onFileDelete(file);
-            super.onFileDelete(file);
+
-
+            try {
-            try {
+                if (rdbAdapter.getRdbMapping().containsKey(file.getName())) {
-                if (rdbAdapter.getRdbMapping().containsKey(file.getName())) {
+                    deleteConfigFromCache(file);
-                    deleteConfigFromCache(file);
+
-
+                    logger.info("Delete a rdb mapping config: {} of canal adapter", file.getName());
-                    logger.info("Delete a rdb mapping config: {} of canal adapter", file.getName());
+                }
-                }
+            } catch (Exception e) {
-            } catch (Exception e) {
+                logger.error(e.getMessage(), e);
-                logger.error(e.getMessage(), e);
+            }
-            }
+        }
-        }
+
-
+        private void addConfigToCache(File file, MappingConfig mappingConfig) {
-        private void addConfigToCache(File file, MappingConfig mappingConfig) {
+            if (mappingConfig == null || mappingConfig.getDbMapping() == null) {
-            if (mappingConfig == null || mappingConfig.getDbMapping() == null) {
+                return;
-                return;
+            }
-            }
+            rdbAdapter.getRdbMapping().put(file.getName(), mappingConfig);
-            rdbAdapter.getRdbMapping().put(file.getName(), mappingConfig);
+            if (!mappingConfig.getDbMapping().getMirrorDb()) {
-            if (!mappingConfig.getDbMapping().getMirrorDb()) {
+                Map<String, MappingConfig> configMap = rdbAdapter.getMappingConfigCache()
-                Map<String, MappingConfig> configMap = rdbAdapter.getMappingConfigCache()
+                    .computeIfAbsent(StringUtils.trimToEmpty(mappingConfig.getDestination()) + "."
-                    .computeIfAbsent(StringUtils.trimToEmpty(mappingConfig.getDestination()) + "."
+                                     + mappingConfig.getDbMapping().getDatabase() + "."
-                                     + mappingConfig.getDbMapping().getDatabase() + "."
+                                     + mappingConfig.getDbMapping().getTable(),
-                                     + mappingConfig.getDbMapping().getTable(),
+                        k1 -> new HashMap<>());
-                        k1 -> new HashMap<>());
+                configMap.put(file.getName(), mappingConfig);
-                configMap.put(file.getName(), mappingConfig);
+            } else {
-            } else {
+                Map<String, MirrorDbConfig> mirrorDbConfigCache = rdbAdapter.getMirrorDbConfigCache();
-                Map<String, MirrorDbConfig> mirrorDbConfigCache = rdbAdapter.getMirrorDbConfigCache();
+                mirrorDbConfigCache.put(StringUtils.trimToEmpty(mappingConfig.getDestination()) + "."
-                mirrorDbConfigCache.put(StringUtils.trimToEmpty(mappingConfig.getDestination()) + "."
+                                        + mappingConfig.getDbMapping().getDatabase(),
-                                        + mappingConfig.getDbMapping().getDatabase(),
+                    MirrorDbConfig.create(file.getName(), mappingConfig));
-                    MirrorDbConfig.create(file.getName(), mappingConfig));
+            }
-            }
+        }
-        }
+
-
+        private void deleteConfigFromCache(File file) {
-        private void deleteConfigFromCache(File file) {
+            MappingConfig mappingConfig = rdbAdapter.getRdbMapping().remove(file.getName());
-            MappingConfig mappingConfig = rdbAdapter.getRdbMapping().remove(file.getName());
+
-
+            if (mappingConfig == null || mappingConfig.getDbMapping() == null) {
-            if (mappingConfig == null || mappingConfig.getDbMapping() == null) {
+                return;
-                return;
+            }
-            }
+            if (!mappingConfig.getDbMapping().getMirrorDb()) {
-            if (!mappingConfig.getDbMapping().getMirrorDb()) {
+                for (Map<String, MappingConfig> configMap : rdbAdapter.getMappingConfigCache().values()) {
-                for (Map<String, MappingConfig> configMap : rdbAdapter.getMappingConfigCache().values()) {
+                    if (configMap != null) {
-                    if (configMap != null) {
+                        configMap.remove(file.getName());
-                        configMap.remove(file.getName());
+                    }
-                    }
+                }
-                }
+            } else {
-            } else {
+                rdbAdapter.getMirrorDbConfigCache().forEach((key, mirrorDbConfig) -> {
-                rdbAdapter.getMirrorDbConfigCache().forEach((key, mirrorDbConfig) -> {
+                    if (mirrorDbConfig.getFileName().equals(file.getName())) {
-                    if (mirrorDbConfig.getFileName().equals(file.getName())) {
+                        rdbAdapter.getMirrorDbConfigCache().remove(key);
-                        rdbAdapter.getMirrorDbConfigCache().remove(key);
+                    }
-                    }
+                });
-                });
+            }
-            }
+
-
+        }
-        }
+    }
-    }
+}
-}

client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbEtlService.java

@@ -13,12 +13,12 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import javax.sql.DataSource;
 
-import com.alibaba.otter.canal.client.adapter.rdb.support.SyncUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.alibaba.otter.canal.client.adapter.rdb.config.MappingConfig;
 import com.alibaba.otter.canal.client.adapter.rdb.config.MappingConfig.DbMapping;
+import com.alibaba.otter.canal.client.adapter.rdb.support.SyncUtil;
 import com.alibaba.otter.canal.client.adapter.support.EtlResult;
 import com.alibaba.otter.canal.client.adapter.support.Util;
 import com.google.common.base.Joiner;
@@ -36,7 +36,8 @@ public class RdbEtlService {
     /**
      * 导入数据
      */
-    public static EtlResult importData(DataSource srcDS, DataSource targetDS, MappingConfig config, List<String> params) {
+    public static EtlResult importData(DataSource srcDS, DataSource targetDS, MappingConfig config,
+                                       List<String> params) {
         EtlResult etlResult = new EtlResult();
         AtomicLong successCount = new AtomicLong();
         List<String> errMsg = new ArrayList<>();
@@ -53,8 +54,8 @@ public class RdbEtlService {
             long start = System.currentTimeMillis();
 
             // 拼接sql
-            StringBuilder sql = new StringBuilder("SELECT * FROM " + dbMapping.getDatabase() + "."
+            StringBuilder sql = new StringBuilder(
-                                                  + dbMapping.getTable());
+                "SELECT * FROM " + dbMapping.getDatabase() + "." + dbMapping.getTable());
 
             // 拼接条件
             appendCondition(params, dbMapping, srcDS, sql);
@@ -91,12 +92,8 @@ public class RdbEtlService {
                     } else {
                         sqlFinal = sql + " LIMIT " + offset + "," + cnt;
                     }
-                    Future<Boolean> future = executor.submit(() -> executeSqlImport(srcDS,
+                    Future<Boolean> future = executor
-                        targetDS,
+                        .submit(() -> executeSqlImport(srcDS, targetDS, sqlFinal, dbMapping, successCount, errMsg));
-                        sqlFinal,
-                        dbMapping,
-                        successCount,
-                        errMsg));
                     futures.add(future);
                 }
 
@@ -109,11 +106,11 @@ public class RdbEtlService {
                 executeSqlImport(srcDS, targetDS, sql.toString(), dbMapping, successCount, errMsg);
             }
 
-            logger.info(dbMapping.getTable() + " etl completed in: " + (System.currentTimeMillis() - start) / 1000
+            logger.info(
-                        + "s!");
+                dbMapping.getTable() + " etl completed in: " + (System.currentTimeMillis() - start) / 1000 + "s!");
 
-            etlResult.setResultMessage("导入目标表 " + SyncUtil.getDbTableName(dbMapping) + " 数据：" + successCount.get()
+            etlResult
-                                       + " 条");
+                .setResultMessage("导入目标表 " + SyncUtil.getDbTableName(dbMapping) + " 数据：" + successCount.get() + " 条");
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
             errMsg.add(hbaseTable + " etl failed! ==>" + e.getMessage());
@@ -127,8 +124,8 @@ public class RdbEtlService {
         return etlResult;
     }
 
-    private static void appendCondition(List<String> params, DbMapping dbMapping, DataSource ds, StringBuilder sql)
+    private static void appendCondition(List<String> params, DbMapping dbMapping, DataSource ds,
-                                                                                                                   throws SQLException {
+                                        StringBuilder sql) throws SQLException {
         if (params != null && params.size() == 1 && dbMapping.getEtlCondition() == null) {
             AtomicBoolean stExists = new AtomicBoolean(false);
             // 验证是否有SYS_TIME字段
@@ -145,9 +142,9 @@ public class RdbEtlService {
                     }
                 } catch (Exception e) {
                     // ignore
-            }
+                }
-            return null;
+                return null;
-        }   );
+            });
             if (stExists.get()) {
                 sql.append(" WHERE SYS_TIME >= '").append(params.get(0)).append("' ");
             }
@@ -168,13 +165,12 @@ public class RdbEtlService {
     private static boolean executeSqlImport(DataSource srcDS, DataSource targetDS, String sql, DbMapping dbMapping,
                                             AtomicLong successCount, List<String> errMsg) {
         try {
-            Util.sqlRS(srcDS, sql, rs -> {
+            Map<String, String> columnsMap = new LinkedHashMap<>();
-                int idx = 1;
+            Map<String, Integer> columnType = new LinkedHashMap<>();
 
+            Util.sqlRS(targetDS, "SELECT * FROM " + SyncUtil.getDbTableName(dbMapping) + " LIMIT 1 ", rs -> {
                 try {
-                    boolean completed = false;
 
-                    Map<String, Integer> columnType = new LinkedHashMap<>();
                     ResultSetMetaData rsd = rs.getMetaData();
                     int columnCount = rsd.getColumnCount();
                     List<String> columns = new ArrayList<>();
@@ -183,91 +179,105 @@ public class RdbEtlService {
                         columns.add(rsd.getColumnName(i));
                     }
 
-                    Map<String, String> columnsMap = SyncUtil.getColumnsMap(dbMapping, columns);
+                    columnsMap.putAll(SyncUtil.getColumnsMap(dbMapping, columns));
+                    return true;
+                } catch (Exception e) {
+                    logger.error(e.getMessage(), e);
+                    return false;
+                }
+            });
+
+            Util.sqlRS(srcDS, sql, rs -> {
+                int idx = 1;
+
+                try {
+                    boolean completed = false;
+
                     // if (dbMapping.isMapAll()) {
                     // columnsMap = dbMapping.getAllColumns();
                     // } else {
                     // columnsMap = dbMapping.getTargetColumns();
                     // }
 
-                StringBuilder insertSql = new StringBuilder();
+                    StringBuilder insertSql = new StringBuilder();
-                insertSql.append("INSERT INTO ").append(SyncUtil.getDbTableName(dbMapping)).append(" (");
+                    insertSql.append("INSERT INTO ").append(SyncUtil.getDbTableName(dbMapping)).append(" (");
-                columnsMap.forEach((targetColumnName, srcColumnName) -> insertSql.append(targetColumnName).append(","));
+                    columnsMap
+                            .forEach((targetColumnName, srcColumnName) -> insertSql.append(targetColumnName).append(","));
 
-                int len = insertSql.length();
+                    int len = insertSql.length();
-                insertSql.delete(len - 1, len).append(") VALUES (");
+                    insertSql.delete(len - 1, len).append(") VALUES (");
-                int mapLen = columnsMap.size();
+                    int mapLen = columnsMap.size();
-                for (int i = 0; i < mapLen; i++) {
+                    for (int i = 0; i < mapLen; i++) {
-                    insertSql.append("?,");
+                        insertSql.append("?,");
-                }
+                    }
-                len = insertSql.length();
+                    len = insertSql.length();
-                insertSql.delete(len - 1, len).append(")");
+                    insertSql.delete(len - 1, len).append(")");
-                try (Connection connTarget = targetDS.getConnection();
+                    try (Connection connTarget = targetDS.getConnection();
-                        PreparedStatement pstmt = connTarget.prepareStatement(insertSql.toString())) {
+                         PreparedStatement pstmt = connTarget.prepareStatement(insertSql.toString())) {
-                    connTarget.setAutoCommit(false);
+                        connTarget.setAutoCommit(false);
 
-                    while (rs.next()) {
+                        while (rs.next()) {
-                        pstmt.clearParameters();
+                            pstmt.clearParameters();
 
-                        // 删除数据
+                            // 删除数据
-                        Map<String, Object> values = new LinkedHashMap<>();
+                            Map<String, Object> values = new LinkedHashMap<>();
-                        StringBuilder deleteSql = new StringBuilder("DELETE FROM " + SyncUtil.getDbTableName(dbMapping)
+                            StringBuilder deleteSql = new StringBuilder(
-                                                                    + " WHERE ");
+                                    "DELETE FROM " + SyncUtil.getDbTableName(dbMapping) + " WHERE ");
-                        appendCondition(dbMapping, deleteSql, values, rs);
+                            appendCondition(dbMapping, deleteSql, values, rs);
-                        try (PreparedStatement pstmt2 = connTarget.prepareStatement(deleteSql.toString())) {
+                            try (PreparedStatement pstmt2 = connTarget.prepareStatement(deleteSql.toString())) {
-                            int k = 1;
+                                int k = 1;
-                            for (Object val : values.values()) {
+                                for (Object val : values.values()) {
-                                pstmt2.setObject(k++, val);
+                                    pstmt2.setObject(k++, val);
-                            }
+                                }
-                            pstmt2.execute();
+                                pstmt2.execute();
-                        }
-
-                        int i = 1;
-                        for (Map.Entry<String, String> entry : columnsMap.entrySet()) {
-                            String targetClolumnName = entry.getKey();
-                            String srcColumnName = entry.getValue();
-                            if (srcColumnName == null) {
-                                srcColumnName = targetClolumnName;
                             }
 
-                            Integer type = columnType.get(targetClolumnName.toLowerCase());
+                            int i = 1;
+                            for (Map.Entry<String, String> entry : columnsMap.entrySet()) {
+                                String targetClolumnName = entry.getKey();
+                                String srcColumnName = entry.getValue();
+                                if (srcColumnName == null) {
+                                    srcColumnName = targetClolumnName;
+                                }
 
-                            Object value = rs.getObject(srcColumnName);
+                                Integer type = columnType.get(targetClolumnName.toLowerCase());
-                            if (value != null) {
+
-                                SyncUtil.setPStmt(type, pstmt, value, i);
+                                Object value = rs.getObject(srcColumnName);
-                            } else {
+                                if (value != null) {
-                                pstmt.setNull(i, type);
+                                    SyncUtil.setPStmt(type, pstmt, value, i);
+                                } else {
+                                    pstmt.setNull(i, type);
+                                }
+
+                                i++;
                             }
 
-                            i++;
+                            pstmt.execute();
-                        }
+                            if (logger.isTraceEnabled()) {
+                                logger.trace("Insert into target table, sql: {}", insertSql);
+                            }
 
-                        pstmt.execute();
+                            if (idx % dbMapping.getCommitBatch() == 0) {
-                        if (logger.isTraceEnabled()) {
+                                connTarget.commit();
-                            logger.trace("Insert into target table, sql: {}", insertSql);
+                                completed = true;
+                            }
+                            idx++;
+                            successCount.incrementAndGet();
+                            if (logger.isDebugEnabled()) {
+                                logger.debug("successful import count:" + successCount.get());
+                            }
                         }
-
+                        if (!completed) {
-                        if (idx % dbMapping.getCommitBatch() == 0) {
                             connTarget.commit();
-                            completed = true;
-                        }
-                        idx++;
-                        successCount.incrementAndGet();
-                        if (logger.isDebugEnabled()) {
-                            logger.debug("successful import count:" + successCount.get());
                         }
                     }
-                    if (!completed) {
-                        connTarget.commit();
-                    }
-                }
 
-            } catch (Exception e) {
+                } catch (Exception e) {
-                logger.error(dbMapping.getTable() + " etl failed! ==>" + e.getMessage(), e);
+                    logger.error(dbMapping.getTable() + " etl failed! ==>" + e.getMessage(), e);
-                errMsg.add(dbMapping.getTable() + " etl failed! ==>" + e.getMessage());
+                    errMsg.add(dbMapping.getTable() + " etl failed! ==>" + e.getMessage());
-            }
+                }
-            return idx;
+                return idx;
-        }   );
+            });
             return true;
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
@@ -278,8 +288,8 @@ public class RdbEtlService {
     /**
      * 拼接目标表主键where条件
      */
-    private static void appendCondition(DbMapping dbMapping, StringBuilder sql, Map<String, Object> values, ResultSet rs)
+    private static void appendCondition(DbMapping dbMapping, StringBuilder sql, Map<String, Object> values,
-                                                                                                                         throws SQLException {
+                                        ResultSet rs) throws SQLException {
         // 拼接主键
         for (Map.Entry<String, String> entry : dbMapping.getTargetPk().entrySet()) {
             String targetColumnName = entry.getKey();

client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/service/RdbMirrorDbSyncService.java

@@ -56,6 +56,15 @@ public class RdbMirrorDbSyncService {
             if (mirrorDbConfig == null) {
                 continue;
             }
+            if (mirrorDbConfig.getMappingConfig() == null) {
+                continue;
+            }
+            if (dml.getGroupId() != null && StringUtils.isNotEmpty(mirrorDbConfig.getMappingConfig().getGroupId())) {
+                if (!mirrorDbConfig.getMappingConfig().getGroupId().equals(dml.getGroupId())) {
+                    continue; // 如果groupId不匹配则过滤
+                }
+            }
+
             if (dml.getIsDdl() != null && dml.getIsDdl() && StringUtils.isNotEmpty(dml.getSql())) {
                 // DDL
                 if (logger.isDebugEnabled()) {
@@ -71,37 +80,35 @@ public class RdbMirrorDbSyncService {
             }
         }
         if (!dmlList.isEmpty()) {
-            rdbSyncService.sync(dmlList,
+            rdbSyncService.sync(dmlList, dml -> {
-                dml -> {
+                MirrorDbConfig mirrorDbConfig = mirrorDbConfigCache.get(dml.getDestination() + "." + dml.getDatabase());
-                    MirrorDbConfig mirrorDbConfig = mirrorDbConfigCache.get(dml.getDestination() + "."
+                if (mirrorDbConfig == null) {
-                                                                            + dml.getDatabase());
+                    return false;
-                    if (mirrorDbConfig == null) {
+                }
-                        return false;
+                String table = dml.getTable();
-                    }
+                MappingConfig config = mirrorDbConfig.getTableConfig().get(table);
-                    String table = dml.getTable();
-                    MappingConfig config = mirrorDbConfig.getTableConfig().get(table);
 
-                    if (config == null) {
+                if (config == null) {
-                        return false;
+                    return false;
-                    }
+                }
 
-                    if (config.getConcurrent()) {
+                if (config.getConcurrent()) {
-                        List<SingleDml> singleDmls = SingleDml.dml2SingleDmls(dml);
+                    List<SingleDml> singleDmls = SingleDml.dml2SingleDmls(dml);
-                        singleDmls.forEach(singleDml -> {
+                    singleDmls.forEach(singleDml -> {
-                            int hash = rdbSyncService.pkHash(config.getDbMapping(), singleDml.getData());
+                        int hash = rdbSyncService.pkHash(config.getDbMapping(), singleDml.getData());
-                            RdbSyncService.SyncItem syncItem = new RdbSyncService.SyncItem(config, singleDml);
+                        RdbSyncService.SyncItem syncItem = new RdbSyncService.SyncItem(config, singleDml);
-                            rdbSyncService.getDmlsPartition()[hash].add(syncItem);
+                        rdbSyncService.getDmlsPartition()[hash].add(syncItem);
-                        });
+                    });
-                    } else {
+                } else {
-                        int hash = 0;
+                    int hash = 0;
-                        List<SingleDml> singleDmls = SingleDml.dml2SingleDmls(dml);
+                    List<SingleDml> singleDmls = SingleDml.dml2SingleDmls(dml);
-                        singleDmls.forEach(singleDml -> {
+                    singleDmls.forEach(singleDml -> {
-                            RdbSyncService.SyncItem syncItem = new RdbSyncService.SyncItem(config, singleDml);
+                        RdbSyncService.SyncItem syncItem = new RdbSyncService.SyncItem(config, singleDml);
-                            rdbSyncService.getDmlsPartition()[hash].add(syncItem);
+                        rdbSyncService.getDmlsPartition()[hash].add(syncItem);
-                        });
+                    });
-                    }
+                }
-                    return true;
+                return true;
-                });
+            });
         }
     }
 
@@ -119,6 +126,7 @@ public class RdbMirrorDbSyncService {
             mappingConfig = new MappingConfig();
             mappingConfig.setDataSourceKey(baseConfigMap.getDataSourceKey());
             mappingConfig.setDestination(baseConfigMap.getDestination());
+            mappingConfig.setGroupId(baseConfigMap.getGroupId());
             mappingConfig.setOuterAdapterKey(baseConfigMap.getOuterAdapterKey());
             mappingConfig.setConcurrent(baseConfigMap.getConcurrent());
             MappingConfig.DbMapping dbMapping = new MappingConfig.DbMapping();

client-adapter/rdb/src/main/resources/rdb/mytest_user.yml

@@ -1,11 +1,12 @@
 dataSourceKey: defaultDS
 destination: example
-outerAdapterKey: oracle1
+groupId: g1
+outerAdapterKey: mysql1
 concurrent: true
 dbMapping:
   database: mytest
   table: user
-  targetTable: mytest.tb_user
+  targetTable: mytest2.user
   targetPk:
     id: id
 #  mapAll: true
@@ -17,9 +18,10 @@ dbMapping:
     test1:
 
 
-# Mirror schema synchronize config
+## Mirror schema synchronize config
 #dataSourceKey: defaultDS
 #destination: example
+#groupId: g1
 #outerAdapterKey: mysql1
 #concurrent: true
 #dbMapping:

client-adapter/rdb/src/test/java/com/alibaba/otter/canal/client/adapter/rdb/test/ConfigLoadTest.java

@@ -20,7 +20,7 @@ public class ConfigLoadTest {
 
     @Test
     public void testLoad() {
-        Map<String, MappingConfig> configMap =  ConfigLoader.load();
+        Map<String, MappingConfig> configMap =  ConfigLoader.load(null);
 
         Assert.assertFalse(configMap.isEmpty());
     }

client-adapter/rdb/src/test/java/com/alibaba/otter/canal/client/adapter/rdb/test/sync/Common.java

@@ -24,7 +24,7 @@ public class Common {
         outerAdapterConfig.setProperties(properties);
 
         RdbAdapter adapter = new RdbAdapter();
-        adapter.init(outerAdapterConfig);
+        adapter.init(outerAdapterConfig, null);
         return adapter;
     }
 }

client/src/main/java/com/alibaba/otter/canal/client/kafka/KafkaCanalConnector.java

@@ -1,326 +1,325 @@
-package com.alibaba.otter.canal.client.kafka;
+package com.alibaba.otter.canal.client.kafka;
-
+
-import java.util.*;
+import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeUnit;
-
+
-import com.google.common.collect.MapMaker;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.serialization.StringDeserializer;
+
-
+import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.otter.canal.client.CanalMQConnector;
-import com.alibaba.otter.canal.client.CanalMQConnector;
+import com.alibaba.otter.canal.client.impl.SimpleCanalConnector;
-import com.alibaba.otter.canal.client.impl.SimpleCanalConnector;
+import com.alibaba.otter.canal.protocol.FlatMessage;
-import com.alibaba.otter.canal.protocol.FlatMessage;
+import com.alibaba.otter.canal.protocol.Message;
-import com.alibaba.otter.canal.protocol.Message;
+import com.alibaba.otter.canal.protocol.exception.CanalClientException;
-import com.alibaba.otter.canal.protocol.exception.CanalClientException;
+import com.google.common.collect.Lists;
-import com.google.common.collect.Lists;
+
-
+/**
-/**
+ * canal kafka 数据操作客户端
- * canal kafka 数据操作客户端
+ *
- *
+ * <pre>
- * <pre>
+ * 注意点：
- * 注意点：
+ * 1. 相比于canal {@linkplain SimpleCanalConnector}, 这里get和ack操作不能有并发, 必须是一个线程执行get后，内存里执行完毕ack后再取下一个get
- * 1. 相比于canal {@linkplain SimpleCanalConnector}, 这里get和ack操作不能有并发, 必须是一个线程执行get后，内存里执行完毕ack后再取下一个get
+ * </pre>
- * </pre>
+ *
- *
+ * @author machengyuan @ 2018-6-12
- * @author machengyuan @ 2018-6-12
+ * @version 1.1.1
- * @version 1.1.1
+ */
- */
+public class KafkaCanalConnector implements CanalMQConnector {
-public class KafkaCanalConnector implements CanalMQConnector {
+
-
+    protected KafkaConsumer<String, Message> kafkaConsumer;
-    protected KafkaConsumer<String, Message> kafkaConsumer;
+    protected KafkaConsumer<String, String>  kafkaConsumer2;                            // 用于扁平message的数据消费
-    protected KafkaConsumer<String, String>  kafkaConsumer2;                            // 用于扁平message的数据消费
+    protected String                         topic;
-    protected String                         topic;
+    protected Integer                        partition;
-    protected Integer                        partition;
+    protected Properties                     properties;
-    protected Properties                     properties;
+    protected volatile boolean               connected      = false;
-    protected volatile boolean               connected      = false;
+    protected volatile boolean               running        = false;
-    protected volatile boolean               running        = false;
+    protected boolean                        flatMessage;
-    protected boolean                        flatMessage;
+
-
+    private Map<Integer, Long>               currentOffsets = new ConcurrentHashMap<>();
-    private Map<Integer, Long>               currentOffsets = new ConcurrentHashMap<>();
+
-
+    public KafkaCanalConnector(String servers, String topic, Integer partition, String groupId, Integer batchSize,
-    public KafkaCanalConnector(String servers, String topic, Integer partition, String groupId, Integer batchSize,
+                               boolean flatMessage){
-                               boolean flatMessage){
+        this.topic = topic;
-        this.topic = topic;
+        this.partition = partition;
-        this.partition = partition;
+        this.flatMessage = flatMessage;
-        this.flatMessage = flatMessage;
+
-
+        properties = new Properties();
-        properties = new Properties();
+        properties.put("bootstrap.servers", servers);
-        properties.put("bootstrap.servers", servers);
+        properties.put("group.id", groupId);
-        properties.put("group.id", groupId);
+        properties.put("enable.auto.commit", false);
-        properties.put("enable.auto.commit", false);
+        properties.put("auto.commit.interval.ms", "1000");
-        properties.put("auto.commit.interval.ms", "1000");
+        properties.put("auto.offset.reset", "latest"); // 如果没有offset则从最后的offset开始读
-        properties.put("auto.offset.reset", "latest"); // 如果没有offset则从最后的offset开始读
+        properties.put("request.timeout.ms", "40000"); // 必须大于session.timeout.ms的设置
-        properties.put("request.timeout.ms", "40000"); // 必须大于session.timeout.ms的设置
+        properties.put("session.timeout.ms", "30000"); // 默认为30秒
-        properties.put("session.timeout.ms", "30000"); // 默认为30秒
+        if (batchSize == null) {
-        if (batchSize == null) {
+            batchSize = 100;
-            batchSize = 100;
+        }
-        }
+        properties.put("max.poll.records", batchSize.toString());
-        properties.put("max.poll.records", batchSize.toString());
+        properties.put("key.deserializer", StringDeserializer.class.getName());
-        properties.put("key.deserializer", StringDeserializer.class.getName());
+        if (!flatMessage) {
-        if (!flatMessage) {
+            properties.put("value.deserializer", MessageDeserializer.class.getName());
-            properties.put("value.deserializer", MessageDeserializer.class.getName());
+        } else {
-        } else {
+            properties.put("value.deserializer", StringDeserializer.class.getName());
-            properties.put("value.deserializer", StringDeserializer.class.getName());
+        }
-        }
+    }
-    }
+
-
+    /**
-    /**
+     * 打开连接
-     * 打开连接
+     */
-     */
+    @Override
-    @Override
+    public void connect() {
-    public void connect() {
+        if (connected) {
-        if (connected) {
+            return;
-            return;
+        }
-        }
+
-
+        connected = true;
-        connected = true;
+        if (kafkaConsumer == null && !flatMessage) {
-        if (kafkaConsumer == null && !flatMessage) {
+            kafkaConsumer = new KafkaConsumer<String, Message>(properties);
-            kafkaConsumer = new KafkaConsumer<String, Message>(properties);
+
-
+        }
-        }
+        if (kafkaConsumer2 == null && flatMessage) {
-        if (kafkaConsumer2 == null && flatMessage) {
+            kafkaConsumer2 = new KafkaConsumer<String, String>(properties);
-            kafkaConsumer2 = new KafkaConsumer<String, String>(properties);
+        }
-        }
+    }
-    }
+
-
+    /**
-    /**
+     * 关闭链接
-     * 关闭链接
+     */
-     */
+    @Override
-    @Override
+    public void disconnect() {
-    public void disconnect() {
+        if (kafkaConsumer != null) {
-        if (kafkaConsumer != null) {
+            kafkaConsumer.close();
-            kafkaConsumer.close();
+            kafkaConsumer = null;
-            kafkaConsumer = null;
+        }
-        }
+        if (kafkaConsumer2 != null) {
-        if (kafkaConsumer2 != null) {
+            kafkaConsumer2.close();
-            kafkaConsumer2.close();
+            kafkaConsumer2 = null;
-            kafkaConsumer2 = null;
+        }
-        }
+
-
+        connected = false;
-        connected = false;
+    }
-    }
+
-
+    protected void waitClientRunning() {
-    protected void waitClientRunning() {
+        running = true;
-        running = true;
+    }
-    }
+
-
+    @Override
-    @Override
+    public boolean checkValid() {
-    public boolean checkValid() {
+        return true;// 默认都放过
-        return true;// 默认都放过
+    }
-    }
+
-
+    /**
-    /**
+     * 订阅topic
-     * 订阅topic
+     */
-     */
+    @Override
-    @Override
+    public void subscribe() {
-    public void subscribe() {
+        waitClientRunning();
-        waitClientRunning();
+        if (!running) {
-        if (!running) {
+            return;
-            return;
+        }
-        }
+
-
+        if (partition == null) {
-        if (partition == null) {
+            if (kafkaConsumer != null) {
-            if (kafkaConsumer != null) {
+                kafkaConsumer.subscribe(Collections.singletonList(topic));
-                kafkaConsumer.subscribe(Collections.singletonList(topic));
+            }
-            }
+            if (kafkaConsumer2 != null) {
-            if (kafkaConsumer2 != null) {
+                kafkaConsumer2.subscribe(Collections.singletonList(topic));
-                kafkaConsumer2.subscribe(Collections.singletonList(topic));
+            }
-            }
+        } else {
-        } else {
+            TopicPartition topicPartition = new TopicPartition(topic, partition);
-            TopicPartition topicPartition = new TopicPartition(topic, partition);
+            if (kafkaConsumer != null) {
-            if (kafkaConsumer != null) {
+                kafkaConsumer.assign(Collections.singletonList(topicPartition));
-                kafkaConsumer.assign(Collections.singletonList(topicPartition));
+            }
-            }
+            if (kafkaConsumer2 != null) {
-            if (kafkaConsumer2 != null) {
+                kafkaConsumer2.assign(Collections.singletonList(topicPartition));
-                kafkaConsumer2.assign(Collections.singletonList(topicPartition));
+            }
-            }
+        }
-        }
+    }
-    }
+
-
+    /**
-    /**
+     * 取消订阅
-     * 取消订阅
+     */
-     */
+    @Override
-    @Override
+    public void unsubscribe() {
-    public void unsubscribe() {
+        waitClientRunning();
-        waitClientRunning();
+        if (!running) {
-        if (!running) {
+            return;
-            return;
+        }
-        }
+
-
+        if (kafkaConsumer != null) {
-        if (kafkaConsumer != null) {
+            kafkaConsumer.unsubscribe();
-            kafkaConsumer.unsubscribe();
+        }
-        }
+        if (kafkaConsumer2 != null) {
-        if (kafkaConsumer2 != null) {
+            kafkaConsumer2.unsubscribe();
-            kafkaConsumer2.unsubscribe();
+        }
-        }
+    }
-    }
+
-
+    @Override
-    @Override
+    public List<Message> getList(Long timeout, TimeUnit unit) throws CanalClientException {
-    public List<Message> getList(Long timeout, TimeUnit unit) throws CanalClientException {
+        waitClientRunning();
-        waitClientRunning();
+        if (!running) {
-        if (!running) {
+            return Lists.newArrayList();
-            return Lists.newArrayList();
+        }
-        }
+
-
+        List<Message> messages = getListWithoutAck(timeout, unit);
-        List<Message> messages = getListWithoutAck(timeout, unit);
+        if (messages != null && !messages.isEmpty()) {
-        if (messages != null && !messages.isEmpty()) {
+            this.ack();
-            this.ack();
+        }
-        }
+        return messages;
-        return messages;
+    }
-    }
+
-
+    @Override
-    @Override
+    public List<Message> getListWithoutAck(Long timeout, TimeUnit unit) throws CanalClientException {
-    public List<Message> getListWithoutAck(Long timeout, TimeUnit unit) throws CanalClientException {
+        waitClientRunning();
-        waitClientRunning();
+        if (!running) {
-        if (!running) {
+            return Lists.newArrayList();
-            return Lists.newArrayList();
+        }
-        }
+
-
+        ConsumerRecords<String, Message> records = kafkaConsumer.poll(unit.toMillis(timeout));
-        ConsumerRecords<String, Message> records = kafkaConsumer.poll(unit.toMillis(timeout));
+
-
+        currentOffsets.clear();
-        currentOffsets.clear();
+        for (TopicPartition topicPartition : records.partitions()) {
-        for (TopicPartition topicPartition : records.partitions()) {
+            currentOffsets.put(topicPartition.partition(), kafkaConsumer.position(topicPartition));
-            currentOffsets.put(topicPartition.partition(), kafkaConsumer.position(topicPartition));
+        }
-        }
+
-
+        if (!records.isEmpty()) {
-        if (!records.isEmpty()) {
+            List<Message> messages = new ArrayList<>();
-            List<Message> messages = new ArrayList<>();
+            for (ConsumerRecord<String, Message> record : records) {
-            for (ConsumerRecord<String, Message> record : records) {
+                messages.add(record.value());
-                messages.add(record.value());
+            }
-            }
+            return messages;
-            return messages;
+        }
-        }
+        return Lists.newArrayList();
-        return Lists.newArrayList();
+    }
-    }
+
-
+    @Override
-    @Override
+    public List<FlatMessage> getFlatList(Long timeout, TimeUnit unit) throws CanalClientException {
-    public List<FlatMessage> getFlatList(Long timeout, TimeUnit unit) throws CanalClientException {
+        waitClientRunning();
-        waitClientRunning();
+        if (!running) {
-        if (!running) {
+            return Lists.newArrayList();
-            return Lists.newArrayList();
+        }
-        }
+
-
+        List<FlatMessage> messages = getFlatListWithoutAck(timeout, unit);
-        List<FlatMessage> messages = getFlatListWithoutAck(timeout, unit);
+        if (messages != null && !messages.isEmpty()) {
-        if (messages != null && !messages.isEmpty()) {
+            this.ack();
-            this.ack();
+        }
-        }
+        return messages;
-        return messages;
+    }
-    }
+
-
+    @Override
-    @Override
+    public List<FlatMessage> getFlatListWithoutAck(Long timeout, TimeUnit unit) throws CanalClientException {
-    public List<FlatMessage> getFlatListWithoutAck(Long timeout, TimeUnit unit) throws CanalClientException {
+        waitClientRunning();
-        waitClientRunning();
+        if (!running) {
-        if (!running) {
+            return Lists.newArrayList();
-            return Lists.newArrayList();
+        }
-        }
+
-
+        ConsumerRecords<String, String> records = kafkaConsumer2.poll(unit.toMillis(timeout));
-        ConsumerRecords<String, String> records = kafkaConsumer2.poll(unit.toMillis(timeout));
+
-
+        currentOffsets.clear();
-        currentOffsets.clear();
+        for (TopicPartition topicPartition : records.partitions()) {
-        for (TopicPartition topicPartition : records.partitions()) {
+            currentOffsets.put(topicPartition.partition(), kafkaConsumer2.position(topicPartition));
-            currentOffsets.put(topicPartition.partition(), kafkaConsumer2.position(topicPartition));
+        }
-        }
+
-
+        if (!records.isEmpty()) {
-        if (!records.isEmpty()) {
+            List<FlatMessage> flatMessages = new ArrayList<>();
-            List<FlatMessage> flatMessages = new ArrayList<>();
+            for (ConsumerRecord<String, String> record : records) {
-            for (ConsumerRecord<String, String> record : records) {
+                String flatMessageJson = record.value();
-                String flatMessageJson = record.value();
+                FlatMessage flatMessage = JSON.parseObject(flatMessageJson, FlatMessage.class);
-                FlatMessage flatMessage = JSON.parseObject(flatMessageJson, FlatMessage.class);
+                flatMessages.add(flatMessage);
-                flatMessages.add(flatMessage);
+            }
-            }
+
-
+            return flatMessages;
-            return flatMessages;
+        }
-        }
+        return Lists.newArrayList();
-        return Lists.newArrayList();
+    }
-    }
+
-
+    @Override
-    @Override
+    public void rollback() {
-    public void rollback() {
+        waitClientRunning();
-        waitClientRunning();
+        if (!running) {
-        if (!running) {
+            return;
-            return;
+        }
-        }
+        // 回滚所有分区
-        // 回滚所有分区
+        if (kafkaConsumer != null) {
-        if (kafkaConsumer != null) {
+            for (Map.Entry<Integer, Long> entry : currentOffsets.entrySet()) {
-            for (Map.Entry<Integer, Long> entry : currentOffsets.entrySet()) {
+                kafkaConsumer.seek(new TopicPartition(topic, entry.getKey()), entry.getValue() - 1);
-                kafkaConsumer.seek(new TopicPartition(topic, entry.getKey()), entry.getValue() - 1);
+            }
-            }
+        }
-        }
+        if (kafkaConsumer2 != null) {
-        if (kafkaConsumer2 != null) {
+            for (Map.Entry<Integer, Long> entry : currentOffsets.entrySet()) {
-            for (Map.Entry<Integer, Long> entry : currentOffsets.entrySet()) {
+                kafkaConsumer2.seek(new TopicPartition(topic, entry.getKey()), entry.getValue() - 1);
-                kafkaConsumer2.seek(new TopicPartition(topic, entry.getKey()), entry.getValue() - 1);
+            }
-            }
+        }
-        }
+    }
-    }
+
-
+    /**
-    /**
+     * 提交offset，如果超过 session.timeout.ms 设置的时间没有ack则会抛出异常，ack失败
-     * 提交offset，如果超过 session.timeout.ms 设置的时间没有ack则会抛出异常，ack失败
+     */
-     */
+    @Override
-    @Override
+    public void ack() {
-    public void ack() {
+        waitClientRunning();
-        waitClientRunning();
+        if (!running) {
-        if (!running) {
+            return;
-            return;
+        }
-        }
+
-
+        if (kafkaConsumer != null) {
-        if (kafkaConsumer != null) {
+            kafkaConsumer.commitSync();
-            kafkaConsumer.commitSync();
+        }
-        }
+        if (kafkaConsumer2 != null) {
-        if (kafkaConsumer2 != null) {
+            kafkaConsumer2.commitSync();
-            kafkaConsumer2.commitSync();
+        }
-        }
+    }
-    }
+
-
+    @Override
-    @Override
+    public void subscribe(String filter) throws CanalClientException {
-    public void subscribe(String filter) throws CanalClientException {
+        throw new CanalClientException("mq not support this method");
-        throw new CanalClientException("mq not support this method");
+    }
-    }
+
-
+    @Override
-    @Override
+    public Message get(int batchSize) throws CanalClientException {
-    public Message get(int batchSize) throws CanalClientException {
+        throw new CanalClientException("mq not support this method");
-        throw new CanalClientException("mq not support this method");
+    }
-    }
+
-
+    @Override
-    @Override
+    public Message get(int batchSize, Long timeout, TimeUnit unit) throws CanalClientException {
-    public Message get(int batchSize, Long timeout, TimeUnit unit) throws CanalClientException {
+        throw new CanalClientException("mq not support this method");
-        throw new CanalClientException("mq not support this method");
+    }
-    }
+
-
+    @Override
-    @Override
+    public Message getWithoutAck(int batchSize) throws CanalClientException {
-    public Message getWithoutAck(int batchSize) throws CanalClientException {
+        throw new CanalClientException("mq not support this method");
-        throw new CanalClientException("mq not support this method");
+    }
-    }
+
-
+    @Override
-    @Override
+    public Message getWithoutAck(int batchSize, Long timeout, TimeUnit unit) throws CanalClientException {
-    public Message getWithoutAck(int batchSize, Long timeout, TimeUnit unit) throws CanalClientException {
+        throw new CanalClientException("mq not support this method");
-        throw new CanalClientException("mq not support this method");
+    }
-    }
+
-
+    @Override
-    @Override
+    public void ack(long batchId) throws CanalClientException {
-    public void ack(long batchId) throws CanalClientException {
+        throw new CanalClientException("mq not support this method");
-        throw new CanalClientException("mq not support this method");
+    }
-    }
+
-
+    @Override
-    @Override
+    public void rollback(long batchId) throws CanalClientException {
-    public void rollback(long batchId) throws CanalClientException {
+        throw new CanalClientException("mq not support this method");
-        throw new CanalClientException("mq not support this method");
+    }
-    }
+
-
+    /**
-    /**
+     * 重新设置sessionTime
-     * 重新设置sessionTime
+     *
-     *
+     * @param timeout
-     * @param timeout
+     * @param unit
-     * @param unit
+     */
-     */
+    public void setSessionTimeout(Long timeout, TimeUnit unit) {
-    public void setSessionTimeout(Long timeout, TimeUnit unit) {
+        long t = unit.toMillis(timeout);
-        long t = unit.toMillis(timeout);
+        properties.put("request.timeout.ms", String.valueOf(t + 60000));
-        properties.put("request.timeout.ms", String.valueOf(t + 60000));
+        properties.put("session.timeout.ms", String.valueOf(t));
-        properties.put("session.timeout.ms", String.valueOf(t));
+    }
-    }
+
-
+}
-}

client/src/main/java/com/alibaba/otter/canal/client/kafka/protocol/KafkaFlatMessage.java

@@ -1,32 +1,35 @@
-package com.alibaba.otter.canal.client.kafka.protocol;
+package com.alibaba.otter.canal.client.kafka.protocol;
-
+
-import com.alibaba.otter.canal.protocol.FlatMessage;
+import com.alibaba.otter.canal.protocol.FlatMessage;
-import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeanUtils;
-
+
-/**
+/**
- * 消息对象（Kafka）
+ * 消息对象（Kafka）
- *
+ *
- * @Author panjianping
+ * @Author panjianping
- * @Email ipanjianping@qq.com
+ * @Email ipanjianping@qq.com
- * @Date 2018/12/17
+ * @Date 2018/12/17
- */
+ */
-public class KafkaFlatMessage extends FlatMessage {
+public class KafkaFlatMessage extends FlatMessage {
-    /**
+
-     * Kafka 消息 offset
+    private static final long serialVersionUID = 5748024400508080710L;
-     */
+
-    private long offset;
+    /**
-
+     * Kafka 消息 offset
-    public KafkaFlatMessage(FlatMessage message, long offset) {
+     */
-        super(message.getId());
+    private long              offset;
-        BeanUtils.copyProperties(message, this);
+
-        this.offset = offset;
+    public KafkaFlatMessage(FlatMessage message, long offset){
-    }
+        super(message.getId());
-
+        BeanUtils.copyProperties(message, this);
-    public long getOffset() {
+        this.offset = offset;
-        return offset;
+    }
-    }
+
-
+    public long getOffset() {
-    public void setOffset(long offset) {
+        return offset;
-        this.offset = offset;
+    }
-    }
+
-}
+    public void setOffset(long offset) {
+        this.offset = offset;
+    }
+}

client/src/main/java/com/alibaba/otter/canal/client/kafka/protocol/KafkaMessage.java

@@ -1,33 +1,35 @@
-package com.alibaba.otter.canal.client.kafka.protocol;
+package com.alibaba.otter.canal.client.kafka.protocol;
-
+
-import com.alibaba.otter.canal.protocol.Message;
+import com.alibaba.otter.canal.protocol.Message;
-import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeanUtils;
-
+
-/**
+/**
- * 消息对象（Kafka）
+ * 消息对象（Kafka）
- *
+ *
- * @Author panjianping
+ * @Author panjianping
- * @Email ipanjianping@qq.com
+ * @Email ipanjianping@qq.com
- * @Date 2018/12/17
+ * @Date 2018/12/17
- */
+ */
-public class KafkaMessage extends Message {
+public class KafkaMessage extends Message {
-    /**
+
-     * Kafka 消息 offset
+    private static final long serialVersionUID = -293120358490119447L;
-     */
+
-    private long offset;
+    /**
-
+     * Kafka 消息 offset
-    public KafkaMessage(Message message, long offset) {
+     */
-        super(message.getId());
+    private long              offset;
-        BeanUtils.copyProperties(message, this);
+
-        this.offset = offset;
+    public KafkaMessage(Message message, long offset){
-    }
+        super(message.getId());
-
+        BeanUtils.copyProperties(message, this);
-
+        this.offset = offset;
-    public long getOffset() {
+    }
-        return offset;
+
-    }
+    public long getOffset() {
-
+        return offset;
-    public void setOffset(long offset) {
+    }
-        this.offset = offset;
+
-    }
+    public void setOffset(long offset) {
-}
+        this.offset = offset;
+    }
+}

common/src/main/java/com/alibaba/otter/canal/common/utils/CommonUtils.java

@@ -0,0 +1,53 @@
+package com.alibaba.otter.canal.common.utils;
+
+import java.io.File;
+
+/**
+ * 通用工具类
+ *
+ * @author rewerma 2019-01-25 下午05:20:16
+ * @version 1.0.0
+ */
+public class CommonUtils {
+
+    /**
+     * 获取conf文件夹所在路径
+     *
+     * @return 路径地址
+     */
+    public static String getConfPath() {
+        String classpath = CommonUtils.class.getResource("/").getPath();
+        String confPath = classpath + "../conf/";
+        if (new File(confPath).exists()) {
+            return confPath;
+        } else {
+            return classpath;
+        }
+    }
+
+    /**
+     * 删除文件夹
+     *
+     * @param dirFile 文件夹对象
+     * @return 是否删除成功
+     */
+    public static boolean deleteDir(File dirFile) {
+        if (!dirFile.exists()) {
+            return false;
+        }
+
+        if (dirFile.isFile()) {
+            return dirFile.delete();
+        } else {
+            File[] files = dirFile.listFiles();
+            if (files == null || files.length == 0) {
+                return dirFile.delete();
+            }
+            for (File file : files) {
+                deleteDir(file);
+            }
+        }
+
+        return dirFile.delete();
+    }
+}

deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalConstants.java

@@ -51,6 +51,7 @@ public class CanalConstants {
     public static final String CANAL_MQ_TRANSACTION              = ROOT + "." + "mq.transaction";
     public static final String CANAL_ALIYUN_ACCESSKEY            = ROOT + "." + "aliyun.accessKey";
     public static final String CANAL_ALIYUN_SECRETKEY            = ROOT + "." + "aliyun.secretKey";
+    public static final String CANAL_MQ_PROPERTIES               = ROOT + "." + "mq.properties";
 
     public static String getInstanceModeKey(String destination) {
         return MessageFormat.format(INSTANCE_MODE_TEMPLATE, destination);

deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalStater.java

@@ -1,5 +1,6 @@
 package com.alibaba.otter.canal.deployer;
 
+import java.util.Map;
 import java.util.Properties;
 
 import org.apache.commons.lang.StringUtils;
@@ -162,7 +163,16 @@ public class CanalStater {
         if (!StringUtils.isEmpty(transaction)) {
             mqProperties.setTransaction(Boolean.valueOf(transaction));
         }
+
+        for (Object key : properties.keySet()) {
+            key = StringUtils.trim(key.toString());
+            if (((String) key).startsWith(CanalConstants.CANAL_MQ_PROPERTIES)) {
+                String value = CanalController.getProperty(properties, (String) key);
+                String subKey = ((String) key).substring(CanalConstants.CANAL_MQ_PROPERTIES.length() + 1);
+                mqProperties.getProperties().put(subKey, value);
+            }
+        }
+
         return mqProperties;
     }
-
 }

deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/remote/DbRemoteConfigLoader.java

@@ -1,7 +1,6 @@
 package com.alibaba.otter.canal.deployer.monitor.remote;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.FileWriter;
 import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
@@ -18,6 +17,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.otter.canal.common.utils.CommonUtils;
 import com.alibaba.otter.canal.common.utils.NamedThreadFactory;
 import com.alibaba.otter.canal.deployer.CanalConstants;
 import com.google.common.base.Joiner;
@@ -101,7 +101,7 @@ public class DbRemoteConfigLoader implements RemoteConfigLoader {
      * @param content 远程配置内容文本
      */
     private void overrideLocalCanalConfig(String content) {
-        try (FileWriter writer = new FileWriter(getConfPath() + "canal.properties")) {
+        try (FileWriter writer = new FileWriter(CommonUtils.getConfPath() + "canal.properties")) {
             writer.write(content);
             writer.flush();
         } catch (Exception e) {
@@ -213,26 +213,6 @@ public class DbRemoteConfigLoader implements RemoteConfigLoader {
         }
     }
 
-    private static boolean deleteDir(File dirFile) {
-        if (!dirFile.exists()) {
-            return false;
-        }
-
-        if (dirFile.isFile()) {
-            return dirFile.delete();
-        } else {
-            File[] files = dirFile.listFiles();
-            if (files == null || files.length == 0) {
-                return dirFile.delete();
-            }
-            for (File file : files) {
-                deleteDir(file);
-            }
-        }
-
-        return dirFile.delete();
-    }
-
     /**
      * 监听 canal 主配置和 instance 配置变化
      *
@@ -281,53 +261,4 @@ public class DbRemoteConfigLoader implements RemoteConfigLoader {
         }
     }
 
-    /**
-     * 获取conf文件夹所在路径
-     *
-     * @return 路径地址
-     */
-    private String getConfPath() {
-        String classpath = this.getClass().getResource("/").getPath();
-        String confPath = classpath + ".." + File.separator + "conf" + File.separator;
-        if (new File(confPath).exists()) {
-            return confPath;
-        } else {
-            return classpath;
-        }
-    }
-
-    /**
-     * 远程xxx/instance.properties配置监听器实现
-     */
-    private class RemoteInstanceMonitorImpl implements RemoteInstanceMonitor {
-
-        @Override
-        public void onAdd(ConfigItem configItem) {
-            this.onModify(configItem);
-        }
-
-        @Override
-        public void onModify(ConfigItem configItem) {
-            File instanceDir = new File(getConfPath() + configItem.getName());
-            if (!instanceDir.exists()) {
-                instanceDir.mkdirs();
-            }
-            try (FileWriter writer = new FileWriter(getConfPath() + configItem.getName() + "/instance.properties")) {
-                writer.write(configItem.getContent());
-                writer.flush();
-                logger.info("## Loaded remote instance config: {}/instance.properties ", configItem.getName());
-            } catch (Exception e) {
-                logger.error(e.getMessage(), e);
-            }
-        }
-
-        @Override
-        public void onDelete(String instanceName) {
-            File file = new File(getConfPath() + instanceName + "/");
-            if (file.exists()) {
-                deleteDir(file);
-                logger.info("## Deleted and loaded remote instance config: {} ", instanceName);
-            }
-        }
-    }
 }

deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/remote/RemoteInstanceMonitorImpl.java

@@ -0,0 +1,55 @@
+package com.alibaba.otter.canal.deployer.monitor.remote;
+
+import java.io.File;
+import java.io.FileWriter;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.alibaba.otter.canal.common.utils.CommonUtils;
+
+/**
+ * 远程xxx/instance.properties配置监听器实现
+ *
+ * @author rewerma 2019-01-25 下午05:20:16
+ * @version 1.0.0
+ */
+public class RemoteInstanceMonitorImpl implements RemoteInstanceMonitor {
+
+    private static final Logger logger = LoggerFactory.getLogger(RemoteInstanceMonitorImpl.class);
+
+    @Override
+    public void onAdd(ConfigItem configItem) {
+        this.onModify(configItem);
+    }
+
+    @Override
+    public void onModify(ConfigItem configItem) {
+        String confDir = CommonUtils.getConfPath() + configItem.getName();
+        File instanceDir = new File(confDir);
+        if (!instanceDir.exists()) {
+            boolean mkDirs = instanceDir.mkdirs();
+            if (!mkDirs) {
+                logger.info("## Error to create instance config dir: {}", configItem.getName());
+                return;
+            }
+        }
+        try (FileWriter writer = new FileWriter(confDir + "/instance.properties")) {
+            writer.write(configItem.getContent());
+            writer.flush();
+            logger.info("## Loaded remote instance config: {}/instance.properties ", configItem.getName());
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void onDelete(String instanceName) {
+        File file = new File(CommonUtils.getConfPath() + instanceName + "/");
+        if (file.exists()) {
+            CommonUtils.deleteDir(file);
+            logger.info("## Deleted and loaded remote instance config: {} ", instanceName);
+        }
+    }
+
+}

deployer/src/main/resources/canal.properties

@@ -116,4 +116,5 @@ canal.mq.flatMessage = true
 canal.mq.compressionType = none
 canal.mq.acks = all
 # use transaction for kafka flatMessage batch produce
-canal.mq.transaction = false
+canal.mq.transaction = false
+#canal.mq.properties. =

server/src/main/java/com/alibaba/otter/canal/common/MQProperties.java

@@ -1,5 +1,7 @@
 package com.alibaba.otter.canal.common;
 
+import java.util.Properties;
+
 /**
  * kafka 配置项
  *
@@ -8,22 +10,23 @@ package com.alibaba.otter.canal.common;
  */
 public class MQProperties {
 
-    private String  servers                = "127.0.0.1:6667";
+    private String     servers                = "127.0.0.1:6667";
-    private int     retries                = 0;
+    private int        retries                = 0;
-    private int     batchSize              = 16384;
+    private int        batchSize              = 16384;
-    private int     lingerMs               = 1;
+    private int        lingerMs               = 1;
-    private int     maxRequestSize         = 1048576;
+    private int        maxRequestSize         = 1048576;
-    private long    bufferMemory           = 33554432L;
+    private long       bufferMemory           = 33554432L;
-    private boolean filterTransactionEntry = true;
+    private boolean    filterTransactionEntry = true;
-    private String  producerGroup          = "Canal-Producer";
+    private String     producerGroup          = "Canal-Producer";
-    private int     canalBatchSize         = 50;
+    private int        canalBatchSize         = 50;
-    private Long    canalGetTimeout        = 100L;
+    private Long       canalGetTimeout        = 100L;
-    private boolean flatMessage            = true;
+    private boolean    flatMessage            = true;
-    private String  compressionType        = "none";
+    private String     compressionType        = "none";
-    private String  acks                   = "all";
+    private String     acks                   = "all";
-    private String  aliyunAccessKey        = "";
+    private String     aliyunAccessKey        = "";
-    private String  aliyunSecretKey        = "";
+    private String     aliyunSecretKey        = "";
-    private boolean transaction            = false;           // 是否开启事务
+    private boolean    transaction            = false;           // 是否开启事务
+    private Properties properties             = new Properties();
 
     public static class CanalDestination {
 
@@ -210,4 +213,12 @@ public class MQProperties {
     public void setTransaction(boolean transaction) {
         this.transaction = transaction;
     }
+
+    public Properties getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Properties properties) {
+        this.properties = properties;
+    }
 }

server/src/main/java/com/alibaba/otter/canal/kafka/CanalKafkaProducer.java

@@ -49,7 +49,12 @@ public class CanalKafkaProducer implements CanalMQProducer {
         properties.put("max.request.size", kafkaProperties.getMaxRequestSize());
         properties.put("buffer.memory", kafkaProperties.getBufferMemory());
         properties.put("key.serializer", StringSerializer.class.getName());
-        if(kafkaProperties.getTransaction()){
+
+        if (!kafkaProperties.getProperties().isEmpty()) {
+            properties.putAll(kafkaProperties.getProperties());
+        }
+
+        if (kafkaProperties.getTransaction()) {
             properties.put("transactional.id", "canal-transactional-id");
         } else {
             properties.put("retries", kafkaProperties.getRetries());