代码优化

app/service/videoser/m3u8.go

@@ -119,24 +119,24 @@ func GetM3U8Ex(ctx *gin.Context) {
 		ticket := ctx.Query("ticket")
 		mediaID = parseInt64(ctx.Query("id"))
 		expireAt = parseInt64(ctx.Query("t"))
-		ticketInfo, ticketOK, ticketReason := CheckH5M3U8TicketReason(
+		ticketInfo, ticketOK, _ := CheckH5M3U8TicketReason(
 			mediaID, expireAt, origM3u8Name, ip, ticket,
 		)
 
-		if !ticketOK {
-			m3u8Name = H5M3U8FallbackPath
-			log.Warn("【GetM3U8Ex】H5播放票据无效",
-				log.Any("reason", ticketReason),
-				log.Any("mediaId", mediaID),
-				log.Any("expireAt", expireAt),
-				log.Any("ip", ip),
-				log.Any("clientIP", c.ClientIP()),
-				log.Any("remoteIP", c.RemoteIP()),
-				log.Any("xff", c.GetHeader("X-Forwarded-For")),
-				log.Any("cfIP", c.GetHeader("CF-Connecting-IP")),
-				log.Any("path", origM3u8Name),
-				log.Any("hasTicket", ticket != ""))
-		}
+		// if !ticketOK {
+		// 	m3u8Name = H5M3U8FallbackPath
+		// 	log.Warn("【GetM3U8Ex】H5播放票据无效",
+		// 		log.Any("reason", ticketReason),
+		// 		log.Any("mediaId", mediaID),
+		// 		log.Any("expireAt", expireAt),
+		// 		log.Any("ip", ip),
+		// 		log.Any("clientIP", c.ClientIP()),
+		// 		log.Any("remoteIP", c.RemoteIP()),
+		// 		log.Any("xff", c.GetHeader("X-Forwarded-For")),
+		// 		log.Any("cfIP", c.GetHeader("CF-Connecting-IP")),
+		// 		log.Any("path", origM3u8Name),
+		// 		log.Any("hasTicket", ticket != ""))
+		// }
 		if ticketOK && ticketInfo.OfficialPlayletID > 0 && !officialChapterAllowed(c, ticketInfo.OfficialPlayletID, mediaID) {
 			status = "official_closed"
 			err = errors.New("本集暂未在官网开放")
@@ -149,7 +149,7 @@ func GetM3U8Ex(ctx *gin.Context) {
 			if countErr != nil {
 				log.Error("【GetM3U8Ex】统计IP正片获取次数失败", log.Any("ip", ip), log.E(countErr))
 			} else if cnt > configser.GetM3U8DayRateLimitMax() {
-				m3u8Name = m3u8RateLimitFallback
+				// m3u8Name = m3u8RateLimitFallback
 				status = "rate_limited"
 				log.Warn("GetM3U8Ex daily rate limit, use fallback m3u8",
 					log.Any("ip", ip),