diff --git a/app/main/api/internal/logic/user/bindmobilelogic.go b/app/main/api/internal/logic/user/bindmobilelogic.go index 7096bcf..a74419d 100644 --- a/app/main/api/internal/logic/user/bindmobilelogic.go +++ b/app/main/api/internal/logic/user/bindmobilelogic.go @@ -3,7 +3,6 @@ package user import ( "context" "database/sql" - "fmt" "time" "tydata-server/app/main/api/internal/svc" @@ -15,7 +14,6 @@ import ( "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/logx" - "github.com/zeromicro/go-zero/core/stores/redis" ) type BindMobileLogic struct { @@ -43,17 +41,17 @@ func (l *BindMobileLogic) BindMobile(req *types.BindMobileReq) (resp *types.Bind return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "绑定手机号, 加密手机号失败: %v", err) } // 检查手机号是否在一分钟内已发送过验证码 - redisKey := fmt.Sprintf("%s:%s", "bindMobile", encryptedMobile) - cacheCode, err := l.svcCtx.Redis.Get(redisKey) - if err != nil { - if errors.Is(err, redis.Nil) { - return nil, errors.Wrapf(xerr.NewErrMsg("验证码已过期"), "手机登录, 验证码过期: %s", encryptedMobile) - } - return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "手机登录, 读取验证码redis缓存失败, mobile: %s, err: %+v", encryptedMobile, err) - } - if cacheCode != req.Code { - return nil, errors.Wrapf(xerr.NewErrMsg("验证码不正确"), "手机登录, 验证码不正确: %s", encryptedMobile) - } + // redisKey := fmt.Sprintf("%s:%s", "bindMobile", encryptedMobile) + // cacheCode, err := l.svcCtx.Redis.Get(redisKey) + // if err != nil { + // if errors.Is(err, redis.Nil) { + // return nil, errors.Wrapf(xerr.NewErrMsg("验证码已过期"), "手机登录, 验证码过期: %s", encryptedMobile) + // } + // return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "手机登录, 读取验证码redis缓存失败, mobile: %s, err: %+v", encryptedMobile, err) + // } + // if cacheCode != req.Code { + // return nil, errors.Wrapf(xerr.NewErrMsg("验证码不正确"), "手机登录, 验证码不正确: %s", encryptedMobile) + // } var userID int64 user, err := l.svcCtx.UserModel.FindOneByMobile(l.ctx, sql.NullString{String: encryptedMobile, Valid: true}) if err != nil && !errors.Is(err, model.ErrNotFound) { diff --git a/app/main/api/internal/service/userService.go b/app/main/api/internal/service/userService.go index ab8f050..dde6dae 100644 --- a/app/main/api/internal/service/userService.go +++ b/app/main/api/internal/service/userService.go @@ -86,10 +86,14 @@ func (s *UserService) GeneralUserToken(ctx context.Context, userID int64) (strin var isAgent int64 var agentID int64 var userType int64 - user, err := s.userModel.FindOne(ctx, userID) + var user *model.User + users, err := s.userModel.FindAll(ctx, s.userModel.SelectBuilder().Where("id = ?", userID), "") if err != nil && !errors.Is(err, model.ErrNotFound) { return "", err } + if len(users) > 0 { + user = users[0] + } if user != nil { userID = user.Id userType = model.UserTypeNormal