Bladeren bron

fix package

AE86 1 jaar geleden
bovenliggende
commit
bcc63f4328

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/AbstractChecker.java

@@ -10,7 +10,7 @@ import org.dbsyncer.parser.model.AbstractConfigModel;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.Convert;
 import org.dbsyncer.plugin.PluginFactory;
-import org.dbsyncer.plugin.config.Plugin;
+import org.dbsyncer.plugin.model.Plugin;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -11,8 +11,8 @@ import org.dbsyncer.parser.LogType;
 import org.dbsyncer.parser.model.Mapping;
 import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.plugin.PluginFactory;
-import org.dbsyncer.plugin.config.Plugin;
-import org.dbsyncer.plugin.enums.FileSuffixEnum;
+import org.dbsyncer.plugin.model.Plugin;
+import org.dbsyncer.common.enums.FileSuffixEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/SystemConfigServiceImpl.java

@@ -12,7 +12,7 @@ import org.dbsyncer.parser.LogType;
 import org.dbsyncer.parser.model.ConfigModel;
 import org.dbsyncer.parser.model.SystemConfig;
 import org.dbsyncer.manager.impl.PreloadTemplate;
-import org.dbsyncer.plugin.enums.FileSuffixEnum;
+import org.dbsyncer.common.enums.FileSuffixEnum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/vo/PluginVo.java

@@ -1,6 +1,6 @@
 package org.dbsyncer.biz.vo;
 
-import org.dbsyncer.plugin.config.Plugin;
+import org.dbsyncer.plugin.model.Plugin;
 
 public class PluginVo extends Plugin {
 

+ 47 - 47
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/enums/FileSuffixEnum.java → dbsyncer-common/src/main/java/org/dbsyncer/common/enums/FileSuffixEnum.java

@@ -1,48 +1,48 @@
-package org.dbsyncer.plugin.enums;
-
-import org.dbsyncer.common.util.StringUtil;
-
-/**
- * 文件格式
- *
- * @author AE86
- * @version 1.0.0
- * @date 2021/2/23 23:21
- */
-public enum FileSuffixEnum {
-
-    /**
-     * jar
-     */
-    JAR("jar"),
-
-    /**
-     * JSON
-     */
-    JSON("json");
-
-    private String name;
-
-    FileSuffixEnum(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取文件类型
-     *
-     * @param suffix
-     * @return
-     */
-    public static FileSuffixEnum getFileSuffix(String suffix) {
-        for (FileSuffixEnum e : FileSuffixEnum.values()) {
-            if (StringUtil.equals(suffix, e.getName())) {
-                return e;
-            }
-        }
-        return null;
-    }
-
-    public String getName() {
-        return name;
-    }
+package org.dbsyncer.common.enums;
+
+import org.dbsyncer.common.util.StringUtil;
+
+/**
+ * 文件格式
+ *
+ * @author AE86
+ * @version 1.0.0
+ * @date 2021/2/23 23:21
+ */
+public enum FileSuffixEnum {
+
+    /**
+     * jar
+     */
+    JAR("jar"),
+
+    /**
+     * JSON
+     */
+    JSON("json");
+
+    private String name;
+
+    FileSuffixEnum(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 获取文件类型
+     *
+     * @param suffix
+     * @return
+     */
+    public static FileSuffixEnum getFileSuffix(String suffix) {
+        for (FileSuffixEnum e : FileSuffixEnum.values()) {
+            if (StringUtil.equals(suffix, e.getName())) {
+                return e;
+            }
+        }
+        return null;
+    }
+
+    public String getName() {
+        return name;
+    }
 }

+ 3 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/scheduled/ScheduledTaskServiceImpl.java → dbsyncer-common/src/main/java/org/dbsyncer/common/scheduled/impl/ScheduledTaskServiceImpl.java

@@ -1,6 +1,8 @@
-package org.dbsyncer.common.scheduled;
+package org.dbsyncer.common.scheduled.impl;
 
 import org.dbsyncer.common.CommonException;
+import org.dbsyncer.common.scheduled.ScheduledTaskJob;
+import org.dbsyncer.common.scheduled.ScheduledTaskService;
 import org.dbsyncer.common.util.UUIDUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 1 - 1
dbsyncer-common/src/main/java/org/dbsyncer/common/file/BufferedRandomAccessFile.java → dbsyncer-listener/src/main/java/org/dbsyncer/listener/file/BufferedRandomAccessFile.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.common.file;
+package org.dbsyncer.listener.file;
 
 import java.io.File;
 import java.io.FileNotFoundException;

+ 0 - 1
dbsyncer-listener/src/main/java/org/dbsyncer/listener/file/FileExtractor.java

@@ -3,7 +3,6 @@ package org.dbsyncer.listener.file;
 import org.apache.commons.io.IOUtils;
 import org.dbsyncer.listener.model.ChangedOffset;
 import org.dbsyncer.listener.event.RowChangedEvent;
-import org.dbsyncer.common.file.BufferedRandomAccessFile;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.NumberUtil;
 import org.dbsyncer.common.util.StringUtil;

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

@@ -1,7 +1,7 @@
 package org.dbsyncer.parser.model;
 
 import org.dbsyncer.connector.model.Filter;
-import org.dbsyncer.plugin.config.Plugin;
+import org.dbsyncer.plugin.model.Plugin;
 
 import java.util.List;
 import java.util.Map;

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

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

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

@@ -2,7 +2,7 @@ package org.dbsyncer.plugin;
 
 import org.apache.commons.io.FileUtils;
 import org.dbsyncer.common.util.CollectionUtils;
-import org.dbsyncer.plugin.config.Plugin;
+import org.dbsyncer.plugin.model.Plugin;
 import org.dbsyncer.sdk.spi.ConvertContext;
 import org.dbsyncer.sdk.spi.ConvertService;
 import org.slf4j.Logger;

+ 1 - 1
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/notify/DefaultNotifyService.java → dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/impl/DefaultNotifyService.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.plugin.notify;
+package org.dbsyncer.plugin.impl;
 
 import org.dbsyncer.sdk.model.NotifyMessage;
 import org.dbsyncer.sdk.spi.NotifyService;

+ 1 - 1
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/service/DemoConvertServiceImpl.java → dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/impl/DemoConvertServiceImpl.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.plugin.service;
+package org.dbsyncer.plugin.impl;
 
 import org.dbsyncer.common.config.AppConfig;
 import org.dbsyncer.sdk.spi.ConvertContext;

+ 1 - 1
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/notify/MailNotifyService.java → dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/impl/MailNotifyService.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.plugin.notify;
+package org.dbsyncer.plugin.impl;
 
 import org.dbsyncer.common.config.AppConfig;
 import org.dbsyncer.common.util.StringUtil;

+ 1 - 1
dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/config/Plugin.java → dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/model/Plugin.java

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