AE86 1 年之前
父节点
当前提交
0a76d71cd8
共有 21 个文件被更改,包括 40 次插入37 次删除
  1. 2 2
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESQuartzListener.java
  2. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/mysql/MySQLConnector.java
  3. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/oracle/OracleConnector.java
  4. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/postgresql/PostgreSQLConnector.java
  5. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLMySQLConnector.java
  6. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLOracleConnector.java
  7. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLPostgreSQLConnector.java
  8. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLSqlServerConnector.java
  9. 1 1
      dbsyncer-connector/src/main/java/org/dbsyncer/connector/sqlserver/SqlServerConnector.java
  10. 1 1
      dbsyncer-manager/src/main/java/org/dbsyncer/manager/impl/IncrementPuller.java
  11. 5 5
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/QuartzFilterEnum.java
  12. 2 2
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/AbstractQuartzListener.java
  13. 3 3
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/DatabaseQuartzListener.java
  14. 1 1
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/QuartzFilter.java
  15. 2 2
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/filter/DateFilter.java
  16. 2 2
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/filter/TimestampFilter.java
  17. 2 2
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/filter/YesDateFilter.java
  18. 2 2
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/filter/YesTimestampFilter.java
  19. 7 3
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/Point.java
  20. 1 2
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/TableGroupQuartzCommand.java
  21. 2 2
      dbsyncer-web/src/main/resources/application.properties

+ 2 - 2
dbsyncer-connector/src/main/java/org/dbsyncer/connector/es/ESQuartzListener.java

@@ -6,8 +6,8 @@ import org.dbsyncer.common.util.StringUtil;
 import org.dbsyncer.connector.ConnectorException;
 import org.dbsyncer.sdk.enums.QuartzFilterEnum;
 import org.dbsyncer.sdk.listener.AbstractQuartzListener;
-import org.dbsyncer.sdk.quartz.Point;
-import org.dbsyncer.sdk.quartz.QuartzFilter;
+import org.dbsyncer.sdk.model.Point;
+import org.dbsyncer.sdk.listener.QuartzFilter;
 import org.dbsyncer.sdk.constant.ConnectorConstant;
 import org.dbsyncer.sdk.model.Filter;
 

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/mysql/MySQLConnector.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.mysql;
 
 import org.dbsyncer.common.util.StringUtil;
-import org.dbsyncer.sdk.quartz.DatabaseQuartzListener;
+import org.dbsyncer.sdk.listener.DatabaseQuartzListener;
 import org.dbsyncer.sdk.config.ReaderConfig;
 import org.dbsyncer.sdk.connector.database.AbstractDatabaseConnector;
 import org.dbsyncer.sdk.constant.DatabaseConstant;

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

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.oracle;
 
 import org.dbsyncer.common.util.StringUtil;
-import org.dbsyncer.sdk.quartz.DatabaseQuartzListener;
+import org.dbsyncer.sdk.listener.DatabaseQuartzListener;
 import org.dbsyncer.sdk.config.CommandConfig;
 import org.dbsyncer.sdk.config.DatabaseConfig;
 import org.dbsyncer.sdk.config.ReaderConfig;

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

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.postgresql;
 
 import org.dbsyncer.common.util.StringUtil;
-import org.dbsyncer.sdk.quartz.DatabaseQuartzListener;
+import org.dbsyncer.sdk.listener.DatabaseQuartzListener;
 import org.dbsyncer.sdk.config.CommandConfig;
 import org.dbsyncer.sdk.config.DatabaseConfig;
 import org.dbsyncer.sdk.config.ReaderConfig;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLMySQLConnector.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.sql;
 
 import org.dbsyncer.connector.mysql.DqlMySQLListener;
-import org.dbsyncer.sdk.quartz.DatabaseQuartzListener;
+import org.dbsyncer.sdk.listener.DatabaseQuartzListener;
 import org.dbsyncer.sdk.config.CommandConfig;
 import org.dbsyncer.sdk.config.ReaderConfig;
 import org.dbsyncer.sdk.connector.database.AbstractDQLConnector;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLOracleConnector.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.sql;
 
 import org.dbsyncer.connector.oracle.DqlOracleListener;
-import org.dbsyncer.sdk.quartz.DatabaseQuartzListener;
+import org.dbsyncer.sdk.listener.DatabaseQuartzListener;
 import org.dbsyncer.sdk.config.ReaderConfig;
 import org.dbsyncer.sdk.connector.database.AbstractDQLConnector;
 import org.dbsyncer.sdk.constant.DatabaseConstant;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLPostgreSQLConnector.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.sql;
 
 import org.dbsyncer.connector.postgresql.DqlPostgreSQLListener;
