diff --git a/link_homework/api/v1/record/Record.go b/link_homework/api/v1/record/Record.go index ea29366..9c84435 100644 --- a/link_homework/api/v1/record/Record.go +++ b/link_homework/api/v1/record/Record.go @@ -44,7 +44,7 @@ type GetShopInfoByDeptIdReq struct { } type GetShopInfoByDeptIdRes struct { - ShopId string `json:"shopId" orm:"db:cms;member_info;column:shopId" dc:"门店id"` + ShopId string `json:"shopId" orm:"db:cms;table:member_info;column:shopId" dc:"门店id"` ShopName string `json:"shopName" orm:"db:cms;member_info;column:shopName" dc:"门店名"` } diff --git a/link_homework/internal/cmd/cmd.go b/link_homework/internal/cmd/cmd.go index 4b4dc72..c67a6ce 100644 --- a/link_homework/internal/cmd/cmd.go +++ b/link_homework/internal/cmd/cmd.go @@ -51,7 +51,8 @@ var ( //客户端 s.Group("/api/homework_client", func(group *ghttp.RouterGroup) { //group.Middleware(middleware.MiddlewareCORS) - group.Middleware(middleware.MiddlewareIsLogin) + //group.Middleware(middleware.MiddlewareIsLogin) + group.Middleware(middleware.MiddlewareIsLoginClient) //gfToken.Middleware(ctx, group) //直接写接口,不用再分组 group.POST("/gethomeworklist", clientPage.NewClientPage().GetHomeworkList) diff --git a/link_homework/internal/logic/middleware/interceptor.go b/link_homework/internal/logic/middleware/interceptor.go index 464f1ef..a10bf80 100644 --- a/link_homework/internal/logic/middleware/interceptor.go +++ b/link_homework/internal/logic/middleware/interceptor.go @@ -3,6 +3,7 @@ package middleware import ( "github.com/gogf/gf/v2/net/ghttp" "link_homework/internal/model/dto" + "link_homework/internal/service" ) func MiddlewareCORS(r *ghttp.Request) { @@ -12,10 +13,24 @@ func MiddlewareCORS(r *ghttp.Request) { func MiddlewareIsLogin(r *ghttp.Request) { token := r.GetHeader("token") - if token == "" { + valid, err := service.LoginLogic().ValidateToken(r.Context(), token) + if err != nil || !valid { r.Response.WriteJsonExit(dto.Result{ Code: 401, - Message: "未登录", + Message: "Token 无效123", + }) + } else { + r.Middleware.Next() + } +} + +func MiddlewareIsLoginClient(r *ghttp.Request) { + token := r.GetHeader("token") + const LocalToken = "9ior41AF0xTIbIG2pRnnbZi0+fEeMx8pywnIlrmTwo5FbqJ9lWrSWOxp9MkpKiNtedtUafqvzIwpFKrwuMs" + if token != LocalToken { + r.Response.WriteJsonExit(dto.Result{ + Code: 401, + Message: "Token 无效123", }) } else { r.Middleware.Next()