From e4e3ad5821eafc1a0e5106f3e8c16589e20ae5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Wed, 29 Nov 2023 02:26:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=A5=E5=BF=97=E5=80=92=E5=BA=8F?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/http/controllers/task_controller.go | 4 ++--
 pkg/tools/tools.go                      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/http/controllers/task_controller.go b/app/http/controllers/task_controller.go
index f6099677..37ddd3d4 100644
--- a/app/http/controllers/task_controller.go
+++ b/app/http/controllers/task_controller.go
@@ -62,9 +62,9 @@ func (r *TaskController) Log(ctx http.Context) http.Response {
 		return ErrorSystem(ctx)
 	}
 
-	log, err := tools.Exec("tail -n 1000 " + task.Log)
+	log, err := tools.Exec("tail -n 1000 " + task.Log + " | tac")
 	if err != nil {
-		return Error(ctx, http.StatusInternalServerError, log)
+		return Error(ctx, http.StatusInternalServerError, "日志已被清理")
 	}
 
 	return Success(ctx, log)
diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go
index 7b404533..74c9681c 100644
--- a/pkg/tools/tools.go
+++ b/pkg/tools/tools.go
@@ -474,10 +474,6 @@ func UpdatePanel(panelInfo PanelInfo) error {
 	if !Exists("/www/panel/database/panel.db") || !Exists("/www/panel/panel.conf") {
 		return errors.New("恢复面板配置失败")
 	}
-	if _, err = Exec("/www/panel/panel --env=panel.conf artisan migrate"); err != nil {
-		color.Redln("运行面板数据库迁移失败")
-		return err
-	}
 	color.Greenln("恢复完成")
 
 	color.Greenln("设置面板文件权限...")
@@ -487,6 +483,10 @@ func UpdatePanel(panelInfo PanelInfo) error {
 	}
 	color.Greenln("设置完成")
 
+	if _, err = Exec("/www/panel/panel --env=panel.conf artisan migrate"); err != nil {
+		color.Redln("运行面板数据库迁移失败")
+		return err
+	}
 	if _, err = Exec("bash /www/panel/scripts/update_panel.sh"); err != nil {
 		color.Redln("执行面板升级后脚本失败")
 		return err