-import org.dbsyncer.sdk.quartz.DatabaseQuartzListener;
+import org.dbsyncer.sdk.listener.DatabaseQuartzListener;
 import org.dbsyncer.sdk.config.ReaderConfig;
 import org.dbsyncer.sdk.connector.database.AbstractDQLConnector;
 import org.dbsyncer.sdk.constant.DatabaseConstant;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/sql/DQLSqlServerConnector.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.connector.sql;
 
 import org.dbsyncer.common.util.StringUtil;
-import org.dbsyncer.sdk.quartz.DatabaseQuartzListener;
+import org.dbsyncer.sdk.listener.DatabaseQuartzListener;
 import org.dbsyncer.connector.sqlserver.DqlSqlServerListener;
 import org.dbsyncer.sdk.config.ReaderConfig;
 import org.dbsyncer.sdk.connector.database.AbstractDQLConnector;

+ 1 - 1
dbsyncer-connector/src/main/java/org/dbsyncer/connector/sqlserver/SqlServerConnector.java

@@ -2,7 +2,7 @@ package org.dbsyncer.connector.sqlserver;
 
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
-import org.dbsyncer.sdk.quartz.DatabaseQuartzListener;
+import org.dbsyncer.sdk.listener.DatabaseQuartzListener;
 import org.dbsyncer.sdk.config.CommandConfig;
 import org.dbsyncer.sdk.config.DatabaseConfig;
 import org.dbsyncer.sdk.config.ReaderConfig;

+ 1 - 1
dbsyncer-manager/src/main/java/org/dbsyncer/manager/impl/IncrementPuller.java

@@ -23,7 +23,7 @@ import org.dbsyncer.sdk.listener.Listener;
 import org.dbsyncer.sdk.model.ChangedOffset;
 import org.dbsyncer.sdk.model.ConnectorConfig;
 import org.dbsyncer.sdk.model.Table;
-import org.dbsyncer.sdk.quartz.TableGroupQuartzCommand;
+import org.dbsyncer.sdk.model.TableGroupQuartzCommand;
 import org.dbsyncer.sdk.scheduled.ScheduledTaskJob;
 import org.dbsyncer.sdk.scheduled.ScheduledTaskService;
 import org.slf4j.Logger;

+ 5 - 5
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/QuartzFilterEnum.java

@@ -1,11 +1,11 @@
 package org.dbsyncer.sdk.enums;
 
 import org.dbsyncer.common.util.StringUtil;
