diff --git a/server/canteen/internal/handler/getcanteendetailhandler.go b/server/canteen/internal/handler/getcanteendetailhandler.go index 09f6c86c..932f64f2 100644 --- a/server/canteen/internal/handler/getcanteendetailhandler.go +++ b/server/canteen/internal/handler/getcanteendetailhandler.go @@ -25,6 +25,7 @@ func GetCanteenDetailHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } // 从Token里获取对应的信息 @@ -36,6 +37,7 @@ func GetCanteenDetailHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } var req types.GetCanteenDetailReq @@ -60,5 +62,6 @@ func GetCanteenDetailHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { httpx.ErrorCtx(r.Context(), w, err) logx.Error(err) } + return } } diff --git a/server/canteen/internal/handler/routes.go b/server/canteen/internal/handler/routes.go index 6e08ffc3..308edfa7 100644 --- a/server/canteen/internal/handler/routes.go +++ b/server/canteen/internal/handler/routes.go @@ -23,6 +23,5 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Handler: SaveCanteenTypeProductHandler(serverCtx), }, }, - rest.WithJwt(serverCtx.Config.Auth.AccessSecret), ) } diff --git a/server/canteen/internal/handler/savecanteentypeproducthandler.go b/server/canteen/internal/handler/savecanteentypeproducthandler.go index 332e3346..8a81fb62 100644 --- a/server/canteen/internal/handler/savecanteentypeproducthandler.go +++ b/server/canteen/internal/handler/savecanteentypeproducthandler.go @@ -25,6 +25,7 @@ func SaveCanteenTypeProductHandler(svcCtx *svc.ServiceContext) http.HandlerFunc Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } // 从Token里获取对应的信息 @@ -36,6 +37,7 @@ func SaveCanteenTypeProductHandler(svcCtx *svc.ServiceContext) http.HandlerFunc Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } var req types.SaveCanteenTypeProductReq @@ -60,5 +62,6 @@ func SaveCanteenTypeProductHandler(svcCtx *svc.ServiceContext) http.HandlerFunc httpx.ErrorCtx(r.Context(), w, err) logx.Error(err) } + return } } diff --git a/server/data-transfer/internal/handler/getqrcodesetlisthandler.go b/server/data-transfer/internal/handler/getqrcodesetlisthandler.go index 9b8067a5..a366d2c0 100644 --- a/server/data-transfer/internal/handler/getqrcodesetlisthandler.go +++ b/server/data-transfer/internal/handler/getqrcodesetlisthandler.go @@ -2,7 +2,6 @@ package handler import ( "errors" - "fusenapi/server/data-transfer/internal/types" "net/http" "github.com/zeromicro/go-zero/core/logx" @@ -25,6 +24,7 @@ func GetQrCodeSetListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } // 从Token里获取对应的信息 @@ -36,10 +36,11 @@ func GetQrCodeSetListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } l := logic.NewGetQrCodeSetListLogic(r.Context(), svcCtx) - resp := l.GetQrCodeSetList(userinfo) + resp := l.GetQrCodeSetList() // 如果响应不为nil,则使用httpx.OkJsonCtx方法返回JSON响应; // 否则,发送500内部服务器错误的JSON响应并记录错误消息logx.Error。 if resp != nil { @@ -49,5 +50,6 @@ func GetQrCodeSetListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { httpx.ErrorCtx(r.Context(), w, err) logx.Error(err) } + return } } diff --git a/server/data-transfer/internal/handler/getstandardlogolisthandler.go b/server/data-transfer/internal/handler/getstandardlogolisthandler.go index f59897e6..1eff3761 100644 --- a/server/data-transfer/internal/handler/getstandardlogolisthandler.go +++ b/server/data-transfer/internal/handler/getstandardlogolisthandler.go @@ -25,6 +25,7 @@ func GetStandardLogoListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } // 从Token里获取对应的信息 @@ -36,6 +37,7 @@ func GetStandardLogoListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } l := logic.NewGetStandardLogoListLogic(r.Context(), svcCtx) @@ -49,5 +51,6 @@ func GetStandardLogoListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { httpx.ErrorCtx(r.Context(), w, err) logx.Error(err) } + return } } diff --git a/server/data-transfer/internal/handler/routes.go b/server/data-transfer/internal/handler/routes.go index 80e849b9..49deda1b 100644 --- a/server/data-transfer/internal/handler/routes.go +++ b/server/data-transfer/internal/handler/routes.go @@ -33,6 +33,5 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Handler: UploadLogoHandler(serverCtx), }, }, - rest.WithJwt(serverCtx.Config.Auth.AccessSecret), ) } diff --git a/server/data-transfer/internal/handler/uploadlogohandler.go b/server/data-transfer/internal/handler/uploadlogohandler.go index f7929b4b..26d18626 100644 --- a/server/data-transfer/internal/handler/uploadlogohandler.go +++ b/server/data-transfer/internal/handler/uploadlogohandler.go @@ -25,6 +25,7 @@ func UploadLogoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } // 从Token里获取对应的信息 @@ -36,6 +37,7 @@ func UploadLogoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } var req types.UploadLogoReq @@ -60,5 +62,6 @@ func UploadLogoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { httpx.ErrorCtx(r.Context(), w, err) logx.Error(err) } + return } } diff --git a/server/data-transfer/internal/handler/uploadqrcodehandler.go b/server/data-transfer/internal/handler/uploadqrcodehandler.go index 27422f1a..b3170434 100644 --- a/server/data-transfer/internal/handler/uploadqrcodehandler.go +++ b/server/data-transfer/internal/handler/uploadqrcodehandler.go @@ -25,6 +25,7 @@ func UploadQrcodeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } // 从Token里获取对应的信息 @@ -36,6 +37,7 @@ func UploadQrcodeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } var req types.UploadQrcodeReq @@ -60,5 +62,6 @@ func UploadQrcodeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { httpx.ErrorCtx(r.Context(), w, err) logx.Error(err) } + return } } diff --git a/server/product/internal/handler/getproductlisthandler.go b/server/product/internal/handler/getproductlisthandler.go index 6430d542..08a24ead 100644 --- a/server/product/internal/handler/getproductlisthandler.go +++ b/server/product/internal/handler/getproductlisthandler.go @@ -25,6 +25,7 @@ func GetProductListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } // 从Token里获取对应的信息 @@ -36,6 +37,7 @@ func GetProductListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } var req types.GetProductListReq @@ -60,5 +62,6 @@ func GetProductListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { httpx.ErrorCtx(r.Context(), w, err) logx.Error(err) } + return } } diff --git a/server/product/internal/handler/getsizebyproducthandler.go b/server/product/internal/handler/getsizebyproducthandler.go index 5f41b078..4504376c 100644 --- a/server/product/internal/handler/getsizebyproducthandler.go +++ b/server/product/internal/handler/getsizebyproducthandler.go @@ -25,6 +25,7 @@ func GetSizeByProductHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } // 从Token里获取对应的信息 @@ -36,6 +37,7 @@ func GetSizeByProductHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } l := logic.NewGetSizeByProductLogic(r.Context(), svcCtx) @@ -49,5 +51,6 @@ func GetSizeByProductHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { httpx.ErrorCtx(r.Context(), w, err) logx.Error(err) } + return } } diff --git a/server/product/internal/handler/getsuccessrecommandhandler.go b/server/product/internal/handler/getsuccessrecommandhandler.go index fb2bcf51..4e78cbae 100644 --- a/server/product/internal/handler/getsuccessrecommandhandler.go +++ b/server/product/internal/handler/getsuccessrecommandhandler.go @@ -25,6 +25,7 @@ func GetSuccessRecommandHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } // 从Token里获取对应的信息 @@ -36,6 +37,7 @@ func GetSuccessRecommandHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { Message: "unauthorized", }) logx.Info("unauthorized:", err.Error()) + return } var req types.GetSuccessRecommandReq @@ -60,5 +62,6 @@ func GetSuccessRecommandHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { httpx.ErrorCtx(r.Context(), w, err) logx.Error(err) } + return } } diff --git a/server/product/internal/handler/routes.go b/server/product/internal/handler/routes.go index 94658c78..0599e7f7 100644 --- a/server/product/internal/handler/routes.go +++ b/server/product/internal/handler/routes.go @@ -28,6 +28,5 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Handler: GetSizeByProductHandler(serverCtx), }, }, - rest.WithJwt(serverCtx.Config.Auth.AccessSecret), ) } diff --git a/server_api/canteen.api b/server_api/canteen.api index 28d191dd..97bc8e4f 100644 --- a/server_api/canteen.api +++ b/server_api/canteen.api @@ -7,10 +7,6 @@ info ( email: "" ) import "basic.api" -//验证登录 -@server( - jwt: Auth -) service canteen { //获取餐厅详情 @handler GetCanteenDetailHandler diff --git a/server_api/data-transfer.api b/server_api/data-transfer.api index e58aded5..8315a875 100644 --- a/server_api/data-transfer.api +++ b/server_api/data-transfer.api @@ -9,9 +9,6 @@ info ( import "basic.api" -@server( - jwt: Auth -) service data-transfer { //获取标准logo列表 @handler GetStandardLogoListHandler diff --git a/server_api/product.api b/server_api/product.api index 815f3283..fd3f2e7e 100644 --- a/server_api/product.api +++ b/server_api/product.api @@ -7,10 +7,6 @@ info ( email: "" ) import "basic.api" -//验证登录 -@server( - jwt: Auth -) service product { //获取产品列表 @handler GetProductListHandler