rm websocket

dbsyncer-web/pom.xml

@@ -59,12 +59,6 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
 
-        <!-- Websocket -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

dbsyncer-web/src/main/java/org/dbsyncer/web/config/TaskPoolConfig.java

@@ -2,16 +2,14 @@ package org.dbsyncer.web.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
 
 /**
- * @version 1.0.0
  * @author AE86
+ * @version 1.0.0
  * @date 2020-04-26 23:40
  */
 @Configuration
@@ -49,15 +47,4 @@ public class TaskPoolConfig {
         return executor;
     }
 
-    @Bean
-    public TaskScheduler taskScheduler() {
-        ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
-        taskScheduler.setPoolSize(5);
-        taskScheduler.setRemoveOnCancelPolicy(true);
-        taskScheduler.setThreadNamePrefix("taskScheduler");
-        taskScheduler.setWaitForTasksToCompleteOnShutdown(true);
-        taskScheduler.setAwaitTerminationSeconds(60);
-        return taskScheduler;
-    }
-
 }

dbsyncer-web/src/main/java/org/dbsyncer/web/config/WebSocketConfig.java

@@ -1,25 +0,0 @@
-package org.dbsyncer.web.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
-import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
-
-@Configuration
-@EnableWebSocketMessageBroker
-public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
-
-    @Override
-    public void registerStompEndpoints(StompEndpointRegistry stompEndpointRegistry) {
-        // 解决跨域问题
-        stompEndpointRegistry.addEndpoint("/simple")
-                .setAllowedOrigins("*")
-                .withSockJS();
-    }
-
-    @Override
-    public void configureMessageBroker(MessageBrokerRegistry registry) {
-        registry.enableSimpleBroker("/topic");
-    }
-}

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

@@ -8,7 +8,7 @@
             <!-- 标题 -->
             <div class="row text-center">
                 <div class="page-header">
-                    <h3>添加连接器</h3>
+                    <h3>添加连接</h3>
                 </div>
             </div>
 
@@ -30,11 +30,11 @@
                 <div class="col-md-12">
                     <div class="panel panel-info">
                         <div class="panel-heading">
-                            <h3 class="panel-title">连接器配置</h3>
+                            <h3 class="panel-title">连接配置</h3>
                         </div>
 
                         <div class="panel-body">
-                            <!-- 连接器类型 -->
+                            <!-- 连接类型 -->
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">类型</label>
                                 <div class="col-sm-10">
@@ -53,7 +53,7 @@
                                 </div>
                             </div>
 
-                            <!-- 连接器配置 -->
+                            <!-- 连接配置 -->
                             <div class="connectorConfig"></div>
 
                         </div>

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

@@ -8,7 +8,7 @@
             <!-- 标题 -->
             <div class="row text-center">
                 <div class="page-header">
-                    <h3>修改连接器</h3>
+                    <h3>修改连接</h3>
                 </div>
             </div>
 
@@ -30,11 +30,11 @@
                 <div class="col-md-12">
                     <div class="panel panel-info">
                         <div class="panel-heading">
-                            <h3 class="panel-title">连接器配置</h3>
+                            <h3 class="panel-title">连接配置</h3>
                         </div>
 
                         <div class="panel-body">
-                            <!-- 连接器ID -->
+                            <!-- 连接ID -->
                             <div class="form-group hidden">
                                 <label class="col-sm-2 control-label">ID</label>
                                 <div class="col-sm-10">
@@ -42,7 +42,7 @@
                                 </div>
                             </div>
 
-                            <!-- 连接器类型 -->
+                            <!-- 连接类型 -->
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">类型</label>
                                 <div class="col-sm-10">
@@ -58,7 +58,7 @@
                                 </div>
                             </div>
 
-                            <!-- 连接器配置 -->
+                            <!-- 连接配置 -->
                             <div class="connectorConfig">
                                 <div th:replace="'connector/add'+${connector?.config?.connectorType} :: content"></div>
                             </div>

dbsyncer-web/src/main/resources/public/index/index.html

@@ -7,9 +7,9 @@
     <div class="row">
         <form class="form-horizontal" role="form" method="post">
 
-            <!-- 连接器管理 -->
+            <!-- 连接管理 -->
             <div class="col-md-12">
-                <!-- 连接器开始位置 -->
+                <!-- 连接开始位置 -->
                 <div class="form-group">
                     <div class="col-md-12">
                         <button type="button" class="btn btn-primary" id="indexAddConnectorBtn">
@@ -17,14 +17,14 @@
                         </button>
                     </div>
                 </div>
-                <!-- 显示连接器列表 -->
+                <!-- 显示连接列表 -->
                 <div class="row" th:if="${connectors?.size() gt 0}">
                     <div class="col-md-12">
                         <div class="panel panel-default">
-                            <!-- 连接器 -->
+                            <!-- 连接 -->
                             <div class="panel-body text-center">
                                 <div class="row connectorList">
-                                    <!-- 连接器__开始 -->
+                                    <!-- 连接__开始 -->
                                     <div class="col-md-1" th:each="c,state : ${connectors}">
                                         <div th:id="${c?.id}" class="jumbotron dbsyncer_block">
                                             <div class="row">
