🐛 iap新版本登录

internal/application/cpdaily/cryptoutil/des_decrypt_test.go

@@ -12,14 +12,14 @@ import (
 )
 
 func TestDesDecrypt(t *testing.T) {
-	decodeString, _ := base64.StdEncoding.DecodeString("X3/auV/FUP3Fj9iou6jNosFm9+6oiZ08pQlSt2qUlEhBEZXchcrXZJ96OsPIH4tfc6oRqdvlnObFx+uJfKA9oEuQQURvvDcDLz/1uAsQHXQIXNaW1Bwt9vdo4e1Sxzvt2sBxcHZXlsAPnxRw8UCM6DnoU4kHXF45A2i9wQpzH1cgKsoN/tWLRPYOBSMsPfbsch+wFgFpkQGRWNM9E0CVmpwZJWn946McO4HbMJngTeT5Df8YOUgpkFdccMKrJyPqE7UMOc56YLkPjb/wzmFyd1/HFCUbJwwdhOueH70GSpsH5LrWEhw7jvf2VBmnm669E2uvQjeCtPI1SvVuf7WP9Srp1BXpMtfK")
+	decodeString, _ := base64.StdEncoding.DecodeString("64JITpWPkKuGMhi1m7Ikxu1ekL6VQOdjmJvaQPI07MWbLETtJsxzkk2bCUVNaWgUULa3wS9LH+ANO5CUBeOXi02CcS/8lN/tYDFYCyuK7dLN+q0fD0gQlUsuHwy/78EkwZa9VrLh4e519vM9AxR2GnK4WGpumeH7TGJjDkLH0AitKfUYQnil9AKZEVgSSkHkg9ko64qj0QJvzmo76zOkMpIb1+1Pn2cO+5soTSl8BCsP/8hOP5HdOMVBCYH++iSK3O5sYz/cwZq/G8aJrqmEFcDHbgTouXyD5kxa4lb72Vw3Ku+eH+3qDwYMYxWrIcAm")
 	decrypt := DesDecrypt(decodeString, Cat)
 	str := "{\"lon\":\"113.045246\",\"lat\":\"28.077659\",\"model\":\"847b5b9c-2d97-41ec-8a5d-e9ac79da090d\",\"appVersion\":\"9.7.2\",\"userId\":\"430181200504150038\",\"systemName\":\"android\",\"deviceId\":\"09E46EC9-57C1-4724-BE53-5879CA80A2A0\",\"cpdailyVersion\":\"9.7.2\",\"systemVersion\":\"iOS 17\"}"
 	encrypt := DesEncrypt([]byte(str), Cat)
 	toString := base64.StdEncoding.EncodeToString(encrypt)
 	t.Log(toString)
 	t.Log(string(decrypt))
-	d2, _ := base64.StdEncoding.DecodeString("0u7hBd+6O11ZaGsT51FUAVfB72waqtTx5oQQLVEEAuCM29x8lQc41i9/dF6+9wjQNC05jdJTBmHlwFoLD09hfsnQWSyjl/ys124RUQL3r/Um5AwNdKiJE24YQsyQlP3ZamUIFlrNSxmn/DfZ/jR9oZhiVKZSlygA2LNLxtNOyk4rETfqKpZKFOnThbXy5Hf779jUDmPNwn1ZrdWN8UHm6wO+EahrrX60vC02VUHs7r3rMrDWZjBJ57eSgD0QwZabcIb/u9kx1AD8OAxINar3X+N+uAhfrxjHd6v6OVvnc2I9iPLEGNFRKZ94jq64hnATOSH6S/IR/QbDoxebWpGUXm3ALYZeoni09uyhG7IE5NtRw/OmqYtdknrs+c0qyOOBkvxPlqKo+SV4qq7xtrn9RWeZIigiyM8mVtdovN1T/x3DnHxd/AYoSS3/cGkg+2QHzWey/Xf5c4g0EvhaGlE0C7ejKIn5wp0XeHyvAjm4ZVyUhgTN2dZVCQ6ChxXOpLnVDWPNeeZ9vysqVl1ZSkQdCz20gy3p9RfYuArluQqjwIoWQe632Cc/Ep++99V5Tc9iIlLr93PfxFaJJfov3avLKw==")
+	d2, _ := base64.StdEncoding.DecodeString("86JzX4MBsorI5KasKBHUj6orO1qcPWbo758Ux6G2NUoRuGCoZnE+cJW5slZvsflBrKITPeitF7GTisMNRJxRqlA8cLXAqyo9ZlBPPx0MM3KjILHiA/EvrRrmamo7vi1d/F0ChQc8jLfMgkkcOg4FBmM1H8Yg6KyYdMNN7anIbIdJ+6RPEsakjAIw0r4eawofSh5E0QclDry0v36GK3UA3GDBBfqSub8V5PRL7fQty/R0lx7+mfc2AIXXjUVsv85WQKoyyUwg3siWpQL5S1cbtQNUXClSQP1IAGROnBftvdrib01PR1h7Cp+kvE3HK0+/8l0FoGJ1aijff1t9T9MaVXM/jSUFwkA7tmZIjodrUDhZcCMNm5YLm1ZO4UVBQO118FyOBjSLet0nPc0Wg0/dTO0XZoo9e2bCQwjIQC2G8TdzHDxvDjGEc6hX++nZrN23n19bAgqdvzZt58KftznE9s5t4CEjiHx3ykyidGEGr/VEi/05uOtm8/EsFUVp8+MyVgaTxoaq/4LBu28L59U6+6mZjOFUt49STR5p3UPI3ZJQLe2lmnx9BdqrIHbdXgYNu5oNzrDM8m3z3ns9M2HEGg==")
 	d := AesDecryptForCat(d2)
 	t.Log(d)
 

internal/application/cpdaily/cryptoutil/rsa.go

@@ -2,6 +2,9 @@ package cryptoutil
 
 import (
 	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/base64"
 	"encoding/hex"
 	"fmt"
 	"math/big"
@@ -36,6 +39,34 @@ func NewRSAKeyPair(exponent, privateExponent, modulus string) (*RSAKeyPair, erro
 	}, nil
 }
 
+// NewRSAKeyPairFromPublicKey 从 X.509 格式的 base64 公钥字符串创建 RSA 密钥对
+// publicKeyBase64: X.509 DER 格式的 base64 编码公钥字符串
+func NewRSAKeyPairFromPublicKey(publicKeyBase64 string) (*RSAKeyPair, error) {
+	// 解码 base64
+	derBytes, err := base64.StdEncoding.DecodeString(publicKeyBase64)
+	if err != nil {
+		return nil, fmt.Errorf("failed to decode base64: %w", err)
+	}
+
+	// 解析 X.509 格式的公钥
+	pubKey, err := x509.ParsePKIXPublicKey(derBytes)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse public key: %w", err)
+	}
+
+	// 转换为 RSA 公钥
+	rsaPubKey, ok := pubKey.(*rsa.PublicKey)
+	if !ok {
+		return nil, fmt.Errorf("not an RSA public key")
+	}
+
+	// 创建密钥对
+	return &RSAKeyPair{
+		n: rsaPubKey.N,
+		e: big.NewInt(int64(rsaPubKey.E)),
+	}, nil
+}
+
 // Encrypt 使用公钥加密数据，返回十六进制字符串
 func (k *RSAKeyPair) Encrypt(plaintext string) (string, error) {
 	ciphertext, err := k.EncryptBytes([]byte(plaintext))

internal/application/cpdaily/cryptoutil/rsa_test.go

@@ -52,3 +52,36 @@ func TestRSAKeyPair_EncryptBytes(t *testing.T) {
 
 	t.Logf("密文长度: %d bytes", len(ciphertext))
 }
+
+func TestNewRSAKeyPairFromPublicKey(t *testing.T) {
+	// 使用你提供的 X.509 格式的 base64 公钥
+	publicKey := "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCpbRy8ZoyQvRPpUDIXycglTwVDcYrLcv7P9HI4E7/TAPZiI3GN0ckTUVVWRvoo/re3uCOOJK+F+Ufh19XiRIdoPYCULsSyEjcLLiyAS09mVOzhAQco84E/lM24T7rRTVID7LIgWPewyN8Nd5vzHET4Q3qTthoL8n82BwC1iXuVQIDAQAB"
+
+	keyPair, err := NewRSAKeyPairFromPublicKey(publicKey)
+	if err != nil {
+		t.Fatalf("从公钥创建 RSA 密钥对失败: %v", err)
+	}
+
+	// 测试加密
+	plaintext := "241703070163"
+	ciphertext, err := keyPair.Encrypt(plaintext)
+	if err != nil {
+		t.Fatalf("加密失败: %v", err)
+	}
+
+	t.Logf("明文: %s", plaintext)
+	t.Logf("密文(十六进制): %s", ciphertext)
+
+	// 验证密文不为空
+	if len(ciphertext) == 0 {
+		t.Error("密文为空")
+	}
+
+	// 验证密文长度（1024位密钥应该产生128字节 = 256个十六进制字符）
+	expectedHexLen := (keyPair.GetModulus().BitLen() + 7) / 8 * 2
+	if len(ciphertext) != expectedHexLen {
+		t.Errorf("密文长度不正确: 期望 %d, 实际 %d", expectedHexLen, len(ciphertext))
+	}
+
+	t.Logf("密钥长度: %d bits", keyPair.GetModulus().BitLen())
+}

internal/application/cpdaily/login/iap.go

@@ -5,18 +5,22 @@ import (
 	"fmt"
 	"io"
 	"likedream-goframe/internal/application/cookiejar"
+	"likedream-goframe/internal/application/cpdaily/cryptoutil"
 	"likedream-goframe/internal/application/cpdaily/school"
 	"likedream-goframe/internal/application/httpclient"
 	"likedream-goframe/internal/common/errors"
 	"likedream-goframe/internal/utils"
 	"net/http"
 	"net/url"
+	"strings"
 
 	"github.com/samber/oops"
 	"github.com/tidwall/gjson"
 	"resty.dev/v3"
 )
 
+const iapRsaPubKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCpbRy8ZoyQvRPpUDIXycglTwVDcYrLcv7P9HI4E7/TAPZiI3GN0ckTUVVWRvoo/re3uCOOJK+F+Ufh19XiRIdoPYCULsSyEjcLLiyAS09mVOzhAQco84E/lM24T7rRTVID7LIgWPewyN8Nd5vzHET4Q3qTthoL8n82BwC1iXuVQIDAQAB"
+
 type CpdailyIapLogin struct {
 	client *resty.Client
 }
@@ -37,11 +41,10 @@ func (c *CpdailyIapLogin) Login(ctx context.Context, schoolDetail *school.School
 	c.client.SetCookieJar(jar).
 		SetRedirectPolicy(resty.NoRedirectPolicy())
 
-	ltInfoResponse, err := c.client.R().
-		WithContext(ctx).
-		SetBody(map[string]any{}).
-		Post(fmt.Sprintf("%s/iap/security/lt", loginUrl))
-
+	// 获取基础lt
+	preLoginUrl := loginUrl + "/portal/login"
+	c.client.SetRedirectPolicy(resty.FlexibleRedirectPolicy(20))
+	loginRedirectResponse, err := c.client.R().Get(preLoginUrl)
 	utils.OkOrPanic(err, func(err error) error {
 		return oops.
 			In("CpdailyIapLogin.Login").
@@ -50,6 +53,25 @@ func (c *CpdailyIapLogin) Login(ctx context.Context, schoolDetail *school.School
 			With("password", password).
 			Wrap(err)
 	})
+	u := loginRedirectResponse.RawResponse.Request.URL
+	oldLt := strings.Split(u.String(), "=")[1]
+	c.client.SetRedirectPolicy(resty.NoRedirectPolicy())
+	ltInfoResponse, err := c.client.R().
+		WithContext(ctx).
+		SetFormData(map[string]string{
+			"lt": oldLt,
+		}).
+		Post(fmt.Sprintf("%s/iap/security/lt", loginUrl))
+	rsa, _ := cryptoutil.NewRSAKeyPairFromPublicKey(iapRsaPubKey)
+	password, _ = rsa.Encrypt(password)
+	utils.OkOrPanic(err, func(err error) error {
+		return oops.
+			In("CpdailyIapLogin.Login").
+			With("schoolDetail", schoolDetail).
+			With("username", username).
+			With("password", "{rsa}"+password).
+			Wrap(err)
+	})
 
 	defer ltInfoResponse.Body.Close()
 
@@ -64,8 +86,9 @@ func (c *CpdailyIapLogin) Login(ctx context.Context, schoolDetail *school.School
 		"rememberMe": "true",
 		"dllt":       "",
 		"mobile":     "",
+		"captcha":    "",
 		"username":   username,
-		"password":   password,
+		"password":   "{rsa}" + password,
 	}
 
 	if isIapNeedCaptcha(ctx, loginUrl, username, c.client) {

internal/common/db/ent_db.go

@@ -27,7 +27,7 @@ func InitDB() {
 	client, err := ent.Open(dbType.String(), dbDsn.String())
 	utils.OkOrPanic(err)
 	// 自动迁移
-	if err := client.Debug().Schema.Create(context.Background()); err != nil {
+	if err := client.Schema.Create(context.Background()); err != nil {
 		logger.Logger.Fatal("failed creating schema resources: %v", zap.Error(err))
 	}
 	Global = client

internal/ent/migrate/schema.go

@@ -79,7 +79,7 @@ var (
 				Symbol:     "cp_tasks_cp_users_cptasks",
 				Columns:    []*schema.Column{CpTasksColumns[15]},
 				RefColumns: []*schema.Column{CpUsersColumns[0]},
-				OnDelete:   schema.NoAction,
+				OnDelete:   schema.Cascade,
 			},
 			{
 				Symbol:     "cp_tasks_sys_user_cp_task",

internal/ent/schema/cpuser.go

@@ -31,7 +31,7 @@ func (CpUser) Fields() []ent.Field {
 // Edges of the CpUser.
 func (CpUser) Edges() []ent.Edge {
 	return []ent.Edge{
-		edge.To("cptasks", CpTask.Type),
+		edge.To("cptasks", CpTask.Type).Annotations(entsql.OnDelete(entsql.Cascade)),
 		edge.From("sysuser", SysUser.Type).Unique().Required().Field("user_id").Ref("cpuser"),
 		edge.To("cp_task_logs", CpTaskLog.Type).Annotations(entsql.OnDelete(entsql.Cascade)), // 用户拥有的cp任务日志
 		edge.From("school", CpSchool.Type).

internal/service/balance/balance_service.go

@@ -16,8 +16,8 @@ var BalanceService = &BalanceServiceV1{}
 type BalanceServiceV1 struct {
 }
 
-func (v *BalanceServiceV1) ChangeUserBalance(ctx context.Context, userId int64, balance decimal.Decimal) error {
-	return db.WithTx(ctx, func(c context.Context, tx *ent.Tx) {
+func (v *BalanceServiceV1) ChangeUserBalance(ctx context.Context, userId int64, balance decimal.Decimal) {
+	err := db.WithTx(ctx, func(c context.Context, tx *ent.Tx) {
 		// 使用 SELECT ... FOR UPDATE 锁定用户记录
 		user, err := tx.SysUser.Query().
 			Where(sysuser.ID(userId)).
@@ -39,5 +39,6 @@ func (v *BalanceServiceV1) ChangeUserBalance(ctx context.Context, userId int64,
 			ExecX(ctx)
 		tx.Commit()
 	}, nil)
+	utils.OkOrPanic(err)
 
 }

internal/service/user_login/user_info_service.go

@@ -364,10 +364,8 @@ func (s *UserInfoServiceV1) BalanceMigrate(ctx context.Context, req *v1.BalanceM
 	if newUser.Edges.Agent != nil {
 		b = utils.TransformBalance(b, newUser.Edges.Agent.Rate)
 	}
-	err = balance.BalanceService.ChangeUserBalance(ctx, newUser.ID, b)
-	if err != nil {
-		return utils.FailParam("积分转移失败，请重新尝试")
-	}
+	balance.BalanceService.ChangeUserBalance(ctx, newUser.ID, b)
+
 	// 清空旧系统积分
 	err = db.GlobalGorm.Table("AspNetUsers").Where("email = ?", oldSystemEmail).Update("balance", 0).Error
 	if err != nil {