修复错误
This commit is contained in:
@@ -3,12 +3,9 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"git.huangwc.com/pig/pig-farm-controller/internal/api/middleware"
|
||||
"git.huangwc.com/pig/pig-farm-controller/internal/controller"
|
||||
"git.huangwc.com/pig/pig-farm-controller/internal/logs"
|
||||
"git.huangwc.com/pig/pig-farm-controller/internal/model"
|
||||
"git.huangwc.com/pig/pig-farm-controller/internal/storage/repository"
|
||||
"github.com/gin-gonic/gin"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
@@ -77,12 +74,8 @@ func (c *Controller) Register(ctx *gin.Context) {
|
||||
}
|
||||
|
||||
// 创建用户
|
||||
user := &model.User{
|
||||
Username: req.Username,
|
||||
PasswordHash: string(hashedPassword),
|
||||
}
|
||||
|
||||
if err := c.userRepo.Create(user); err != nil {
|
||||
user, err := c.userRepo.CreateUser(req.Username, string(hashedPassword))
|
||||
if err != nil {
|
||||
c.logger.Error("创建用户失败: " + err.Error())
|
||||
controller.SendErrorResponse(ctx, controller.InternalServerErrorCode, "用户注册失败")
|
||||
return
|
||||
@@ -118,7 +111,7 @@ func (c *Controller) Login(ctx *gin.Context) {
|
||||
}
|
||||
|
||||
// 生成JWT token
|
||||
token, err := middleware.GenerateToken(user)
|
||||
token, err := middleware.NewAuthMiddleware(c.userRepo).GenerateToken(user.ID, user.Username)
|
||||
if err != nil {
|
||||
c.logger.Error("生成JWT token失败: " + err.Error())
|
||||
controller.SendErrorResponse(ctx, controller.InternalServerErrorCode, "登录失败")
|
||||
|
||||
Reference in New Issue
Block a user