@@ -42,7 +42,7 @@
                                             </ul>
                                         </div>
                                     </div>
-                                    <!-- 连接器__结束 -->
+                                    <!-- 连接__结束 -->
 
                                 </div>
                             </div>
@@ -50,7 +50,7 @@
                         </div>
                     </div>
                 </div>
-                <!-- 连接器开结束位置 -->
+                <!-- 连接开结束位置 -->
             </div>
 
             <!-- 驱动管理 -->
@@ -88,8 +88,8 @@
                                                         </div>
                                                         <div class="col-md-1"></div>
                                                     </div>
-                                                    <span th:if="${m?.sourceConnector?.running}" th:title="连接器正常" class="well-sign-left"><i class="fa fa-2x fa-circle well-sign-green"></i></span>
-                                                    <span th:unless="${m?.sourceConnector?.running}" th:title="连接器异常" class="well-sign-left"><i class="fa fa-2x fa-times-circle-o well-sign-red"></i></span>
+                                                    <span th:if="${m?.sourceConnector?.running}" th:title="连接正常" class="well-sign-left"><i class="fa fa-2x fa-circle well-sign-green"></i></span>
+                                                    <span th:unless="${m?.sourceConnector?.running}" th:title="连接异常" class="well-sign-left"><i class="fa fa-2x fa-times-circle-o well-sign-red"></i></span>
                                                 </div>
 
                                                 <!--中间图标 -->
@@ -112,8 +112,8 @@
                                                             <span th:text="${m?.targetConnector?.name}" th:title="${m?.targetConnector?.name}"></span>
                                                         </div>
                                                         <div class="col-md-1"></div>
-                                                        <span th:if="${m?.targetConnector?.running}" th:title="连接器正常" class="well-sign-right"><i class="fa fa-2x fa-circle well-sign-green"></i></span>
-                                                        <span th:unless="${m?.targetConnector?.running}" th:title="连接器异常" class="well-sign-right"><i class="fa fa-2x fa-times-circle-o well-sign-red"></i></span>
+                                                        <span th:if="${m?.targetConnector?.running}" th:title="连接正常" class="well-sign-right"><i class="fa fa-2x fa-circle well-sign-green"></i></span>
+                                                        <span th:unless="${m?.targetConnector?.running}" th:title="连接异常" class="well-sign-right"><i class="fa fa-2x fa-times-circle-o well-sign-red"></i></span>
                                                     </div>
                                                 </div>
                                             </div>

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

@@ -3,7 +3,7 @@
       xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
 
 <div th:fragment="content">
-    <!-- 针对DQL的连接器配置 -->
+    <!-- 针对DQL的连接配置 -->
     <div class="form-group" th:if="${#strings.startsWith(mapping?.sourceConnector?.config?.connectorType,'Dql')}">
         <div class="row">
             <div class="col-md-4">

dbsyncer-web/src/main/resources/static/js/connector/add.js

@@ -1,7 +1,7 @@
 function submit(data) {
     doPoster("/connector/add", data, function (data) {
         if (data.success == true) {
-            bootGrowl("新增连接器成功!", "success");
+            bootGrowl("新增连接成功!", "success");
             backIndexPage();
         } else {
             bootGrowl(data.resultValue, "danger");
@@ -17,11 +17,11 @@ var check = function () {
     }
 };
 
-//切换连接器
+//切换连接
 function changeConnectorType($this) {
-    //连接器类型
+    //连接类型
     var connType = $this.val();
-    //获取连接器配置元素
+    //获取连接配置元素
     var connectorConfig = $this.parent().parent().parent().find(".connectorConfig");
     //清空配置
     connectorConfig.html("");
@@ -39,10 +39,10 @@ $(function () {
         width: "100%",
         theme: "classic"
     });
-    // 默认渲染连接器页面
+    // 默认渲染连接页面
     changeConnectorType($connectorTypeSelect);
 
-    //连接器类型切换事件
+    //连接类型切换事件
     $("select[name='connectorType']").change(function () {
         changeConnectorType($(this));
     });

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

@@ -1,7 +1,7 @@
 function submit(data) {
     doPoster("/connector/edit", data, function (data) {
         if (data.success == true) {
-            bootGrowl("修改连接器成功!", "success");
+            bootGrowl("修改连接成功!", "success");
             backIndexPage();
         } else {
             bootGrowl(data.resultValue, "danger");

dbsyncer-web/src/main/resources/static/js/index/index.js

@@ -1,12 +1,12 @@
-// 添加连接器
+// 添加连接
 function bindAddConnector() {
-    // 绑定添加连接器按钮点击事件
+    // 绑定添加连接按钮点击事件
     $("#indexAddConnectorBtn").click(function () {
         doLoader('/connector/page/add');
     });
 }
 
-// 编辑连接器
+// 编辑连接
 function bindEditConnector() {
     $(".connectorList .dbsyncer_block").click(function () {
         var $id = $(this).attr("id");

dbsyncer-web/src/main/resources/static/js/monitor/index.js

@@ -345,7 +345,7 @@ $(function () {
         theme: "classic"
     });
 
-    // 连接器类型切换事件
+    // 连接类型切换事件
     $("#searchMetaData").change(function () {
         var $id = $(this).val();
         doLoader('/monitor?id=' + $id);