!40 V_1.1.1

Merge pull request !40 from AE86/V_1.0.0

dbsyncer-biz/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>dbsyncer</artifactId>
 		<groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>dbsyncer-biz</artifactId>

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

@@ -1,6 +1,7 @@
 package org.dbsyncer.biz.checker.impl.mapping;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.dbsyncer.biz.checker.MappingConfigChecker;
 import org.dbsyncer.listener.config.ListenerConfig;
 import org.dbsyncer.listener.enums.ListenerTypeEnum;
@@ -22,7 +23,7 @@ public class TimingConfigChecker implements MappingConfigChecker {
 
     @Override
     public void modify(Mapping mapping, Map<String, String> params) {
-        String cron = params.get("incrementStrategyTimingCronExpression");
+        String period = params.get("incrementStrategyTimingPeriodExpression");
         String eventFieldName = params.get("incrementStrategyTimingEventFieldName");
         String insert = params.get("incrementStrategyTimingInsert");
         String update = params.get("incrementStrategyTimingUpdate");
@@ -31,8 +32,8 @@ public class TimingConfigChecker implements MappingConfigChecker {
         ListenerConfig config = mapping.getListener();
         Assert.notNull(config, "ListenerConfig can not be null.");
 
-        if (StringUtils.isNotBlank(cron)) {
-            config.setCronExpression(cron);
+        if (StringUtils.isNotBlank(period)) {
+            config.setPeriod(NumberUtils.toLong(period, 30));
         }
         if (StringUtils.isNotBlank(eventFieldName)) {
             config.setEventFieldName(eventFieldName);

dbsyncer-cache/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>dbsyncer</artifactId>
 		<groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>dbsyncer-cache</artifactId>

dbsyncer-cluster/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</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>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-common</artifactId>

dbsyncer-common/src/main/java/org/dbsyncer/common/event/RowChangedEvent.java

@@ -43,6 +43,10 @@ public class RowChangedEvent {
         return tableGroupIndex;
     }
 
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
     public String getTableName() {
         return tableName;
     }

dbsyncer-connector/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-connector</artifactId>

dbsyncer-connector/src/main/java/org/dbsyncer/connector/database/setter/TinyintSetter.java

@@ -1,5 +1,6 @@
 package org.dbsyncer.connector.database.setter;
 
+import org.dbsyncer.connector.ConnectorException;
 import org.dbsyncer.connector.database.AbstractSetter;
 
 import java.sql.PreparedStatement;
@@ -12,4 +13,14 @@ public class TinyintSetter extends AbstractSetter<Integer> {
         ps.setInt(i, val);
     }
 
+    @Override
+    protected void setIfValueTypeNotMatch(PreparedFieldMapper mapper, PreparedStatement ps, int i, int type, Object val)
+            throws SQLException {
+        if (val instanceof Short) {
+            Short v = (Short) val;
+            ps.setShort(i, v);
+            return;
+        }
+        throw new ConnectorException(String.format("TinyintSetter can not find type [%s], val [%s]", type, val));
+    }
 }

dbsyncer-connector/src/main/java/org/dbsyncer/connector/sqlserver/SqlServerConnectorMapper.java

@@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.dao.EmptyResultDataAccessException;
 
 import java.sql.Connection;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -34,7 +35,7 @@ public final class SqlServerConnectorMapper extends ConnectorMapper {
         boolean locked = false;
         Object apply = null;
         try {
-            locked = connectionLock.tryLock();
+            locked = connectionLock.tryLock(60, TimeUnit.SECONDS);
             if (locked) {
                 apply = callback.apply(new DatabaseTemplate(connection));
             }

dbsyncer-listener/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-listener</artifactId>

dbsyncer-listener/src/main/java/org/dbsyncer/listener/config/ListenerConfig.java

@@ -20,8 +20,8 @@ public class ListenerConfig {
      */
     private int readNum = 200;
 
-    // 定时表达式, 格式: [秒] [分] [小时] [日] [月] [周]
-    private String cronExpression = "*/30 * * * * ?";
+    // 定时(秒)
+    private long period = 30;
 
     // 事件字段
     private String eventFieldName = "";
@@ -61,12 +61,12 @@ public class ListenerConfig {
         this.readNum = readNum;
     }
 
-    public String getCronExpression() {
-        return cronExpression;
+    public long getPeriod() {
+        return period;
     }
 
-    public void setCronExpression(String cronExpression) {
-        this.cronExpression = cronExpression;
+    public void setPeriod(long period) {
+        this.period = period;
     }
 
     public String getEventFieldName() {

dbsyncer-listener/src/main/java/org/dbsyncer/listener/quartz/QuartzExtractor.java

@@ -40,21 +40,20 @@ public class QuartzExtractor extends AbstractExtractor implements ScheduledTaskJ
     private Set<String> insert;
     private Set<String> delete;
     private String taskKey;
-    private String cron;
+    private long period;
     private AtomicBoolean running;
 
     @Override
     public void start() {
         init();
         run();
-        scheduledTaskService.start(taskKey, cron, this);
-        logger.info("启动定时任务:{} >> {}", taskKey, cron);
+        scheduledTaskService.start(taskKey, period * 1000, this);
+        logger.info("启动定时任务:{} >> {}秒", taskKey, period);
     }
 
     @Override
     public void run() {
         try {
-            logger.debug("执行定时任务:{} >> {}", taskKey, cron);
             if (running.compareAndSet(false, true)) {
                 // 依次执行同步映射关系
                 for (int i = 0; i < commandSize; i++) {
@@ -175,7 +174,7 @@ public class QuartzExtractor extends AbstractExtractor implements ScheduledTaskJ
         delete = Stream.of(listenerConfig.getDelete().split(",")).collect(Collectors.toSet());
 
         taskKey = UUIDUtil.getUUID();
-        cron = listenerConfig.getCronExpression();
+        period = listenerConfig.getPeriod();
         running = new AtomicBoolean();
     }
 

dbsyncer-manager/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-manager</artifactId>

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

@@ -254,10 +254,7 @@ public class IncrementPuller extends AbstractPuller implements ScheduledTaskJob,
         @Override
         public void changedEvent(RowChangedEvent rowChangedEvent) {
             final FieldPicker picker = tablePicker.get(rowChangedEvent.getTableGroupIndex());
-            logger.info("监听数据=> tableName:{}, event:{}, before:{}, after:{}", picker.getTableGroup().getSourceTable().getName(),
-                    rowChangedEvent.getEvent(),
-                    rowChangedEvent.getBefore(),
-                    rowChangedEvent.getAfter());
+            rowChangedEvent.setTableName(picker.getTableGroup().getSourceTable().getName());
 
             // 处理过程有异常向上抛
             parser.execute(mapping, picker.getTableGroup(), rowChangedEvent);

dbsyncer-monitor/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-monitor</artifactId>

dbsyncer-parser/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-parser</artifactId>

dbsyncer-parser/src/main/resources/Mapping.json

@@ -54,7 +54,7 @@
   "model":"full",
   "listener": {
     "listenerType": "Polling",
-    "cronExpression": "*/30 * * * * ?",
+    "period": 30,
     "eventFieldName": "MyEvent",
     "update": [
       "U",

dbsyncer-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-plugin</artifactId>

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

@@ -117,6 +117,7 @@ public class PluginFactory {
                 String className = s.getClass().getName();
                 service.put(className, s);
                 plugins.add(new Plugin(s.getName(), className, s.getVersion(), fileName));
+                logger.info("{}, {}_{} {}", fileName, s.getName(), s.getVersion(), className);
             }
         } catch (MalformedURLException e) {
             logger.error(e.getMessage());

dbsyncer-plugin/src/main/java/org/dbsyncer/plugin/service/DemoConvertServiceImpl.java

@@ -26,7 +26,7 @@ public class DemoConvertServiceImpl implements ConvertService {
 
     @Override
     public void convert(String event, Map source, Map target) {
-        logger.info(String.format("插件正在处理同步数据，事件:%s，数据:%s", event, source));
+        logger.info("插件正在处理同步数据，事件:{}，数据:{}", event, source);
     }
 
     @Override

dbsyncer-storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-storage</artifactId>

dbsyncer-web/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-		<version>1.1.0-Alpha</version>
+		<version>1.1.1-Alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-web</artifactId>

dbsyncer-web/src/main/assembly/bin/startup.bat

@@ -27,4 +27,4 @@ rem jmxremote model
 rem SERVER_OPTS=%SERVER_OPTS% %JMXREMOTE_HOSTNAME% %JMXREMOTE_PORT% %JMXREMOTE_SSL% %JMXREMOTE_AUTH% %JMXREMOTE_ACCESS% %JMXREMOTE_PASSWORD%
 
 echo %SERVER_OPTS%
-java %SERVER_OPTS% -Dfile.encoding=GBK -Djava.ext.dirs=%JAVA_HOME%\jre\lib\ext;./lib -Dspring.config.location=%cd%\conf\application.properties org.dbsyncer.web.Application
+java %SERVER_OPTS% -Dfile.encoding=GBK -Djava.ext.dirs="%JAVA_HOME%"\jre\lib\ext;./lib -Dspring.config.location=%cd%\conf\application.properties org.dbsyncer.web.Application

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/upload/UploadController.java

@@ -55,6 +55,7 @@ public class UploadController {
                         String filename = file.getOriginalFilename();
                         pluginService.checkFileSuffix(filename);
                         File dest = new File(filePath + filename);
+                        FileUtils.deleteQuietly(dest);
                         FileUtils.copyInputStreamToFile(file.getInputStream(), dest);
                     }
                 }

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

@@ -23,7 +23,7 @@ management.endpoints.web.base-path=/app
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always
 info.app.name=DBSyncer
-info.app.version=1.1.0-Alpha
+info.app.version=1.1.1-Alpha
 info.app.copyright=&copy;2021 ${info.app.name}(${info.app.version})<footer>Designed By <a href='https://gitee.com/ghi/dbsyncer' target='_blank' >AE86</a></footer>
 
 #All < Trace < Debug < Info < Warn < Error < Fatal < OFF

dbsyncer-web/src/main/resources/public/mapping/add.html

@@ -37,14 +37,14 @@
                                 <label class="col-sm-2 control-label">数据源</label>
                                 <div class="col-sm-4">
                                     <select name="sourceConnectorId" class="form-control select-control">
-                                        <option th:each="c,s:${connectors}" th:value="${c?.id}" th:text="${c?.name}" />
+                                        <option th:each="c,s:${connectors}" th:value="${c?.id}" th:text="${c?.name + '(' + c?.config?.connectorType + ')'}" />
                                     </select>
                                 </div>
                                 <!-- 目标源 -->
                                 <label class="col-sm-2 control-label">目标源</label>
                                 <div class="col-sm-4">
                                     <select name="targetConnectorId" class="form-control select-control">
-                                        <option th:each="c,s:${connectors}" th:value="${c?.id}" th:text="${c?.name}" />
+                                        <option th:each="c,s:${connectors}" th:value="${c?.id}" th:text="${c?.name + '(' + c?.config?.connectorType + ')'}" />
                                     </select>
                                 </div>
                             </div>

dbsyncer-web/src/main/resources/public/mapping/edit.html

@@ -15,7 +15,7 @@
 
             <!-- 隐藏表单值 -->
             <div class="form-group hidden">
-                <input name="id" type="text" th:value="${mapping?.id}"/>
+                <input id="mappingId" name="id" type="text" th:value="${mapping?.id}"/>
                 <input name="name" type="text" th:value="${mapping?.name}"/>
             </div>
 

dbsyncer-web/src/main/resources/public/mapping/editIncrementQuartz.html

@@ -6,9 +6,9 @@
     <div class="form-group">
         <div class="row">
             <div class="col-md-4">
-                <label class="col-sm-3 control-label text-right">定时*</label>
+                <label class="col-sm-3 control-label text-right">间隔(秒)*</label>
                 <div class="col-sm-9">
-                    <input name="incrementStrategyTimingCronExpression" type="text" class="form-control" dbsyncer-valid="require" th:value="${mapping?.listener?.cronExpression}?:'*/30 * * * * ?'"/>
+                    <input name="incrementStrategyTimingPeriodExpression" type="number" min="1" class="form-control" dbsyncer-valid="require" th:value="${mapping?.listener?.period}?:30"/>
                 </div>
             </div>
             <div class="col-md-4">

dbsyncer-web/src/main/resources/static/js/mapping/edit.js

@@ -25,12 +25,31 @@ function bindMappingModelChange() {
         cursor: true,
         radioClass: 'iradio_flat-blue',
     }).on('ifChecked', function (event) {
-        showMappingEditConfig($(this).val());
+        var $form = $("#mappingModifyForm");
+        if ($form.formValidate() == true) {
+            var data = $form.serializeJson();
+            doPoster("/mapping/edit", data, function (response) {
+                if (response.success == true) {
+                    refresh($("#mappingId").val());
+                } else {
+                    bootGrowl(response.resultValue, "danger");
+                }
+            });
+        }
     });
 
     // 渲染选择radio配置
-    var value = $mappingModelChange.find('input[type="radio"]:checked').val();
-    showMappingEditConfig(value);
+    var $value = $mappingModelChange.find('input[type="radio"]:checked').val();
+    // 显示驱动编辑配置（全量/增量）
+    var $full = $("#mappingFullConfig");
+    var $increment = $("#mappingIncrementConfig");
+    if ('full' == $value) {
+        $increment.addClass("hidden");
+        $full.removeClass("hidden");
+    } else {
+        $full.addClass("hidden");
+        $increment.removeClass("hidden");
+    }
 }
 
 // 绑定删除表关系复选框事件
@@ -70,20 +89,6 @@ function getCheckedBoxSize($checkbox){
     return checked;
 }
 
-// 显示驱动编辑配置（全量/增量）
-function showMappingEditConfig($value) {
-    var $full = $("#mappingFullConfig");
-    var $increment = $("#mappingIncrementConfig");
-
-    if ('full' == $value) {
-        $increment.addClass("hidden");
-        $full.removeClass("hidden");
-    } else {
-        $full.addClass("hidden");
-        $increment.removeClass("hidden");
-    }
-}
-
 // 绑定表关系点击事件
 function bindMappingTableGroupListClick() {
     var $tableGroupList = $("#tableGroupList");

pom.xml

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

version.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-set APP_VERSION=1.1.0-Alpha
+set APP_VERSION=1.1.1-Alpha
 
 echo "Clean Project ..."
 call mvn clean -f pom.xml