refactor(adcenter): /api/app/ads/click 改用 AdsClickInfo，接收并透传 appId

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

app/api/adsapi/click.go

@@ -0,0 +1,31 @@
+package adsapi
+
+import (
+	"strconv"
+
+	"videoweb/app/api/proto"
+	"videoweb/app/service/configser"
+	"videoweb/pub/common"
+	"videoweb/pub/common/srvdef"
+
+	"github.com/gin-gonic/gin"
+)
+
+// Click 广告点击上报
+// @Tags 广告
+// @Summary 广告点击上报
+// @Description 用户点击广告时异步上报到广告中心。请求可带 appId 覆盖默认，缺省时按本站 appId 上报。
+// @Accept json
+// @Produce json
+// @Param param body proto.AdsClickInfo true "参数"
+// @Success 200 {string} json
+// @Router /api/app/ads/click [POST]
+func Click(c *gin.Context) {
+	var req proto.AdsClickInfo
+	if err := c.ShouldBindJSON(&req); err != nil {
+		common.ServerJSON(c, srvdef.ErrParamError, err.Error())
+		return
+	}
+	configser.AsyncAdvertiseClick(strconv.FormatInt(req.AdsId, 10), int32(req.AppId))
+	common.ServerJSON(c, srvdef.Success, nil)
+}

app/conf/app.yaml

@@ -24,11 +24,12 @@ attack:
   h5key: "kaFttDJRcahRMTI7"
   windowDurationSeconds: 60
 pprof: false
-host: "172.104.181.99"
+host: "172.104.166.87"
 listenAddr: "20001"
 origDomain: "https://yuan.bbaazz.me/"
 trustedProxies: ""
 bucketVideoAddressV2: "http://139.162.27.29:19996"
+versionUrl: "http://139.162.47.194:8089"
 adCenter:
   apiDomain: "https://adopenapi.adcs01.top"
   merchantCode: "1991129808640122880"

app/router/ads.go

@@ -0,0 +1,11 @@
+package router
+
+import (
+	"videoweb/app/api/adsapi"
+
+	"github.com/gin-gonic/gin"
+)
+
+func adsRouter(r *gin.Engine) {
+	r.POST("/api/app/ads/click", adsapi.Click)
+}

app/router/gin.go

@@ -119,6 +119,7 @@ func registeRouter(r *gin.Engine) {
 	appInfoRouter(r)
 	translationRouter(r)
 	statcenterRouter(r)
+	adsRouter(r)
 	r.GET("/notpage", templatecache.WithCache(time.Minute*1), home.PageNotFound)
 
 }

app/service/configser/advertise_click.go

@@ -0,0 +1,66 @@
+package configser
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+	"strings"
+
+	"videoweb/app/appg"
+	"videoweb/pub/common/godef"
+	"videoweb/pub/common/httputil"
+	"videoweb/pub/common/log"
+)
+
+type advertiseClickReq struct {
+	Id    int64 `json:"id"`
+	AppId int32 `json:"appId"`
+}
+
+type advertiseClickResp struct {
+	Code int64 `json:"code"`
+}
+
+// resolveAdvertiseAppId 请求带了 AppId 用请求的，否则回落到默认 advertiseAppId
+func resolveAdvertiseAppId(reqAppId int32) int32 {
+	if reqAppId > 0 {
+		return reqAppId
+	}
+	return advertiseAppId
+}
+
+// AdvertiseClickCenter 同步上报单条广告点击到广告中心。
+// appId<=0 时回落到默认 advertiseAppId。
+func AdvertiseClickCenter(advertiseId int64, appId int32) error {
+	versionUrl := strings.TrimRight(strings.TrimSpace(appg.Conf.VersionUrl), "/")
+	if versionUrl == "" {
+		return fmt.Errorf("versionUrl 未配置")
+	}
+	url := versionUrl + "/api/stat/advitise/v2/click"
+	body, _ := json.Marshal(advertiseClickReq{Id: advertiseId, AppId: resolveAdvertiseAppId(appId)})
+	var resp advertiseClickResp
+	code, err := httputil.Client().POSTJsonWithJResp(&resp, url, map[string]string{"Content-Type": "application/json"}, body)
+	if err != nil {
+		log.Error("AdvertiseClickCenter POST fail", log.Any("url", url), log.Any("id", advertiseId), log.E(err))
+		return err
+	}
+	if code != http.StatusOK {
+		log.Error("AdvertiseClickCenter response status", log.Any("code", code), log.Any("id", advertiseId))
+		return fmt.Errorf("response status %d", code)
+	}
+	return nil
+}
+
+// AsyncAdvertiseClick 异步上报广告点击，非数字 id 忽略。
+// appId<=0 时回落到默认 advertiseAppId。
+func AsyncAdvertiseClick(id string, appId int32) {
+	advertiseId, err := strconv.ParseInt(strings.TrimSpace(id), 10, 64)
+	if err != nil {
+		log.Warn("AsyncAdvertiseClick invalid id", log.Any("id", id))
+		return
+	}
+	godef.Go(func() {
+		_ = AdvertiseClickCenter(advertiseId, appId)
+	})
+}

