Compare commits

...

2 Commits

Author SHA1 Message Date
4704cf6949 fix: issues
Some checks failed
build quyun / Build (push) Failing after 1m21s
2025-12-22 12:04:38 +08:00
ed48ec46a8 feat: 使用 errgroup 并发处理 HTTP 服务和作业启动 2025-12-22 11:33:51 +08:00
3 changed files with 34 additions and 10 deletions

View File

@@ -23,6 +23,7 @@ import (
"go.ipao.vip/atom/container"
"go.ipao.vip/atom/contracts"
"github.com/go-pay/errgroup"
"github.com/gofiber/fiber/v3"
"github.com/gofiber/fiber/v3/middleware/favicon"
"github.com/rogeecn/fabfile"
@@ -93,7 +94,23 @@ func Serve(cmd *cobra.Command, args []string) error {
svc.Http.Engine.Get("/admin*", checkStaticFile(svc.App.DistAdmin))
svc.Http.Engine.Get("/*", checkStaticFile(svc.App.DistWeChat))
return svc.Http.Serve(ctx)
var eg errgroup.Group
eg.Go(func(ctx context.Context) error {
// river job
if err := svc.Job.Start(ctx); err != nil {
log.WithError(err).Error("job start failed")
return err
}
defer svc.Job.StopAndCancel(ctx)
return nil
})
eg.Go(func(ctx context.Context) error {
return svc.Http.Serve(ctx)
})
return eg.Wait()
})
}

View File

@@ -186,15 +186,20 @@ func (ctl *posts) Play(ctx fiber.Ctx, post *models.Post, user *models.User) (*Pl
// return &PlayUrl{
// Url: "https://github.com/mediaelement/mediaelement-files/raw/refs/heads/master/big_buck_bunny.mp4",
// }, nil
preview := true
bought, err := services.Users.HasBought(ctx, user.ID, post.ID)
if err != nil {
preview = false
if post.Status != fields.PostStatusPublished {
return nil, fiber.ErrNotFound
}
if bought {
preview = false
preview := true
if user != nil {
bought, err := services.Users.HasBought(ctx, user.ID, post.ID)
if err != nil {
preview = false
}
if bought {
preview = false
}
}
log.Infof("Fetching play URL for post ID: %d", post.ID)

View File

@@ -22,7 +22,9 @@ func (f *Middlewares) AuthFrontend(ctx fiber.Ctx) error {
if strings.HasPrefix(ctx.Path(), "/v1/posts/") && strings.HasSuffix(ctx.Path(), "show") {
return ctx.Next()
}
if strings.HasPrefix(ctx.Path(), "/v1/posts/") && strings.HasSuffix(ctx.Path(), "play") {
token := ctx.Get("Authorization")
if token == "" && strings.HasPrefix(ctx.Path(), "/v1/posts/") && strings.HasSuffix(ctx.Path(), "play") {
return ctx.Next()
}
@@ -47,7 +49,6 @@ func (f *Middlewares) AuthFrontend(ctx fiber.Ctx) error {
fullUrl = u.String()
// 仅使用 Header 的 Bearer Token前端 localStorage 存储,随请求透传)。
token := ctx.Get("Authorization")
if token == "" {
log.Infof("auth redirect_uri: %s", fullUrl)
if ctx.XHR() {
@@ -73,6 +74,7 @@ func (f *Middlewares) AuthFrontend(ctx fiber.Ctx) error {
}
ctx.Locals("user", user)
log.Infof("jwt login user id: %d", user.ID)
return ctx.Next()
}