✨ 适配华侨大学

config.toml

@@ -46,7 +46,7 @@ bucket = "likedream"
 appVersion = "9.7.2"
 systemVersion = "iOS 17"
 calVersion = "firstv"
-
+sliderIds = ["1018764144934965", "sdhyxy", "hqdx"]
 
 [task]
 concurrency = 20

internal/application/cpdaily/login/cas.go

@@ -23,6 +23,7 @@ import (
 	"github.com/PuerkitoBio/goquery"
 	"github.com/avast/retry-go/v4"
 	"github.com/deatil/go-cryptobin/cryptobin/crypto"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/samber/oops"
 	"github.com/tidwall/gjson"
 	"resty.dev/v3"
@@ -192,7 +193,8 @@ func (c *CpdailyCasLogin) Login(ctx context.Context, schoolDetail *school.School
 	}
 
 	// 声明需要滑块验证码的学校id
-	var SliderCaptchaIds = []string{"1018764144934965", "sdhyxy"}
+	var SliderCaptchaIds = g.Cfg().MustGet(ctx, cst.ConfigSliderSchoolIds).Strings()
+	// []string{"1018764144934965", "sdhyxy", "hqdx"}
 	// 判断是否需要验证码
 	if isCasNeedCaptcha(ctx, loginResponseUrl, loginType, username, c.client) {
 		// 如果是滑块验证码

internal/application/cpdaily/submitcaptcha/interface.go

@@ -42,9 +42,7 @@ type ApiResponse struct {
 type ITStarResponse struct {
 	Code json.Number `json:"code"`
 	Msg  string      `json:"msg"`
-	Data struct {
-		SuccCode []string `json:"succCode"`
-	} `json:"data"`
+	Data []string    `json:"data"`
 }
 
 type SubmitCaptchaResolver interface {

internal/application/cpdaily/submitcaptcha/resolver.go

@@ -145,10 +145,7 @@ func (r *NormalSubmitCaptchaResolver) getResultFromItStar(rawResponse json.RawMe
 	err := sonic.Unmarshal(rawResponse, &responseMap)
 	utils.OkOrPanic(err)
 
-	responseMap["authKey"] = "ITStarYYDS"
-
-	itstarUrl := strings.TrimSuffix(r.getITStarUrl(), "/")
-	url := itstarUrl + "/captcha/unLimitValidate"
+	url := r.getITStarUrl()
 
 	resp, err := r.client.R().
 		SetBody(responseMap).
@@ -161,7 +158,7 @@ func (r *NormalSubmitCaptchaResolver) getResultFromItStar(rawResponse json.RawMe
 		utils.OkOrPanic(errors.NewBusinessError(503, fmt.Sprintf("验证码识别出错: %s", itstarResp.Msg)))
 	}
 
-	return itstarResp.Data.SuccCode
+	return itstarResp.Data
 }
 
 // submitCaptcha 提交验证码

internal/application/cpdaily/task/sleepcheck.go

@@ -551,7 +551,7 @@ func (c *CpdailySleepCheckTask) FillCustomForm(ctx context.Context, form map[str
 			return utils.Catch(func() {
 				ticket = submitCaptchaResolver.GetCaptchaTicket(ctx, captchaInfo)
 			})
-		}, retry.Delay(15*time.Second), retry.Attempts(5), retry.Context(ctx))
+		}, retry.Delay(10*time.Second), retry.Attempts(5), retry.Context(ctx))
 		if e != nil {
 			utils.OkOrPanic(errors.NewBusinessError(503, "提交验证码识别失败").WithInnerError(e), oops.WithContext(ctx).Wrap)
 		}

internal/common/cst/config.go

@@ -22,6 +22,7 @@ const (
 	ConfigCpdailyAppVersion     = "cpdaily.appVersion"
 	ConfigCpdailySystemVersion  = "cpdaily.systemVersion"
 	ConfigCpdailyCalVersion     = "cpdaily.calVersion"
+	ConfigSliderSchoolIds       = "cpdaily.sliderIds"
 
 	ConfigRedisUrl = "redis.url"
 

internal/service/cpdaily/cpuser.go

@@ -174,9 +174,9 @@ func (v CpUserServiceV1) AuthorizeRandom(ctx context.Context, req *v1.CpUserAuth
 }
 
 func (v CpUserServiceV1) LoginGetCode(ctx context.Context, req *v1.LoginGetCode) *utils.Response[any] {
-
+	return utils.SuccessWithMsg("")
 }
 
 func (v CpUserServiceV1) AddByCode(ctx context.Context, req *v1.AddByCode) *utils.Response[any] {
-
+	return utils.SuccessWithMsg("")
 }