pig/pig-farm-controller
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

优化接口返回值状态码

Browse Source
This commit is contained in:
huang
2025-09-08 12:30:33 +08:00
parent c7e2aaee89
commit 6f3f7db870
4 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
internal/controller/user/user.go
View File

@@ -8,6 +8,7 @@ import (
"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"
@@ -56,14 +57,14 @@ type LoginResponseData struct {
func (c *Controller) Register(ctx *gin.Context) {
var req RegisterRequest
if err := ctx.ShouldBindJSON(&req); err != nil {
controller.SendErrorResponse(ctx, http.StatusBadRequest, "请求参数错误")
controller.SendErrorResponse(ctx, controller.InvalidParameterCode, "请求参数错误")
return
}
// 检查用户名是否已存在
_, err := c.userRepo.FindByUsername(req.Username)
if err == nil {
controller.SendErrorResponse(ctx, http.StatusBadRequest, "用户名已存在")
controller.SendErrorResponse(ctx, controller.InvalidParameterCode, "用户名已存在")
return
}
@@ -71,15 +72,19 @@ func (c *Controller) Register(ctx *gin.Context) {
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
if err != nil {
c.logger.Error("密码哈希处理失败: " + err.Error())
controller.SendErrorResponse(ctx, http.StatusInternalServerError, "用户注册失败")
controller.SendErrorResponse(ctx, controller.InternalServerErrorCode, "用户注册失败")
return
}
// 创建用户
user, err := c.userRepo.CreateUser(req.Username, string(hashedPassword))
if err != nil {
user := &model.User{
Username: req.Username,
PasswordHash: string(hashedPassword),
}
if err := c.userRepo.Create(user); err != nil {
c.logger.Error("创建用户失败: " + err.Error())
controller.SendErrorResponse(ctx, http.StatusInternalServerError, "用户注册失败")
controller.SendErrorResponse(ctx, controller.InternalServerErrorCode, "用户注册失败")
return
}
@@ -95,28 +100,28 @@ func (c *Controller) Register(ctx *gin.Context) {
func (c *Controller) Login(ctx *gin.Context) {
var req LoginRequest
if err := ctx.ShouldBindJSON(&req); err != nil {
controller.SendErrorResponse(ctx, http.StatusBadRequest, "请求参数错误")
controller.SendErrorResponse(ctx, controller.InvalidParameterCode, "请求参数错误")
return
}
// 查找用户
user, err := c.userRepo.FindByUsername(req.Username)
if err != nil {
controller.SendErrorResponse(ctx, http.StatusUnauthorized, "用户名或密码错误")
controller.SendErrorResponse(ctx, controller.UnauthorizedCode, "用户名或密码错误")
return
}
// 验证密码
if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(req.Password)); err != nil {
controller.SendErrorResponse(ctx, http.StatusUnauthorized, "用户名或密码错误")
controller.SendErrorResponse(ctx, controller.UnauthorizedCode, "用户名或密码错误")
return
}
// 生成JWT token
token, err := middleware.NewAuthMiddleware(c.userRepo).GenerateToken(user.ID, user.Username)
token, err := middleware.GenerateToken(user)
if err != nil {
c.logger.Error("生成JWT token失败: " + err.Error())
controller.SendErrorResponse(ctx, http.StatusInternalServerError, "登录失败")
controller.SendErrorResponse(ctx, controller.InternalServerErrorCode, "登录失败")
return
}