fix DQL

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

@@ -1,38 +1,83 @@
+// 获取项目地址
+var $location = (window.location + '').split('/');
+var $basePath = $location[0] + '//' + $location[2];
+// 全局内容区域
+var $initContainer = $("#initContainer");
+
+// ******************* 插件封装 ***************************
+// 全局提示框
+function bootGrowl(data, type) {
+    $.bootstrapGrowl(data, { // data为提示信息
+        type: type == undefined ? 'success' : type,// type指提示类型
+        delay: 1000,// 提示框显示时间
+        allow_dismiss: true // 显示取消提示框
+    });
+}
+
+// 跳转主页
+function backIndexPage() {
+    // 加载页面
+    $initContainer.load("/index?refresh=" + new Date().getTime());
+}
+
+// 美化SQL
+function beautifySql(){
+    var $sql = $("#sql");
+    var $tmp = $sql.attr('tmp');
+    if(null == $tmp){
+        $sql.attr('tmp', $sql.val());
+        $sql.val(sqlFormatter.format($sql.val()));
+        return;
+    }
+    $sql.val($tmp);
+    $sql.removeAttr('tmp');
+}
+
+// ******************* 扩展JS表单方法 ***************************
+$.fn.serializeJson = function () {
+    var o = {};
+    var a = this.serializeArray();
+    $.each(a, function () {
+        if (o[this.name] !== undefined) {
+            if (!o[this.name].push) {
+                o[this.name] = [o[this.name]];
+            }
+            o[this.name].push(this.value || '');
+        } else {
+            o[this.name] = this.value || '';
+        }
+    });
+    return o;
+};
+
+// 全局Ajax post
+function doPoster(url, params, action) {
+    $.loadingT(true);
+    $.post(url, params, function (data) {
+        $.loadingT(false);
+        // 异常请求：302
+        if (!(data instanceof Object)) {
+            bootGrowl("会话过期, 3秒后将访问登录主页...", "danger");
+            setTimeout(function () {
+                location.href = $basePath;
+            }, 3000);
+        } else {
+            action(data);
+        }
+    }).error(function (xhr, status, info) {
+        $.loadingT(false);
+        bootGrowl("访问异常，请刷新或重试.", "danger");
+    });
+}
+
+// ******************* 常量配置 ***************************
 // 连接器类型
 var ConnectorConstant = {
-    "Mysql" : {
-        "url" : "/connector/page/addMysql",
-        "type" : "Mysql",
-        "image" : "/images/mysql.png"
-    },
-    "Oracle" : {
-        "url" : "/connector/page/addOracle",
-        "type" : "Oracle",
-        "image" : "/images/oracle.png"
-    },
-    "SqlServer" : {
-        "url" : "/connector/page/addSqlServer",
-        "type" : "SqlServer",
-        "image" : "/images/sqlserver.png"
-    },
-    "DQL_Mysql" : {
-        "url" : "/connector/page/addDQL_Mysql",
-        "type" : "DQL_Mysql",
-        "image" : "/images/sql_mysql.png"
-    },
-    "DQL_Oracle" : {
-        "url" : "/connector/page/addDQL_Oracle",
-        "type" : "DQL_Oracle",
-        "image" : "/images/sql_oracle.png"
-    },
-    "Ldap" : {
-        "url" : "/connector/page/addLdap",
-        "type" : "Ldap",
-        "image" : "/images/ldap.png"
-    },
-    "Redis" : {
-        "url" : "/connector/page/addRedis",
-        "type" : "Redis",
-        "image" : "/images/redis.png"
-    }
+    "Mysql" : "/connector/page/addMysql",
+    "Oracle" : "/connector/page/addOracle",
+    "SqlServer" : "/connector/page/addSqlServer",
+    "DQL_Mysql" : "/connector/page/addDQL_Mysql",
+    "DQL_Oracle" : "/connector/page/addDQL_Oracle",
+    "Ldap" : "/connector/page/addLdap",
+    "Redis" : "/connector/page/addRedis"
 }

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

