diff --git a/app/console/commands/monitoring.go b/app/console/commands/monitoring.go index 0f2b10f1..1eabb0a4 100644 --- a/app/console/commands/monitoring.go +++ b/app/console/commands/monitoring.go @@ -2,7 +2,6 @@ package commands import ( "context" - "strconv" "github.com/goravel/framework/contracts/console" "github.com/goravel/framework/contracts/console/command" @@ -82,12 +81,7 @@ func (receiver *Monitoring) Handle(console.Context) error { } // 删除过期数据 - monitorDays := setting.Get(models.SettingKeyMonitorDays) - days, err := strconv.Atoi(monitorDays) - if err != nil { - return nil - } - + days := cast.ToInt(setting.Get(models.SettingKeyMonitorDays)) if days <= 0 || internal.Status != internal.StatusNormal { return nil } diff --git a/app/providers/queue_service_provider.go b/app/providers/queue_service_provider.go index c0bf18f9..afbebffb 100644 --- a/app/providers/queue_service_provider.go +++ b/app/providers/queue_service_provider.go @@ -12,7 +12,9 @@ type QueueServiceProvider struct { } func (receiver *QueueServiceProvider) Register(app foundation.Application) { - facades.Queue().Register(receiver.Jobs()) + if err := facades.Queue().Register(receiver.Jobs()); err != nil { + panic(err.Error()) + } } func (receiver *QueueServiceProvider) Boot(app foundation.Application) { diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go index a61058a8..e85f7ee0 100644 --- a/pkg/tools/tools.go +++ b/pkg/tools/tools.go @@ -4,8 +4,8 @@ package tools import ( "errors" "fmt" + "github.com/spf13/cast" "os" - "strconv" "strings" "time" @@ -101,30 +101,12 @@ func GenerateVersions(start, end string) ([]string, error) { return nil, fmt.Errorf("版本格式错误") } - startMajor, err := strconv.Atoi(startParts[0]) - if err != nil { - return nil, fmt.Errorf("无效的起始主版本号: %v", err) - } - startMinor, err := strconv.Atoi(startParts[1]) - if err != nil { - return nil, fmt.Errorf("无效的起始次版本号: %v", err) - } - startPatch, err := strconv.Atoi(startParts[2]) - if err != nil { - return nil, fmt.Errorf("无效的起始修订号: %v", err) - } - endMajor, err := strconv.Atoi(endParts[0]) - if err != nil { - return nil, fmt.Errorf("无效的结束主版本号: %v", err) - } - endMinor, err := strconv.Atoi(endParts[1]) - if err != nil { - return nil, fmt.Errorf("无效的结束次版本号: %v", err) - } - endPatch, err := strconv.Atoi(endParts[2]) - if err != nil { - return nil, fmt.Errorf("无效的结束修订号: %v", err) - } + startMajor := cast.ToInt(startParts[0]) + startMinor := cast.ToInt(startParts[1]) + startPatch := cast.ToInt(startParts[2]) + endMajor := cast.ToInt(endParts[0]) + endMinor := cast.ToInt(endParts[1]) + endPatch := cast.ToInt(endParts[2]) for major := startMajor; major <= endMajor; major++ { for minor := 0; minor <= 99; minor++ {