Re-migrate code

This commit is contained in:
2026-03-02 10:41:43 +08:00
parent 1cc3097d9b
commit 6070df659a
6 changed files with 139 additions and 29 deletions

View File

@@ -21,12 +21,12 @@ func (s *AuthService) ValidateUser(username string, password string) (*models.Us
var user models.User
result := database.DB.Where("username = ?", username).First(&user)
if result.Error != nil {
return nil, fmt.Errorf("验证用户失败: %w", errors.New("用户名或密码错误"))
return nil, errors.New("用户名或密码不正确")
}
err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password))
if err != nil {
return nil, fmt.Errorf("密码验证失败: %w", errors.New("用户名或密码错误"))
return nil, errors.New("用户名或密码不正确")
}
return &user, nil

View File

@@ -244,6 +244,8 @@ func (s *SerialsService) Update(serialNumber string, updateData models.UpdateSer
return nil, fmt.Errorf("更新序列号失败: %w", result.Error)
}
_ = database.DB.Preload("User").Where("serial_number = ?", serial.SerialNumber).First(&serial)
return &serial, nil
}