项目初始化

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/vo/ApiLogVo.java

 package cn.datax.service.data.market.api.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -18,6 +19,7 @@ public class ApiLogVo implements Serializable {
     private String callerUrl;
     private Integer callerSize;
     private String callerParams;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime callerDate;
     private Long time;
     private String msg;

datax-modules/data-market-service-parent/data-market-service-mapping/src/main/java/cn/datax/service/data/market/mapping/config/ApiLogAspect.java

@@ -40,9 +40,10 @@ public class ApiLogAspect {
         long startTime = System.currentTimeMillis();
         Object result = joinPoint.proceed();
         long endTime = System.currentTimeMillis();
-        ApiLogDto log = getLog();
-        log.setTime(endTime - startTime);
-        handleLog(joinPoint, log);
+        System.out.println("endTime:" + endTime);
+//        ApiLogDto log = getLog();
+//        log.setTime(endTime - startTime);
+//        handleLog(joinPoint, log);
         return result;
     }
 
@@ -54,10 +55,11 @@ public class ApiLogAspect {
      */
     @AfterThrowing(value = "logPointCut()", throwing = "e")
     public void doAfterThrowing(JoinPoint joinPoint, Exception e) {
-        ApiLogDto log = getLog();
-        log.setStatus(DataConstant.EnableState.DISABLE.getKey());
-        log.setMsg(e.getMessage());
-        handleLog(joinPoint, log);
+        log.error("出错{}", e.getMessage());
+//        ApiLogDto log = getLog();
+//        log.setStatus(DataConstant.EnableState.DISABLE.getKey());
+//        log.setMsg(e.getMessage());
+//        handleLog(joinPoint, log);
     }
 
     private ApiLogDto getLog() {

datax-ui/src/layout/components/AppMain.vue

@@ -32,16 +32,6 @@ export default {
   .content {
     padding: 6px;
     min-height: calc(100vh - 39px - 107px);
-    &::-webkit-scrollbar-track-piece {
-      background: #d3dce6;
-    }
-    &::-webkit-scrollbar {
-      width: 6px;
-    }
-    &::-webkit-scrollbar-thumb {
-      background: #99a9bf;
-      border-radius: 20px;
-    }
   }
 }
 .fixed-header+.app-main {

datax-ui/src/layout/index.vue

@@ -66,6 +66,18 @@ export default {
       position: fixed;
       top: 0;
     }
+    .main-container{
+      ::-webkit-scrollbar {
+        width: 6px;
+      }
+      ::-webkit-scrollbar-track-piece {
+        background: #d3dce6;
+      }
+      ::-webkit-scrollbar-thumb {
+        background: #99a9bf;
+        border-radius: 10px;
+      }
+    }
   }
   .drawer-bg {
     background: #000;

datax-ui/src/views/market/apilog/LogDetail.vue

@@ -28,7 +28,13 @@
             <el-input v-model="form.time" />
           </el-form-item>
           <el-form-item label="状态" prop="status">
-            <el-input v-model="form.status" />
+            <el-radio-group v-model="form.status">
+              <el-radio
+                v-for="dict in statusOptions"
+                :key="dict.id"
+                :label="dict.itemText"
+              >{{dict.itemValue}}</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="信息记录" prop="msg">
             <el-input v-model="form.msg" />
@@ -66,11 +72,18 @@ export default {
         showDetail: false
       },
       // 表单参数
-      form: {}
+      form: {},
+      // 状态数据字典
+      statusOptions: []
     }
   },
   created() {
     console.log('id:' + this.data.id)
+    this.getDicts('sys_normal_status').then(response => {
+      if (response.success) {
+        this.statusOptions = response.data
+      }
+    })
   },
   mounted() {
     this.getLog(this.data.id)

datax-ui/src/views/market/apilog/LogList.vue

@@ -266,7 +266,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delApiLog(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/market/apimask/ApiMaskList.vue

@@ -303,7 +303,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delApiMask(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/market/dataapi/DataApiList.vue

@@ -331,7 +331,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delDataApi(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/market/dataservice/DataServiceList.vue

@@ -312,7 +312,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delDataService(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/market/servicelog/LogDetail.vue

@@ -31,7 +31,13 @@
             <el-input v-model="form.time" />
           </el-form-item>
           <el-form-item label="状态" prop="status">
-            <el-input v-model="form.status" />
+            <el-radio-group v-model="form.status">
+              <el-radio
+                v-for="dict in statusOptions"
+                :key="dict.id"
+                :label="dict.itemText"
+              >{{dict.itemValue}}</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="信息记录" prop="msg">
             <el-input v-model="form.msg" />
@@ -69,11 +75,18 @@ export default {
         showDetail: false
       },
       // 表单参数
-      form: {}
+      form: {},
+      // 状态数据字典
+      statusOptions: []
     }
   },
   created() {
     console.log('id:' + this.data.id)
+    this.getDicts('sys_normal_status').then(response => {
+      if (response.success) {
+        this.statusOptions = response.data
+      }
+    })
   },
   mounted() {
     this.getLog(this.data.id)

datax-ui/src/views/market/servicelog/LogList.vue

@@ -265,7 +265,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delDataServiceLog(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/metadata/changerecord/ChangeRecordList.vue

@@ -302,7 +302,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delChangeRecord(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/metadata/datasource/DataSourceList.vue

@@ -303,7 +303,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delDataSource(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/metadata/sqlconsole/index.vue

@@ -4,19 +4,25 @@
       <div :style="classCardbody">
         <el-row>
           <el-col :span="24">
-            <el-select v-model="sqlDataSource" placeholder="请选择数据源">
-              <el-option
-                v-for="source in sourceOptions"
-                :key="source.id"
-                :label="source.sourceName"
-                :value="source.id"
-                :disabled="source.status === '0'"
-              ></el-option>
-            </el-select>
-            <el-button size="mini" round @click="runData" :disabled="sqlExecuting">运行</el-button>
-            <el-button size="mini" round @click="stopData" :disabled="!sqlExecuting">停止</el-button>
-            <el-button size="mini" round @click="formaterSql" :disabled="sqlExecuting">格式化</el-button>
-            <el-button size="mini" round @click="refreshData" :disabled="sqlExecuting">重置</el-button>
+            <el-form :inline="true" class="demo-form-inline">
+              <el-form-item label="数据源">
+                <el-select v-model="sqlDataSource" placeholder="请选择数据源">
+                  <el-option
+                    v-for="source in sourceOptions"
+                    :key="source.id"
+                    :label="source.sourceName"
+                    :value="source.id"
+                    :disabled="source.status === '0'"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item>
+                <el-button size="mini" round @click="runData" :disabled="sqlExecuting">运行</el-button>
+                <el-button size="mini" round @click="stopData" :disabled="!sqlExecuting">停止</el-button>
+                <el-button size="mini" round @click="formaterSql" :disabled="sqlExecuting">格式化</el-button>
+                <el-button size="mini" round @click="refreshData" :disabled="sqlExecuting">重置</el-button>
+              </el-form-item>
+            </el-form>
           </el-col>
         </el-row>
         <el-row>

datax-ui/src/views/monitor/loginlog/LogList.vue

@@ -256,7 +256,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delLog(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/monitor/operlog/LogList.vue

@@ -274,7 +274,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delLog(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/scheduler/job/JobList.vue

@@ -338,7 +338,6 @@ export default {
         type: 'warning'
       }).then(() => {
         pauseJob(row.id || this.ids[0])
-      }).then(() => {
         this.$message.success('任务暂停成功')
         this.getList()
       }).catch(() => {
@@ -352,7 +351,6 @@ export default {
         type: 'warning'
       }).then(() => {
         resumeJob(row.id || this.ids[0])
-      }).then(() => {
         this.$message.success('任务恢复成功')
         this.getList()
       }).catch(() => {
@@ -366,7 +364,6 @@ export default {
         type: 'warning'
       }).then(() => {
         runJob(row.id || this.ids[0])
-      }).then(() => {
         this.$message.success('任务执行成功')
         this.getList()
       }).catch(() => {
@@ -380,7 +377,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delJob(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/scheduler/log/JobLogList.vue

@@ -285,7 +285,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delLog(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/system/config/ConfigList.vue

@@ -312,7 +312,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delConfig(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/system/dept/DeptList.vue

@@ -241,7 +241,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delDept(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/system/dict/DictList.vue

@@ -365,7 +365,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delDict(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/system/dict/item/DictItemList.vue

@@ -339,7 +339,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delDictItem(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/system/menu/MenuList.vue

@@ -262,7 +262,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delMenu(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/system/post/PostList.vue

@@ -303,7 +303,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delPost(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/system/role/RoleList.vue

@@ -310,7 +310,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delRole(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/system/user/UserList.vue

@@ -385,7 +385,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delUser(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {

datax-ui/src/views/visual/dataset/DataSetList.vue

@@ -304,7 +304,6 @@ export default {
         type: 'warning'
       }).then(() => {
         delDataSet(row.id)
-      }).then(() => {
         this.$message.success('删除成功')
         this.getList()
       }).catch(() => {