From 0bc2fd31523db729ab3d2f3c41d197bfe5cd4f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Tue, 16 Aug 2022 06:19:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(response):=E5=A2=9E=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E7=94=A8=E4=BA=8E=E8=A1=A8=E7=A4=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9C=AA=E8=8E=B7=E5=BE=97=E6=8E=88=E6=9D=83=E7=9A=84=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/maintenance_fee.go | 8 ++++---- controller/park.go | 16 ++++++++-------- response/base_response.go | 8 ++++++++ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/controller/maintenance_fee.go b/controller/maintenance_fee.go index 0e06e22..310108e 100644 --- a/controller/maintenance_fee.go +++ b/controller/maintenance_fee.go @@ -31,7 +31,7 @@ func listMaintenanceFees(c *gin.Context) { result := response.NewResult(c) userSession, err := _retreiveSession(c) if err != nil { - result.Failure(http.StatusInternalServerError, err.Error()) + result.Unauthorized(err.Error()) return } requestPark := c.DefaultQuery("park", "") @@ -42,7 +42,7 @@ func listMaintenanceFees(c *gin.Context) { return } if !sure { - result.NotAccept("不能访问不属于自己的园区。") + result.Unauthorized("不能访问不属于自己的园区。") return } fees, err := service.MaintenanceFeeService.ListMaintenanceFees([]string{requestPark}) @@ -79,7 +79,7 @@ func createMaintenanceFeeRecord(c *gin.Context) { c.BindJSON(formData) userSession, err := _retreiveSession(c) if err != nil { - result.Failure(http.StatusInternalServerError, err.Error()) + result.Unauthorized(err.Error()) return } sure, err := service.ParkService.EnsurePark(userSession.Uid, formData.ParkId) @@ -88,7 +88,7 @@ func createMaintenanceFeeRecord(c *gin.Context) { return } if !sure { - result.NotAccept("不能访问不属于自己的园区。") + result.Unauthorized("不能访问不属于自己的园区。") return } newMaintenanceFee := &model.MaintenanceFee{} diff --git a/controller/park.go b/controller/park.go index 13c00da..4e84c80 100644 --- a/controller/park.go +++ b/controller/park.go @@ -37,7 +37,7 @@ func listAllParksUnderSessionUser(c *gin.Context) { result := response.NewResult(c) userSession, err := _retreiveSession(c) if err != nil { - result.Failure(http.StatusInternalServerError, err.Error()) + result.Unauthorized(err.Error()) return } parks, err := service.ParkService.ListAllParkBelongsTo(userSession.Uid) @@ -76,7 +76,7 @@ func createNewPark(c *gin.Context) { result := response.NewResult(c) userSession, err := _retreiveSession(c) if err != nil { - result.Failure(http.StatusInternalServerError, err.Error()) + result.Unauthorized(err.Error()) return } formData := new(_ParkInfoFormData) @@ -100,7 +100,7 @@ func modifyPark(c *gin.Context) { result := response.NewResult(c) userSession, err := _retreiveSession(c) if err != nil { - result.Failure(http.StatusInternalServerError, err.Error()) + result.Unauthorized(err.Error()) return } requestParkId := c.Param("pid") @@ -112,7 +112,7 @@ func modifyPark(c *gin.Context) { return } if userSession.Uid != park.UserId { - result.NotAccept("不能修改不属于自己的园区。") + result.Unauthorized("不能修改不属于自己的园区。") return } copier.Copy(park, formData) @@ -130,7 +130,7 @@ func fetchParkDetail(c *gin.Context) { result := response.NewResult(c) userSession, err := _retreiveSession(c) if err != nil { - result.Failure(http.StatusInternalServerError, err.Error()) + result.Unauthorized(err.Error()) return } requestParkId := c.Param("pid") @@ -140,7 +140,7 @@ func fetchParkDetail(c *gin.Context) { return } if userSession.Uid != park.UserId { - result.NotAccept("不能访问不属于自己的园区。") + result.Unauthorized("不能访问不属于自己的园区。") return } result.Json(http.StatusOK, "已经获取到指定园区的信息。", gin.H{"park": park}) @@ -154,7 +154,7 @@ func changeParkEnableState(c *gin.Context) { result := response.NewResult(c) userSession, err := _retreiveSession(c) if err != nil { - result.Failure(http.StatusInternalServerError, err.Error()) + result.Unauthorized(err.Error()) return } requestParkId := c.Param("pid") @@ -172,7 +172,7 @@ func deleteSpecificPark(c *gin.Context) { result := response.NewResult(c) userSession, err := _retreiveSession(c) if err != nil { - result.Failure(http.StatusInternalServerError, err.Error()) + result.Unauthorized(err.Error()) return } requestParkId := c.Param("pid") diff --git a/response/base_response.go b/response/base_response.go index 8e4a267..28826b6 100644 --- a/response/base_response.go +++ b/response/base_response.go @@ -42,6 +42,14 @@ func (r *Result) Error(code int, msg string) { r.Ctx.JSON(http.StatusOK, res) } +// 用户未获得授权)响应 +func (r *Result) Unauthorized(msg string) { + res := BaseResponse{} + res.Code = http.StatusUnauthorized + res.Message = msg + r.Ctx.JSON(http.StatusOK, res) +} + // 简易操作成功信息 func (r *Result) Success(msg string) { res := BaseResponse{}