ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

enhance(response):调整基础响应构建功能。

Browse Source
This commit is contained in:
徐涛 2022-08-12 13:39:58 +08:00
parent a09629ee2b
commit b9b9a9c738
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controller/user.go
View File

@ -96,7 +96,7 @@ func (_UserController) InvalidUserPassword(c *gin.Context) {
result.Error(500, err.Error()) result.Error(500, err.Error())
return return
} }
result.QuickJson(http.StatusOK, http.StatusAccepted, "用户密码已经失效", gin.H{"verify": verifyCode}) result.Json(http.StatusOK, http.StatusAccepted, "用户密码已经失效", gin.H{"verify": verifyCode})
} }
type ResetPasswordFormData struct { type ResetPasswordFormData struct {
@ -110,14 +110,18 @@ func (_UserController) ResetUserPassword(c *gin.Context) {
resetForm := new(ResetPasswordFormData) resetForm := new(ResetPasswordFormData)
c.BindJSON(resetForm) c.BindJSON(resetForm)
verified, err := service.UserService.VerifyUserPassword(resetForm.Username, resetForm.VerifyCode) verified, err := service.UserService.VerifyUserPassword(resetForm.Username, resetForm.VerifyCode)
if !verified { if errors.Is(err, &exceptions.NotFoundError{}) {
result.Error(http.StatusUnauthorized, "验证码不正确。") result.NotFound("指定的用户不存在。")
return return
} }
if err != nil { if err != nil {
result.Error(http.StatusInternalServerError, err.Error()) result.Error(http.StatusInternalServerError, err.Error())
return return
} }
if !verified {
result.Error(http.StatusUnauthorized, "验证码不正确。")
return
}
completed, err := service.UserService.ResetUserPassword(resetForm.Username, resetForm.NewPassword) completed, err := service.UserService.ResetUserPassword(resetForm.Username, resetForm.NewPassword)
if err != nil { if err != nil {
result.Error(http.StatusInternalServerError, err.Error()) result.Error(http.StatusInternalServerError, err.Error())
@ -127,5 +131,5 @@ func (_UserController) ResetUserPassword(c *gin.Context) {
result.Success("用户凭据已更新。") result.Success("用户凭据已更新。")
return return
} }
result.Error(http.StatusNotAcceptable, "用户凭据未能成功更新。") result.NotAccept("用户凭据未能成功更新。")
} }

8
response/base_response.go
View File

@ -15,6 +15,12 @@ type BaseResponse struct {
Message string `json:"message"` Message string `json:"message"`
} }
type PagedResponse struct {
Page int `json:"page"`
Size int `json:"pageSize"`
Total int `json:"total"`
}
func NewResult(ctx *gin.Context) *Result { func NewResult(ctx *gin.Context) *Result {
return &Result{Ctx: ctx} return &Result{Ctx: ctx}
} }
@ -77,7 +83,7 @@ func (r *Result) NotFound(msg string) {
// 快速自由JSON格式响应 // 快速自由JSON格式响应
// ! 注意，给定的map中，同名的键会被覆盖。 // ! 注意，给定的map中，同名的键会被覆盖。
func (r *Result) QuickJson(status, code int, msg string, payloads ...map[string]interface{}) { func (r *Result) Json(status, code int, msg string, payloads ...map[string]interface{}) {
var finalPayload = make(map[string]interface{}, 0) var finalPayload = make(map[string]interface{}, 0)
finalPayload["code"] = code finalPayload["code"] = code
finalPayload["message"] = &msg finalPayload["message"] = &msg