优化结构

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 {