v1.1

app/main/api/internal/logic/user/wxh5authlogic.go

@@ -1,21 +1,22 @@
 package user
 
 import (
-	"context"
-	"ycc-server/app/main/model"
-	"ycc-server/common/xerr"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"time"
+    "context"
+    "ycc-server/app/main/model"
+    "ycc-server/common/xerr"
+    "encoding/json"
+    "fmt"
+    "io"
+    "net/http"
+    "time"
 
-	"github.com/pkg/errors"
+    "github.com/google/uuid"
+    "github.com/pkg/errors"
 
-	"ycc-server/app/main/api/internal/svc"
-	"ycc-server/app/main/api/internal/types"
+    "ycc-server/app/main/api/internal/svc"
+    "ycc-server/app/main/api/internal/types"
 
-	"github.com/zeromicro/go-zero/core/logx"
+    "github.com/zeromicro/go-zero/core/logx"
 )
 
 type WxH5AuthLogic struct {
@@ -46,41 +47,29 @@ func (l *WxH5AuthLogic) WxH5Auth(req *types.WXH5AuthReq) (resp *types.WXH5AuthRe
 	}
 
 	// Step 3: 处理用户信息
-	var userID int64
-	var userType int64
-	if userAuth != nil {
-		// 已存在用户，直接登录
-		userID = userAuth.UserId
-		userType = model.UserTypeNormal
-	} else {
-		// 检查临时用户表
-		userTemp, err := l.svcCtx.UserTempModel.FindOneByAuthTypeAuthKey(l.ctx, model.UserAuthTypeWxh5OpenID, accessTokenResp.Openid)
-		if err != nil && !errors.Is(err, model.ErrNotFound) {
-			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询用户临时信息失败: %v", err)
-		}
-
-		if userTemp == nil {
-			// 创建临时用户记录
-			userTemp = &model.UserTemp{
-				AuthType: model.UserAuthTypeWxh5OpenID,
-				AuthKey:  accessTokenResp.Openid,
-			}
-			result, err := l.svcCtx.UserTempModel.Insert(l.ctx, nil, userTemp)
-			if err != nil {
-				return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建临时用户信息失败: %v", err)
-			}
-			userID, err = result.LastInsertId()
-			if err != nil {
-				return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取新创建的临时用户ID失败: %v", err)
-			}
-		} else {
-			userID = userTemp.Id
-		}
-		userType = model.UserTypeTemp
-	}
+    var userID string
+    var userType int64
+    if userAuth != nil {
+        // 已存在用户，直接登录
+        userID = userAuth.UserId
+        userType = model.UserTypeNormal
+    } else {
+        user := &model.User{Id: uuid.NewString()}
+        _, err := l.svcCtx.UserModel.Insert(l.ctx, nil, user)
+        if err != nil {
+            return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建用户失败: %v", err)
+        }
+        ua := &model.UserAuth{Id: uuid.NewString(), UserId: user.Id, AuthType: model.UserAuthTypeWxh5OpenID, AuthKey: accessTokenResp.Openid}
+        _, err = l.svcCtx.UserAuthModel.Insert(l.ctx, nil, ua)
+        if err != nil {
+            return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建用户授权失败: %v", err)
+        }
+        userID = user.Id
+        userType = model.UserTypeTemp
+    }
 
 	// Step 4: 生成JWT Token
-	token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
+    token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID, userType)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成JWT token失败: %v", err)
 	}