-import org.dbsyncer.sdk.quartz.QuartzFilter;
-import org.dbsyncer.sdk.quartz.filter.DateFilter;
-import org.dbsyncer.sdk.quartz.filter.TimestampFilter;
-import org.dbsyncer.sdk.quartz.filter.YesDateFilter;
-import org.dbsyncer.sdk.quartz.filter.YesTimestampFilter;
+import org.dbsyncer.sdk.listener.QuartzFilter;
+import org.dbsyncer.sdk.listener.filter.DateFilter;
+import org.dbsyncer.sdk.listener.filter.TimestampFilter;
+import org.dbsyncer.sdk.listener.filter.YesDateFilter;
+import org.dbsyncer.sdk.listener.filter.YesTimestampFilter;
 
 /**
  * @author AE86

+ 2 - 2
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/AbstractQuartzListener.java

@@ -7,9 +7,9 @@ import org.dbsyncer.common.util.UUIDUtil;
 import org.dbsyncer.sdk.config.ReaderConfig;
 import org.dbsyncer.sdk.constant.ConnectorConstant;
 import org.dbsyncer.sdk.listener.event.ScanChangedEvent;
+import org.dbsyncer.sdk.model.Point;
 import org.dbsyncer.sdk.model.Table;
-import org.dbsyncer.sdk.quartz.Point;
-import org.dbsyncer.sdk.quartz.TableGroupQuartzCommand;
+import org.dbsyncer.sdk.model.TableGroupQuartzCommand;
 import org.dbsyncer.sdk.scheduled.ScheduledTaskJob;
 import org.dbsyncer.sdk.util.PrimaryKeyUtil;
 import org.slf4j.Logger;

+ 3 - 3
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/quartz/DatabaseQuartzListener.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/DatabaseQuartzListener.java

@@ -1,10 +1,10 @@
-package org.dbsyncer.sdk.quartz;
+package org.dbsyncer.sdk.listener;
 
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
-import org.dbsyncer.sdk.enums.QuartzFilterEnum;
 import org.dbsyncer.sdk.constant.ConnectorConstant;
-import org.dbsyncer.sdk.listener.AbstractQuartzListener;
+import org.dbsyncer.sdk.enums.QuartzFilterEnum;
+import org.dbsyncer.sdk.model.Point;
 import org.springframework.util.Assert;
 
 import java.util.ArrayList;

+ 1 - 1
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/quartz/QuartzFilter.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/QuartzFilter.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.sdk.quartz;
+package org.dbsyncer.sdk.listener;
 
 public interface QuartzFilter<T> {
 

+ 2 - 2
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/quartz/filter/DateFilter.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/filter/DateFilter.java

@@ -1,7 +1,7 @@
-package org.dbsyncer.sdk.quartz.filter;
+package org.dbsyncer.sdk.listener.filter;
 
 import org.dbsyncer.common.util.DateFormatUtil;
-import org.dbsyncer.sdk.quartz.QuartzFilter;
+import org.dbsyncer.sdk.listener.QuartzFilter;
 
 import java.sql.Date;
 import java.time.Instant;

+ 2 - 2
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/quartz/filter/TimestampFilter.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/filter/TimestampFilter.java

@@ -1,6 +1,6 @@
-package org.dbsyncer.sdk.quartz.filter;
+package org.dbsyncer.sdk.listener.filter;
 
-import org.dbsyncer.sdk.quartz.QuartzFilter;
+import org.dbsyncer.sdk.listener.QuartzFilter;
 
 import java.sql.Timestamp;
 import java.time.Instant;

+ 2 - 2
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/quartz/filter/YesDateFilter.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/filter/YesDateFilter.java

@@ -1,7 +1,7 @@
-package org.dbsyncer.sdk.quartz.filter;
+package org.dbsyncer.sdk.listener.filter;
 
 import org.dbsyncer.common.util.DateFormatUtil;
-import org.dbsyncer.sdk.quartz.QuartzFilter;
+import org.dbsyncer.sdk.listener.QuartzFilter;
 
 import java.sql.Date;
 import java.time.LocalDateTime;

+ 2 - 2
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/quartz/filter/YesTimestampFilter.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/filter/YesTimestampFilter.java

@@ -1,6 +1,6 @@
-package org.dbsyncer.sdk.quartz.filter;
+package org.dbsyncer.sdk.listener.filter;
 
-import org.dbsyncer.sdk.quartz.QuartzFilter;
+import org.dbsyncer.sdk.listener.QuartzFilter;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;

+ 7 - 3
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/quartz/Point.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/Point.java

@@ -1,8 +1,12 @@
-package org.dbsyncer.sdk.quartz;
+package org.dbsyncer.sdk.model;
 
 import org.dbsyncer.common.util.StringUtil;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class Point {
 
@@ -33,7 +37,7 @@ public class Point {
     }
 
     public void refresh() {
-        if(StringUtil.isNotBlank(beginKey) && StringUtil.isNotBlank(beginValue)){
+        if (StringUtil.isNotBlank(beginKey) && StringUtil.isNotBlank(beginValue)) {
             position.put(beginKey, beginValue);
             refreshed = true;
         }

+ 1 - 2
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/quartz/TableGroupQuartzCommand.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/model/TableGroupQuartzCommand.java

@@ -1,6 +1,5 @@
-package org.dbsyncer.sdk.quartz;
+package org.dbsyncer.sdk.model;
 
-import org.dbsyncer.sdk.model.Table;
 import org.dbsyncer.sdk.util.PrimaryKeyUtil;
 
 import java.util.List;

+ 2 - 2
dbsyncer-web/src/main/resources/application.properties

@@ -46,8 +46,8 @@ dbsyncer.parser.table.group.buffer-period-millisecond=300
 #storage
 # 是否使用MySQL存储配置(false-关闭; true-开启)
 # false: 保存磁盘/data/config(驱动配置)|data(按驱动分别存储增量数据)|log(系统日志)}
-dbsyncer.storage.support.mysql.enabled=true
-dbsyncer.storage.support.mysql.config.url=jdbc:mysql://127.0.0.1:3305/dbsyncer?rewriteBatchedStatements=true&seUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&useSSL=false&verifyServerCertificate=false&autoReconnect=true
+dbsyncer.storage.support.mysql.enabled=false
+dbsyncer.storage.support.mysql.config.url=jdbc:mysql://127.0.0.1:3306/dbsyncer?rewriteBatchedStatements=true&seUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&useSSL=false&verifyServerCertificate=false&autoReconnect=true
 dbsyncer.storage.support.mysql.config.username=root
 dbsyncer.storage.support.mysql.config.password=123
 # [StorageBufferActuator]线程数