From 5ef3b40dfeda66d4ce6741801daae0d7142443a7 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Thu, 20 Jul 2023 15:45:58 +0800 Subject: [PATCH 1/3] fix --- server_api/product.api | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server_api/product.api b/server_api/product.api index f3eb5ab8..4729fd54 100644 --- a/server_api/product.api +++ b/server_api/product.api @@ -34,9 +34,6 @@ service product { //其他产品推荐列表 @handler OtherProductListHandler get /api/product/other-list (OtherProductListReq) returns (response); - //获取详情页推荐产品列表 - @handler GetRecommandProductListHandler - get /api/product/recommand (GetRecommandProductListReq) returns (response); //获取分类产品列表 @handler GetTagProductListHandler get /api/product/tag_product_list(GetTagProductListReq) returns (response); @@ -68,6 +65,9 @@ service product { //获取产品千人千面设计方案 @handler GetLastProductDesignHandler get /api/product/get_last_product_design(request) returns (response); + //获取详情页推荐产品列表 + @handler GetRecommandProductListHandler + get /api/product/recommand (GetRecommandProductListReq) returns (response); //*********************产品详情分解接口结束*********************** //*********************推荐产品接口开始×××××××××××××××××××××××××× From b93c2d4708e331aaad6fe3d13162ee9e53d14fec Mon Sep 17 00:00:00 2001 From: Hiven Date: Thu, 20 Jul 2023 15:55:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home-user-auth/internal/handler/routes.go | 2 +- .../internal/handler/userorderlisthandler.go | 28 +++++++++++++++++++ ...rderlistlogic.go => userorderlistlogic.go} | 10 +++---- server/home-user-auth/internal/types/types.go | 4 +-- server_api/home-user-auth.api | 10 +++---- 5 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 server/home-user-auth/internal/handler/userorderlisthandler.go rename server/home-user-auth/internal/logic/{getuserorderlistlogic.go => userorderlistlogic.go} (93%) diff --git a/server/home-user-auth/internal/handler/routes.go b/server/home-user-auth/internal/handler/routes.go index 9d1c303a..88082836 100644 --- a/server/home-user-auth/internal/handler/routes.go +++ b/server/home-user-auth/internal/handler/routes.go @@ -75,7 +75,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { Method: http.MethodGet, Path: "/api/user/order-list", - Handler: GetUserOrderListHandler(serverCtx), + Handler: UserOrderListHandler(serverCtx), }, { Method: http.MethodGet, diff --git a/server/home-user-auth/internal/handler/userorderlisthandler.go b/server/home-user-auth/internal/handler/userorderlisthandler.go new file mode 100644 index 00000000..c48130e8 --- /dev/null +++ b/server/home-user-auth/internal/handler/userorderlisthandler.go @@ -0,0 +1,28 @@ +package handler + +import ( + "net/http" + + "fusenapi/utils/basic" + + "fusenapi/server/home-user-auth/internal/logic" + "fusenapi/server/home-user-auth/internal/svc" + "fusenapi/server/home-user-auth/internal/types" +) + +func UserOrderListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + + var req types.UserOrderListReq + userinfo, err := basic.RequestParse(w, r, svcCtx, &req) + if err != nil { + return + } + + // 创建一个业务逻辑层实例 + l := logic.NewUserOrderListLogic(r.Context(), svcCtx) + resp := l.UserOrderList(&req, userinfo) + + basic.AfterLogic(w, r, resp) + } +} diff --git a/server/home-user-auth/internal/logic/getuserorderlistlogic.go b/server/home-user-auth/internal/logic/userorderlistlogic.go similarity index 93% rename from server/home-user-auth/internal/logic/getuserorderlistlogic.go rename to server/home-user-auth/internal/logic/userorderlistlogic.go index 7503c8b1..9b51e532 100644 --- a/server/home-user-auth/internal/logic/getuserorderlistlogic.go +++ b/server/home-user-auth/internal/logic/userorderlistlogic.go @@ -18,21 +18,21 @@ import ( "gorm.io/gorm" ) -type GetUserOrderListLogic struct { +type UserOrderListLogic struct { logx.Logger ctx context.Context svcCtx *svc.ServiceContext } -func NewGetUserOrderListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserOrderListLogic { - return &GetUserOrderListLogic{ +func NewUserOrderListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserOrderListLogic { + return &UserOrderListLogic{ Logger: logx.WithContext(ctx), ctx: ctx, svcCtx: svcCtx, } } -func (l *GetUserOrderListLogic) GetUserOrderList(req *types.GetUserOrderListReq, userinfo *auth.UserInfo) (resp *basic.Response) { +func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo *auth.UserInfo) (resp *basic.Response) { // 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data) // userinfo 传入值时, 一定不为null @@ -136,7 +136,7 @@ func (l *GetUserOrderListLogic) GetUserOrderList(req *types.GetUserOrderListReq, } - return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetUserOrderListRsp{ + return resp.SetStatusWithMessage(basic.CodeOK, "success", types.UserOrderListRsp{ Items: respList, Meta: types.Meta{ TotalCount: total, diff --git a/server/home-user-auth/internal/types/types.go b/server/home-user-auth/internal/types/types.go index a6163430..648d0eba 100644 --- a/server/home-user-auth/internal/types/types.go +++ b/server/home-user-auth/internal/types/types.go @@ -14,7 +14,7 @@ type UserOrderCancelReq struct { type UserOrderCancelRsp struct { } -type GetUserOrderListReq struct { +type UserOrderListReq struct { Page int64 `form:"page"` // 分页 PageSize int64 `form:"page_size"` // 每页数量 Status int64 `form:"status"` // 状态筛选 @@ -23,7 +23,7 @@ type GetUserOrderListReq struct { Size int64 `form:"size"` // 图片尺寸 } -type GetUserOrderListRsp struct { +type UserOrderListRsp struct { Items []Items `json:"items"` Meta Meta `json:"_meta"` } diff --git a/server_api/home-user-auth.api b/server_api/home-user-auth.api index cb4422cb..6ca28d71 100644 --- a/server_api/home-user-auth.api +++ b/server_api/home-user-auth.api @@ -53,9 +53,9 @@ service home-user-auth { @handler UserGoogleLoginHandler get /api/user/oauth2/login/google(RequestGoogleLogin) returns (response); - //获取订单列表 - @handler GetUserOrderListHandler - get /api/user/order-list (GetUserOrderListReq) returns (response); + //订单列表 + @handler UserOrderListHandler + get /api/user/order-list (UserOrderListReq) returns (response); //取消订单 @handler UserOrderCancelHandler @@ -76,7 +76,7 @@ type ( // 获取订单列表 type ( - GetUserOrderListReq { + UserOrderListReq { Page int64 `form:"page"` // 分页 PageSize int64 `form:"page_size"` // 每页数量 Status int64 `form:"status"` // 状态筛选 @@ -85,7 +85,7 @@ type ( Size int64 `form:"size"` // 图片尺寸 } - GetUserOrderListRsp { + UserOrderListRsp { Items []Items `json:"items"` Meta Meta `json:"_meta"` } From 8258dfa8c1192589109f7a266a689b17620c9caf Mon Sep 17 00:00:00 2001 From: Hiven Date: Thu, 20 Jul 2023 16:09:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/getuserorderlisthandler.go | 78 ------------------- .../internal/handler/userorderlisthandler.go | 59 ++++++++++++-- 2 files changed, 54 insertions(+), 83 deletions(-) delete mode 100644 server/home-user-auth/internal/handler/getuserorderlisthandler.go diff --git a/server/home-user-auth/internal/handler/getuserorderlisthandler.go b/server/home-user-auth/internal/handler/getuserorderlisthandler.go deleted file mode 100644 index 9191d130..00000000 --- a/server/home-user-auth/internal/handler/getuserorderlisthandler.go +++ /dev/null @@ -1,78 +0,0 @@ -package handler - -import ( - "errors" - "net/http" - - "github.com/zeromicro/go-zero/core/logx" - "github.com/zeromicro/go-zero/rest/httpx" - - "fusenapi/utils/auth" - "fusenapi/utils/basic" - - "fusenapi/server/home-user-auth/internal/logic" - "fusenapi/server/home-user-auth/internal/svc" - "fusenapi/server/home-user-auth/internal/types" -) - -func GetUserOrderListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - - var ( - // 定义错误变量 - err error - // 定义用户信息变量 - userinfo *auth.UserInfo - ) - // 解析JWT token,并对空用户进行判断 - claims, err := svcCtx.ParseJwtToken(r) - // 如果解析JWT token出错,则返回未授权的JSON响应并记录错误消息 - if err != nil { - httpx.OkJsonCtx(r.Context(), w, &basic.Response{ - Code: 401, // 返回401状态码,表示未授权 - Message: "unauthorized", // 返回未授权信息 - }) - logx.Info("unauthorized:", err.Error()) // 记录错误日志 - return - } - - if claims != nil { - // 从token中获取对应的用户信息 - userinfo, err = auth.GetUserInfoFormMapClaims(claims) - // 如果获取用户信息出错,则返回未授权的JSON响应并记录错误消息 - if err != nil { - httpx.OkJsonCtx(r.Context(), w, &basic.Response{ - Code: 401, - Message: "unauthorized", - }) - logx.Info("unauthorized:", err.Error()) - return - } - } else { - // 如果claims为nil,则认为用户身份为白板用户 - userinfo = &auth.UserInfo{UserId: 0, GuestId: 0} - } - - var req types.GetUserOrderListReq - // 如果端点有请求结构体，则使用httpx.Parse方法从HTTP请求体中解析请求数据 - if err := httpx.Parse(r, &req); err != nil { - httpx.OkJsonCtx(r.Context(), w, &basic.Response{ - Code: 510, - Message: "parameter error", - }) - logx.Info(err) - return - } - // 创建一个业务逻辑层实例 - l := logic.NewGetUserOrderListLogic(r.Context(), svcCtx) - resp := l.GetUserOrderList(&req, userinfo) - // 如果响应不为nil，则使用httpx.OkJsonCtx方法返回JSON响应; - if resp != nil { - httpx.OkJsonCtx(r.Context(), w, resp) - } else { - err := errors.New("server logic is error, resp must not be nil") - httpx.ErrorCtx(r.Context(), w, err) - logx.Error(err) - } - } -} diff --git a/server/home-user-auth/internal/handler/userorderlisthandler.go b/server/home-user-auth/internal/handler/userorderlisthandler.go index c48130e8..fc74c3f9 100644 --- a/server/home-user-auth/internal/handler/userorderlisthandler.go +++ b/server/home-user-auth/internal/handler/userorderlisthandler.go @@ -1,28 +1,77 @@ package handler import ( + "errors" "net/http" + "fusenapi/utils/auth" "fusenapi/utils/basic" "fusenapi/server/home-user-auth/internal/logic" "fusenapi/server/home-user-auth/internal/svc" "fusenapi/server/home-user-auth/internal/types" + + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func UserOrderListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - - var req types.UserOrderListReq - userinfo, err := basic.RequestParse(w, r, svcCtx, &req) + var ( + // 定义错误变量 + err error + // 定义用户信息变量 + userinfo *auth.UserInfo + ) + // 解析JWT token,并对空用户进行判断 + claims, err := svcCtx.ParseJwtToken(r) + // 如果解析JWT token出错,则返回未授权的JSON响应并记录错误消息 if err != nil { + httpx.OkJsonCtx(r.Context(), w, &basic.Response{ + Code: 401, // 返回401状态码,表示未授权 + Message: "unauthorized", // 返回未授权信息 + }) + logx.Info("unauthorized:", err.Error()) // 记录错误日志 return } + if claims != nil { + // 从token中获取对应的用户信息 + userinfo, err = auth.GetUserInfoFormMapClaims(claims) + // 如果获取用户信息出错,则返回未授权的JSON响应并记录错误消息 + if err != nil { + httpx.OkJsonCtx(r.Context(), w, &basic.Response{ + Code: 401, + Message: "unauthorized", + }) + logx.Info("unauthorized:", err.Error()) + return + } + } else { + // 如果claims为nil,则认为用户身份为白板用户 + userinfo = &auth.UserInfo{UserId: 0, GuestId: 0} + } + + var req types.UserOrderListReq + // 如果端点有请求结构体，则使用httpx.Parse方法从HTTP请求体中解析请求数据 + if err := httpx.Parse(r, &req); err != nil { + httpx.OkJsonCtx(r.Context(), w, &basic.Response{ + Code: 510, + Message: "parameter error", + }) + logx.Info(err) + return + } // 创建一个业务逻辑层实例 l := logic.NewUserOrderListLogic(r.Context(), svcCtx) resp := l.UserOrderList(&req, userinfo) - - basic.AfterLogic(w, r, resp) + // 如果响应不为nil，则使用httpx.OkJsonCtx方法返回JSON响应; + if resp != nil { + httpx.OkJsonCtx(r.Context(), w, resp) + } else { + err := errors.New("server logic is error, resp must not be nil") + httpx.ErrorCtx(r.Context(), w, err) + logx.Error(err) + } } }