acepanel/panel
2
0
Fork 0
mirror of https://github.com/acepanel/panel.git synced 2026-02-05 12:23:35 +08:00
Code Issues Packages Releases Activity

refactor: 重构 tools.Exec 函数

Browse Source
This commit is contained in:
耗子
2023-11-14 01:54:26 +08:00
parent 1c5b32a7a9
commit 2b1b58ea2b
39 changed files with 1843 additions and 1332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/http/controllers/task_controller.go
View File

@@ -38,9 +38,9 @@ func (r *TaskController) List(ctx http.Context) http.Response {
var total int64
err := facades.Orm().Query().Order("id desc").Paginate(ctx.Request().QueryInt("page", 1), ctx.Request().QueryInt("limit", 10), &tasks, &total)
if err != nil {
facades.Log().Request(ctx.Request()).With(map[string]any{
facades.Log().Request(ctx.Request()).Tags("面板", "任务中心").With(map[string]any{
"error": err.Error(),
}).Info("[面板][TaskController] 查询任务列表失败")
}).Info("查询任务列表失败")
return ErrorSystem(ctx)
}
@@ -55,14 +55,17 @@ func (r *TaskController) Log(ctx http.Context) http.Response {
var task models.Task
err := facades.Orm().Query().Where("id", ctx.Request().QueryInt("id")).FirstOrFail(&task)
if err != nil {
facades.Log().Request(ctx.Request()).With(map[string]any{
facades.Log().Request(ctx.Request()).Tags("面板", "任务中心").With(map[string]any{
"id": ctx.Request().QueryInt("id"),
"error": err.Error(),
}).Info("[面板][TaskController] 查询任务失败")
}).Info("查询任务失败")
return ErrorSystem(ctx)
}
log := tools.Exec("tail -n 1000 " + task.Log)
log, err := tools.Exec("tail -n 1000 " + task.Log)
if err != nil {
return Error(ctx, http.StatusInternalServerError, log)
}
return Success(ctx, log)
}
@@ -72,10 +75,10 @@ func (r *TaskController) Delete(ctx http.Context) http.Response {
var task models.Task
_, err := facades.Orm().Query().Where("id", ctx.Request().Input("id")).Delete(&task)
if err != nil {
facades.Log().With(map[string]any{
facades.Log().Request(ctx.Request()).Tags("面板", "任务中心").With(map[string]any{
"id": ctx.Request().QueryInt("id"),
"error": err.Error(),
}).Info("[面板][TaskController] 删除任务失败")
}).Info("删除任务失败")
return ErrorSystem(ctx)
}