优化结构

internal/server/handler/dictionary.go

@@ -210,7 +210,7 @@ func (h *Dictionary) Details(c *gin.Context) {
 func (h *Dictionary) Tree(byType bool) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		rawID := c.Query("sysDictionaryID")
-		id, parseErr := strconv.ParseUint(rawID, 10, 32)
+		var id uint64
 		typ := ""
 		if byType {
 			typ = c.Query("type")
@@ -221,9 +221,13 @@ func (h *Dictionary) Tree(byType bool) gin.HandlerFunc {
 		} else if rawID == "" {
 			Fail(c, "字典ID不能为空")
 			return
-		} else if parseErr != nil {
-			Fail(c, "字典ID格式错误")
-			return
+		} else {
+			var parseErr error
+			id, parseErr = strconv.ParseUint(rawID, 10, 32)
+			if parseErr != nil {
+				Fail(c, "字典ID格式错误")
+				return
+			}
 		}
 		items, err := h.service.DictionaryTree(c.Request.Context(), uint(id), typ)
 		if err != nil {

internal/server/handler/public.go

@@ -27,29 +27,20 @@ func NewPublic(auth *systemservice.AuthService, system *systemservice.SystemConf
 	return &Public{auth: auth, system: system, settings: settings, store: &captchaStore{service: settings}}
 }
 
-func (h *Public) captchaConfig() (int, int, int) {
-	config := h.settings.CaptchaSettings()
-	return config.KeyLong, config.ImageWidth, config.ImageHeight
-}
-
 func (h *Public) Captcha(c *gin.Context) {
-	keyLong, width, height := h.captchaConfig()
 	security, err := h.settings.CurrentSecurity(c.Request.Context())
 	if err != nil || security == nil {
 		Fail(c, "安全服务暂不可用")
 		return
 	}
-	openCaptcha := true
-	if security != nil {
-		keyLong, width, height = security.KeyLong, security.ImgWidth, security.ImgHeight
-		ttl := time.Duration(security.CaptchaTimeout) * time.Second
-		failures, counterErr := h.settings.EnsureLoginIPCounter(c.Request.Context(), c.ClientIP(), ttl)
-		if counterErr != nil {
-			Fail(c, "安全服务暂不可用")
-			return
-		}
-		openCaptcha = security.CaptchaOpen == 0 || failures > security.CaptchaOpen
+	keyLong, width, height := security.KeyLong, security.ImgWidth, security.ImgHeight
+	ttl := time.Duration(security.CaptchaTimeout) * time.Second
+	failures, counterErr := h.settings.EnsureLoginIPCounter(c.Request.Context(), c.ClientIP(), ttl)
+	if counterErr != nil {
+		Fail(c, "安全服务暂不可用")
+		return
 	}
+	openCaptcha := security.CaptchaOpen == 0 || failures > security.CaptchaOpen
 	driver := base64Captcha.NewDriverDigit(height, width, keyLong, 0.7, 80)
 	id, picture, _, err := base64Captcha.NewCaptcha(driver, h.store).Generate()
 	if err != nil {

internal/server/handler/system_config.go

@@ -81,7 +81,7 @@ func (h *SystemConfig) Reload(c *gin.Context) {
 }
 
 func (h *SystemConfig) ServerInfo(c *gin.Context) {
-	server, err := h.system.ServerInfo()
+	server, err := h.system.ServerInfo(c.Request.Context())
 	if err != nil {
 		Fail(c, "获取失败")
 		return