team/ycc-proxy-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
liangzai
2025-12-10 14:10:15 +08:00
parent a87326a085
commit fda007011b
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/main/api/internal/logic/user/wxh5authlogic.go
View File

@@ -34,15 +34,22 @@ func NewWxH5AuthLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WxH5Auth
}
func (l *WxH5AuthLogic) WxH5Auth(req *types.WXH5AuthReq) (resp *types.WXH5AuthResp, err error) {
l.Infof("🔄 WxH5Auth 开始处理微信H5授权请求")
// Step 1: 使用code获取access_token
l.Infof("📡 Step 1: 使用code获取access_token, code=%s", req.Code)
accessTokenResp, err := l.GetAccessToken(req.Code)
if err != nil {
l.Errorf("❌ 获取access_token失败: %v", err)
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取access_token失败: %v", err)
}
l.Infof("✅ 成功获取access_token, openid=%s", accessTokenResp.Openid)
// Step 2: 查找用户授权信息
l.Infof("📡 Step 2: 查找用户授权信息, auth_type=%s, openid=%s", model.UserAuthTypeWxh5OpenID, accessTokenResp.Openid)
userAuth, findErr := l.svcCtx.UserAuthModel.FindOneByAuthTypeAuthKey(l.ctx, model.UserAuthTypeWxh5OpenID, accessTokenResp.Openid)
if findErr != nil && !errors.Is(findErr, model.ErrNotFound) {
l.Errorf("❌ 查询用户授权失败: %v", findErr)
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询用户授权失败: %v", findErr)
}
@@ -51,35 +58,50 @@ func (l *WxH5AuthLogic) WxH5Auth(req *types.WXH5AuthReq) (resp *types.WXH5AuthRe
if userAuth != nil {
// 已存在用户，直接登录
userID = userAuth.UserId
l.Infof("✅ 用户已存在, userID=%s, openid=%s", userID, accessTokenResp.Openid)
} else {
// 新用户创建为临时用户（没有mobile）
l.Infof("📝 Step 3a: 创建新的临时用户, openid=%s", accessTokenResp.Openid)
user := &model.User{Id: uuid.NewString()}
_, err := l.svcCtx.UserModel.Insert(l.ctx, nil, user)
if err != nil {
l.Errorf("❌ 创建User失败: userID=%s, error=%v", user.Id, err)
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建用户失败: %v", err)
}
l.Infof("✅ User创建成功: userID=%s, mobile=null (临时用户)", user.Id)
l.Infof("📝 Step 3b: 创建UserAuth记录, userID=%s, openid=%s", user.Id, accessTokenResp.Openid)
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 {
l.Errorf("❌ 创建UserAuth失败: userID=%s, openid=%s, error=%v", user.Id, accessTokenResp.Openid, err)
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建用户授权失败: %v", err)
}
l.Infof("✅ UserAuth创建成功: userAuthID=%s, userID=%s, authType=%s", ua.Id, user.Id, model.UserAuthTypeWxh5OpenID)
userID = user.Id
l.Infof("Created new weixin user: userID=%s, openid=%s", userID, accessTokenResp.Openid)
l.Infof("✅ 新建临时用户完成: userID=%s, openid=%s", userID, accessTokenResp.Openid)
}
// Step 4: 生成JWT Token（动态计算userType）
l.Infof("📡 Step 4: 生成JWT Token, userID=%s", userID)
token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
if err != nil {
l.Errorf("❌ 生成token失败: userID=%s, error=%v", userID, err)
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成JWT token失败: %v", err)
}
l.Infof("✅ Token生成成功: userID=%s, tokenLen=%d", userID, len(token))
// Step 5: 返回登录结果
l.Infof("📡 Step 5: 返回登录结果")
now := time.Now().Unix()
return &types.WXH5AuthResp{
resp = &types.WXH5AuthResp{
AccessToken: token,
AccessExpire: now + l.svcCtx.Config.JwtAuth.AccessExpire,
RefreshAfter: now + l.svcCtx.Config.JwtAuth.RefreshAfter,
}, nil
}
l.Infof("🎯 WxH5Auth完成: userID=%s, accessExpire=%d, refreshAfter=%d", userID, resp.AccessExpire, resp.RefreshAfter)
return resp, nil
}
type AccessTokenResp struct {