feat: update v2.0.10

TheTNB · Jul 22, 2023 · a5e1fbc · a5e1fbc
1 parent 1689ef4
commit a5e1fbc
Show file tree

Hide file tree

Showing 34 changed files with 3,114 additions and 229 deletions.
diff --git a/app/console/commands/panel.go b/app/console/commands/panel.go
@@ -4,11 +4,10 @@ import (
 	"os"
 
 	"github.com/gookit/color"
-	"github.com/spf13/cast"
-
 	"github.com/goravel/framework/contracts/console"
 	"github.com/goravel/framework/contracts/console/command"
 	"github.com/goravel/framework/facades"
+	"github.com/spf13/cast"
 
 	"panel/app/models"
 	"panel/app/services"
@@ -73,12 +72,19 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 		color.Greenln("初始化成功")
 
 	case "update":
+		var task models.Task
+		err := facades.Orm().Query().Where("status", models.TaskStatusRunning).OrWhere("status", models.TaskStatusWaiting).FirstOrFail(&task)
+		if err == nil {
+			color.Redln("当前有任务正在执行，禁止更新")
+			return nil
+		}
+
 		input := arg1
 		proxy := false
 		if input == "y" || input == "Y" || input == "yes" || input == "Yes" {
 			proxy = true
 		}
-		err := tools.UpdatePanel(cast.ToBool(proxy))
+		err = tools.UpdatePanel(cast.ToBool(proxy))
 		if err != nil {
 			color.Redln("更新失败: " + err.Error())
 			return nil

diff --git a/app/http/controllers/cron_controller.go b/app/http/controllers/cron_controller.go
@@ -53,7 +53,7 @@ func (r *CronController) Add(ctx http.Context) {
 		return
 	}
 	if validator.Fails() {
-		Error(ctx, http.StatusBadRequest, validator.Errors().All())
+		Error(ctx, http.StatusBadRequest, validator.Errors().One())
 		return
 	}
 
@@ -129,7 +129,7 @@ func (r *CronController) Update(ctx http.Context) {
 		return
 	}
 	if validator.Fails() {
-		Error(ctx, http.StatusBadRequest, validator.Errors().All())
+		Error(ctx, http.StatusBadRequest, validator.Errors().One())
 		return
 	}
 

diff --git a/app/http/controllers/info_controller.go b/app/http/controllers/info_controller.go
@@ -163,8 +163,15 @@ func (c *InfoController) CheckUpdate(ctx http.Context) {
 }
 
 func (c *InfoController) Update(ctx http.Context) {
+	var task models.Task
+	err := facades.Orm().Query().Where("status", models.TaskStatusRunning).OrWhere("status", models.TaskStatusWaiting).FirstOrFail(&task)
+	if err == nil {
+		Error(ctx, http.StatusInternalServerError, "当前有任务正在执行，禁止更新")
+		return
+	}
+
 	proxy := ctx.Request().InputBool("proxy")
-	err := tools.UpdatePanel(proxy)
+	err = tools.UpdatePanel(proxy)
 	if err != nil {
 		facades.Log().Error("[面板][InfoController] 更新面板失败 ", err.Error())
 		Error(ctx, http.StatusInternalServerError, "更新失败: "+err.Error())