AE86 5 éve
szülő
commit
3c3a2307ba

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/DqlMysqlLogConfigChecker.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.biz.checker.impl.mapping;
 
 import org.dbsyncer.biz.checker.MappingLogConfigChecker;
-import org.dbsyncer.parser.model.ListenerConfig;
+import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.parser.model.Mapping;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/DqlOracleLogConfigChecker.java

@@ -1,7 +1,7 @@
 package org.dbsyncer.biz.checker.impl.mapping;
 
 import org.dbsyncer.biz.checker.MappingLogConfigChecker;
-import org.dbsyncer.parser.model.ListenerConfig;
+import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.parser.model.Mapping;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/LogConfigChecker.java

@@ -7,7 +7,7 @@ import org.dbsyncer.connector.config.ConnectorConfig;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.enums.IncrementEnum;
 import org.dbsyncer.parser.model.Connector;
-import org.dbsyncer.parser.model.ListenerConfig;
+import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.parser.model.Mapping;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 0
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/MappingChecker.java

@@ -7,6 +7,7 @@ import org.dbsyncer.biz.checker.MappingConfigChecker;
 import org.dbsyncer.biz.checker.impl.tablegroup.TableGroupChecker;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.StringUtil;
+import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.enums.IncrementEnum;
 import org.dbsyncer.parser.enums.ModelEnum;

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/TimingConfigChecker.java

@@ -3,7 +3,7 @@ package org.dbsyncer.biz.checker.impl.mapping;
 import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.checker.MappingConfigChecker;
 import org.dbsyncer.manager.enums.IncrementEnum;
-import org.dbsyncer.parser.model.ListenerConfig;
+import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.parser.model.Mapping;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/model/ListenerConfig.java → dbsyncer-listener/src/main/java/org/dbsyncer/listener/config/ListenerConfig.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.parser.model;
+package org.dbsyncer.listener.config;
 
 /**
  * @author AE86

+ 0 - 14
dbsyncer-manager/pom.xml

@@ -19,13 +19,6 @@
             <version>${project.parent.version}</version>
         </dependency>
 
-        <!-- Listener 监听器 -->
-        <dependency>
-            <groupId>org.ghi</groupId>
-            <artifactId>dbsyncer-listener</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
         <!-- Cache 缓存服务 -->
         <dependency>
             <groupId>org.ghi</groupId>
@@ -33,13 +26,6 @@
             <version>${project.parent.version}</version>
         </dependency>
 
-        <!-- Message 消息服务 -->
-        <dependency>
-            <groupId>org.ghi</groupId>
-            <artifactId>dbsyncer-message</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
         <!-- Storage 存储服务 -->
         <dependency>
             <groupId>org.ghi</groupId>

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

@@ -4,6 +4,7 @@ import org.dbsyncer.common.event.Event;
 import org.dbsyncer.listener.DefaultExtractor;
 import org.dbsyncer.listener.Extractor;
 import org.dbsyncer.listener.Listener;
+import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.manager.enums.IncrementEnum;
 import org.dbsyncer.manager.puller.AbstractPuller;

+ 0 - 15
dbsyncer-message/pom.xml

@@ -1,15 +0,0 @@
-<?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>1.0.0-Alpha</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>dbsyncer-message</artifactId>
-
-
-</project>

+ 2 - 9
dbsyncer-parser/pom.xml

@@ -12,17 +12,10 @@
     <artifactId>dbsyncer-parser</artifactId>
 
     <dependencies>
-        <!-- Connector 连接器 -->
+        <!-- Listener 监听器 -->
         <dependency>
             <groupId>org.ghi</groupId>
-            <artifactId>dbsyncer-connector</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-
-        <!-- Message 消息服务 -->
-        <dependency>
-            <groupId>org.ghi</groupId>
-            <artifactId>dbsyncer-message</artifactId>
+            <artifactId>dbsyncer-listener</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
 

+ 0 - 32
dbsyncer-parser/src/main/java/org/dbsyncer/parser/enums/ListenerEnum.java

@@ -1,32 +0,0 @@
-package org.dbsyncer.parser.enums;
-
-/**
- * 支持监听器类型
- *
- * @author AE86
- * @version 1.0.0
- * @date 2019/9/19 23:56
- */
-public enum ListenerEnum {
-
-    /**
-     * 日志
-     */
-    LOG("log"),
-    /**
-     * 定时
-     */
-    TIMING("timing");
-
-    // 策略编码
-    private String code;
-
-    ListenerEnum(String code) {
-        this.code = code;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-}

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

@@ -1,6 +1,7 @@
 package org.dbsyncer.parser.model;
 
 import org.dbsyncer.connector.config.Field;
+import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.parser.enums.ModelEnum;
 
 import java.util.List;

+ 1 - 2
pom.xml

@@ -11,7 +11,7 @@
     <name>dbsyncer</name>
     <url>https://gitee.com/ghi/dbsyncer</url>
 
-    <!-- 管理的子模块(13个) -->
+    <!-- 管理的子模块(12个) -->
     <modules>
         <module>dbsyncer-biz</module>
         <module>dbsyncer-cache</module>
@@ -20,7 +20,6 @@
         <module>dbsyncer-connector</module>
         <module>dbsyncer-listener</module>
         <module>dbsyncer-manager</module>
-        <module>dbsyncer-message</module>
         <module>dbsyncer-monitor</module>
         <module>dbsyncer-parser</module>
         <module>dbsyncer-plugin</module>