From c42f2c651f7f4c8e0009fa1fbddca02e182fad84 Mon Sep 17 00:00:00 2001 From: Rogee Date: Sat, 20 Dec 2025 11:05:35 +0800 Subject: [PATCH] udpate --- .vscode/launch.json | 3 +- backend_v1/.air.toml | 51 +++++++------ backend_v1/app/commands/http/http.go | 12 +-- backend_v1/app/http/admin/medias.go | 2 +- backend_v1/app/http/admin/posts.go | 12 +-- backend_v1/app/http/admin/routes.manual.go | 4 +- backend_v1/app/http/admin/statistics.go | 2 +- backend_v1/app/http/admin/uploads.go | 4 +- backend_v1/app/http/posts.go | 24 +++--- backend_v1/app/http/routes.gen.go | 28 +++---- backend_v1/app/http/routes.manual.go | 6 +- backend_v1/app/http/users.go | 4 +- backend_v1/app/jobs/download_from_alioss.go | 2 +- backend_v1/app/jobs/publish_draft_posts.go | 4 +- backend_v1/app/jobs/video_cut.go | 4 +- .../app/jobs/video_extract_head_image.go | 2 +- backend_v1/app/jobs/video_store_short.go | 2 +- backend_v1/app/middlewares/mid_auth.go | 73 +++++++++++++++++++ backend_v1/app/middlewares/mid_auth_admin.go | 34 +++++++++ .../app/middlewares/mid_wechat_mp_verify.go | 19 +++++ backend_v1/app/middlewares/middlewares.go | 5 ++ backend_v1/app/middlewares/provider.gen.go | 13 +++- .../app/services/{medias.go => media.go} | 16 ++-- backend_v1/app/services/provider.gen.go | 8 +- backend_v1/app/services/services.gen.go | 6 +- 25 files changed, 245 insertions(+), 95 deletions(-) create mode 100644 backend_v1/app/middlewares/mid_auth.go create mode 100644 backend_v1/app/middlewares/mid_auth_admin.go create mode 100644 backend_v1/app/middlewares/mid_wechat_mp_verify.go rename backend_v1/app/services/{medias.go => media.go} (78%) diff --git a/.vscode/launch.json b/.vscode/launch.json index 2d68bd2..5ab320f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,8 @@ "type": "go", "request": "launch", "mode": "auto", - "program": "${workspaceFolder}", + "cwd": "backend_v1", + "program": "${workspaceFolder}/backend_v1/main.go", "args": [ "serve" ], diff --git a/backend_v1/.air.toml b/backend_v1/.air.toml index f97236a..f841839 100644 --- a/backend_v1/.air.toml +++ b/backend_v1/.air.toml @@ -1,40 +1,39 @@ # .air.toml - Air 热重载配置文件 - root = "." testdata_dir = "testdata" tmp_dir = "tmp" [build] - args_bin = [] - bin = "./tmp/main" - cmd = "go build -o ./tmp/main ." - delay = 1000 - exclude_dir = ["assets", "tmp", "vendor", "testdata", "frontend"] - exclude_file = [] - exclude_regex = ["_test.go"] - exclude_unchanged = false - follow_symlink = false - full_bin = "" - include_dir = [] - include_ext = ["go", "tpl", "tmpl", "html", "yaml", "yml", "toml"] - kill_delay = "0s" - log = "build-errors.log" - send_interrupt = false - stop_on_root = false +args_bin = ["serve"] +bin = "./tmp/main" +cmd = "go build -o ./tmp/main ." +delay = 1000 +exclude_dir = ["assets", "tmp", "vendor", "testdata", "frontend"] +exclude_file = [] +exclude_regex = ["_test.go"] +exclude_unchanged = false +follow_symlink = false +full_bin = "" +include_dir = [] +include_ext = ["go", "tpl", "tmpl", "html", "yaml", "yml", "toml"] +kill_delay = "0s" +log = "build-errors.log" +send_interrupt = false +stop_on_root = false [color] - app = "" - build = "yellow" - main = "magenta" - runner = "green" - watcher = "cyan" +app = "" +build = "yellow" +main = "magenta" +runner = "green" +watcher = "cyan" [log] - time = false +time = false [misc] - clean_on_exit = false +clean_on_exit = false [screen] - clear_on_rebuild = false - keep_scroll = true \ No newline at end of file +clear_on_rebuild = false +keep_scroll = true diff --git a/backend_v1/app/commands/http/http.go b/backend_v1/app/commands/http/http.go index 9b3a68c..b539cd7 100644 --- a/backend_v1/app/commands/http/http.go +++ b/backend_v1/app/commands/http/http.go @@ -56,11 +56,12 @@ func Command() atom.Option { type Service struct { dig.In - App *app.Config - Job *job.Job - Http *http.Service - Initials []contracts.Initial `group:"initials"` - Routes []contracts.HttpRoute `group:"routes"` + App *app.Config + Job *job.Job + Middleware *middlewares.Middlewares + Http *http.Service + Initials []contracts.Initial `group:"initials"` + Routes []contracts.HttpRoute `group:"routes"` } func Serve(cmd *cobra.Command, args []string) error { @@ -76,6 +77,7 @@ func Serve(cmd *cobra.Command, args []string) error { svc.Http.Engine.Use(favicon.New(favicon.Config{ Data: []byte{}, })) + svc.Http.Engine.Use(svc.Middleware.DebugMode) for _, route := range svc.Routes { group := svc.Http.Engine.Group(route.Path(), route.Middlewares()...).Name(route.Name()) diff --git a/backend_v1/app/http/admin/medias.go b/backend_v1/app/http/admin/medias.go index c43d2ed..0bf432e 100644 --- a/backend_v1/app/http/admin/medias.go +++ b/backend_v1/app/http/admin/medias.go @@ -27,7 +27,7 @@ type medias struct { // @Bind pagination query // @Bind query query func (ctl *medias) List(ctx fiber.Ctx, pagination *requests.Pagination, query *ListQuery) (*requests.Pager, error) { - return services.Medias.List(ctx, pagination, models.MediaQuery.Name.Like(database.WrapLike(*query.Keyword))) + return services.Media.List(ctx, pagination, models.MediaQuery.Name.Like(database.WrapLike(*query.Keyword))) } // Show media diff --git a/backend_v1/app/http/admin/posts.go b/backend_v1/app/http/admin/posts.go index 012707a..95231ae 100644 --- a/backend_v1/app/http/admin/posts.go +++ b/backend_v1/app/http/admin/posts.go @@ -39,7 +39,7 @@ func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Li return nil, err } - postIds := lo.Map(pager.Items.([]models.Post), func(item models.Post, _ int) int64 { + postIds := lo.Map(pager.Items.([]*models.Post), func(item *models.Post, _ int) int64 { return item.ID }) if len(postIds) > 0 { @@ -48,13 +48,13 @@ func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Li return pager, err } - items := lo.Map(pager.Items.([]models.Post), func(item models.Post, _ int) PostItem { + items := lo.Map(pager.Items.([]*models.Post), func(item *models.Post, _ int) PostItem { cnt := int64(0) if v, ok := postCntMap[item.ID]; ok { cnt = v } - return PostItem{Post: &item, BoughtCount: cnt} + return PostItem{Post: item, BoughtCount: cnt} }) pager.Items = items @@ -97,7 +97,7 @@ func (ctl *posts) Create(ctx fiber.Ctx, form *PostForm) error { } if form.Medias != nil { - medias, err := services.Medias.GetByIds(ctx, form.Medias) + medias, err := services.Media.GetByIds(ctx, form.Medias) if err != nil { return err } @@ -140,7 +140,7 @@ func (ctl *posts) Update(ctx fiber.Ctx, post *models.Post, form *PostForm) error post.Tags = types.NewJSONType([]string{}) if form.Medias != nil { - medias, err := services.Medias.GetByIds(ctx, form.Medias) + medias, err := services.Media.GetByIds(ctx, form.Medias) if err != nil { return err } @@ -192,7 +192,7 @@ type PostItem struct { // @Router /admin/posts/:id [get] // @Bind post path key(id) model(id) func (ctl *posts) Show(ctx fiber.Ctx, post *models.Post) (*PostItem, error) { - medias, err := services.Medias.GetByIds(ctx, lo.Map(post.Assets.Data(), func(asset fields.MediaAsset, _ int) int64 { + medias, err := services.Media.GetByIds(ctx, lo.Map(post.Assets.Data(), func(asset fields.MediaAsset, _ int) int64 { return asset.Media })) if err != nil { diff --git a/backend_v1/app/http/admin/routes.manual.go b/backend_v1/app/http/admin/routes.manual.go index 003e032..a221022 100644 --- a/backend_v1/app/http/admin/routes.manual.go +++ b/backend_v1/app/http/admin/routes.manual.go @@ -5,5 +5,7 @@ func (r *Routes) Path() string { } func (r *Routes) Middlewares() []any { - return []any{} + return []any{ + r.middlewares.AuthAdmin, + } } diff --git a/backend_v1/app/http/admin/statistics.go b/backend_v1/app/http/admin/statistics.go index 4eed135..d1b5931 100644 --- a/backend_v1/app/http/admin/statistics.go +++ b/backend_v1/app/http/admin/statistics.go @@ -47,7 +47,7 @@ func (s *statistics) statistics(ctx fiber.Ctx) (*StatisticsResponse, error) { return nil, err } - statistics.Media, err = services.Medias.Count(ctx) + statistics.Media, err = services.Media.Count(ctx) if err != nil { return nil, err } diff --git a/backend_v1/app/http/admin/uploads.go b/backend_v1/app/http/admin/uploads.go index 6122150..f7cfd82 100644 --- a/backend_v1/app/http/admin/uploads.go +++ b/backend_v1/app/http/admin/uploads.go @@ -46,7 +46,7 @@ type PreCheckResp struct { // @Bind ext path // @Bind mime query func (up *uploads) PreUploadCheck(ctx fiber.Ctx, md5, ext, mime string) (*PreCheckResp, error) { - _, err := services.Medias.GetByHash(ctx, md5) + _, err := services.Media.GetByHash(ctx, md5) if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { preSign, err := up.oss.PreSignUpload(ctx, fmt.Sprintf("%s.%s", md5, ext), mime) if err != nil { @@ -77,7 +77,7 @@ type PostUploadedForm struct { // @Router /admin/uploads/post-uploaded-action [post] // @Bind body body func (up *uploads) PostUploadedAction(ctx fiber.Ctx, body *PostUploadedForm) error { - m, err := services.Medias.GetByHash(ctx, body.Md5) + m, err := services.Media.GetByHash(ctx, body.Md5) if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { return err } diff --git a/backend_v1/app/http/posts.go b/backend_v1/app/http/posts.go index ad014a5..8f55fb3 100644 --- a/backend_v1/app/http/posts.go +++ b/backend_v1/app/http/posts.go @@ -42,7 +42,7 @@ type posts struct { // @Param pagination query requests.Pagination false "分页参数" // @Param query query ListQuery false "筛选条件" // @Success 200 {object} requests.Pager{items=PostItem} "成功" -// @Router /posts [get] +// @Router /v1/posts [get] // @Bind pagination query // @Bind query query // @Bind user local @@ -55,7 +55,11 @@ func (ctl *posts) List( tbl, _ := models.PostQuery.QueryContext(ctx) conds := []gen.Condition{ tbl.Status.Eq(fields.PostStatusPublished), - tbl.Title.Like(database.WrapLike(*query.Keyword)), + } + if query.Keyword != nil && *query.Keyword != "" { + conds = append(conds, + tbl.Title.Like(database.WrapLike(*query.Keyword)), + ) } pager, err := services.Posts.List(ctx, pagination, conds...) @@ -64,14 +68,14 @@ func (ctl *posts) List( return nil, err } - postIds := lo.Map(pager.Items.([]models.Post), func(item models.Post, _ int) int64 { return item.ID }) + postIds := lo.Map(pager.Items.([]*models.Post), func(item *models.Post, _ int) int64 { return item.ID }) if len(postIds) > 0 { userBoughtIds, err := services.Users.BatchCheckHasBought(ctx, user.ID, postIds) if err != nil { log.WithError(err).Errorf("BatchCheckHasBought err: %v", err) } - items := lo.FilterMap(pager.Items.([]models.Post), func(item models.Post, _ int) (PostItem, bool) { + items := lo.FilterMap(pager.Items.([]*models.Post), func(item *models.Post, _ int) (PostItem, bool) { medias, err := services.Posts.GetMediasByIds(ctx, item.HeadImages.Data()) if err != nil { log.Errorf("GetMediaByIds err: %v", err) @@ -132,7 +136,7 @@ type PostItem struct { // @Produce json // @Param id path int64 true "作品 ID" // @Success 200 {object} PostItem "成功" -// @Router /posts/:id/show [get] +// @Router /v1/posts/:id/show [get] // @Bind post path key(id) model(id) // @Bind user local func (ctl *posts) Show(ctx fiber.Ctx, post *models.Post, user *models.User) (*PostItem, error) { @@ -187,7 +191,7 @@ type PlayUrl struct { // @Produce json // @Param id path int64 true "作品 ID" // @Success 200 {object} PlayUrl "成功" -// @Router /posts/:id/play [get] +// @Router /v1/posts/:id/play [get] // @Bind post path key(id) model(id) // @Bind user local func (ctl *posts) Play(ctx fiber.Ctx, post *models.Post, user *models.User) (*PlayUrl, error) { @@ -207,7 +211,7 @@ func (ctl *posts) Play(ctx fiber.Ctx, post *models.Post, user *models.User) (*Pl for _, asset := range post.Assets.Data() { if asset.Type == "video/mp4" && asset.Metas != nil && asset.Metas.Short == preview { - media, err := services.Medias.FindByID(ctx, asset.Media) + media, err := services.Media.FindByID(ctx, asset.Media) if err != nil { log.WithError(err).Errorf("medias GetByID err: %v", err) return nil, err @@ -239,7 +243,7 @@ func (ctl *posts) Play(ctx fiber.Ctx, post *models.Post, user *models.User) (*Pl // @Param pagination query requests.Pagination false "分页参数" // @Param query query ListQuery false "筛选条件" // @Success 200 {object} requests.Pager{items=PostItem} "成功" -// @Router /posts/mine [get] +// @Router /v1/posts/mine [get] // @Bind pagination query // @Bind query query // @Bind user local @@ -265,7 +269,7 @@ func (ctl *posts) Mine( postIds := lo.Map(pager.Items.([]*models.Post), func(item *models.Post, _ int) int64 { return item.ID }) if len(postIds) > 0 { items := lo.FilterMap(pager.Items.([]*models.Post), func(item *models.Post, _ int) (PostItem, bool) { - medias, err := services.Medias.GetByIds(ctx, item.HeadImages.Data()) + medias, err := services.Media.GetByIds(ctx, item.HeadImages.Data()) if err != nil { log.Errorf("GetMediaByIds err: %v", err) return PostItem{}, false @@ -306,7 +310,7 @@ func (ctl *posts) Mine( // @Produce json // @Param id path int64 true "作品 ID" // @Success 200 {object} wechat.JSAPIPayParams "成功（余额支付返回 AppId=balance）" -// @Router /posts/:id/buy [post] +// @Router /v1/posts/:id/buy [post] // @Bind post path key(id) model(id) // @Bind user local func (ctl *posts) Buy(ctx fiber.Ctx, post *models.Post, user *models.User) (*wechat.JSAPIPayParams, error) { diff --git a/backend_v1/app/http/routes.gen.go b/backend_v1/app/http/routes.gen.go index a5ad585..d434369 100644 --- a/backend_v1/app/http/routes.gen.go +++ b/backend_v1/app/http/routes.gen.go @@ -45,15 +45,15 @@ func (r *Routes) Name() string { // Each route is registered with its corresponding controller action and parameter bindings. func (r *Routes) Register(router fiber.Router) { // Register routes for controller: posts - r.log.Debugf("Registering route: Get /posts -> posts.List") - router.Get("/posts"[len(r.Path()):], DataFunc3( + r.log.Debugf("Registering route: Get /v1/posts -> posts.List") + router.Get("/v1/posts"[len(r.Path()):], DataFunc3( r.posts.List, Query[requests.Pagination]("pagination"), Query[ListQuery]("query"), Local[*models.User]("user"), )) - r.log.Debugf("Registering route: Get /posts/:id/play -> posts.Play") - router.Get("/posts/:id/play"[len(r.Path()):], DataFunc2( + r.log.Debugf("Registering route: Get /v1/posts/:id/play -> posts.Play") + router.Get("/v1/posts/:id/play"[len(r.Path()):], DataFunc2( r.posts.Play, func(ctx fiber.Ctx) (*models.Post, error) { v := fiber.Params[int](ctx, "id") @@ -61,8 +61,8 @@ func (r *Routes) Register(router fiber.Router) { }, Local[*models.User]("user"), )) - r.log.Debugf("Registering route: Get /posts/:id/show -> posts.Show") - router.Get("/posts/:id/show"[len(r.Path()):], DataFunc2( + r.log.Debugf("Registering route: Get /v1/posts/:id/show -> posts.Show") + router.Get("/v1/posts/:id/show"[len(r.Path()):], DataFunc2( r.posts.Show, func(ctx fiber.Ctx) (*models.Post, error) { v := fiber.Params[int](ctx, "id") @@ -70,15 +70,15 @@ func (r *Routes) Register(router fiber.Router) { }, Local[*models.User]("user"), )) - r.log.Debugf("Registering route: Get /posts/mine -> posts.Mine") - router.Get("/posts/mine"[len(r.Path()):], DataFunc3( + r.log.Debugf("Registering route: Get /v1/posts/mine -> posts.Mine") + router.Get("/v1/posts/mine"[len(r.Path()):], DataFunc3( r.posts.Mine, Query[requests.Pagination]("pagination"), Query[ListQuery]("query"), Local[*models.User]("user"), )) - r.log.Debugf("Registering route: Post /posts/:id/buy -> posts.Buy") - router.Post("/posts/:id/buy"[len(r.Path()):], DataFunc2( + r.log.Debugf("Registering route: Post /v1/posts/:id/buy -> posts.Buy") + router.Post("/v1/posts/:id/buy"[len(r.Path()):], DataFunc2( r.posts.Buy, func(ctx fiber.Ctx) (*models.Post, error) { v := fiber.Params[int](ctx, "id") @@ -87,13 +87,13 @@ func (r *Routes) Register(router fiber.Router) { Local[*models.User]("user"), )) // Register routes for controller: users - r.log.Debugf("Registering route: Get /users/profile -> users.Profile") - router.Get("/users/profile"[len(r.Path()):], DataFunc1( + r.log.Debugf("Registering route: Get /v1/users/profile -> users.Profile") + router.Get("/v1/users/profile"[len(r.Path()):], DataFunc1( r.users.Profile, Local[*models.User]("user"), )) - r.log.Debugf("Registering route: Put /users/username -> users.Update") - router.Put("/users/username"[len(r.Path()):], Func2( + r.log.Debugf("Registering route: Put /v1/users/username -> users.Update") + router.Put("/v1/users/username"[len(r.Path()):], Func2( r.users.Update, Local[*models.User]("user"), Body[ProfileForm]("form"), diff --git a/backend_v1/app/http/routes.manual.go b/backend_v1/app/http/routes.manual.go index cb8df6d..b98db69 100644 --- a/backend_v1/app/http/routes.manual.go +++ b/backend_v1/app/http/routes.manual.go @@ -1,9 +1,11 @@ package http func (r *Routes) Path() string { - return "/http" + return "/v1" } func (r *Routes) Middlewares() []any { - return []any{} + return []any{ + r.middlewares.AuthFrontend, + } } diff --git a/backend_v1/app/http/users.go b/backend_v1/app/http/users.go index e337704..9c4c44c 100644 --- a/backend_v1/app/http/users.go +++ b/backend_v1/app/http/users.go @@ -27,7 +27,7 @@ type UserInfo struct { // @Tags Users // @Produce json // @Success 200 {object} UserInfo "成功" -// @Router /users/profile [get] +// @Router /v1/users/profile [get] // @Bind user local func (ctl *users) Profile(ctx fiber.Ctx, user *models.User) (*UserInfo, error) { return &UserInfo{ @@ -51,7 +51,7 @@ type ProfileForm struct { // @Produce json // @Param form body ProfileForm true "请求体" // @Success 200 {object} any "成功" -// @Router /users/username [put] +// @Router /v1/users/username [put] // @Bind user local // @Bind form body func (ctl *users) Update(ctx fiber.Ctx, user *models.User, form *ProfileForm) error { diff --git a/backend_v1/app/jobs/download_from_alioss.go b/backend_v1/app/jobs/download_from_alioss.go index 1b06e89..7522f44 100644 --- a/backend_v1/app/jobs/download_from_alioss.go +++ b/backend_v1/app/jobs/download_from_alioss.go @@ -53,7 +53,7 @@ func (w *DownloadFromAliOSSWorker) Work(ctx context.Context, job *Job[DownloadFr log.Infof("[Start] Working on job with strings: %+v", job.Args) defer log.Infof("[End] Finished %s", job.Args.Kind()) - media, err := services.Medias.GetByHash(ctx, job.Args.MediaHash) + media, err := services.Media.GetByHash(ctx, job.Args.MediaHash) if err != nil { log.Errorf("Error getting media by ID: %v", err) return JobCancel(err) diff --git a/backend_v1/app/jobs/publish_draft_posts.go b/backend_v1/app/jobs/publish_draft_posts.go index 43d60d7..f036cc9 100644 --- a/backend_v1/app/jobs/publish_draft_posts.go +++ b/backend_v1/app/jobs/publish_draft_posts.go @@ -58,13 +58,13 @@ func (w *PublishDraftPostsWorker) Work(ctx context.Context, job *Job[PublishDraf log.Infof("[Start] Working on job with strings: %+v", job.Args) defer log.Infof("[End] Finished %s", job.Args.Kind()) - media, err := services.Medias.GetByHash(ctx, job.Args.MediaHash) + media, err := services.Media.GetByHash(ctx, job.Args.MediaHash) if err != nil { log.Errorf("Error getting media by ID: %v", err) return JobCancel(err) } - relationMedias, err := services.Medias.GetRelations(ctx, media.Hash) + relationMedias, err := services.Media.GetRelations(ctx, media.Hash) if err != nil { log.Errorf("Error getting relation medias: %v", err) return JobCancel(err) diff --git a/backend_v1/app/jobs/video_cut.go b/backend_v1/app/jobs/video_cut.go index ddcc147..49bee2e 100644 --- a/backend_v1/app/jobs/video_cut.go +++ b/backend_v1/app/jobs/video_cut.go @@ -54,7 +54,7 @@ func (w *VideoCutWorker) Work(ctx context.Context, job *Job[VideoCut]) error { log.Infof("[Start] Working on job with strings: %+v", job.Args) defer log.Infof("[End] Finished %s", job.Args.Kind()) - media, err := services.Medias.GetByHash(ctx, job.Args.MediaHash) + media, err := services.Media.GetByHash(ctx, job.Args.MediaHash) if err != nil { log.Errorf("Error getting media by ID: %v", err) return JobCancel(err) @@ -81,7 +81,7 @@ func (w *VideoCutWorker) Work(ctx context.Context, job *Job[VideoCut]) error { Short: false, Duration: duration, } - if err := services.Medias.UpdateMetas(ctx, media.ID, metas); err != nil { + if err := services.Media.UpdateMetas(ctx, media.ID, metas); err != nil { log.Errorf("Error updating media metas: %v", err) return errors.Wrap(err, "update media metas") } diff --git a/backend_v1/app/jobs/video_extract_head_image.go b/backend_v1/app/jobs/video_extract_head_image.go index 021561b..6e39bfb 100644 --- a/backend_v1/app/jobs/video_extract_head_image.go +++ b/backend_v1/app/jobs/video_extract_head_image.go @@ -59,7 +59,7 @@ func (w *VideoExtractHeadImageWorker) Work(ctx context.Context, job *Job[VideoEx log.Infof("[Start] Working on job with strings: %+v", job.Args) defer log.Infof("[End] Finished %s", job.Args.Kind()) - media, err := services.Medias.GetByHash(ctx, job.Args.MediaHash) + media, err := services.Media.GetByHash(ctx, job.Args.MediaHash) if err != nil { log.Errorf("Error getting media by ID: %v", err) return JobCancel(err) diff --git a/backend_v1/app/jobs/video_store_short.go b/backend_v1/app/jobs/video_store_short.go index c86ac7d..566e108 100644 --- a/backend_v1/app/jobs/video_store_short.go +++ b/backend_v1/app/jobs/video_store_short.go @@ -59,7 +59,7 @@ func (w *VideoStoreShortWorker) Work(ctx context.Context, job *Job[VideoStoreSho log.Infof("[Start] Working on job with strings: %+v", job.Args) defer log.Infof("[End] Finished %s", job.Args.Kind()) - media, err := services.Medias.GetByHash(ctx, job.Args.MediaHash) + media, err := services.Media.GetByHash(ctx, job.Args.MediaHash) if err != nil { log.Errorf("Error getting media by ID: %v", err) return JobCancel(err) diff --git a/backend_v1/app/middlewares/mid_auth.go b/backend_v1/app/middlewares/mid_auth.go new file mode 100644 index 0000000..dffc2aa --- /dev/null +++ b/backend_v1/app/middlewares/mid_auth.go @@ -0,0 +1,73 @@ +package middlewares + +import ( + "net/url" + "strings" + + "quyun/v2/app/services" + "quyun/v2/pkg/utils" + + "github.com/gofiber/fiber/v3" + log "github.com/sirupsen/logrus" +) + +func (f *Middlewares) AuthFrontend(ctx fiber.Ctx) error { + if strings.HasPrefix(ctx.Path(), "/v1/auth/") { + return ctx.Next() + } + + if f.app.IsDevMode() && true { + user, err := services.Users.FindByID(ctx.Context(), 1001) + if err != nil { + return ctx.Send([]byte("User not found")) + } + ctx.Locals("user", user) + return ctx.Next() + } + + fullUrl := utils.FullURI(ctx) + u, err := url.Parse(fullUrl) + if err != nil { + return err + } + query := u.Query() + query.Set("redirect", fullUrl) + u.RawQuery = query.Encode() + u.Path = "/v1/auth/wechat" // TODO: use phone validation + fullUrl = u.String() + + // check cookie exists + cookie := ctx.Cookies("token") + log.Infof("cookie: %s", cookie) + if cookie == "" { + log.Infof("auth redirect_uri: %s", fullUrl) + if ctx.XHR() { + return ctx.SendStatus(fiber.StatusUnauthorized) + } + return ctx.Redirect().To(fullUrl) + } + + jwt, err := f.jwt.Parse(cookie) + if err != nil { + // remove cookie + ctx.ClearCookie("token") + if ctx.XHR() { + return ctx.SendStatus(fiber.StatusUnauthorized) + } + return ctx.Redirect().To(fullUrl) + } + + user, err := services.Users.FindByID(ctx.Context(), jwt.UserID) + if err != nil { + // remove cookie + ctx.ClearCookie("token") + if ctx.XHR() { + return ctx.SendStatus(fiber.StatusUnauthorized) + } + return ctx.Redirect().To(fullUrl) + } + + ctx.Locals("user", user) + + return ctx.Next() +} diff --git a/backend_v1/app/middlewares/mid_auth_admin.go b/backend_v1/app/middlewares/mid_auth_admin.go new file mode 100644 index 0000000..786b5a4 --- /dev/null +++ b/backend_v1/app/middlewares/mid_auth_admin.go @@ -0,0 +1,34 @@ +package middlewares + +import ( + "strings" + + "github.com/gofiber/fiber/v3" +) + +func (f *Middlewares) AuthAdmin(ctx fiber.Ctx) error { + if !strings.HasPrefix(ctx.Path(), "/v1/admin") { + return ctx.Next() + } + + if ctx.Path() == "/v1/admin/auth" { + return ctx.Next() + } + + token := ctx.Get("Authorization") + if token == "" { + token = ctx.Query("token") + if token == "" { + return ctx.Status(fiber.StatusUnauthorized).SendString("Unauthorized") + } + } + jwt, err := f.jwt.Parse(token) + if err != nil { + return ctx.Status(fiber.StatusUnauthorized).SendString("Unauthorized") + } + if jwt.UserID != -20140202 { + return ctx.Status(fiber.StatusForbidden).SendString("Forbidden") + } + + return ctx.Next() +} diff --git a/backend_v1/app/middlewares/mid_wechat_mp_verify.go b/backend_v1/app/middlewares/mid_wechat_mp_verify.go new file mode 100644 index 0000000..8ebc77d --- /dev/null +++ b/backend_v1/app/middlewares/mid_wechat_mp_verify.go @@ -0,0 +1,19 @@ +package middlewares + +import ( + "strings" + + "github.com/gofiber/fiber/v3" +) + +func (f *Middlewares) WechatMpVerify(ctx fiber.Ctx) error { + if !strings.HasPrefix(ctx.Path(), "/MP_verify_") { + return ctx.Next() + } + + path := strings.Replace(ctx.Path(), "MP_verify_", "", 1) + path = strings.Replace(path, ".txt", "", 1) + path = strings.Trim(path, "/") + + return ctx.SendString(path) +} diff --git a/backend_v1/app/middlewares/middlewares.go b/backend_v1/app/middlewares/middlewares.go index 69e0e4c..a44064d 100644 --- a/backend_v1/app/middlewares/middlewares.go +++ b/backend_v1/app/middlewares/middlewares.go @@ -1,12 +1,17 @@ package middlewares import ( + "quyun/v2/providers/app" + "quyun/v2/providers/jwt" + log "github.com/sirupsen/logrus" ) // @provider type Middlewares struct { log *log.Entry `inject:"false"` + app *app.Config + jwt *jwt.JWT } func (f *Middlewares) Prepare() error { diff --git a/backend_v1/app/middlewares/provider.gen.go b/backend_v1/app/middlewares/provider.gen.go index f84d36c..0fea5eb 100755 --- a/backend_v1/app/middlewares/provider.gen.go +++ b/backend_v1/app/middlewares/provider.gen.go @@ -1,13 +1,22 @@ package middlewares import ( + "quyun/v2/providers/app" + "quyun/v2/providers/jwt" + "go.ipao.vip/atom/container" "go.ipao.vip/atom/opt" ) func Provide(opts ...opt.Option) error { - if err := container.Container.Provide(func() (*Middlewares, error) { - obj := &Middlewares{} + if err := container.Container.Provide(func( + app *app.Config, + jwt *jwt.JWT, + ) (*Middlewares, error) { + obj := &Middlewares{ + app: app, + jwt: jwt, + } if err := obj.Prepare(); err != nil { return nil, err } diff --git a/backend_v1/app/services/medias.go b/backend_v1/app/services/media.go similarity index 78% rename from backend_v1/app/services/medias.go rename to backend_v1/app/services/media.go index 7b45d2b..842fc69 100644 --- a/backend_v1/app/services/medias.go +++ b/backend_v1/app/services/media.go @@ -12,9 +12,9 @@ import ( ) // @provider -type medias struct{} +type media struct{} -func (m *medias) List( +func (m *media) List( ctx context.Context, pagination *requests.Pagination, conds ...gen.Condition, @@ -39,7 +39,7 @@ func (m *medias) List( } // GetByIds -func (m *medias) GetByIds(ctx context.Context, ids []int64) ([]*models.Media, error) { +func (m *media) GetByIds(ctx context.Context, ids []int64) ([]*models.Media, error) { if len(ids) == 0 { return []*models.Media{}, nil } @@ -57,7 +57,7 @@ func (m *medias) GetByIds(ctx context.Context, ids []int64) ([]*models.Media, er } // GetByHash -func (m *medias) GetByHash(ctx context.Context, hash string) (*models.Media, error) { +func (m *media) GetByHash(ctx context.Context, hash string) (*models.Media, error) { tbl, query := models.MediaQuery.QueryContext(ctx) item, err := query. Where(tbl.Hash.Eq(hash)). @@ -69,7 +69,7 @@ func (m *medias) GetByHash(ctx context.Context, hash string) (*models.Media, err } // UpdateMetas -func (m *medias) UpdateMetas(ctx context.Context, id int64, metas fields.MediaMetas) error { +func (m *media) UpdateMetas(ctx context.Context, id int64, metas fields.MediaMetas) error { tbl, query := models.MediaQuery.QueryContext(ctx) _, err := query. Where(tbl.ID.Eq(id)). @@ -82,13 +82,13 @@ func (m *medias) UpdateMetas(ctx context.Context, id int64, metas fields.MediaMe // GetRelationMedias -func (m *medias) GetRelations(ctx context.Context, hash string) ([]*models.Media, error) { +func (m *media) GetRelations(ctx context.Context, hash string) ([]*models.Media, error) { tbl, query := models.MediaQuery.QueryContext(ctx) return query.Where(tbl.Metas.KeyEq("parent_hash", hash)).Find() } // FindByID -func (m *medias) FindByID(ctx context.Context, id int64) (*models.Media, error) { +func (m *media) FindByID(ctx context.Context, id int64) (*models.Media, error) { tbl, query := models.MediaQuery.QueryContext(ctx) item, err := query.Where(tbl.ID.Eq(id)).First() if err != nil { @@ -98,7 +98,7 @@ func (m *medias) FindByID(ctx context.Context, id int64) (*models.Media, error) } // Count -func (m *medias) Count(ctx context.Context, conds ...gen.Condition) (int64, error) { +func (m *media) Count(ctx context.Context, conds ...gen.Condition) (int64, error) { _, query := models.MediaQuery.QueryContext(ctx) if len(conds) > 0 { query = query.Where(conds...) diff --git a/backend_v1/app/services/provider.gen.go b/backend_v1/app/services/provider.gen.go index 495bc1f..04f3734 100755 --- a/backend_v1/app/services/provider.gen.go +++ b/backend_v1/app/services/provider.gen.go @@ -9,8 +9,8 @@ import ( ) func Provide(opts ...opt.Option) error { - if err := container.Container.Provide(func() (*medias, error) { - obj := &medias{} + if err := container.Container.Provide(func() (*media, error) { + obj := &media{} return obj, nil }); err != nil { @@ -32,14 +32,14 @@ func Provide(opts ...opt.Option) error { } if err := container.Container.Provide(func( db *gorm.DB, - medias *medias, + media *media, orders *orders, posts *posts, users *users, ) (contracts.Initial, error) { obj := &services{ db: db, - medias: medias, + media: media, orders: orders, posts: posts, users: users, diff --git a/backend_v1/app/services/services.gen.go b/backend_v1/app/services/services.gen.go index e3ce276..d505930 100644 --- a/backend_v1/app/services/services.gen.go +++ b/backend_v1/app/services/services.gen.go @@ -8,7 +8,7 @@ var _db *gorm.DB // exported CamelCase Services var ( - Medias *medias + Media *media Orders *orders Posts *posts Users *users @@ -18,7 +18,7 @@ var ( type services struct { db *gorm.DB // define Services - medias *medias + media *media orders *orders posts *posts users *users @@ -28,7 +28,7 @@ func (svc *services) Prepare() error { _db = svc.db // set exported Services here - Medias = svc.medias + Media = svc.media Orders = svc.orders Posts = svc.posts Users = svc.users