调整开关

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

@@ -98,7 +98,7 @@ public class MappingChecker extends AbstractChecker {
         mapping.setReadNum(NumberUtil.toInt(params.get("readNum"), mapping.getReadNum()));
         mapping.setBatchNum(NumberUtil.toInt(params.get("batchNum"), mapping.getBatchNum()));
         mapping.setThreadNum(NumberUtil.toInt(params.get("threadNum"), mapping.getThreadNum()));
-        mapping.setForceUpdate(StringUtil.isBlank(params.get("forceUpdate")));
+        mapping.setForceUpdate(StringUtil.isNotBlank(params.get("forceUpdate")));
 
         // 增量配置(日志/定时)
         String incrementStrategy = params.get("incrementStrategy");
@@ -183,10 +183,10 @@ public class MappingChecker extends AbstractChecker {
     private void updateListenerConfig(ListenerConfig listener, Map<String, String> params) {
         Assert.notNull(listener, "ListenerConfig can not be null.");
 
-        listener.setBanUpdate(StringUtil.isNotBlank(params.get("banUpdate")));
-        listener.setBanInsert(StringUtil.isNotBlank(params.get("banInsert")));
-        listener.setBanDelete(StringUtil.isNotBlank(params.get("banDelete")));
-        listener.setBanDDL(StringUtil.isNotBlank(params.get("banDDL")));
+        listener.setEnableUpdate(StringUtil.isNotBlank(params.get("enableUpdate")));
+        listener.setEnableInsert(StringUtil.isNotBlank(params.get("enableInsert")));
+        listener.setEnableDelete(StringUtil.isNotBlank(params.get("enableDelete")));
+        listener.setEnableDDL(StringUtil.isNotBlank(params.get("enableDDL")));
     }
 
     /**

dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/TableGroupBufferActuator.java

@@ -53,7 +53,8 @@ public class TableGroupBufferActuator extends GeneralBufferActuator implements C
         return threadPoolTaskExecutor;
     }
 
-    public void buildConfig() {
+    @Override
+    protected void buildConfig() {
         super.setConfig(tableGroupBufferConfig);
         super.buildQueueConfig();
         taskKey = UUIDUtil.getUUID();

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

@@ -43,22 +43,22 @@ public class ListenerConfig {
     /**
      * 禁用修改事件
      */
-    private boolean banUpdate;
+    private boolean enableUpdate = true;
 
     /**
      * 禁用插入事件
      */
-    private boolean banInsert;
+    private boolean enableInsert = true;
 
     /**
      * 禁用删除事件
      */
-    private boolean banDelete;
+    private boolean enableDelete = true;
 
     /**
      * 禁用ddl事件
      */
-    private boolean banDDL;
+    private boolean enableDDL = true;
 
     public ListenerConfig() {
     }
@@ -115,35 +115,35 @@ public class ListenerConfig {
         this.cron = cron;
     }
 
-    public boolean isBanUpdate() {
-        return banUpdate;
+    public boolean isEnableUpdate() {
+        return enableUpdate;
     }
 
-    public void setBanUpdate(boolean banUpdate) {
-        this.banUpdate = banUpdate;
+    public void setEnableUpdate(boolean enableUpdate) {
+        this.enableUpdate = enableUpdate;
     }
 
-    public boolean isBanInsert() {
-        return banInsert;
+    public boolean isEnableInsert() {
+        return enableInsert;
     }
 
-    public void setBanInsert(boolean banInsert) {
-        this.banInsert = banInsert;
+    public void setEnableInsert(boolean enableInsert) {
+        this.enableInsert = enableInsert;
     }
 
-    public boolean isBanDelete() {
-        return banDelete;
+    public boolean isEnableDelete() {
+        return enableDelete;
     }
 
-    public void setBanDelete(boolean banDelete) {
-        this.banDelete = banDelete;
+    public void setEnableDelete(boolean enableDelete) {
+        this.enableDelete = enableDelete;
     }
 
-    public boolean isBanDDL() {
-        return banDDL;
+    public boolean isEnableDDL() {
+        return enableDDL;
     }
 
-    public void setBanDDL(boolean banDDL) {
-        this.banDDL = banDDL;
+    public void setEnableDDL(boolean enableDDL) {
+        this.enableDDL = enableDDL;
     }
 }

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/connector/database/AbstractDatabaseConnector.java

@@ -211,8 +211,8 @@ public abstract class AbstractDatabaseConnector extends AbstractConnector implem
             // 2、设置参数
             execute = connectorInstance.execute(databaseTemplate -> databaseTemplate.batchUpdate(executeSql, batchRows(fields, data)));
         } catch (Exception e) {
-            if(!config.isForceUpdate()){
-              data.forEach(row -> forceUpdate(result, connectorInstance, config, pkFields, row));
+            if (config.isForceUpdate()) {
+                data.forEach(row -> forceUpdate(result, connectorInstance, config, pkFields, row));
             }
         }
 
@@ -223,7 +223,7 @@ public abstract class AbstractDatabaseConnector extends AbstractConnector implem
                     result.getSuccessData().add(data.get(i));
                     continue;
                 }
-                if(!config.isForceUpdate()){
+                if (config.isForceUpdate()) {
                     forceUpdate(result, connectorInstance, config, pkFields, data.get(i));
                 }
             }

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/listener/AbstractListener.java

@@ -53,19 +53,19 @@ public abstract class AbstractListener<C extends ConnectorInstance> implements L
             switch (event.getEvent()) {
                 case ConnectorConstant.OPERTION_UPDATE:
                     // 是否支持监听修改事件
-                    processEvent(!listenerConfig.isBanUpdate(), event);
+                    processEvent(listenerConfig.isEnableUpdate(), event);
                     break;
                 case ConnectorConstant.OPERTION_INSERT:
                     // 是否支持监听新增事件
-                     processEvent(!listenerConfig.isBanInsert(), event);
+                     processEvent(listenerConfig.isEnableInsert(), event);
                     break;
                 case ConnectorConstant.OPERTION_DELETE:
                     // 是否支持监听删除事件
-                    processEvent(!listenerConfig.isBanDelete(), event);
+                    processEvent(listenerConfig.isEnableDelete(), event);
                     break;
                 case ConnectorConstant.OPERTION_ALTER:
                     // 表结构变更事件
-                    processEvent(!listenerConfig.isBanDDL(),event);
+                    processEvent(listenerConfig.isEnableDDL(),event);
                     break;
                 default:
                     break;

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

@@ -42,9 +42,8 @@
         <div class="row">
             <div class="col-md-4">
                 <label class="col-sm-3 control-label text-right">参数</label>
-
                 <div class="col-sm-9">
-                    <textarea id="conditionArg" class="form-control" rows="2" placeholder="请输入参数"></textarea>
+                    <textarea id="conditionArg" class="form-control dbsyncer_textarea_resize_none" rows="2" placeholder="请输入参数"></textarea>
                 </div>
             </div>
             <div class="col-md-4">

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

@@ -52,19 +52,19 @@
             <div class="col-md-4">
                 <label class="col-sm-3 control-label text-right">新增*</label>
                 <div class="col-sm-9">
-                    <input name="banInsert" class="banEventSwitch" th:checked="${mapping?.listener?.banInsert}" type="checkbox">
+                    <input name="enableInsert" class="dbsyncer_switch" th:checked="${mapping?.listener?.enableInsert}" type="checkbox">
                 </div>
             </div>
             <div class="col-md-4">
                 <label class="col-sm-3 control-label text-right">修改*</label>
                 <div class="col-sm-9">
-                    <input name="banUpdate" class="banEventSwitch" th:checked="${mapping?.listener?.banUpdate}" type="checkbox">
+                    <input name="enableUpdate" class="dbsyncer_switch" th:checked="${mapping?.listener?.enableUpdate}" type="checkbox">
                 </div>
             </div>
             <div class="col-md-4">
                 <label class="col-sm-3 control-label text-right">删除*</label>
                 <div class="col-sm-9">
-                    <input name="banDelete" class="banEventSwitch" th:checked="${mapping?.listener?.banDelete}" type="checkbox">
+                    <input name="enableDelete" class="dbsyncer_switch" th:checked="${mapping?.listener?.enableDelete}" type="checkbox">
                 </div>
             </div>
         </div>
@@ -74,7 +74,7 @@
             <div class="col-md-4">
                 <label class="col-sm-3 control-label text-right">ddl*</label>
                 <div class="col-sm-9">
-                    <input name="banDDL" class="banEventSwitch" th:checked="${mapping?.listener?.banDDL}" type="checkbox">
+                    <input name="enableDDL" class="dbsyncer_switch" th:checked="${mapping?.listener?.enableDDL}" type="checkbox">
                 </div>
             </div>
             <div class="col-md-8"></div>

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

@@ -8,15 +8,15 @@
     <div class="form-group">
         <div class="row">
             <div class="col-md-4">
-                <label class="col-sm-3 control-label text-right">覆盖 <i class="fa fa-question-circle fa_gray" aria-hidden="true" title="[支持]-目标表不存在该条数据时， 会执行insert， 存在，会执行update; [禁用]-不生效"></i></label>
+                <label class="col-sm-3 control-label text-right">覆盖 <i class="fa fa-question-circle fa_gray" aria-hidden="true" title="Yes-目标表不存在数据时， 执行insert，存在会执行update; No-不生效"></i></label>
                 <div class="col-sm-9">
-                    <input name="forceUpdate" class="banEventSwitch" th:checked="!${mapping?.forceUpdate}" type="checkbox">
+                    <input name="forceUpdate" class="dbsyncer_switch" th:checked="${mapping?.forceUpdate}" type="checkbox">
                 </div>
             </div>
             <div class="col-md-4">
-                <label class="col-sm-3 control-label">扩展参数</label>
+                <label class="col-sm-3 control-label">扩展参数 <i class="fa fa-question-circle fa_gray" aria-hidden="true" title="需要自定义参数用于插件内使用，推荐填写JSON格式文本，例：{'key': 123}"></i></label>
                 <div class="col-sm-9">
-                    <textarea id="extInfo" name="extInfo" class="form-control dbsyncer_textarea_resize_none" maxlength="512" rows="5">{"key": "test"}</textarea>
+                    <textarea id="extInfo" name="extInfo" class="form-control dbsyncer_textarea_resize_none" maxlength="512" rows="2"></textarea>
                 </div>
             </div>
             <div class="col-md-4"></div>

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

@@ -51,12 +51,12 @@ function bindMappingMetaSnapshotModifyClick(){
 
 // 绑定监听配置事件开关切换事件
 function bindMappingListenerConfigSwitchClick(){
-    $('.banEventSwitch').bootstrapSwitch({
-        onText: "禁用",
-        offText: "支持",
-        onColor: "warning",
+    $('.dbsyncer_switch').bootstrapSwitch({
+        onText: "Yes",
+        offText: "No",
+        onColor: "success",
         offColor: "info",
-        size: "small"
+        size: "normal"
     });
 }