新版本，代理功能上线

app/user/cmd/api/internal/logic/user/agentmobilecodeloginlogic.go

@@ -0,0 +1,91 @@
+package user
+
+import (
+	"context"
+	"fmt"
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/stores/redis"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
+	"time"
+	"tydata-server/app/user/cmd/api/internal/svc"
+	"tydata-server/app/user/cmd/api/internal/types"
+	"tydata-server/app/user/model"
+	jwtx "tydata-server/common/jwt"
+	"tydata-server/common/xerr"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type AgentMobileCodeLoginLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewAgentMobileCodeLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AgentMobileCodeLoginLogic {
+	return &AgentMobileCodeLoginLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *AgentMobileCodeLoginLogic) AgentMobileCodeLogin(req *types.MobileCodeLoginReq) (resp *types.MobileCodeLoginResp, err error) {
+	// 检查手机号是否在一分钟内已发送过验证码
+	redisKey := fmt.Sprintf("%s:%s", "query", req.Mobile)
+	cacheCode, err := l.svcCtx.Redis.Get(redisKey)
+	if err != nil {
+		if errors.Is(err, redis.Nil) {
+			return nil, errors.Wrapf(xerr.NewErrMsg("验证码已过期"), "手机登录, 验证码过期: %s", req.Mobile)
+		}
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "手机登录, 读取验证码redis缓存失败, mobile: %s, err: %+v", req.Mobile, err)
+	}
+	if cacheCode != req.Code {
+		return nil, errors.Wrapf(xerr.NewErrMsg("验证码不正确"), "手机登录, 验证码不正确: %s", req.Mobile)
+	}
+
+	user, findUserErr := l.svcCtx.UserModel.FindOneByMobile(l.ctx, req.Mobile)
+	if findUserErr != nil && findUserErr != model.ErrNotFound {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "手机登录, 读取数据库获取用户失败, mobile: %s, err: %+v", req.Mobile, err)
+	}
+	if user == nil {
+		user = &model.User{Mobile: req.Mobile}
+		if len(user.Nickname) == 0 {
+			user.Nickname = req.Mobile
+		}
+		if transErr := l.svcCtx.UserModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
+			insertResult, userInsertErr := l.svcCtx.UserModel.Insert(ctx, session, user)
+			if userInsertErr != nil {
+				return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "手机注册, 数据库插入新用户失败, mobile%s, err: %+v", req.Mobile, err)
+			}
+			lastId, lastInsertIdErr := insertResult.LastInsertId()
+			if lastInsertIdErr != nil {
+				return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "手机注册, 获取新用户ID失败, err:%+v, user:%+v", lastInsertIdErr, user)
+			}
+			user.Id = lastId
+
+			userAuth := new(model.UserAuth)
+			userAuth.UserId = lastId
+			userAuth.AuthKey = req.Mobile
+			userAuth.AuthType = model.UserAuthTypeH5Mobile
+			if _, userAuthInsertErr := l.svcCtx.UserAuthModel.Insert(ctx, session, userAuth); userAuthInsertErr != nil {
+				return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "手机注册, 数据库插入用户认证失败, err:%+v", userAuthInsertErr)
+			}
+			return nil
+		}); transErr != nil {
+			return nil, transErr
+		}
+	}
+	token, generaErr := jwtx.GenerateJwtToken(user.Id, l.svcCtx.Config.JwtAuth.AccessSecret, l.svcCtx.Config.JwtAuth.AccessExpire)
+	if generaErr != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "手机登录, 生成token失败 : %d", user.Id)
+	}
+
+	// 获取当前时间戳
+	now := time.Now().Unix()
+	return &types.MobileCodeLoginResp{
+		AccessToken:  token,
+		AccessExpire: now + l.svcCtx.Config.JwtAuth.AccessExpire,
+		RefreshAfter: now + l.svcCtx.Config.JwtAuth.RefreshAfter,
+	}, nil
+}

app/user/cmd/api/internal/logic/user/detaillogic.go

@@ -29,16 +29,16 @@ func NewDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DetailLogi
 func (l *DetailLogic) Detail() (resp *types.UserInfoResp, err error) {
 	userID, err := ctxdata.GetUidFromCtx(l.ctx)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "用户信息, %+v", err)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "用户信息, %v", err)
 	}
 	user, err := l.svcCtx.UserModel.FindOne(l.ctx, userID)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "用户信息, 数据库查询用户信息失败, %+v", err)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "用户信息, 数据库查询用户信息失败, %v", err)
 	}
 	var userInfo types.User
 	err = copier.Copy(&userInfo, user)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "用户信息, 用户信息结构体复制失败, %+v", err)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "用户信息, 用户信息结构体复制失败, %v", err)
 	}
 	return &types.UserInfoResp{
 		UserInfo: userInfo,

app/user/cmd/api/internal/logic/user/gettokenlogic.go

@@ -31,7 +31,7 @@ func NewGetTokenLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetToken
 func (l *GetTokenLogic) GetToken() (resp *types.MobileCodeLoginResp, err error) {
 	userID, err := ctxdata.GetUidFromCtx(l.ctx)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "用户信息, %+v", err)
+		return nil, errors.Wrapf(xerr.NewErrMsg(""), "用户信息, %v", err)
 	}
 	token, generaErr := jwtx.GenerateJwtToken(userID, l.svcCtx.Config.JwtAuth.AccessSecret, l.svcCtx.Config.JwtAuth.AccessExpire)
 	if generaErr != nil {
@@ -44,5 +44,4 @@ func (l *GetTokenLogic) GetToken() (resp *types.MobileCodeLoginResp, err error)
 		AccessExpire: now + l.svcCtx.Config.JwtAuth.AccessExpire,
 		RefreshAfter: now + l.svcCtx.Config.JwtAuth.RefreshAfter,
 	}, nil
-
 }

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

@@ -37,7 +37,7 @@ func (l *WxH5AuthLogic) WxH5Auth(req *types.WXH5AuthReq) (resp *types.WXH5AuthRe
 	// Step 1: 使用code获取access_token
 	accessTokenResp, err := GetAccessToken(req.Code)
 	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取access_token失败: %+v", err)
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取access_token失败: %v", err)
 	}
 
 	// Step 2: 查找用户授权信息