app/service/configser/announcement.go

@@ -2,60 +2,112 @@ package configser
 
 import (
 	"context"
+	"encoding/json"
+	"fmt"
 	"net/http"
+	"sort"
+	"strconv"
+	"strings"
+	"videoweb/app/appg"
+	"videoweb/pub/common/httputil"
 	"videoweb/pub/common/log"
 	"videoweb/pub/common/netutil"
-	"videoweb/pub/pubdef"
-	"videoweb/pub/storage"
 	"videoweb/pub/storage/proxy"
 )
 
-// UpdateAdvitiseData 从媒资中心按 AppId 拉取广告，图片拼接 CDN 后写入缓存
-func UpdateAdvitiseData(ctx context.Context) {
-	config := GetConfigInfo()
-	queryAdvitiseReq := &proxy.AppAdvitiseInfoReq{
-		Id: pubdef.AppId,
+// 广告中心应用ID（本站专用）
+const advertiseAppId int32 = 12
+
+// advertiseInfo 广告中心 /api/stat/advitise/v2/get 的广告条目
+type advertiseInfo struct {
+	Id       int64  `json:"id"`       // 广告id
+	Title    string `json:"title"`    // 广告标题
+	CoverImg string `json:"coverImg"` // 封面
+	LocId    int32  `json:"locId"`    // 位置id
+	JumpType int32  `json:"jumpType"` // 跳转方式
+	Link     string `json:"link"`     // 链接地址
+	Sort     int64  `json:"sort"`     // 排序
+	Tags     string `json:"tags"`     // 标签
+	Remark   string `json:"remark"`   // 备注描述
+}
+
+type advertiseReq struct {
+	AppId int32 `json:"appId"`
+}
+
+type advertiseRes struct {
+	AdvertiseList []advertiseInfo `json:"advertiseList"`
+}
+
+// fetchAdvertiseList 请求广告中心 /api/stat/advitise/v2/get
+func fetchAdvertiseList() (*advertiseRes, error) {
+	versionUrl := strings.TrimRight(strings.TrimSpace(appg.Conf.VersionUrl), "/")
+	if versionUrl == "" {
+		return nil, fmt.Errorf("versionUrl 未配置")
 	}
-	advitiseResult, err := storage.QueryAdvitiseList(ctx, queryAdvitiseReq, "")
-	if err != nil || advitiseResult.Code != http.StatusOK {
-		if advitiseResult != nil {
-			log.Warn("UpdateAdvitiseData.QueryAdvitiseList failed", log.Any("filter", queryAdvitiseReq), log.E(err), log.Any("respCode", advitiseResult.Code))
-		} else {
-			log.Warn("UpdateAdvitiseData.QueryAdvitiseList failed", log.Any("filter", queryAdvitiseReq), log.E(err))
-		}
+	url := versionUrl + "/api/stat/advitise/v2/get"
+	body, _ := json.Marshal(advertiseReq{AppId: advertiseAppId})
+	var resp advertiseRes
+	code, err := httputil.Client().POSTJsonWithJResp(&resp, url, map[string]string{"Content-Type": "application/json"}, body)
+	if err != nil {
+		return nil, err
+	}
+	if code != http.StatusOK {
+		return nil, fmt.Errorf("response status %d", code)
+	}
+	return &resp, nil
+}
+
+// UpdateAdvitiseData 从广告中心拉取广告并更新内存缓存，列表为空时重试一次
+func UpdateAdvitiseData(ctx context.Context) {
+	resp, err := fetchAdvertiseList()
+	if err != nil {
+		log.Error("UpdateAdvitiseData fetchAdvertiseList fail", log.E(err))
 		return
 	}
+	if len(resp.AdvertiseList) == 0 {
+		resp, err = fetchAdvertiseList()
+		if err != nil {
+			log.Error("UpdateAdvitiseData fetchAdvertiseList retry fail", log.E(err))
+			return
+		}
+	}
+	list := resp.AdvertiseList
+	sort.SliceStable(list, func(i, j int) bool {
+		if list[i].LocId != list[j].LocId {
+			return list[i].LocId < list[j].LocId
+		}
+		return list[i].Sort < list[j].Sort
+	})
 
-	data := advitiseResult.Data
-	for _, list := range []*[]proxy.AdvitiseInfo{
-		&data.DialogList,
-		&data.HomeList,
-		&data.VideoTopList,
-		&data.VideoDownList,
-		&data.HotAppList,
-		&data.NewAppList,
-		&data.MustAppList,
-		&data.TitleAppList,
-		&data.FriendList,
-		&data.NineGridList,
-		&data.VideoList,
-		&data.StopList,
-		&data.ForcedJumpList,
-		&data.AppInfoAList,
-		&data.AppInfoBList,
-	} {
-		mergeAdvitiseImages(*list, config.ImgCdn)
+	config := GetConfigInfo()
+	data := proxy.AdvitiseData{}
+
+	for _, v := range list {
+		pos := int64(v.LocId)
+		info := proxy.AdvitiseInfo{
+			Id:       strconv.FormatInt(v.Id, 10),
+			Location: pos,
+			Title:    v.Title,
+			Images:   netutil.MergeURL(config.ImgCdn, strings.TrimLeft(v.CoverImg, "/")),
+			Link:     strings.ReplaceAll(v.Link, "inner://yinseinner/", "yinseinner://"),
+		}
+		switch pos {
+		case 1:
+			data.DialogList = append(data.DialogList, info)
+		case 2:
+			data.NineGridList = append(data.NineGridList, info)
+		case 3:
+			data.VideoTopList = append(data.VideoTopList, info)
+			data.VideoDownList = append(data.VideoDownList, info)
+		case 12:
+			data.AppInfoAList = append(data.AppInfoAList, info)
+		case 13:
+			data.AppInfoBList = append(data.AppInfoBList, info)
+		}
 	}
 
 	CacheMgr.Lock.Lock()
 	defer CacheMgr.Lock.Unlock()
 	CacheMgr.Advitise = data
 }
-
-func mergeAdvitiseImages(list []proxy.AdvitiseInfo, cdn string) {
-	for i := range list {
-		if len(list[i].Images) > 0 {
-			list[i].Images = netutil.MergeURL(cdn, list[i].Images)
-		}
-	}
-}

app/service/videoser/m3u8.go

@@ -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),

app/skd/job/sitemap/data.go

@@ -2,11 +2,14 @@ package sitemap
 
 import (
 	"context"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
+	"videoweb/pub/common/log"
 	"videoweb/pub/common/utils"
 	"videoweb/pub/models/playletcategorymod"
+	"videoweb/pub/models/playletchaptermod"
 	"videoweb/pub/models/playletmod"
 	"videoweb/pub/models/playlettagmod"
 	"videoweb/pub/models/playletthememod"
@@ -16,9 +19,10 @@ import (
 )
 
 type idWithTime struct {
-	Id      int64
-	Slug    string
-	LastMod time.Time
+	Id         int64
+	Slug       string
+	LastMod    time.Time
+	IsOriginal bool // 仅短剧使用：原创剧只算已加水印的剧集
 }
 
 type staticPageEntry struct {
@@ -144,7 +148,7 @@ func getURL(sg *SitemapGenerator) {
 	if urls := buildPlayletPathURLs(webAddr, listed.items, "/detail", "weekly", 0.7); len(urls) > 0 {
 		_ = sg.writeSitemapFiles("sitemap-playletdetail", urls)
 	}
-	if urls := buildPlayletPathURLs(webAddr, listed.items, "/play", "weekly", 0.6); len(urls) > 0 {
+	if urls := buildPlayletPlayURLs(webAddr, listed.items, firstPlayletChapterIDs(ctx, listed.items), "weekly", 0.6); len(urls) > 0 {
 		_ = sg.writeSitemapFiles("sitemap-playletplay", urls)
 	}
 }
@@ -194,6 +198,78 @@ func buildPlayletPathURLs(webAddr string, items []idWithTime, prefix string, cha
 	return urls
 }
 
+// buildPlayletPlayURLs 播放页直接写第一集的规范地址 /play/{slug}/{chapterId}/，
+// 避免 /play/{slug}/ 在 h5 再 301 一次；没有可播放剧集的短剧不写入（h5 会返回 404）。
+func buildPlayletPlayURLs(webAddr string, items []idWithTime, firstChapter map[int64]int64, changeFreq string, priority float32) []URL {
+	urls := make([]URL, 0, len(items))
+	for _, item := range items {
+		chapterID := firstChapter[item.Id]
+		if chapterID <= 0 {
+			continue
+		}
+		lastMod := formatLastMod(item.LastMod)
+		if lastMod == "" {
+			lastMod = time.Now().Format(time.DateOnly)
+		}
+		urls = append(urls, URL{
+			Loc:        utils.JoinUrlPathKeepSlash(webAddr, entityPath("/play", item.Slug, item.Id)+strconv.FormatInt(chapterID, 10)+"/"),
+			LastMod:    lastMod,
+			ChangeFreq: changeFreq,
+			Priority:   priority,
+		})
+	}
+	return urls
+}
+
+// firstPlayletChapterIDs 取每部短剧的第一集 ID，规则与 app 详情接口的选集列表一致
+// （按集号、ID 升序；原创剧只算已加水印的剧集），h5 播放页跳转也取这一集。
+func firstPlayletChapterIDs(ctx context.Context, items []idWithTime) map[int64]int64 {
+	result := make(map[int64]int64, len(items))
+	original := make(map[int64]bool, len(items))
+	ids := make([]int64, 0, len(items))
+	for _, item := range items {
+		if item.Id > 0 {
+			ids = append(ids, item.Id)
+			original[item.Id] = item.IsOriginal
+		}
+	}
+	const batch = 500
+	for start := 0; start < len(ids); start += batch {
+		end := start + batch
+		if end > len(ids) {
+			end = len(ids)
+		}
+		list, err := playletchaptermod.FindManyPlayletChapter(ctx, bson.M{
+			playletchaptermod.FN.PlayletChapter.PlayletId: bson.M{"$in": ids[start:end]},
+		}, options.Find().
+			SetSort(bson.D{
+				{Key: playletchaptermod.FN.PlayletChapter.PlayletId, Value: 1},
+				{Key: playletchaptermod.FN.PlayletChapter.CurrentEpisode, Value: 1},
+				{Key: playletchaptermod.FN.PlayletChapter.Id, Value: 1},
+			}).
+			SetProjection(bson.M{
+				playletchaptermod.FN.PlayletChapter.Id:                1,
+				playletchaptermod.FN.PlayletChapter.PlayletId:         1,
+				playletchaptermod.FN.PlayletChapter.CurrentEpisode:    1,
+				playletchaptermod.FN.PlayletChapter.WatermarkVideoUrl: 1,
+			}))
+		if err != nil {
+			log.Error("sitemap 查询短剧第一集失败", log.E(err))
+			continue
+		}
+		for _, ch := range list {
+			if ch == nil || ch.Id <= 0 || result[ch.PlayletId] > 0 {
+				continue
+			}
+			if original[ch.PlayletId] && ch.WatermarkVideoUrl == "" {
+				continue
+			}
+			result[ch.PlayletId] = ch.Id
+		}
+	}
+	return result
+}
+
 func formatLastMod(t time.Time) string {
 	if t.IsZero() {
 		return ""
@@ -226,6 +302,7 @@ func getPlayletList(ctx context.Context) listedPlaylets {
 				playletmod.FN.Playlet.ThemeIds:    1,
 				playletmod.FN.Playlet.TagIds:      1,
 				playletmod.FN.Playlet.CategoryIds: 1,
+				playletmod.FN.Playlet.IsOriginal:  1,
 			}))
 		for _, info := range list {
 			if info == nil || info.Id <= 0 {
@@ -235,7 +312,7 @@ func getPlayletList(ctx context.Context) listedPlaylets {
 			if lastMod.IsZero() {
 				lastMod = info.OnlineAt
 			}
-			result.items = append(result.items, idWithTime{Id: info.Id, Slug: info.Slug, LastMod: lastMod})
+			result.items = append(result.items, idWithTime{Id: info.Id, Slug: info.Slug, LastMod: lastMod, IsOriginal: info.IsOriginal})
 			addListedIDs(result.themeIDs, info.ThemeIds)
 			addListedIDs(result.tagIDs, info.TagIds)
 			addListedIDs(result.categoryIDs, info.CategoryIds)

app/skd/job/sitemap/play_url_test.go

@@ -0,0 +1,17 @@
+package sitemap
+
+import "testing"
+
+func TestBuildPlayletPlayURLs(t *testing.T) {
+	items := []idWithTime{
+		{Id: 12, Slug: "xionnhge"},
+		{Id: 13, Slug: "nochapter"},
+	}
+	urls := buildPlayletPlayURLs("https://hgaidj.net", items, map[int64]int64{12: 27939}, "weekly", 0.6)
+	if len(urls) != 1 {
+		t.Fatalf("got %d urls, want 1 (playlet without chapters must be skipped)", len(urls))
+	}
+	if urls[0].Loc != "https://hgaidj.net/play/xionnhge/27939/" {
+		t.Errorf("Loc = %q", urls[0].Loc)
+	}
+}

pub/common/utils/strings.go

@@ -113,6 +113,19 @@ func IsSlugAllDigits(s string) bool {
 	return true
 }
 
+// RandomSlugLength 随机 slug 长度
+const RandomSlugLength = 8
+
+// MakeRandomSlug 生成唯一的随机 slug（8 位小写字母）；exists 返回 true 表示已被占用。
+func MakeRandomSlug(exists func(string) bool) string {
+	for {
+		s := strings.ToLower(GetRandomLetters(RandomSlugLength))
+		if !exists(s) {
+			return s
+		}
+	}
+}
+
 // MakeUniqueSlug 生成唯一 slug；exists 返回 true 表示已被占用。生成结果不能全是数字。
 func MakeUniqueSlug(source string, exists func(string) bool) string {
 	pinyin := GetSlugInfo(source)

web/conf/web.yaml

@@ -24,7 +24,7 @@ attack:
   h5key: "kaFttDJRcahRMTI7"
   windowDurationSeconds: 60
 pprof: false
-host: "139.162.47.194"
+host: "172.104.166.87"
 listenAddr: "20002"
 origDomain: "https://yuan.bbaazz.me/"
 trustedProxies: ""

web/service/srv_mediaresource/resource.go

@@ -1276,8 +1276,7 @@ func ensureImportedPlayletSlug(ctx context.Context, playlet *playletmod.Playlet)
 	if playlet == nil {
 		return srvdef.New(srvdef.ErrParamError, "短剧数据为空", "")
 	}
-	source := utils.SlugSourceFromKeywordsOrTitle(playlet.SeoInfo.Keyworld, playlet.Title)
-	playlet.Slug = utils.MakeUniqueSlug(source, func(slug string) bool {
+	playlet.Slug = utils.MakeRandomSlug(func(slug string) bool {
 		exist, _ := playletmod.FindOnePlaylet(ctx, bson.M{
 			playletmod.FN.Playlet.Slug: slug,
 		})

web/service/srv_playlet/slug.go

@@ -48,8 +48,7 @@ func ensureThemeSlug(ctx context.Context, ac *playletthememod.PlayletTheme, excl
 		}
 		return nil
 	}
-	source := utils.SlugSourceFromKeywordsOrTitle(ac.SeoInfo.Keyworld, ac.Name)
-	ac.Slug = utils.MakeUniqueSlug(source, func(slug string) bool {
+	ac.Slug = utils.MakeRandomSlug(func(slug string) bool {
 		filter := bson.M{playletthememod.FN.PlayletTheme.Slug: slug}
 		if excludeId > 0 {
 			filter[playletthememod.FN.PlayletTheme.Id] = bson.M{"$ne": excludeId}
@@ -81,16 +80,7 @@ func prepareThemeSlugOnUpdate(ctx context.Context, id int64, info *playletthemem
 		}
 		return nil
 	}
-	name := info.Name
-	if req.Name != nil {
-		name = strings.TrimSpace(*req.Name)
-	}
-	keywords := info.SeoInfo.Keyworld
-	if req.SeoInfo != nil {
-		keywords = normalizeSeoValue(*req.SeoInfo).Keyworld
-	}
-	source := utils.SlugSourceFromKeywordsOrTitle(keywords, name)
-	newSlug := utils.MakeUniqueSlug(source, func(s string) bool {
+	newSlug := utils.MakeRandomSlug(func(s string) bool {
 		exist, _ := playletthememod.FindOnePlayletTheme(ctx, bson.M{
 			playletthememod.FN.PlayletTheme.Slug: s,
 			playletthememod.FN.PlayletTheme.Id:   bson.M{"$ne": id},
@@ -186,8 +176,7 @@ func ensurePlayletSlug(ctx context.Context, ac *playletmod.Playlet, excludeId in
 		}
 		return nil
 	}
-	source := utils.SlugSourceFromKeywordsOrTitle(ac.SeoInfo.Keyworld, ac.Title)
-	ac.Slug = utils.MakeUniqueSlug(source, func(slug string) bool {
+	ac.Slug = utils.MakeRandomSlug(func(slug string) bool {
 		filter := bson.M{playletmod.FN.Playlet.Slug: slug}
 		if excludeId > 0 {
 			filter[playletmod.FN.Playlet.Id] = bson.M{"$ne": excludeId}
@@ -219,16 +208,7 @@ func preparePlayletSlugOnUpdate(ctx context.Context, id int64, info *playletmod.
 		}
 		return nil
 	}
-	title := info.Title
-	if req.Title != nil {
-		title = strings.TrimSpace(*req.Title)
-	}
-	keywords := info.SeoInfo.Keyworld
-	if req.SeoInfo != nil {
-		keywords = normalizeSeoValue(*req.SeoInfo).Keyworld
-	}
-	source := utils.SlugSourceFromKeywordsOrTitle(keywords, title)
-	newSlug := utils.MakeUniqueSlug(source, func(s string) bool {
+	newSlug := utils.MakeRandomSlug(func(s string) bool {
 		exist, _ := playletmod.FindOnePlaylet(ctx, bson.M{
 			playletmod.FN.Playlet.Slug: s,
 			playletmod.FN.Playlet.Id:   bson.M{"$ne": id},