完善logic.tpl的错误

home-user-auth/internal/logic/userbasicinfologic.go

@@ -35,6 +35,5 @@ func (l *UserBasicInfoLogic) UserBasicInfo(req *types.Request) (resp *types.Resp
 		logx.Error(err)
 		return resp.Set(510, err.Error())
 	}
-
 	return resp.SetStatus(basic.CodeOK, fsUserModel)
 }

home-user-auth/internal/logic/userloginlogic.go

@@ -28,7 +28,6 @@ func NewUserLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserLog
 }
 
 func (l *UserLoginLogic) genJwtToken(accessSecret string, accessExpire, nowSec, userid int64) (string, error) {
-
 	claims := make(jwt.MapClaims)
 	claims["exp"] = nowSec + accessExpire
 	claims["iat"] = nowSec
@@ -39,13 +38,19 @@ func (l *UserLoginLogic) genJwtToken(accessSecret string, accessExpire, nowSec,
 }
 
 func (l *UserLoginLogic) UserLogin(req *types.RequestUserLogin) (resp *types.Response, jwtToken string) {
-	userModel, err := model.NewFsUserModel(l.svcCtx.MysqlConn).FindOneByEmail(l.ctx, req.Name)
+	m := model.NewFsUserModel(l.svcCtx.MysqlConn)
+	userModel, err := m.FindOneByEmail(l.ctx, req.Name)
 
 	if err == model.ErrNotFound {
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error()), jwtToken
 	}
 
+	if userModel.PasswordHash != req.Password {
+		logx.Info("密码错误")
+		return resp.SetStatusWithMessage(basic.CodeUnAuth, "密码错误"), jwtToken
+	}
+
 	// jwt 生成
 	nowSec := time.Now().Unix()
 	jwtToken, err = l.genJwtToken(l.svcCtx.Config.Auth.AccessSecret, l.svcCtx.Config.Auth.AccessExpire, nowSec, userModel.Id)
@@ -54,9 +59,13 @@ func (l *UserLoginLogic) UserLogin(req *types.RequestUserLogin) (resp *types.Res
 		return resp.SetStatus(basic.CodeUnAuth), jwtToken
 	}
 
+	err = m.UpdateVerificationToken(l.ctx, userModel.Id, jwtToken)
+	if err != nil {
+		return resp.SetStatus(basic.CodeUnAuth), jwtToken
+	}
+
 	data := &types.DataUserLogin{
-		Token:    userModel.PasswordResetToken.String,
-		JwtToken: jwtToken,
+		Token: jwtToken,
 	}
 
 	return resp.SetStatus(basic.CodeOK, data), jwtToken

home-user-auth/internal/logic/userstatusconfiglogic.go

@@ -0,0 +1,31 @@
+package logic
+
+import (
+	"context"
+
+	"fusenapi/home-user-auth/internal/svc"
+	"fusenapi/home-user-auth/internal/types"
+	"fusenapi/utils/basic"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type UserStatusConfigLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewUserStatusConfigLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserStatusConfigLogic {
+	return &UserStatusConfigLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *UserStatusConfigLogic) UserStatusConfig(req *types.RequestBasicInfoForm) (resp *types.Response) {
+	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
+
+	return resp.SetStatus(basic.CodeOK)
+}