Merge branch 'pr-237': support del log of task

原本是清除所有日志，现在支持只清除部分日志
ouqiang#237

Author: zqhong

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/klauspost/cpuid v1.2.1 // indirect
 	github.com/lib/pq v1.1.1
 	github.com/ouqiang/goutil v1.1.1
-	github.com/rakyll/statik v0.1.6
+	github.com/rakyll/statik v0.1.7
 	github.com/sirupsen/logrus v1.4.2
 	github.com/urfave/cli v1.20.0
 	golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 // indirect

go.sum

@@ -83,6 +83,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rakyll/statik v0.1.6 h1:uICcfUXpgqtw2VopbIncslhAmE5hwc4g20TEyEENBNs=
 github.com/rakyll/statik v0.1.6/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs=
+github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
+github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=

internal/routers/routers.go

@@ -54,9 +54,7 @@ func Register(m *macaron.Macaron) {
 			ctx.WriteHeader(http.StatusInternalServerError)
 			return
 		}
-
 		io.Copy(ctx.Resp, file)
-
 	})
 	// 系统安装
 	m.Group("/install", func() {
@@ -232,7 +230,6 @@ func userAuth(ctx *macaron.Context) {
 	jsonResp := utils.JsonResponse{}
 	data := jsonResp.Failure(utils.AuthError, "认证失败")
 	ctx.Write([]byte(data))
-
 }
 
 // URL权限验证

internal/routers/tasklog/task_log.go

@@ -32,13 +32,16 @@ func Index(ctx *macaron.Context) string {
 
 // 清空日志
 func Clear(ctx *macaron.Context) string {
+	taskId := ctx.QueryInt("task_id")
 	taskLogModel := new(models.TaskLog)
+	if taskId > 0 {
+		taskLogModel.TaskId = taskId
+	}
 	_, err := taskLogModel.Clear()
 	json := utils.JsonResponse{}
 	if err != nil {
 		return json.CommonFailure(utils.FailureContent)
 	}
-
 	return json.Success(utils.SuccessContent, nil)
 }
 

internal/statik/statik.go

@@ -5,8 +5,8 @@ export default {
     httpClient.get('/task/log', query, callback)
   },
 
-  clear (callback) {
-    httpClient.post('/task/log/clear', {}, callback)
+  clear (taskId, callback) {
+    httpClient.post('/task/log/clear', { task_id: taskId }, callback)
   },
 
   stop (id, taskId, callback) {

web/vue/src/api/taskLog.js

@@ -33,8 +33,8 @@
         </el-form-item>
       </el-form>
       <el-row type="flex" justify="end">
-        <el-col :span="3">
-          <el-button type="danger" v-if="this.$store.getters.user.isAdmin" @click="clearLog">清空日志</el-button>
+        <el-col :span="4">
+          <el-button type="danger" v-if="this.$store.getters.user.isAdmin" @click="clearLog">清空{{ searchParams.task_id == '' ? "所有": "当前"}}任务日志</el-button>
         </el-col>
         <el-col :span="2">
           <el-button type="info" @click="refresh">刷新</el-button>
@@ -237,7 +237,7 @@ export default {
     },
     clearLog () {
       this.$appConfirm(() => {
-        taskLogService.clear(() => {
+        taskLogService.clear(this.searchParams.task_id, () => {
           this.searchParams.page = 1
           this.search()
         })