AE86 1 tahun lalu
induk
melakukan
1817e62d79
95 mengubah file dengan 358 tambahan dan 328 penghapusan
  1. 1 1
      dbsyncer-biz/pom.xml
  2. 6 6
      dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/connector/ConnectorChecker.java
  3. 2 2
      dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/ConnectorServiceImpl.java
  4. 1 1
      dbsyncer-cluster/pom.xml
  5. 1 2
      dbsyncer-common/pom.xml
  6. 8 1
      dbsyncer-connector/pom.xml
  7. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/AbstractConnector.java
  8. 5 5
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/AbstractValueMapper.java
  9. 2 2
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/Connector.java
  10. 7 6
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/ConnectorFactory.java
  11. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/ValueMapper.java
  12. 4 4
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/CommandConfig.java
  13. 2 2
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/DatabaseConfig.java
  14. 2 2
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/ESConfig.java
  15. 2 2
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/FileConfig.java
  16. 2 2
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/KafkaConfig.java
  17. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/AbstractDatabaseConnector.java
  18. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/DatabaseConnectorMapper.java
  19. 4 4
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/enums/ConnectorEnum.java
  20. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java
  21. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnectorMapper.java
  22. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESDateValueMapper.java
  23. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESOtherValueMapper.java
  24. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/file/FileConnector.java
  25. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/file/FileConnectorMapper.java
  26. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/kafka/KafkaConnector.java
  27. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/kafka/KafkaConnectorMapper.java
  28. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/oracle/OracleOtherValueMapper.java
  29. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/postgresql/PostgreSQLBitValueMapper.java
  30. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/postgresql/PostgreSQLOtherValueMapper.java
  31. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/BigintValueMapper.java
  32. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/BinaryValueMapper.java
  33. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/BitValueMapper.java
  34. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/BlobValueMapper.java
  35. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/CharValueMapper.java
  36. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/ClobValueMapper.java
  37. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/DateValueMapper.java
  38. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/DecimalValueMapper.java
  39. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/DoubleValueMapper.java
  40. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/FloatValueMapper.java
  41. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/IntegerValueMapper.java
  42. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/LongVarBinaryValueMapper.java
  43. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/LongVarcharValueMapper.java
  44. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/NCharValueMapper.java
  45. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/NClobValueMapper.java
  46. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/NVarcharValueMapper.java
  47. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/NumberValueMapper.java
  48. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/OtherValueMapper.java
  49. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/RealValueMapper.java
  50. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/RowIdValueMapper.java
  51. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/SmallintValueMapper.java
  52. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/TimeValueMapper.java
  53. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/TimestampValueMapper.java
  54. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/TinyintValueMapper.java
  55. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/VarBinaryValueMapper.java
  56. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/VarcharValueMapper.java
  57. 1 1
      dbsyncer-listener/pom.xml
  58. 3 3
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/AbstractExtractor.java
  59. 1 1
      dbsyncer-listener/src/main/java/org/dbsyncer/listener/quartz/AbstractQuartzExtractor.java
  60. 8 1
      dbsyncer-manager/pom.xml
  61. 2 2
      dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/IncrementPuller.java
  62. 1 1
      dbsyncer-parser/pom.xml
  63. 2 2
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/ParserComponent.java
  64. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/event/FullRefreshEvent.java
  65. 8 8
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/GeneralBufferActuator.java
  66. 2 2
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/MessageServiceImpl.java
  67. 9 9
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/ParserComponentImpl.java
  68. 2 2
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/ProfileComponentImpl.java
  69. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/BatchWriter.java
  70. 4 4
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/Connector.java
  71. 8 1
      dbsyncer-plugin/pom.xml
  72. 1 1
      dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/NotifySupportConfiguration.java
  73. 4 4
      dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/PluginFactory.java
  74. 2 2
      dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/notify/DefaultNotifyService.java
  75. 9 5
      dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/notify/MailNotifyService.java
  76. 5 8
      dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/proxy/ProxyApplicationContextImpl.java
  77. 5 4
      dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/service/DemoConvertServiceImpl.java
  78. 21 0
      dbsyncer-sdk/pom.xml
  79. 12 0
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/RemoteClient.java
  80. 4 4
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/AbstractConvertContext.java
  81. 3 3
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/ConnectorConfig.java
  82. 2 2
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/FullConvertContext.java
  83. 2 2
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/IncrementConvertContext.java
  84. 1 1
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/NotifyMessage.java
  85. 2 22
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/ConnectorMapper.java
  86. 69 69
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/ConvertContext.java
  87. 57 57
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/ConvertService.java
  88. 2 2
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/NotifyService.java
  89. 1 1
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/ProxyApplicationContext.java
  90. 1 8
      dbsyncer-storage/pom.xml
  91. 5 5
      dbsyncer-storage/src/main/java/org/dbsyncer/storage/binlog/AbstractBinlogService.java
  92. 1 1
      dbsyncer-web/pom.xml
  93. 2 2
      dbsyncer-web/src/main/resources/public/plugin/plugin.html
  94. 3 2
      pom.xml
  95. 1 1
      version.cmd

+ 1 - 1
dbsyncer-biz/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.7_1103</version>
+        <version>2.0.0</version>
     </parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>dbsyncer-biz</artifactId>

+ 6 - 6
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/connector/ConnectorChecker.java

@@ -3,8 +3,6 @@ package org.dbsyncer.biz.checker.impl.connector;
 import org.dbsyncer.biz.BizException;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.biz.checker.ConnectorConfigChecker;
-import org.dbsyncer.common.model.AbstractConnectorConfig;
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.ConnectorFactory;
 import org.dbsyncer.connector.enums.ConnectorEnum;
@@ -15,6 +13,8 @@ import org.dbsyncer.parser.LogService;
 import org.dbsyncer.parser.LogType;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.Connector;
