优化

internal/server/handler/system_config.go

@@ -1,22 +1,23 @@
 package handler
 
 import (
+	"errors"
+
+	"kra/internal/biz"
 	"kra/internal/server/httpx"
 	"kra/internal/service"
 	"kra/internal/service/dto"
-	"kra/internal/worker"
 
 	"github.com/gin-gonic/gin"
 )
 
 type SystemConfig struct {
-	system    *service.SystemConfigService
-	settings  *service.SecurityService
-	scheduler *worker.TaskScheduler
+	system   *service.SystemConfigService
+	settings *service.SecurityService
 }
 
-func NewSystemConfig(system *service.SystemConfigService, settings *service.SecurityService, scheduler *worker.TaskScheduler) *SystemConfig {
-	return &SystemConfig{system: system, settings: settings, scheduler: scheduler}
+func NewSystemConfig(system *service.SystemConfigService, settings *service.SecurityService) *SystemConfig {
+	return &SystemConfig{system: system, settings: settings}
 }
 
 func (h *SystemConfig) GetSecurity(c *gin.Context) {
@@ -61,13 +62,13 @@ func (h *SystemConfig) Set(c *gin.Context) {
 
 func (h *SystemConfig) Reload(c *gin.Context) {
 	if err := h.system.ReloadConfig(c.Request.Context()); err != nil {
+		if errors.Is(err, biz.ErrTaskRuntimeReload) {
+			httpx.Fail(c, "系统配置已重载，但定时任务重载失败:"+err.Error())
+			return
+		}
 		httpx.Fail(c, "重载系统失败:"+err.Error())
 		return
 	}
-	if err := h.scheduler.Reload(c.Request.Context()); err != nil {
-		httpx.Fail(c, "系统配置已重载，但定时任务重载失败:"+err.Error())
-		return
-	}
 	httpx.Write(c, httpx.CodeSuccess, gin.H{}, "重载系统成功")
 }