Merge remote-tracking branch 'origin/v_2.0' into v_2.0

dbsyncer-biz/pom.xml

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

dbsyncer-cluster/pom.xml

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

dbsyncer-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-common</artifactId>

dbsyncer-connector/dbsyncer-connector-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-elasticsearch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-elasticsearch/src/main/java/org/dbsyncer/connector/elasticsearch/ElasticsearchConnector.java

@@ -58,7 +58,6 @@ import org.elasticsearch.search.sort.SortOrder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.sql.Types;
 import java.util.ArrayList;
@@ -86,8 +85,7 @@ public final class ElasticsearchConnector extends AbstractConnector implements C
 
     private final ESConfigValidator configValidator = new ESConfigValidator();
 
-    @PostConstruct
-    private void init() {
+    public ElasticsearchConnector() {
         VALUE_MAPPERS.put(Types.DATE, new ESDateValueMapper());
         VALUE_MAPPERS.put(Types.OTHER, new ESOtherValueMapper());
 

dbsyncer-connector/dbsyncer-connector-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-kafka/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-mysql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/cdc/MySQLListener.java

@@ -134,9 +134,8 @@ public class MySQLListener extends AbstractDatabaseListener {
 
     private List<Host> readNodes(String url) {
         Matcher matcher = compile("(//)(?!(/)).+?(/)").matcher(url);
-        while (matcher.find()) {
+        if (matcher.find()) {
             url = matcher.group(0);
-            break;
         }
         url = StringUtil.replace(url, "/", "");
 

dbsyncer-connector/dbsyncer-connector-oracle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-oracle/src/main/java/org/dbsyncer/connector/oracle/OracleConnector.java

@@ -23,7 +23,6 @@ import org.dbsyncer.sdk.util.PrimaryKeyUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
 import java.sql.Types;
 import java.util.List;
 
@@ -41,8 +40,7 @@ public final class OracleConnector extends AbstractDatabaseConnector {
     private final String TYPE = "Oracle";
     private final OracleConfigValidator configValidator = new OracleConfigValidator();
 
-    @PostConstruct
-    private void init() {
+    public OracleConnector() {
         VALUE_MAPPERS.put(Types.OTHER, new OracleOtherValueMapper());
     }
 

dbsyncer-connector/dbsyncer-connector-postgresql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-postgresql/src/main/java/org/dbsyncer/connector/postgresql/PostgreSQLConnector.java

@@ -24,7 +24,6 @@ import org.dbsyncer.sdk.util.PrimaryKeyUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
 import java.sql.Types;
 import java.util.List;
 
@@ -42,6 +41,11 @@ public final class PostgreSQLConnector extends AbstractDatabaseConnector {
     private final String TYPE = "PostgreSQL";
     private final PostgreSQLConfigValidator configValidator = new PostgreSQLConfigValidator();
 
+    public PostgreSQLConnector() {
+        VALUE_MAPPERS.put(Types.BIT, new PostgreSQLBitValueMapper());
+        VALUE_MAPPERS.put(Types.OTHER, new PostgreSQLOtherValueMapper());
+    }
+
     @Override
     public String getConnectorType() {
         return TYPE;
@@ -64,12 +68,6 @@ public final class PostgreSQLConnector extends AbstractDatabaseConnector {
         return null;
     }
 
-    @PostConstruct
-    private void init() {
-        VALUE_MAPPERS.put(Types.BIT, new PostgreSQLBitValueMapper());
-        VALUE_MAPPERS.put(Types.OTHER, new PostgreSQLOtherValueMapper());
-    }
-
     @Override
     public String buildSqlWithQuotation() {
         return "\"";

dbsyncer-connector/dbsyncer-connector-sqlite/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-sqlserver/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-connector</artifactId>

dbsyncer-manager/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-manager</artifactId>

dbsyncer-parser/pom.xml

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

dbsyncer-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-plugin</artifactId>

dbsyncer-sdk/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-sdk</artifactId>

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/util/DatabaseUtil.java

@@ -38,9 +38,8 @@ public abstract class DatabaseUtil {
 
     public static String getDatabaseName(String url) {
         Matcher matcher = compile("(//)(?!(\\?)).+?(\\?)").matcher(url);
-        while (matcher.find()) {
+        if (matcher.find()) {
             url = matcher.group(0);
-            break;
         }
         int s = url.lastIndexOf("/");
         int e = url.lastIndexOf("?");

dbsyncer-storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0</version>
+        <version>2.0.0_1226-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-storage</artifactId>

dbsyncer-storage/src/main/test/LuceneFactoryTest.java → dbsyncer-storage/src/test/LuceneFactoryTest.java

@@ -261,8 +261,7 @@ public class LuceneFactoryTest {
         System.out.println("新增后：");
         maps = query(new MatchAllDocsQuery());
         maps.forEach(m -> {
-            m.get("content");
-            System.out.println(m);
+            logger.info(String.valueOf(m.get("content")));
         });
         check();
 

dbsyncer-web/pom.xml

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

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.ghi</groupId>
     <artifactId>dbsyncer</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.0_1226-Beta</version>
     <packaging>pom</packaging>
     <name>dbsyncer</name>
     <url>https://gitee.com/ghi/dbsyncer</url>

version.cmd

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

version.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=2.0.0_$(date +"%m%d")
+VERSION=2.0.0_$(date +"%m%d")-Beta
 read -p "Please enter a new version number($VERSION)：" APP_VERSION
 if [ -z "$APP_VERSION" ]; then
   APP_VERSION=$VERSION