diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java index 1d8855ab..98361883 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/controller/DbSqlExecutorController.java @@ -22,13 +22,18 @@ import com.zyplayer.doc.db.framework.db.mapper.base.ExecuteType; import com.zyplayer.doc.db.framework.db.mapper.base.SqlExecutor; import com.zyplayer.doc.db.framework.json.DocDbResponseJson; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.sql.Timestamp; -import java.util.*; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; /** * sql执行器 @@ -40,6 +45,7 @@ import java.util.*; @RestController @RequestMapping("/zyplayer-doc-db/executor") public class DbSqlExecutorController { + private static Logger logger = LoggerFactory.getLogger(DbSqlExecutorController.class); @Resource SqlExecutor sqlExecutor; @@ -84,6 +90,7 @@ public class DbSqlExecutorController { String resultJsonStr = JSON.toJSONString(executeResult, mapping, SerializerFeature.WriteMapNullValue); resultList.add(resultJsonStr); } catch (Exception e) { + logger.error("执行出错", e); ExecuteResult executeResult = ExecuteResult.error(StringUtil.getException(e), sqlItem); resultList.add(JSON.toJSONString(executeResult)); } diff --git a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java index 6ca79486..82c6f414 100644 --- a/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java +++ b/zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/mapper/base/SqlExecutor.java @@ -134,6 +134,7 @@ public class SqlExecutor { long useTime = System.currentTimeMillis() - startTime; return new ExecuteResult(updateCount, resultList, useTime, executeParam.getSql()); } catch (Exception e) { + logger.error("执行出错", e); throw new RuntimeException(e); } finally { statementMap.remove(executeParam.getExecuteId()); diff --git a/zyplayer-doc-ui/db-ui/src/common/config/apimix.js b/zyplayer-doc-ui/db-ui/src/common/config/apimix.js index c546a35b..d1eea186 100644 --- a/zyplayer-doc-ui/db-ui/src/common/config/apimix.js +++ b/zyplayer-doc-ui/db-ui/src/common/config/apimix.js @@ -5,14 +5,14 @@ var href = window.location.href; var _fn = { href: href, // 本地启动时使用本地接口调试 - // HOST: 'http://local.zyplayer.com:8083/zyplayer-doc-manage', - // HOST1: 'http://local.zyplayer.com:8083/zyplayer-doc-manage', + HOST: 'http://local.zyplayer.com:8083/zyplayer-doc-manage', + HOST1: 'http://local.zyplayer.com:8083/zyplayer-doc-manage', // 也可以直接使用线上的服务调试 // HOST: 'http://doc.zyplayer.com/zyplayer-doc-manage', // HOST1: 'http://doc.zyplayer.com/zyplayer-doc-manage', // 打包时使用下面这两行，文件就放在根目录下，所以当前路劲就好 - HOST: './', - HOST1: './', + // HOST: './', + // HOST1: './', mixUrl: function (host, url) { var p; diff --git a/zyplayer-doc-ui/db-ui/src/views/data/DatasourceManage.vue b/zyplayer-doc-ui/db-ui/src/views/data/DatasourceManage.vue index e5666808..b599cd95 100644 --- a/zyplayer-doc-ui/db-ui/src/views/data/DatasourceManage.vue +++ b/zyplayer-doc-ui/db-ui/src/views/data/DatasourceManage.vue @@ -1,28 +1,26 @@