+import org.dbsyncer.sdk.model.ConnectorConfig;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,7 +60,7 @@ public class ConnectorChecker extends AbstractChecker {
 
         Connector connector = new Connector();
         connector.setName(name);
-        AbstractConnectorConfig config = getConfig(connectorType);
+        ConnectorConfig config = getConfig(connectorType);
         connector.setConfig(config);
 
         // 配置连接器配置
@@ -90,7 +90,7 @@ public class ConnectorChecker extends AbstractChecker {
         this.modifyConfigModel(connector, params);
 
         // 配置连接器配置
-        AbstractConnectorConfig config = connector.getConfig();
+        ConnectorConfig config = connector.getConfig();
         String type = StringUtil.toLowerCaseFirstOne(config.getConnectorType()).concat("ConfigChecker");
         ConnectorConfigChecker checker = map.get(type);
         Assert.notNull(checker, "Checker can not be null.");
@@ -102,9 +102,9 @@ public class ConnectorChecker extends AbstractChecker {
         return connector;
     }
 
-    private AbstractConnectorConfig getConfig(String connectorType) {
+    private ConnectorConfig getConfig(String connectorType) {
         try {
-            AbstractConnectorConfig config = ConnectorEnum.getConnectorEnum(connectorType).getConfigClass().newInstance();
+            ConnectorConfig config = ConnectorEnum.getConnectorEnum(connectorType).getConfigClass().newInstance();
             config.setConnectorType(connectorType);
             return config;
         } catch (Exception e) {

+ 2 - 2
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/ConnectorServiceImpl.java

@@ -3,7 +3,6 @@ package org.dbsyncer.biz.impl;
 import org.dbsyncer.biz.BizException;
 import org.dbsyncer.biz.ConnectorService;
 import org.dbsyncer.biz.checker.Checker;
-import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.StringUtil;
@@ -14,6 +13,7 @@ import org.dbsyncer.parser.LogType;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.Connector;
 import org.dbsyncer.parser.model.Mapping;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -160,7 +160,7 @@ public class ConnectorServiceImpl extends BaseServiceImpl implements ConnectorSe
         return health.containsKey(id) && health.get(id);
     }
 
-    private boolean isAliveConnectorConfig(AbstractConnectorConfig config) {
+    private boolean isAliveConnectorConfig(ConnectorConfig config) {
         boolean alive = false;
         try {
             alive = connectorFactory.isAlive(config);

+ 1 - 1
dbsyncer-cluster/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.7_1103</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-cluster</artifactId>

+ 1 - 2
dbsyncer-common/pom.xml

@@ -5,13 +5,12 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.7_1103</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-common</artifactId>
 
     <dependencies>
-
         <!-- Log4j2框架的性能是最强的 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 8 - 1
dbsyncer-connector/pom.xml

@@ -5,12 +5,19 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.7_1103</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-connector</artifactId>
 
     <dependencies>
+        <!-- sdk -->
+        <dependency>
+            <groupId>org.ghi</groupId>
+            <artifactId>dbsyncer-sdk</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
         <!-- Common 公共层 -->
         <dependency>
             <groupId>org.ghi</groupId>

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/AbstractConnector.java

@@ -1,6 +1,5 @@
 package org.dbsyncer.connector;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.config.WriterBatchConfig;
@@ -32,6 +31,7 @@ import org.dbsyncer.connector.schema.TimestampValueMapper;
 import org.dbsyncer.connector.schema.TinyintValueMapper;
 import org.dbsyncer.connector.schema.VarBinaryValueMapper;
 import org.dbsyncer.connector.schema.VarcharValueMapper;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+ 5 - 5
dbsyncer-connector/src/main/java/org/dbsyncer/connector/AbstractValueMapper.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.connector;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.lang.reflect.ParameterizedType;
 
@@ -30,7 +30,7 @@ public abstract class AbstractValueMapper<T> implements ValueMapper {
      * @param val
      * @return
      */
-    protected boolean skipConvert(Object val){
+    protected boolean skipConvert(Object val) {
         return false;
     }
 
@@ -46,14 +46,14 @@ public abstract class AbstractValueMapper<T> implements ValueMapper {
 
     @Override
     public Object convertValue(ConnectorMapper connectorMapper, Object val) throws Exception {
-        if(null != val){
+        if (null != val) {
             // 是否需要跳过转换
-            if(skipConvert(val)){
+            if (skipConvert(val)) {
                 return val;
             }
 
             // 当数据类型不同时,返回转换值
-            if(!val.getClass().equals(parameterClazz)){
+            if (!val.getClass().equals(parameterClazz)) {
                 return convert(connectorMapper, val);
             }
         }

+ 2 - 2
dbsyncer-connector/src/main/java/org/dbsyncer/connector/Connector.java

@@ -1,13 +1,13 @@
 package org.dbsyncer.connector;
 
 import org.dbsyncer.common.model.Result;
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.config.CommandConfig;
 import org.dbsyncer.connector.config.DDLConfig;
 import org.dbsyncer.connector.config.ReaderConfig;
 import org.dbsyncer.connector.config.WriterBatchConfig;
 import org.dbsyncer.connector.model.MetaInfo;
 import org.dbsyncer.connector.model.Table;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.util.List;
 import java.util.Map;
@@ -103,7 +103,7 @@ public interface Connector<M, C> {
      * @param ddlConfig
      * @return
      */
-    default Result writerDDL(M connectorMapper, DDLConfig ddlConfig){
+    default Result writerDDL(M connectorMapper, DDLConfig ddlConfig) {
         throw new ConnectorException("Unsupported method.");
     }
 

+ 7 - 6
dbsyncer-connector/src/main/java/org/dbsyncer/connector/ConnectorFactory.java

@@ -1,8 +1,6 @@
 package org.dbsyncer.connector;
 
-import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.model.Result;
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.config.CommandConfig;
 import org.dbsyncer.connector.config.DDLConfig;
@@ -11,6 +9,8 @@ import org.dbsyncer.connector.config.WriterBatchConfig;
 import org.dbsyncer.connector.enums.ConnectorEnum;
 import org.dbsyncer.connector.model.MetaInfo;
 import org.dbsyncer.connector.model.Table;
+import org.dbsyncer.sdk.model.ConnectorConfig;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.util.Assert;
 
@@ -41,7 +41,7 @@ public class ConnectorFactory implements DisposableBean {
      *
      * @param config
      */
-    public ConnectorMapper connect(AbstractConnectorConfig config) {
+    public ConnectorMapper connect(ConnectorConfig config) {
         Assert.notNull(config, "ConnectorConfig can not be null.");
         Connector connector = getConnector(config.getConnectorType());
         String cacheKey = connector.getConnectorMapperCacheKey(config);
@@ -68,7 +68,7 @@ public class ConnectorFactory implements DisposableBean {
      * @param config
      * @return
      */
-    public boolean refresh(AbstractConnectorConfig config) {
+    public boolean refresh(ConnectorConfig config) {
         Assert.notNull(config, "ConnectorConfig can not be null.");
         Connector connector = getConnector(config.getConnectorType());
         String cacheKey = connector.getConnectorMapperCacheKey(config);
@@ -86,7 +86,7 @@ public class ConnectorFactory implements DisposableBean {
      * @param config
      * @return
      */
-    public boolean isAlive(AbstractConnectorConfig config) {
+    public boolean isAlive(ConnectorConfig config) {
         Assert.notNull(config, "ConnectorConfig can not be null.");
         Connector connector = getConnector(config.getConnectorType());
         String cacheKey = connector.getConnectorMapperCacheKey(config);
@@ -180,7 +180,8 @@ public class ConnectorFactory implements DisposableBean {
     }
 
     public Connector getConnector(ConnectorMapper connectorMapper) {
-        return getConnector(connectorMapper.getConnectorType());
+        ConnectorConfig connectorConfig = (ConnectorConfig) connectorMapper.getConfig();
+        return getConnector(connectorConfig.getConnectorType());
     }
 
     /**

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/ValueMapper.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.connector;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * 值转换器

+ 4 - 4
dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/CommandConfig.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.config;
 
-import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.connector.model.Filter;
 import org.dbsyncer.connector.model.Table;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 
 import java.util.List;
 
@@ -21,9 +21,9 @@ public class CommandConfig {
 
     private List<Filter> filter;
 
-    private AbstractConnectorConfig connectorConfig;
+    private ConnectorConfig connectorConfig;
 
-    public CommandConfig(String type, Table table, AbstractConnectorConfig connectorConfig, List<Filter> filter) {
+    public CommandConfig(String type, Table table, ConnectorConfig connectorConfig, List<Filter> filter) {
         this.type = type;
         this.table = table;
         this.filter = filter;
@@ -42,7 +42,7 @@ public class CommandConfig {
         return filter;
     }
 
-    public AbstractConnectorConfig getConnectorConfig() {
+    public ConnectorConfig getConnectorConfig() {
         return connectorConfig;
     }
 }

+ 2 - 2
dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/DatabaseConfig.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.config;
 
-import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.connector.model.SqlTable;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.Map;
  * @Description: 数据库连接配置
  * @date: 2017年7月20日 下午3:40:59
  */
-public class DatabaseConfig extends AbstractConnectorConfig {
+public class DatabaseConfig extends ConnectorConfig {
 
     /**
      * 驱动

+ 2 - 2
dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/ESConfig.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.connector.config;
 
-import org.dbsyncer.common.model.AbstractConnectorConfig;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 
 /**
  * @author AE86
@@ -8,7 +8,7 @@ import org.dbsyncer.common.model.AbstractConnectorConfig;
  * @Description: ES连接配置
  * @date: 2021年8月23日 下午8:00:00
  */
-public class ESConfig extends AbstractConnectorConfig {
+public class ESConfig extends ConnectorConfig {
 
     /**
      * 集群地址, http(s)-9200, tcp-9300 http://192.168.1.100:9200,http://192.168.1.200:9200

+ 2 - 2
dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/FileConfig.java

@@ -1,13 +1,13 @@
 package org.dbsyncer.connector.config;
 
-import org.dbsyncer.common.model.AbstractConnectorConfig;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 
 /**
  * @author AE86
  * @version 1.0.0
  * @date 2022/5/5 23:19
  */
-public class FileConfig extends AbstractConnectorConfig {
+public class FileConfig extends ConnectorConfig {
 
     /**
      * 文件目录

+ 2 - 2
dbsyncer-connector/src/main/java/org/dbsyncer/connector/config/KafkaConfig.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.connector.config;
 
-import org.dbsyncer.common.model.AbstractConnectorConfig;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 
 /**
  * @author AE86
@@ -8,7 +8,7 @@ import org.dbsyncer.common.model.AbstractConnectorConfig;
  * @Description: Kafka连接配置
  * @date: 2021年11月4日 下午8:00:00
  */
-public class KafkaConfig extends AbstractConnectorConfig {
+public class KafkaConfig extends ConnectorConfig {
 
     private String bootstrapServers;
     private String topic;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/AbstractDatabaseConnector.java

@@ -1,7 +1,6 @@
 package org.dbsyncer.connector.database;
 
 import org.dbsyncer.common.model.Result;
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.AbstractConnector;
@@ -25,6 +24,7 @@ import org.dbsyncer.connector.model.PageSql;
 import org.dbsyncer.connector.model.Table;
 import org.dbsyncer.connector.util.DatabaseUtil;
 import org.dbsyncer.connector.util.PrimaryKeyUtil;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.support.rowset.ResultSetWrappingSqlRowSet;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/DatabaseConnectorMapper.java

@@ -1,10 +1,10 @@
 package org.dbsyncer.connector.database;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.ConnectorException;
 import org.dbsyncer.connector.config.DatabaseConfig;
 import org.dbsyncer.connector.database.ds.SimpleConnection;
 import org.dbsyncer.connector.database.ds.SimpleDataSource;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.EmptyResultDataAccessException;

+ 4 - 4
dbsyncer-connector/src/main/java/org/dbsyncer/connector/enums/ConnectorEnum.java

@@ -1,6 +1,5 @@
 package org.dbsyncer.connector.enums;
 
-import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.Connector;
 import org.dbsyncer.connector.ConnectorException;
@@ -19,6 +18,7 @@ import org.dbsyncer.connector.sql.DQLOracleConnector;
 import org.dbsyncer.connector.sql.DQLPostgreSQLConnector;
 import org.dbsyncer.connector.sql.DQLSqlServerConnector;
 import org.dbsyncer.connector.sqlserver.SqlServerConnector;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 
 /**
  * 支持的连接器类型
@@ -81,9 +81,9 @@ public enum ConnectorEnum {
     private Connector connector;
 
     // 配置
-    private Class<? extends AbstractConnectorConfig> configClass;
+    private Class<? extends ConnectorConfig> configClass;
 
-    ConnectorEnum(String type, Connector connector, Class<? extends AbstractConnectorConfig> configClass) {
+    ConnectorEnum(String type, Connector connector, Class<? extends ConnectorConfig> configClass) {
         this.type = type;
         this.connector = connector;
         this.configClass = configClass;
@@ -113,7 +113,7 @@ public enum ConnectorEnum {
         return connector;
     }
 
-    public Class<? extends AbstractConnectorConfig> getConfigClass() {
+    public Class<? extends ConnectorConfig> getConfigClass() {
         return configClass;
     }
 }

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnector.java

@@ -1,7 +1,6 @@
 package org.dbsyncer.connector.es;
 
 import org.dbsyncer.common.model.Result;
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.common.util.StringUtil;
@@ -22,6 +21,7 @@ import org.dbsyncer.connector.model.MetaInfo;
 import org.dbsyncer.connector.model.Table;
 import org.dbsyncer.connector.util.ESUtil;
 import org.dbsyncer.connector.util.PrimaryKeyUtil;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkResponse;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESConnectorMapper.java

@@ -1,9 +1,9 @@
 package org.dbsyncer.connector.es;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.ConnectorException;
 import org.dbsyncer.connector.config.ESConfig;
 import org.dbsyncer.connector.util.ESUtil;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.elasticsearch.Version;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.core.MainResponse;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESDateValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.es;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.sql.Date;
 import java.sql.Timestamp;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESOtherValueMapper.java

@@ -1,9 +1,9 @@
 package org.dbsyncer.connector.es;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.postgresql.util.PGobject;
 
 import java.util.Map;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/file/FileConnector.java

@@ -3,7 +3,6 @@ package org.dbsyncer.connector.file;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
 import org.dbsyncer.common.model.Result;
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.AbstractConnector;
@@ -17,6 +16,7 @@ import org.dbsyncer.connector.model.Field;
 import org.dbsyncer.connector.model.FileSchema;
 import org.dbsyncer.connector.model.MetaInfo;
 import org.dbsyncer.connector.model.Table;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/file/FileConnectorMapper.java

@@ -1,10 +1,10 @@
 package org.dbsyncer.connector.file;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.connector.config.FileConfig;
 import org.dbsyncer.connector.model.Field;
 import org.dbsyncer.connector.model.FileSchema;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.springframework.util.Assert;
 
 import java.io.File;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/kafka/KafkaConnector.java

@@ -1,7 +1,6 @@
 package org.dbsyncer.connector.kafka;
 
 import org.dbsyncer.common.model.Result;
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.connector.AbstractConnector;
@@ -15,6 +14,7 @@ import org.dbsyncer.connector.model.Field;
 import org.dbsyncer.connector.model.MetaInfo;
 import org.dbsyncer.connector.model.Table;
 import org.dbsyncer.connector.util.PrimaryKeyUtil;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/kafka/KafkaConnectorMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.kafka;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.config.KafkaConfig;
 import org.dbsyncer.connector.util.KafkaUtil;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 public final class KafkaConnectorMapper implements ConnectorMapper<KafkaConfig, KafkaClient> {
     private KafkaConfig config;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/oracle/OracleOtherValueMapper.java

@@ -3,11 +3,11 @@ package org.dbsyncer.connector.oracle;
 import com.microsoft.sqlserver.jdbc.Geometry;
 import oracle.jdbc.OracleConnection;
 import org.dbsyncer.connector.oracle.geometry.JGeometry;
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
 import org.dbsyncer.connector.database.ds.SimpleConnection;
 import org.dbsyncer.connector.util.DatabaseUtil;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.sql.Struct;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/postgresql/PostgreSQLBitValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.postgresql;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * @author AE86

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/postgresql/PostgreSQLOtherValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.postgresql;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.postgis.Geometry;
 import org.postgis.PGgeometry;
 import org.postgis.binary.BinaryParser;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/BigintValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/BinaryValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * @author AE86

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/BitValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.nio.ByteBuffer;
 import java.util.BitSet;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/BlobValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.sql.Blob;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/CharValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * @author AE86

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/ClobValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.sql.Clob;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/DateValueMapper.java

@@ -1,9 +1,9 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.DateFormatUtil;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.sql.Date;
 import java.sql.Timestamp;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/DecimalValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/DoubleValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.math.BigDecimal;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/FloatValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.math.BigDecimal;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/IntegerValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/LongVarBinaryValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * @author AE86

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/LongVarcharValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.sql.Date;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/NCharValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * @author AE86

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/NClobValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.sql.NClob;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/NVarcharValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * @author AE86

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/NumberValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/OtherValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * @author AE86

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/RealValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * @author AE86

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/RowIdValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.sql.RowId;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/SmallintValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * @author AE86

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/TimeValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.sql.Time;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/TimestampValueMapper.java

@@ -1,9 +1,9 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.DateFormatUtil;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.sql.Date;
 import java.sql.SQLException;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/TinyintValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.math.BigDecimal;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/VarBinaryValueMapper.java

@@ -1,8 +1,8 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.nio.ByteBuffer;
 import java.util.BitSet;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/schema/VarcharValueMapper.java

@@ -1,9 +1,9 @@
 package org.dbsyncer.connector.schema;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.DateFormatUtil;
 import org.dbsyncer.connector.AbstractValueMapper;
 import org.dbsyncer.connector.ConnectorException;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.postgresql.util.PGobject;
 
 import java.sql.Date;

+ 1 - 1
dbsyncer-listener/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.7_1103</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-listener</artifactId>

+ 3 - 3
dbsyncer-listener/src/main/java/org/dbsyncer/listener/AbstractExtractor.java

@@ -1,13 +1,13 @@
 package org.dbsyncer.listener;
 
 import org.dbsyncer.listener.model.ChangedOffset;
-import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.connector.ConnectorFactory;
 import org.dbsyncer.connector.constant.ConnectorConstant;
 import org.dbsyncer.connector.model.Table;
 import org.dbsyncer.listener.config.ListenerConfig;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,7 +28,7 @@ public abstract class AbstractExtractor implements Extractor {
     private final Logger logger = LoggerFactory.getLogger(getClass());
     protected ConnectorFactory connectorFactory;
     protected ScheduledTaskService scheduledTaskService;
-    protected AbstractConnectorConfig connectorConfig;
+    protected ConnectorConfig connectorConfig;
     protected ListenerConfig listenerConfig;
     protected Set<String> filterTable;
     protected List<Table> sourceTable;
@@ -125,7 +125,7 @@ public abstract class AbstractExtractor implements Extractor {
         this.scheduledTaskService = scheduledTaskService;
     }
 
-    public void setConnectorConfig(AbstractConnectorConfig connectorConfig) {
+    public void setConnectorConfig(ConnectorConfig connectorConfig) {
         this.connectorConfig = connectorConfig;
     }
 

+ 1 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/quartz/AbstractQuartzExtractor.java

@@ -3,7 +3,6 @@ package org.dbsyncer.listener.quartz;
 import org.dbsyncer.listener.event.ScanChangedEvent;
 import org.dbsyncer.common.model.Result;
 import org.dbsyncer.common.scheduled.ScheduledTaskJob;
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.common.util.UUIDUtil;
@@ -12,6 +11,7 @@ import org.dbsyncer.connector.constant.ConnectorConstant;
 import org.dbsyncer.connector.model.Table;
 import org.dbsyncer.connector.util.PrimaryKeyUtil;
 import org.dbsyncer.listener.AbstractExtractor;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

+ 8 - 1
dbsyncer-manager/pom.xml

@@ -5,12 +5,19 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.7_1103</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-manager</artifactId>
 
     <dependencies>
+        <!-- Cluster 集群服务 -->
+        <dependency>
+            <groupId>org.ghi</groupId>
+            <artifactId>dbsyncer-cluster</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
         <!-- Parser 解析器 -->
         <dependency>
             <groupId>org.ghi</groupId>

+ 2 - 2
dbsyncer-manager/src/main/java/org/dbsyncer/manager/puller/IncrementPuller.java

@@ -2,7 +2,6 @@ package org.dbsyncer.manager.puller;
 
 import org.dbsyncer.listener.model.ChangedOffset;
 import org.dbsyncer.parser.event.RefreshOffsetEvent;
-import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.scheduled.ScheduledTaskJob;
 import org.dbsyncer.common.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.CollectionUtils;
@@ -26,6 +25,7 @@ import org.dbsyncer.parser.model.Connector;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.Meta;
 import org.dbsyncer.parser.model.TableGroup;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
@@ -142,7 +142,7 @@ public final class IncrementPuller extends AbstractPuller implements Application
     }
 
     private AbstractExtractor getExtractor(Mapping mapping, Connector connector, List<TableGroup> list, Meta meta) throws InstantiationException, IllegalAccessException {
-        AbstractConnectorConfig connectorConfig = connector.getConfig();
+        ConnectorConfig connectorConfig = connector.getConfig();
         ListenerConfig listenerConfig = mapping.getListener();
         // timing/log
         final String listenerType = listenerConfig.getListenerType();

+ 1 - 1
dbsyncer-parser/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.7_1103</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-parser</artifactId>

+ 2 - 2
dbsyncer-parser/src/main/java/org/dbsyncer/parser/ParserComponent.java

@@ -2,14 +2,14 @@ package org.dbsyncer.parser;
 
 import org.dbsyncer.listener.ChangedEvent;
 import org.dbsyncer.common.model.Result;
-import org.dbsyncer.common.spi.ConnectorMapper;
-import org.dbsyncer.common.spi.ConvertContext;
 import org.dbsyncer.connector.model.MetaInfo;
 import org.dbsyncer.connector.model.Table;
 import org.dbsyncer.parser.model.BatchWriter;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.parser.model.Task;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
+import org.dbsyncer.sdk.spi.ConvertContext;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/event/FullRefreshEvent.java

@@ -4,7 +4,7 @@ import org.dbsyncer.parser.model.Task;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ApplicationContextEvent;
 
-public class FullRefreshEvent extends ApplicationContextEvent {
+public final class FullRefreshEvent extends ApplicationContextEvent {
 
     private Task task;
 

+ 8 - 8
dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/GeneralBufferActuator.java

@@ -1,12 +1,7 @@
 package org.dbsyncer.parser.flush.impl;
 
-import org.dbsyncer.parser.CacheService;
 import org.dbsyncer.common.config.GeneralBufferConfig;
-import org.dbsyncer.parser.event.RefreshOffsetEvent;
-import org.dbsyncer.common.model.AbstractConnectorConfig;
-import org.dbsyncer.common.model.IncrementConvertContext;
 import org.dbsyncer.common.model.Result;
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.ConnectorFactory;
@@ -14,8 +9,10 @@ import org.dbsyncer.connector.config.DDLConfig;
 import org.dbsyncer.connector.constant.ConnectorConstant;
 import org.dbsyncer.connector.enums.ConnectorEnum;
 import org.dbsyncer.connector.model.MetaInfo;
+import org.dbsyncer.parser.CacheService;
 import org.dbsyncer.parser.ParserComponent;
 import org.dbsyncer.parser.ddl.DDLParser;
+import org.dbsyncer.parser.event.RefreshOffsetEvent;
 import org.dbsyncer.parser.flush.AbstractBufferActuator;
 import org.dbsyncer.parser.model.BatchWriter;
 import org.dbsyncer.parser.model.ConfigModel;
@@ -31,6 +28,9 @@ import org.dbsyncer.parser.util.ConfigModelUtil;
 import org.dbsyncer.parser.util.ConvertUtil;
 import org.dbsyncer.parser.util.PickerUtil;
 import org.dbsyncer.plugin.PluginFactory;
+import org.dbsyncer.sdk.model.ConnectorConfig;
+import org.dbsyncer.sdk.model.IncrementConvertContext;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 import org.dbsyncer.storage.StorageService;
 import org.dbsyncer.storage.enums.StorageEnum;
 import org.slf4j.Logger;
@@ -186,8 +186,8 @@ public class GeneralBufferActuator extends AbstractBufferActuator<WriterRequest,
      */
     private void parseDDl(WriterResponse response, Mapping mapping, TableGroup tableGroup) {
         try {
-            AbstractConnectorConfig sConnConfig = getConnectorConfig(mapping.getSourceConnectorId());
-            AbstractConnectorConfig tConnConfig = getConnectorConfig(mapping.getTargetConnectorId());
+            ConnectorConfig sConnConfig = getConnectorConfig(mapping.getSourceConnectorId());
+            ConnectorConfig tConnConfig = getConnectorConfig(mapping.getTargetConnectorId());
             String sConnType = sConnConfig.getConnectorType();
             String tConnType = tConnConfig.getConnectorType();
             // 0.生成目标表执行SQL(暂支持MySQL) fixme AE86 暂内测MySQL作为试运行版本
@@ -235,7 +235,7 @@ public class GeneralBufferActuator extends AbstractBufferActuator<WriterRequest,
      * @param connectorId
      * @return
      */
-    private AbstractConnectorConfig getConnectorConfig(String connectorId) {
+    private ConnectorConfig getConnectorConfig(String connectorId) {
         Assert.hasText(connectorId, "Connector id can not be empty.");
         Connector conn = cacheService.get(connectorId, Connector.class);
         Assert.notNull(conn, "Connector can not be null.");

+ 2 - 2
dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/MessageServiceImpl.java

@@ -1,12 +1,12 @@
 package org.dbsyncer.parser.impl;
 
-import org.dbsyncer.common.model.NotifyMessage;
-import org.dbsyncer.common.spi.NotifyService;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.parser.MessageService;
 import org.dbsyncer.parser.ProfileComponent;
 import org.dbsyncer.parser.model.UserConfig;
+import org.dbsyncer.sdk.model.NotifyMessage;
+import org.dbsyncer.sdk.spi.NotifyService;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

+ 9 - 9
dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/ParserComponentImpl.java

@@ -1,11 +1,7 @@
 package org.dbsyncer.parser.impl;
 
 import org.dbsyncer.listener.ChangedEvent;
-import org.dbsyncer.common.model.AbstractConnectorConfig;
-import org.dbsyncer.common.model.FullConvertContext;
 import org.dbsyncer.common.model.Result;
-import org.dbsyncer.common.spi.ConnectorMapper;
-import org.dbsyncer.common.spi.ConvertContext;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.ConnectorFactory;
@@ -33,6 +29,10 @@ import org.dbsyncer.parser.strategy.FlushStrategy;
 import org.dbsyncer.parser.util.ConvertUtil;
 import org.dbsyncer.parser.util.PickerUtil;
 import org.dbsyncer.plugin.PluginFactory;
+import org.dbsyncer.sdk.model.ConnectorConfig;
+import org.dbsyncer.sdk.model.FullConvertContext;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
+import org.dbsyncer.sdk.spi.ConvertContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
@@ -99,8 +99,8 @@ public class ParserComponentImpl implements ParserComponent {
 
     @Override
     public Map<String, String> getCommand(Mapping mapping, TableGroup tableGroup) {
-        AbstractConnectorConfig sConnConfig = getConnectorConfig(mapping.getSourceConnectorId());
-        AbstractConnectorConfig tConnConfig = getConnectorConfig(mapping.getTargetConnectorId());
+        ConnectorConfig sConnConfig = getConnectorConfig(mapping.getSourceConnectorId());
+        ConnectorConfig tConnConfig = getConnectorConfig(mapping.getTargetConnectorId());
         Table sourceTable = tableGroup.getSourceTable();
         Table targetTable = tableGroup.getTargetTable();
         Table sTable = new Table(sourceTable.getName(), sourceTable.getType(), new ArrayList<>(), sourceTable.getSql());
@@ -135,9 +135,9 @@ public class ParserComponentImpl implements ParserComponent {
         final String sourceConnectorId = mapping.getSourceConnectorId();
         final String targetConnectorId = mapping.getTargetConnectorId();
 
-        AbstractConnectorConfig sConfig = getConnectorConfig(sourceConnectorId);
+        ConnectorConfig sConfig = getConnectorConfig(sourceConnectorId);
         Assert.notNull(sConfig, "数据源配置不能为空.");
-        AbstractConnectorConfig tConfig = getConnectorConfig(targetConnectorId);
+        ConnectorConfig tConfig = getConnectorConfig(targetConnectorId);
         Assert.notNull(tConfig, "目标源配置不能为空.");
         TableGroup group = PickerUtil.mergeTableGroupConfig(mapping, tableGroup);
         Map<String, String> command = group.getCommand();
@@ -291,7 +291,7 @@ public class ParserComponentImpl implements ParserComponent {
      * @param connectorId
      * @return
      */
-    private AbstractConnectorConfig getConnectorConfig(String connectorId) {
+    private ConnectorConfig getConnectorConfig(String connectorId) {
         return profileComponent.getConnector(connectorId).getConfig();
     }
 

+ 2 - 2
dbsyncer-parser/src/main/java/org/dbsyncer/parser/impl/ProfileComponentImpl.java

@@ -3,7 +3,6 @@
  */
 package org.dbsyncer.parser.impl;
 
-import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.JsonUtil;
 import org.dbsyncer.connector.enums.ConnectorEnum;
@@ -25,6 +24,7 @@ import org.dbsyncer.parser.model.SystemConfig;
 import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.parser.model.UserConfig;
 import org.dbsyncer.parser.template.OperationTemplate;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 import org.dbsyncer.storage.enums.StorageDataStatusEnum;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
@@ -55,7 +55,7 @@ public class ProfileComponentImpl implements ProfileComponent {
         Assert.notNull(connector, "Connector can not be null.");
         String connectorType = (String) config.get("connectorType");
         ConnectorEnum connectorEnum = ConnectorEnum.getConnectorEnum(connectorType);
-        AbstractConnectorConfig obj = JsonUtil.jsonToObj(config.toString(), connectorEnum.getConfigClass());
+        ConnectorConfig obj = JsonUtil.jsonToObj(config.toString(), connectorEnum.getConfigClass());
         obj.setConnectorType(connectorEnum.getType());
         connector.setConfig(obj);
 

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/BatchWriter.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.parser.model;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
 import org.dbsyncer.connector.model.Field;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.util.List;
 import java.util.Map;

+ 4 - 4
dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/Connector.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.parser.model;
 
-import org.dbsyncer.common.model.AbstractConnectorConfig;
 import org.dbsyncer.connector.model.Table;
+import org.dbsyncer.sdk.model.ConnectorConfig;
 import org.dbsyncer.storage.constant.ConfigConstant;
 
 import java.util.List;
@@ -25,7 +25,7 @@ public class Connector extends ConfigModel{
     /**
      * 连接器配置
      */
-    private AbstractConnectorConfig config;
+    private ConnectorConfig config;
 
     public List<Table> getTable() {
         return table;
@@ -36,11 +36,11 @@ public class Connector extends ConfigModel{
         return this;
     }
 
-    public AbstractConnectorConfig getConfig() {
+    public ConnectorConfig getConfig() {
         return config;
     }
 
-    public Connector setConfig(AbstractConnectorConfig config) {
+    public Connector setConfig(ConnectorConfig config) {
         this.config = config;
         return this;
     }

+ 8 - 1
dbsyncer-plugin/pom.xml

@@ -5,12 +5,19 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.7_1103</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-plugin</artifactId>
 
     <dependencies>
+        <!-- sdk -->
+        <dependency>
+            <groupId>org.ghi</groupId>
+            <artifactId>dbsyncer-sdk</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
         <!-- Connector 连接器 -->
         <dependency>
             <groupId>org.ghi</groupId>

+ 1 - 1
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/NotifySupportConfiguration.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.plugin;
 
-import org.dbsyncer.common.spi.NotifyService;
 import org.dbsyncer.plugin.notify.DefaultNotifyService;
+import org.dbsyncer.sdk.spi.NotifyService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 4 - 4
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/PluginFactory.java

@@ -1,12 +1,12 @@
 package org.dbsyncer.plugin;
 
 import org.apache.commons.io.FileUtils;
-import org.dbsyncer.common.model.AbstractConvertContext;
-import org.dbsyncer.common.spi.ConvertContext;
-import org.dbsyncer.common.spi.ConvertService;
-import org.dbsyncer.common.spi.ProxyApplicationContext;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.plugin.config.Plugin;
+import org.dbsyncer.sdk.model.AbstractConvertContext;
+import org.dbsyncer.sdk.spi.ConvertContext;
+import org.dbsyncer.sdk.spi.ConvertService;
+import org.dbsyncer.sdk.spi.ProxyApplicationContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;

+ 2 - 2
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/notify/DefaultNotifyService.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.plugin.notify;
 
-import org.dbsyncer.common.model.NotifyMessage;
-import org.dbsyncer.common.spi.NotifyService;
+import org.dbsyncer.sdk.model.NotifyMessage;
+import org.dbsyncer.sdk.spi.NotifyService;
 
 /**
  * 默认通知服务

+ 9 - 5
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/notify/MailNotifyService.java

@@ -1,19 +1,23 @@
 package org.dbsyncer.plugin.notify;
 
 import org.dbsyncer.common.config.AppConfig;
-import org.dbsyncer.common.model.NotifyMessage;
-import org.dbsyncer.common.spi.NotifyService;
 import org.dbsyncer.common.util.StringUtil;
+import org.dbsyncer.sdk.model.NotifyMessage;
+import org.dbsyncer.sdk.spi.NotifyService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
 import javax.annotation.PostConstruct;
-import javax.mail.*;
+import javax.annotation.Resource;
+import javax.mail.Authenticator;
+import javax.mail.Message;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import java.util.List;
@@ -33,7 +37,7 @@ public class MailNotifyService implements NotifyService {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private AppConfig appConfig;
 
     /**

+ 5 - 8
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/proxy/ProxyApplicationContextImpl.java

@@ -1,12 +1,10 @@
 package org.dbsyncer.plugin.proxy;
 
-import org.dbsyncer.common.spi.ProxyApplicationContext;
+import org.dbsyncer.sdk.spi.ProxyApplicationContext;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
@@ -14,9 +12,9 @@ import org.springframework.context.MessageSourceResolvable;
 import org.springframework.context.NoSuchMessageException;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.env.Environment;
-import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.util.Locale;
@@ -30,8 +28,7 @@ import java.util.Map;
 @Component("proxyApplicationContext")
 public class ProxyApplicationContextImpl implements ProxyApplicationContext {
 
-    @Qualifier("webApplicationContext")
-    @Autowired
+    @Resource
     private ApplicationContext applicationContext;
 
     @Override
@@ -250,12 +247,12 @@ public class ProxyApplicationContextImpl implements ProxyApplicationContext {
     }
 
     @Override
-    public Resource[] getResources(String locationPattern) throws IOException {
+    public org.springframework.core.io.Resource[] getResources(String locationPattern) throws IOException {
         return applicationContext.getResources(locationPattern);
     }
 
     @Override
-    public Resource getResource(String location) {
+    public org.springframework.core.io.Resource getResource(String location) {
         return applicationContext.getResource(location);
     }
 

+ 5 - 4
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/service/DemoConvertServiceImpl.java

@@ -1,19 +1,20 @@
 package org.dbsyncer.plugin.service;
 
 import org.dbsyncer.common.config.AppConfig;
-import org.dbsyncer.common.spi.ConvertContext;
-import org.dbsyncer.common.spi.ConvertService;
+import org.dbsyncer.sdk.spi.ConvertContext;
+import org.dbsyncer.sdk.spi.ConvertService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 @Component
 public class DemoConvertServiceImpl implements ConvertService {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private AppConfig appConfig;
 
     @Override

+ 21 - 0
dbsyncer-sdk/pom.xml

@@ -0,0 +1,21 @@
+<?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">
+    <parent>
+        <artifactId>dbsyncer</artifactId>
+        <groupId>org.ghi</groupId>
+        <version>2.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dbsyncer-sdk</artifactId>
+
+    <dependencies>
+        <!-- Common 公共层 -->
+        <dependency>
+            <groupId>org.ghi</groupId>
+            <artifactId>dbsyncer-common</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+    </dependencies>
+</project>

+ 12 - 0
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/RemoteClient.java

@@ -0,0 +1,12 @@
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
+package org.dbsyncer.sdk;
+
+/**
+ * @Version 1.0.0
+ * @Author AE86
+ * @Date 2023-11-14 23:34
+ */
+public class RemoteClient {
+}

+ 4 - 4
dbsyncer-common/src/main/java/org/dbsyncer/common/model/AbstractConvertContext.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/AbstractConvertContext.java

@@ -1,8 +1,8 @@
-package org.dbsyncer.common.model;
+package org.dbsyncer.sdk.model;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
-import org.dbsyncer.common.spi.ConvertContext;
-import org.dbsyncer.common.spi.ProxyApplicationContext;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
+import org.dbsyncer.sdk.spi.ConvertContext;
+import org.dbsyncer.sdk.spi.ProxyApplicationContext;
 
 import java.util.List;
 import java.util.Map;

+ 3 - 3
dbsyncer-common/src/main/java/org/dbsyncer/common/model/AbstractConnectorConfig.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/ConnectorConfig.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.model;
+package org.dbsyncer.sdk.model;
 
 /**
  * 连接器配置
@@ -6,7 +6,7 @@ package org.dbsyncer.common.model;
  * @version 1.0.0
  * @date 2019/9/21 0:01
  */
-public abstract class AbstractConnectorConfig {
+public abstract class ConnectorConfig {
 
     /**
      * 连接器类型
@@ -17,7 +17,7 @@ public abstract class AbstractConnectorConfig {
         return connectorType;
     }
 
-    public AbstractConnectorConfig setConnectorType(String connectorType) {
+    public ConnectorConfig setConnectorType(String connectorType) {
         this.connectorType = connectorType;
         return this;
     }

+ 2 - 2
dbsyncer-common/src/main/java/org/dbsyncer/common/model/FullConvertContext.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/FullConvertContext.java

@@ -1,6 +1,6 @@
-package org.dbsyncer.common.model;
+package org.dbsyncer.sdk.model;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 /**
  * @author AE86

+ 2 - 2
dbsyncer-common/src/main/java/org/dbsyncer/common/model/IncrementConvertContext.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/IncrementConvertContext.java

@@ -1,6 +1,6 @@
-package org.dbsyncer.common.model;
+package org.dbsyncer.sdk.model;
 
-import org.dbsyncer.common.spi.ConnectorMapper;
+import org.dbsyncer.sdk.spi.ConnectorMapper;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/model/NotifyMessage.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/NotifyMessage.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.model;
+package org.dbsyncer.sdk.model;
 
 import java.util.List;
 

+ 2 - 22
dbsyncer-common/src/main/java/org/dbsyncer/common/spi/ConnectorMapper.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/ConnectorMapper.java

@@ -1,7 +1,4 @@
-package org.dbsyncer.common.spi;
-
-
-import org.dbsyncer.common.model.AbstractConnectorConfig;
+package org.dbsyncer.sdk.spi;
 
 /**
  * 连接器实例,管理连接生命周期
@@ -14,24 +11,6 @@ import org.dbsyncer.common.model.AbstractConnectorConfig;
  */
 public interface ConnectorMapper<K, V> extends Cloneable {
 
-    /**
-     * 获取连接配置
-     *
-     * @return
-     */
-    default AbstractConnectorConfig getOriginalConfig() {
-        return (AbstractConnectorConfig) getConfig();
-    }
-
-    /**
-     * 获取连接器类型
-     *
-     * @return
-     */
-    default String getConnectorType() {
-        return getOriginalConfig().getConnectorType();
-    }
-
     /**
      * 获取连接配置
      *
@@ -41,6 +20,7 @@ public interface ConnectorMapper<K, V> extends Cloneable {
 
     /**
      * 设置
+     *
      * @param k
      */
     void setConfig(K k);

+ 69 - 69
dbsyncer-common/src/main/java/org/dbsyncer/common/spi/ConvertContext.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/ConvertContext.java

@@ -1,70 +1,70 @@
-package org.dbsyncer.common.spi;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 插件转换上下文
- *
- * @author AE86
- * @version 1.0.0
- * @date 2022/10/28 20:26
- */
-public interface ConvertContext {
-
-    /**
-     * 是否终止同步数据到目标源库
-     *
-     * @return
-     */
-    boolean isTerminated();
-
-    /**
-     * 是否终止同步数据到目标源库
-     * <p>true: 终止,默认值false
-     *
-     * @param terminated
-     */
-    void setTerminated(boolean terminated);
-
-    /**
-     * Spring上下文
-     */
-    ProxyApplicationContext getContext();
-
-    /**
-     * 数据源连接实例
-     */
-    ConnectorMapper getSourceConnectorMapper();
-
-    /**
-     * 目标源连接实例
-     */
-    ConnectorMapper getTargetConnectorMapper();
-
-    /**
-     * 数据源表
-     */
-    String getSourceTableName();
-
-    /**
-     * 目标源表
-     */
-    String getTargetTableName();
-
-    /**
-     * 增量同步,事件(INSERT/UPDATE/DELETE)
-     */
-    String getEvent();
-
-    /**
-     * 数据源数据集合
-     */
-    List<Map> getSourceList();
-
-    /**
-     * 目标源源数据集合
-     */
-    List<Map> getTargetList();
-
+package org.dbsyncer.sdk.spi;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 插件转换上下文
+ *
+ * @author AE86
+ * @version 1.0.0
+ * @date 2022/10/28 20:26
+ */
+public interface ConvertContext {
+
+    /**
+     * 是否终止同步数据到目标源库
+     *
+     * @return
+     */
+    boolean isTerminated();
+
+    /**
+     * 是否终止同步数据到目标源库
+     * <p>true: 终止,默认值false
+     *
+     * @param terminated
+     */
+    void setTerminated(boolean terminated);
+
+    /**
+     * Spring上下文
+     */
+    ProxyApplicationContext getContext();
+
+    /**
+     * 数据源连接实例
+     */
+    ConnectorMapper getSourceConnectorMapper();
+
+    /**
+     * 目标源连接实例
+     */
+    ConnectorMapper getTargetConnectorMapper();
+
+    /**
+     * 数据源表
+     */
+    String getSourceTableName();
+
+    /**
+     * 目标源表
+     */
+    String getTargetTableName();
+
+    /**
+     * 增量同步,事件(INSERT/UPDATE/DELETE)
+     */
+    String getEvent();
+
+    /**
+     * 数据源数据集合
+     */
+    List<Map> getSourceList();
+
+    /**
+     * 目标源源数据集合
+     */
+    List<Map> getTargetList();
+
 }

+ 57 - 57
dbsyncer-common/src/main/java/org/dbsyncer/common/spi/ConvertService.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/ConvertService.java

@@ -1,58 +1,58 @@
-package org.dbsyncer.common.spi;
-
-/**
- * 插件扩展服务接口
- * <p>全量同步/增量同步,扩展转换</p>
- *
- * @author AE86
- * @version 1.0.0
- * @date 2021/02/22 20:26
- */
-public interface ConvertService {
-
-    /**
-     * 初始化加载
-     */
-    default void init(){
-
-    }
-
-    /**
-     * 全量同步/增量同步
-     *
-     * @param context 上下文
-     */
-    void convert(ConvertContext context);
-
-    /**
-     * 全量同步/增量同步完成后执行处理
-     *
-     * @param context 上下文
-     */
-    default void postProcessAfter(ConvertContext context) {
-    }
-
-    /**
-     * 版本号
-     *
-     * @return
-     */
-    default String getVersion() {
-        return "1.0.0";
-    }
-
-    /**
-     * 插件名称
-     *
-     * @return
-     */
-    default String getName() {
-        return getClass().getSimpleName();
-    }
-
-    /**
-     * 关闭服务(上传相同插件或服务关闭时触发)
-     */
-    default void close() {
-    }
+package org.dbsyncer.sdk.spi;
+
+/**
+ * 插件扩展服务接口
+ * <p>全量同步/增量同步,扩展转换</p>
+ *
+ * @author AE86
+ * @version 1.0.0
+ * @date 2021/02/22 20:26
+ */
+public interface ConvertService {
+
+    /**
+     * 初始化加载
+     */
+    default void init(){
+
+    }
+
+    /**
+     * 全量同步/增量同步
+     *
+     * @param context 上下文
+     */
+    void convert(ConvertContext context);
+
+    /**
+     * 全量同步/增量同步完成后执行处理
+     *
+     * @param context 上下文
+     */
+    default void postProcessAfter(ConvertContext context) {
+    }
+
+    /**
+     * 版本号
+     *
+     * @return
+     */
+    default String getVersion() {
+        return "1.0.0";
+    }
+
+    /**
+     * 插件名称
+     *
+     * @return
+     */
+    default String getName() {
+        return getClass().getSimpleName();
+    }
+
+    /**
+     * 关闭服务(上传相同插件或服务关闭时触发)
+     */
+    default void close() {
+    }
 }

+ 2 - 2
dbsyncer-common/src/main/java/org/dbsyncer/common/spi/NotifyService.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/NotifyService.java

@@ -1,6 +1,6 @@
-package org.dbsyncer.common.spi;
+package org.dbsyncer.sdk.spi;
 
-import org.dbsyncer.common.model.NotifyMessage;
+import org.dbsyncer.sdk.model.NotifyMessage;
 
 /**
  * 通知服务(同步异常、连接器异常、应用异常等消息)

+ 1 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/spi/ProxyApplicationContext.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/spi/ProxyApplicationContext.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.spi;
+package org.dbsyncer.sdk.spi;
 
 import org.springframework.context.ApplicationContext;
 

+ 1 - 8
dbsyncer-storage/pom.xml

@@ -5,19 +5,12 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.7_1103</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-storage</artifactId>
 
     <dependencies>
-        <!-- Cluster 集群服务 -->
-        <dependency>
-            <groupId>org.ghi</groupId>
-            <artifactId>dbsyncer-cluster</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
         <!-- Connector 连接器 -->
         <dependency>
             <groupId>org.ghi</groupId>

+ 5 - 5
dbsyncer-storage/src/main/java/org/dbsyncer/storage/binlog/AbstractBinlogService.java

@@ -22,9 +22,9 @@ import org.dbsyncer.storage.query.filter.IntFilter;
 import org.dbsyncer.storage.query.filter.LongFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -48,13 +48,13 @@ public abstract class AbstractBinlogService<Message> implements BinlogRecorder {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
+    @Resource
     private StorageService storageService;
 
-    @Autowired
+    @Resource
     private ScheduledTaskService scheduledTaskService;
 
-    @Autowired
+    @Resource
     private SnowflakeIdWorker snowflakeIdWorker;
 
     private BinlogRecorderConfig binlogRecorderConfig = new BinlogRecorderConfig();
@@ -161,7 +161,7 @@ public abstract class AbstractBinlogService<Message> implements BinlogRecorder {
             } catch (Exception e) {
                 logger.error(e.getMessage(), e);
             } finally {
-                 if (locked) {
+                if (locked) {
                     binlogLock.unlock();
                 }
             }

+ 1 - 1
dbsyncer-web/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>1.2.7_1103</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-web</artifactId>

+ 2 - 2
dbsyncer-web/src/main/resources/public/plugin/plugin.html

@@ -19,11 +19,11 @@
                     <li>导入开发包:
                         <ul>
                             <li>方式1:导入jar
-                                <p><a onClick="downLoad('common')" href="javascript:;" title="下载开发包">dbsyncer-common-[[${version}]].jar</a></p>
+                                <p><a onClick="downLoad('sdk')" href="javascript:;" title="下载开发包">dbsyncer-sdk-[[${version}]].jar</a></p>
                                 <p><a onClick="downLoad('connector')" href="javascript:;" title="下载开发包">dbsyncer-connector-[[${version}]].jar</a> (非必须)</p>
                             </li>
                             <li>方式2:引入pom(需要安装到本地)
-                                <pre>&lt;dependency&gt;<br/>&nbsp;&nbsp;&lt;groupId>org.ghi&lt;/groupId&gt;<br/>&nbsp;&nbsp;&lt;artifactId>dbsyncer-common&lt;/artifactId&gt;<br/>&nbsp;&nbsp;&lt;version>[[${version}]]&lt;/version&gt;<br/>&lt;/dependency&gt;<br/>&lt;dependency&gt;<br/>&nbsp;&nbsp;&lt;groupId>org.ghi&lt;/groupId&gt;<br/>&nbsp;&nbsp;&lt;artifactId>dbsyncer-connector&lt;/artifactId&gt;<br/>&nbsp;&nbsp;&lt;version>[[${version}]]&lt;/version&gt;<br/>&lt;/dependency&gt;</pre>
+                                <pre>&lt;dependency&gt;<br/>&nbsp;&nbsp;&lt;groupId>org.ghi&lt;/groupId&gt;<br/>&nbsp;&nbsp;&lt;artifactId>dbsyncer-sdk&lt;/artifactId&gt;<br/>&nbsp;&nbsp;&lt;version>[[${version}]]&lt;/version&gt;<br/>&lt;/dependency&gt;<br/>&lt;dependency&gt;<br/>&nbsp;&nbsp;&lt;groupId>org.ghi&lt;/groupId&gt;<br/>&nbsp;&nbsp;&lt;artifactId>dbsyncer-connector&lt;/artifactId&gt;<br/>&nbsp;&nbsp;&lt;version>[[${version}]]&lt;/version&gt;<br/>&lt;/dependency&gt;</pre>
                             </li>
                         </ul>
                     </li>

+ 3 - 2
pom.xml

@@ -6,12 +6,12 @@
 
     <groupId>org.ghi</groupId>
     <artifactId>dbsyncer</artifactId>
-    <version>1.2.7_1103</version>
+    <version>2.0.0</version>
     <packaging>pom</packaging>
     <name>dbsyncer</name>
     <url>https://gitee.com/ghi/dbsyncer</url>
 
-    <!-- 管理的子模块(10个) -->
+    <!-- 管理的子模块(11个) -->
     <modules>
         <module>dbsyncer-biz</module>
         <module>dbsyncer-cluster</module>
@@ -21,6 +21,7 @@
         <module>dbsyncer-manager</module>
         <module>dbsyncer-parser</module>
         <module>dbsyncer-plugin</module>
+        <module>dbsyncer-sdk</module>
         <module>dbsyncer-storage</module>
         <module>dbsyncer-web</module>
     </modules>

+ 1 - 1
version.cmd

@@ -1,7 +1,7 @@
 @echo off
 
 set CURRENT_DATE=%date:~5,2%%date:~8,2%
-set VERSION=1.2.7_%CURRENT_DATE%
+set VERSION=2.0.0_%CURRENT_DATE%
 set /p APP_VERSION=Please enter a new version number(%VERSION%): || set APP_VERSION=%VERSION%
 echo %APP_VERSION%