feat(captcha): add Cap version config for 1.x/2.x compatibility

middleware/captcha.go

@@ -147,10 +147,24 @@ func CaptchaRequired(enabled func(c *gin.Context) bool) gin.HandlerFunc {
 					request2.WithHeader(http.Header{"Content-Type": []string{"application/json"}}),
 				)
 
-				capEndpoint := strings.TrimSuffix(captchaSetting.InstanceURL, "/") + "/" + captchaSetting.SiteKey + "/siteverify"
+				var capEndpoint string
-				requestBody := map[string]string{
+				var requestBody map[string]string
-					"secret":   captchaSetting.SecretKey,
+
-					"response": service.Ticket,
+				// Support both 1.x and 2.x API formats
+				if captchaSetting.Version == "1.x" {
+					// Version 1.x: /api/{keyID}/siteverify
+					capEndpoint = strings.TrimSuffix(captchaSetting.InstanceURL, "/") + "/api/" + captchaSetting.SiteKey + "/siteverify"
+					requestBody = map[string]string{
+						"secret":   captchaSetting.SecretKey,
+						"response": service.Ticket,
+					}
+				} else {
+					// Version 2.x (default): /{siteKey}/siteverify
+					capEndpoint = strings.TrimSuffix(captchaSetting.InstanceURL, "/") + "/" + captchaSetting.SiteKey + "/siteverify"
+					requestBody = map[string]string{
+						"secret":   captchaSetting.SecretKey,
+						"response": service.Ticket,
+					}
 				}
 				requestData, err := json.Marshal(requestBody)
 				if err != nil {

pkg/setting/provider.go

@@ -671,6 +671,7 @@ func (s *settingProvider) CapCaptcha(ctx context.Context) *Cap {
 		InstanceURL: s.getString(ctx, "captcha_cap_instance_url", ""),
 		SiteKey:     s.getString(ctx, "captcha_cap_key_id", ""),
 		SecretKey:   s.getString(ctx, "captcha_cap_key_secret", ""),
+		Version:     s.getString(ctx, "captcha_cap_version", "2.x"),
 	}
 }
 

pkg/setting/types.go

@@ -52,6 +52,7 @@ type Cap struct {
 	InstanceURL string
 	SiteKey     string
 	SecretKey   string
+	Version     string // "1.x" or "2.x"
 }
 
 type SMTP struct {

service/basic/site.go

@@ -31,6 +31,7 @@ type SiteConfig struct {
 	TurnstileSiteID  string              `json:"turnstile_site_id,omitempty"`
 	CapInstanceURL   string              `json:"captcha_cap_instance_url,omitempty"`
 	CapKeyID         string              `json:"captcha_cap_key_id,omitempty"`
+	CapVersion       string              `json:"captcha_cap_version,omitempty"`
 	RegisterEnabled  bool                `json:"register_enabled,omitempty"`
 	TosUrl           string              `json:"tos_url,omitempty"`
 	PrivacyPolicyUrl string              `json:"privacy_policy_url,omitempty"`
@@ -138,6 +139,7 @@ func (s *GetSettingService) GetSiteConfig(c *gin.Context) (*SiteConfig, error) {
 		ReCaptchaKey:    reCaptcha.Key,
 		CapInstanceURL:  capCaptcha.InstanceURL,
 		CapKeyID:        capCaptcha.SiteKey,
+		CapVersion:      capCaptcha.Version,
 		AppPromotion:    appSetting.Promotion,
 	}, nil
 }