From 23535cf4547c10580b2dac814ae36df65848ac66 Mon Sep 17 00:00:00 2001 From: SliverHorn Date: Sat, 7 Nov 2020 00:32:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96server/api/v1/exa=5Fcustomer.?= =?UTF-8?q?go=E7=9A=84=E4=BB=A3=E7=A0=81=E5=8F=8A=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/api/v1/exa_customer.go | 76 +++++++++++++---------------------- server/api/v1/sys_user.go | 21 +++++----- 2 files changed, 37 insertions(+), 60 deletions(-) diff --git a/server/api/v1/exa_customer.go b/server/api/v1/exa_customer.go index 77c46dc8..e999b5d2 100644 --- a/server/api/v1/exa_customer.go +++ b/server/api/v1/exa_customer.go @@ -11,13 +11,13 @@ import ( "github.com/gin-gonic/gin" ) -// @Tags SysApi +// @Tags ExaCustomer // @Summary 创建客户 // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data body model.ExaCustomer true "创建客户" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Param data body model.ExaCustomer true "客户用户名, 客户手机号码" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}" // @Router /customer/customer [post] func CreateExaCustomer(c *gin.Context) { var cu model.ExaCustomer @@ -26,66 +26,53 @@ func CreateExaCustomer(c *gin.Context) { "CustomerName": {utils.NotEmpty()}, "CustomerPhoneData": {utils.NotEmpty()}, } - CustomerVerifyErr := utils.Verify(cu, CustomerVerify) - if CustomerVerifyErr != nil { + if CustomerVerifyErr := utils.Verify(cu, CustomerVerify); CustomerVerifyErr != nil { response.FailWithMessage(CustomerVerifyErr.Error(), c) return } - claims, _ := c.Get("claims") - waitUse := claims.(*request.CustomClaims) - cu.SysUserID = waitUse.ID - cu.SysUserAuthorityID = waitUse.AuthorityId - err := service.CreateExaCustomer(cu) - if err != nil { + cu.SysUserID = getUserID(c) + cu.SysUserAuthorityID = getUserAuthorityId(c) + if err := service.CreateExaCustomer(cu); err != nil { response.FailWithMessage(fmt.Sprintf("删除失败：%v", err), c) } else { response.OkWithMessage("创建成功", c) } } -// @Tags SysApi +// @Tags ExaCustomer // @Summary 删除客户 // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data body model.ExaCustomer true "删除客户" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Param data body model.ExaCustomer true "客户ID" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}" // @Router /customer/customer [delete] func DeleteExaCustomer(c *gin.Context) { var cu model.ExaCustomer _ = c.ShouldBindJSON(&cu) - CustomerVerify := utils.Rules{ - "ID": {utils.NotEmpty()}, - } - CustomerVerifyErr := utils.Verify(cu.GVA_MODEL, CustomerVerify) - if CustomerVerifyErr != nil { + if CustomerVerifyErr := utils.Verify(cu.GVA_MODEL, utils.Rules{"ID": {utils.NotEmpty()}}); CustomerVerifyErr != nil { response.FailWithMessage(CustomerVerifyErr.Error(), c) return } - err := service.DeleteExaCustomer(cu) - if err != nil { + if err := service.DeleteExaCustomer(cu); err != nil { response.FailWithMessage(fmt.Sprintf("删除失败：%v", err), c) } else { response.OkWithMessage("删除成功", c) } } -// @Tags SysApi +// @Tags ExaCustomer // @Summary 更新客户信息 // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data body model.ExaCustomer true "创建客户" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Param data body model.ExaCustomer true "客户ID, 客户信息" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}" // @Router /customer/customer [put] func UpdateExaCustomer(c *gin.Context) { var cu model.ExaCustomer _ = c.ShouldBindJSON(&cu) - IdCustomerVerify := utils.Rules{ - "ID": {utils.NotEmpty()}, - } - IdCustomerVerifyErr := utils.Verify(cu.GVA_MODEL, IdCustomerVerify) - if IdCustomerVerifyErr != nil { + if IdCustomerVerifyErr := utils.Verify(cu.GVA_MODEL, utils.Rules{"ID": {utils.NotEmpty()}}); IdCustomerVerifyErr != nil { response.FailWithMessage(IdCustomerVerifyErr.Error(), c) return } @@ -93,35 +80,29 @@ func UpdateExaCustomer(c *gin.Context) { "CustomerName": {utils.NotEmpty()}, "CustomerPhoneData": {utils.NotEmpty()}, } - CustomerVerifyErr := utils.Verify(cu, CustomerVerify) - if CustomerVerifyErr != nil { + if CustomerVerifyErr := utils.Verify(cu, CustomerVerify); CustomerVerifyErr != nil { response.FailWithMessage(CustomerVerifyErr.Error(), c) return } - err := service.UpdateExaCustomer(&cu) - if err != nil { + if err := service.UpdateExaCustomer(&cu); err != nil { response.FailWithMessage(fmt.Sprintf("更新失败：%v", err), c) } else { response.OkWithMessage("更新成功", c) } } -// @Tags SysApi +// @Tags ExaCustomer // @Summary 获取单一客户信息 // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data body model.ExaCustomer true "获取单一客户信息" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Param data body model.ExaCustomer true "客户ID" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"操作成功"}" // @Router /customer/customer [get] func GetExaCustomer(c *gin.Context) { var cu model.ExaCustomer _ = c.ShouldBindQuery(&cu) - IdCustomerVerify := utils.Rules{ - "ID": {utils.NotEmpty()}, - } - IdCustomerVerifyErr := utils.Verify(cu.GVA_MODEL, IdCustomerVerify) - if IdCustomerVerifyErr != nil { + if IdCustomerVerifyErr := utils.Verify(cu.GVA_MODEL, utils.Rules{"ID": {utils.NotEmpty()}}); IdCustomerVerifyErr != nil { response.FailWithMessage(IdCustomerVerifyErr.Error(), c) return } @@ -133,25 +114,22 @@ func GetExaCustomer(c *gin.Context) { } } -// @Tags SysApi +// @Tags ExaCustomer // @Summary 获取权限客户列表 // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data body request.PageInfo true "获取权限客户列表" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" +// @Param data body request.PageInfo true "页码, 每页大小" +// @Success 200 {string} string "{"success":true,"data":{},"msg":"操作成功"}" // @Router /customer/customerList [get] func GetExaCustomerList(c *gin.Context) { - claims, _ := c.Get("claims") - waitUse := claims.(*request.CustomClaims) var pageInfo request.PageInfo _ = c.ShouldBindQuery(&pageInfo) - PageVerifyErr := utils.Verify(pageInfo, utils.CustomizeMap["PageVerify"]) - if PageVerifyErr != nil { + if PageVerifyErr := utils.Verify(pageInfo, utils.CustomizeMap["PageVerify"]); PageVerifyErr != nil { response.FailWithMessage(PageVerifyErr.Error(), c) return } - err, customerList, total := service.GetCustomerInfoList(waitUse.AuthorityId, pageInfo) + err, customerList, total := service.GetCustomerInfoList(getUserAuthorityId(c), pageInfo) if err != nil { response.FailWithMessage(fmt.Sprintf("获取失败：%v", err), c) } else { diff --git a/server/api/v1/sys_user.go b/server/api/v1/sys_user.go index 100c7eb6..52ecc675 100644 --- a/server/api/v1/sys_user.go +++ b/server/api/v1/sys_user.go @@ -1,7 +1,6 @@ package v1 import ( - "errors" "fmt" "gin-vue-admin/global" "gin-vue-admin/global/response" @@ -169,7 +168,7 @@ func ChangePassword(c *gin.Context) { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data body request.PageInfo true "页码, 页大小" +// @Param data body request.PageInfo true "页码, 每页大小" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Router /user/getUserList [post] func GetUserList(c *gin.Context) { @@ -274,34 +273,34 @@ func SetUserInfo(c *gin.Context) { } // 从Gin的Context中获取从jwt解析出来的用户ID -func getUserID(c *gin.Context) (uint, error) { +func getUserID(c *gin.Context) uint { if claims, exists := c.Get("claims"); !exists { global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户ID失败, 请检查路由是否使用jwt中间件") - return 0, errors.New("解析失败") + return 0 } else { waitUse := claims.(*request.CustomClaims) - return waitUse.ID, nil + return waitUse.ID } } // 从Gin的Context中获取从jwt解析出来的用户UUID -func getUserUuid(c *gin.Context) (string, error) { +func getUserUuid(c *gin.Context) string { if claims, exists := c.Get("claims"); !exists { global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件") - return "", errors.New("解析失败") + return "" } else { waitUse := claims.(*request.CustomClaims) - return waitUse.UUID.String(), nil + return waitUse.UUID.String() } } // 从Gin的Context中获取从jwt解析出来的用户角色id -func getUserAuthorityId(c *gin.Context) (string, error) { +func getUserAuthorityId(c *gin.Context) string { if claims, exists := c.Get("claims"); !exists { global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件") - return "", errors.New("解析失败") + return "" } else { waitUse := claims.(*request.CustomClaims) - return waitUse.AuthorityId, nil + return waitUse.AuthorityId } } -- GitLab