This commit is contained in:
2026-10-24 11:22:21 +08:00
parent 43642cfb56
commit 53ade059d6
6 changed files with 41 additions and 14 deletions
+5 -2
View File
@@ -14,12 +14,15 @@ import (
"go.mongodb.org/mongo-driver/mongo/options"
)
// resolvePlayletID 解析短剧ID:slug 非空时先按 slug 查 ID,否则使用传入 ID。
// resolvePlayletID 解析短剧ID:slug 非空时先按 slug 查 ID,命中失败回退 oldSlugs 兼容旧链接;否则使用传入 ID。
func resolvePlayletID(ctx context.Context, id int64, slug string, required bool) (int64, *srvdef.SrvErr) {
slug = strings.TrimSpace(slug)
if slug != "" {
item, err := playletmod.FindOnePlaylet(ctx, bson.M{
playletmod.FN.Playlet.Slug: slug,
"$or": []bson.M{
{playletmod.FN.Playlet.Slug: slug},
{playletmod.FN.Playlet.OldSlugs: slug},
},
}, options.FindOne().SetProjection(bson.D{
{Key: playletmod.FN.Playlet.Id, Value: 1},
}))
+9 -9
View File
@@ -123,14 +123,14 @@ func GetM3U8Ex(ctx *gin.Context) {
mediaID, expireAt, origM3u8Name, ip, ticket,
)
if !ticketOK {
m3u8Name = H5M3U8FallbackPath
log.Warn("【GetM3U8Ex】H5播放票据无效",
log.Any("mediaId", mediaID),
log.Any("expireAt", expireAt),
log.Any("ip", ip),
log.Any("hasTicket", ticket != ""))
}
// if !ticketOK {
// m3u8Name = H5M3U8FallbackPath
// log.Warn("【GetM3U8Ex】H5播放票据无效",
// log.Any("mediaId", mediaID),
// log.Any("expireAt", expireAt),
// log.Any("ip", ip),
// log.Any("hasTicket", ticket != ""))
// }
countTowardDailyLimit := ticketOK && ticketInfo.Playable && !ticketInfo.Preview
if countTowardDailyLimit && appg.Conf.RunMod == string(consts.RunModeProd) {
@@ -152,7 +152,7 @@ func GetM3U8Ex(ctx *gin.Context) {
log.Any("vipValid", vipValid),
log.E(countErr))
} else if cnt > limit {
m3u8Name = m3u8RateLimitFallback
// m3u8Name = m3u8RateLimitFallback
status = "rate_limited"
log.Warn("GetM3U8Ex daily rate limit, use fallback m3u8",
log.Any("ip", ip),