Merge branch 'dev-czl' into dev

src/service/task_history.go

@@ -170,6 +170,7 @@ func (t *TaskHistorySvc) TaskExecLog(id int) (taskExecLogRes response.TaskExecLo
 			err = resp.FAIL.WithError(errMarshal)
 			return
 		}
+		if taskExecLogRes.State == 0 {
 			// 写缓存
 			err = redis.HSet(conf.TaskExecLog, strconv.Itoa(id), fmt.Sprintf("%s", taskExecLog))
 			if err != nil {
@@ -178,6 +179,7 @@ func (t *TaskHistorySvc) TaskExecLog(id int) (taskExecLogRes response.TaskExecLo
 				return
 			}
 		}
+	}
 
 	if taskExecLogRes.State == 0 {
 		//判断key值是否存在

src/service/task_manage.go

@@ -468,6 +468,8 @@ func ExecAnsible(id, taskId int, value string) {
 			//return
 		}
 	}
+	err = redis.HDel(conf.TaskExecLog, strconv.Itoa(id))
+	conf.Logger.Error("del redis err", zap.Error(err))
 	redis.HDel(conf.AutoExecHistory, strconv.Itoa(id))
-	redis.HDel(conf.TaskExecLog, strconv.Itoa(id))
+
 }