@@ -35,9 +35,8 @@ function changeConnectorType($this) {
     //从公共js/common.js配置文件中读取常量
     for (var key in ConnectorConstant) {
         if (connType == key) {
-            var val = ConnectorConstant[key];
             //加载页面
-            connectorConfig.load(val['url']);
+            connectorConfig.load(ConnectorConstant[key]);
             break;
         }
     }

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

@@ -1,63 +1,3 @@
-// 获取项目地址
-var $location = (window.location + '').split('/');
-var $basePath = $location[0] + '//' + $location[2];
-
-// 全局内容区域
-var $initContainer = $("#initContainer");
-
-// ******************* 插件封装 ***************************
-// 全局提示框
-function bootGrowl(data, type) {
-    $.bootstrapGrowl(data, { // data为提示信息
-        type: type == undefined ? 'success' : type,// type指提示类型
-        delay: 1000,// 提示框显示时间
-        allow_dismiss: true // 显示取消提示框
-    });
-}
-
-// 跳转主页
-function backIndexPage() {
-    // 加载页面
-    $initContainer.load("/index?refresh=" + new Date().getTime());
-}
-
-// ******************* 扩展JS表单方法 ***************************
-$.fn.serializeJson = function () {
-    var o = {};
-    var a = this.serializeArray();
-    $.each(a, function () {
-        if (o[this.name] !== undefined) {
-            if (!o[this.name].push) {
-                o[this.name] = [o[this.name]];
-            }
-            o[this.name].push(this.value || '');
-        } else {
-            o[this.name] = this.value || '';
-        }
-    });
-    return o;
-};
-
-// 全局Ajax post
-function doPoster(url, params, action) {
-    $.loadingT(true);
-    $.post(url, params, function (data) {
-        $.loadingT(false);
-        // 异常请求：302
-        if (!(data instanceof Object)) {
-            bootGrowl("会话过期, 3秒后将访问登录主页...", "danger");
-            setTimeout(function () {
-                location.href = $basePath;
-            }, 3000);
-        } else {
-            action(data);
-        }
-    }).error(function (xhr, status, info) {
-        $.loadingT(false);
-        bootGrowl("访问异常，请刷新或重试.", "danger");
-    });
-}
-
 // ******************* 初始化 *****************************
 // 默认绑定菜单事件
 $(function () {

dbsyncer-web/src/main/resources/templates/connector/addDQL_Mysql.html

@@ -17,12 +17,12 @@
     <div class="form-group">
         <label class="col-sm-2 control-label">SQL <strong class="driverVerifcateRequired">*</strong></label>
         <div class="col-sm-10">
-            <textarea name="sql" class="form-control" maxlength="1024" dbsyncer-valid="require" rows="10">SELECT T1.* FROM USER T1 </textarea>
+            <textarea id="sql" name="sql" class="form-control" maxlength="1024" dbsyncer-valid="require" rows="10">SELECT T1.* FROM USER T1 </textarea>
         </div>
     </div>
     <div class="form-group">
         <div class="col-sm-12 text-right">
-            <a id="beautifySql" href="javascript:;"><span class="fa fa-magic fa-1x fa-flip-horizontal dbsyncer_pointer" title="美化SQL"></span>美化SQL</a>
+            <a href="javascript:beautifySql();"><span class="fa fa-magic fa-1x fa-flip-horizontal dbsyncer_pointer" title="美化SQL"></span>美化SQL</a>
         </div>
     </div>
     <div class="form-group">
@@ -34,7 +34,7 @@
     <div class="form-group">
         <label class="col-sm-2 control-label">驱动 </label>
         <div class="col-sm-10">
-            <input class="form-control" readonly="true" name="driver" type="text" value="com.mysql.jdbc.Driver" />
+            <input class="form-control" readonly="true" name="driverClassName" type="text" value="com.mysql.jdbc.Driver" />
         </div>
     </div>
 </div>

dbsyncer-web/src/main/resources/templates/connector/addDQL_Oracle.html

@@ -17,12 +17,12 @@
     <div class="form-group">
         <label class="col-sm-2 control-label">SQL <strong class="driverVerifcateRequired">*</strong></label>
         <div class="col-sm-10">
-            <textarea name="sql" class="form-control" maxlength="1024" dbsyncer-valid="require" rows="10">SELECT T1.* FROM USER T1 </textarea>
+            <textarea id="sql" name="sql" class="form-control" maxlength="1024" dbsyncer-valid="require" rows="10">SELECT T1.* FROM USER T1 </textarea>
         </div>
     </div>
     <div class="form-group">
         <div class="col-sm-12 text-right">
-            <a id="beautifySql" href="javascript:;"><span class="fa fa-magic fa-1x fa-flip-horizontal dbsyncer_pointer" title="美化SQL"></span>美化SQL</a>
+            <a href="javascript:beautifySql();"><span class="fa fa-magic fa-1x fa-flip-horizontal dbsyncer_pointer" title="美化SQL"></span>美化SQL</a>
         </div>
     </div>
     <div class="form-group">
@@ -34,7 +34,7 @@
     <div class="form-group">
         <label class="col-sm-2 control-label">驱动 </label>
         <div class="col-sm-10">
-            <input class="form-control" readonly="true" name="driver" type="text" value="oracle.jdbc.OracleDriver" />
+            <input class="form-control" readonly="true" name="driverClassName" type="text" value="oracle.jdbc.OracleDriver" />
         </div>
     </div>
 </div>

dbsyncer-web/src/main/resources/templates/connector/addOracle.html

@@ -23,7 +23,7 @@
     <div class="form-group">
         <label class="col-sm-2 control-label">驱动 </label>
         <div class="col-sm-10">
-            <input class="form-control" readonly="true" name="driver" type="text" value="oracle.jdbc.OracleDriver" />
+            <input class="form-control" readonly="true" name="driverClassName" type="text" value="oracle.jdbc.OracleDriver" />
         </div>
     </div>
 </div>

dbsyncer-web/src/main/resources/templates/connector/addSqlServer.html

@@ -31,13 +31,13 @@
     <div class="form-group">
         <label class="col-sm-2 control-label">URL <strong class="driverVerifcateRequired">*</strong></label>
         <div class="col-sm-10">
-            <textarea name="url" class="form-control" maxlength="1024" dbsyncer-valid="require" rows="5">jdbc:sqlserver://127.0.0.1:1433;DatabaseName=xddb</textarea>
+            <textarea name="url" class="form-control" maxlength="1024" dbsyncer-valid="require" rows="5">jdbc:sqlserver://127.0.0.1:1433;DatabaseName=test</textarea>
         </div>
     </div>
     <div class="form-group">
         <label class="col-sm-2 control-label">驱动 </label>
         <div class="col-sm-10">
-            <input class="form-control" readonly="true" name="driver" type="text" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />
+            <input class="form-control" readonly="true" name="driverClassName" type="text" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />
         </div>
     </div>
 </div>

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

@@ -47,6 +47,6 @@
 <script th:src="@{/plugins/js/select2/select2.min.js}"></script>
 <script th:src="@{/plugins/js/formValidate/formValidate.js}"></script>
 <script th:src="@{/plugins/js/sql-formatter/sql-formatter.min.js}"></script>
-<script th:src="@{/js/index.js}"></script>
 <script th:src="@{/js/common.js}"></script>
+<script th:src="@{/js/index.js}"></script>
 </html>