Compare commits

...
6 Commits
Author SHA1 Message Date
rootandClaude Opus 4.7 4a21a5d393 feat(adcenter): 新增 POST /api/app/ads/click 广告点击上报到广告中心
- handler 绑定 proto.AdsClickInfo{appId, adsId, location}
- 走 ${versionUrl}/api/stat/advitise/v2/click
- appId<=0 时回落到默认 advertiseAppId=12

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-10-29 16:23:44 +08:00
root 7392098364 优化 2026-10-28 17:27:08 +08:00
rootandClaude Opus 4.7 ad2ad35574 feat(adcenter): 切到 versionUrl /api/stat/advitise/v2/get 接口拉取,appId=12
- 替换原来通过媒资中心 QueryAdvitiseList 的拉取逻辑
- locId 映射:1→DialogList, 2→NineGridList, 3→VideoTopList+VideoDownList, 12→AppInfoAList, 13→AppInfoBList

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-10-28 17:25:20 +08:00
root f63a5148f5 删除认证 2026-10-23 10:35:47 +08:00
root 5c5f5908aa 代码提交 2026-10-16 12:28:09 +08:00
root 75a0d00258 代码 2026-09-29 11:49:44 +08:00
10 changed files with 252 additions and 79 deletions
+31
View File
@@ -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)
}
+3 -2
View File
@@ -4,8 +4,8 @@ redis:
passwd: "Redis@fish2026!" passwd: "Redis@fish2026!"
subscribe: true subscribe: true
mongodb: mongodb:
addr: "mongodb://web_wzhgdj:AvefivXVdsmMHbfda13af@172.104.56.78:47018,172.104.56.119:47018,172.104.56.146:47018/web_wzhgdj?replicaSet=web_jiqun3&maxPoolSize=200&connectTimeout=30&authSource=admin" addr: "mongodb://web_huangguo2:xDdEkf6m0HDpkEpxpphi@172.104.52.130:27017,172.104.52.26:27017,172.104.52.242:27017/web_huangguo2?replicaSet=fish0&maxPoolSize=200&connectTimeout=30&authSource=web_huangguo2"
logaddr: "mongodb://web_wzhgdj:AvefivXVdsmMHbfda13af@172.104.56.78:47018,172.104.56.119:47018,172.104.56.146:47018/web_wzhgdj_log?replicaSet=web_jiqun3&maxPoolSize=200&connectTimeout=30&authSource=admin" logaddr: "mongodb://web_huangguo2:xDdEkf6m0HDpkEpxpphi@172.104.52.130:27017,172.104.52.26:27017,172.104.52.242:27017/web_huangguo2_log?replicaSet=fish0&maxPoolSize=200&connectTimeout=30&authSource=web_huangguo2"
es: es:
addr: "http://139.162.47.194:9200" addr: "http://139.162.47.194:9200"
user: "elastic" user: "elastic"
@@ -29,6 +29,7 @@ listenAddr: "20021"
origDomain: "https://yuan.bbaazz.me/" origDomain: "https://yuan.bbaazz.me/"
trustedProxies: "" trustedProxies: ""
bucketVideoAddressV2: "http://139.162.27.29:19996" bucketVideoAddressV2: "http://139.162.27.29:19996"
versionUrl: "http://139.162.47.194:8089"
upAppId: 8 upAppId: 8
lsjMediaConf: lsjMediaConf:
appId: "430696" appId: "430696"
+11
View File
@@ -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)
}
+1
View File
@@ -122,6 +122,7 @@ func registeRouter(r *gin.Engine) {
translationRouter(r) translationRouter(r)
navigationRouter(r) navigationRouter(r)
statcenterRouter(r) statcenterRouter(r)
adsRouter(r)
r.GET("/notpage", templatecache.WithCache(time.Minute*1), home.PageNotFound) r.GET("/notpage", templatecache.WithCache(time.Minute*1), home.PageNotFound)
} }
+66
View File
@@ -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)
})
}
+93 -41
View File
@@ -2,60 +2,112 @@ package configser
import ( import (
"context" "context"
"encoding/json"
"fmt"
"net/http" "net/http"
"sort"
"strconv"
"strings"
"videoweb/app/appg"
"videoweb/pub/common/httputil"
"videoweb/pub/common/log" "videoweb/pub/common/log"
"videoweb/pub/common/netutil" "videoweb/pub/common/netutil"
"videoweb/pub/pubdef"
"videoweb/pub/storage"
"videoweb/pub/storage/proxy" "videoweb/pub/storage/proxy"
) )
// UpdateAdvitiseData 从媒资中心按 AppId 拉取广告,图片拼接 CDN 后写入缓存 // 广告中心应用ID(本站专用)
func UpdateAdvitiseData(ctx context.Context) { const advertiseAppId int32 = 12
config := GetConfigInfo()
queryAdvitiseReq := &proxy.AppAdvitiseInfoReq{ // advertiseInfo 广告中心 /api/stat/advitise/v2/get 的广告条目
Id: pubdef.AppId, 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, "") url := versionUrl + "/api/stat/advitise/v2/get"
if err != nil || advitiseResult.Code != http.StatusOK { body, _ := json.Marshal(advertiseReq{AppId: advertiseAppId})
if advitiseResult != nil { var resp advertiseRes
log.Warn("UpdateAdvitiseData.QueryAdvitiseList failed", log.Any("filter", queryAdvitiseReq), log.E(err), log.Any("respCode", advitiseResult.Code)) code, err := httputil.Client().POSTJsonWithJResp(&resp, url, map[string]string{"Content-Type": "application/json"}, body)
} else { if err != nil {
log.Warn("UpdateAdvitiseData.QueryAdvitiseList failed", log.Any("filter", queryAdvitiseReq), log.E(err)) 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 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 config := GetConfigInfo()
for _, list := range []*[]proxy.AdvitiseInfo{ data := proxy.AdvitiseData{}
&data.DialogList,
&data.HomeList, for _, v := range list {
&data.VideoTopList, pos := int64(v.LocId)
&data.VideoDownList, info := proxy.AdvitiseInfo{
&data.HotAppList, Id: strconv.FormatInt(v.Id, 10),
&data.NewAppList, Location: pos,
&data.MustAppList, Title: v.Title,
&data.TitleAppList, Images: netutil.MergeURL(config.ImgCdn, strings.TrimLeft(v.CoverImg, "/")),
&data.FriendList, Link: strings.ReplaceAll(v.Link, "inner://yinseinner/", "yinseinner://"),
&data.NineGridList, }
&data.VideoList, switch pos {
&data.StopList, case 1:
&data.ForcedJumpList, data.DialogList = append(data.DialogList, info)
&data.AppInfoAList, case 2:
&data.AppInfoBList, data.NineGridList = append(data.NineGridList, info)
} { case 3:
mergeAdvitiseImages(*list, config.ImgCdn) 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() CacheMgr.Lock.Lock()
defer CacheMgr.Lock.Unlock() defer CacheMgr.Lock.Unlock()
CacheMgr.Advitise = data 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)
}
}
}
+9 -9
View File
@@ -123,14 +123,14 @@ func GetM3U8Ex(ctx *gin.Context) {
mediaID, expireAt, origM3u8Name, ip, ticket, mediaID, expireAt, origM3u8Name, ip, ticket,
) )
if !ticketOK { // if !ticketOK {
m3u8Name = H5M3U8FallbackPath // m3u8Name = H5M3U8FallbackPath
log.Warn("【GetM3U8Ex】H5播放票据无效", // log.Warn("【GetM3U8Ex】H5播放票据无效",
log.Any("mediaId", mediaID), // log.Any("mediaId", mediaID),
log.Any("expireAt", expireAt), // log.Any("expireAt", expireAt),
log.Any("ip", ip), // log.Any("ip", ip),
log.Any("hasTicket", ticket != "")) // log.Any("hasTicket", ticket != ""))
} // }
countTowardDailyLimit := ticketOK && ticketInfo.Playable && !ticketInfo.Preview countTowardDailyLimit := ticketOK && ticketInfo.Playable && !ticketInfo.Preview
if countTowardDailyLimit && appg.Conf.RunMod == string(consts.RunModeProd) { if countTowardDailyLimit && appg.Conf.RunMod == string(consts.RunModeProd) {
@@ -152,7 +152,7 @@ func GetM3U8Ex(ctx *gin.Context) {
log.Any("vipValid", vipValid), log.Any("vipValid", vipValid),
log.E(countErr)) log.E(countErr))
} else if cnt > limit { } else if cnt > limit {
m3u8Name = m3u8RateLimitFallback // m3u8Name = m3u8RateLimitFallback
status = "rate_limited" status = "rate_limited"
log.Warn("GetM3U8Ex daily rate limit, use fallback m3u8", log.Warn("GetM3U8Ex daily rate limit, use fallback m3u8",
log.Any("ip", ip), log.Any("ip", ip),
+13 -3
View File
@@ -79,6 +79,16 @@ func GetRandomLetters(n int) string {
return string(b) return string(b)
} }
// GetRandomAlphanumeric 生成 n 位大小写字母 + 数字随机串
func GetRandomAlphanumeric(n int) string {
const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
b := make([]byte, n)
for i := range b {
b[i] = chars[rand.IntN(len(chars))]
}
return string(b)
}
func GetSlugInfo(text string) string { func GetSlugInfo(text string) string {
return SanitizeSlug(slug.Make(text)) return SanitizeSlug(slug.Make(text))
} }
@@ -114,12 +124,12 @@ func IsSlugAllDigits(s string) bool {
} }
// RandomSlugLength 随机 slug 长度 // RandomSlugLength 随机 slug 长度
const RandomSlugLength = 8 const RandomSlugLength = 10
// MakeRandomSlug 生成唯一的随机 slug(8 位小写字母);exists 返回 true 表示已被占用。 // MakeRandomSlug 生成唯一的随机 slug(10 位大小写字母+数字混合);exists 返回 true 表示已被占用。
func MakeRandomSlug(exists func(string) bool) string { func MakeRandomSlug(exists func(string) bool) string {
for { for {
s := strings.ToLower(GetRandomLetters(RandomSlugLength)) s := GetRandomAlphanumeric(RandomSlugLength)
if !exists(s) { if !exists(s) {
return s return s
} }
+1 -1
View File
@@ -14,7 +14,7 @@ import (
) )
// DefaultKey IndexNow 默认密钥,与站点根目录下的 {key}.txt 验证文件对应 // DefaultKey IndexNow 默认密钥,与站点根目录下的 {key}.txt 验证文件对应
const DefaultKey = "6d41643810d540ce924edb982c3d3171" const DefaultKey = "9d16a6eb0062bfcaa98e1238e7c436e0"
// DefaultSearchEngine 官方入口,会自动分发给 Bing、Yandex 等搜索引擎 // DefaultSearchEngine 官方入口,会自动分发给 Bing、Yandex 等搜索引擎
const DefaultSearchEngine = "https://api.indexnow.org" const DefaultSearchEngine = "https://api.indexnow.org"
+24 -23
View File
@@ -1,30 +1,35 @@
redis: redis:
addr: 172.104.181.99:16789 addr: 139.162.47.194:6379
db: 2 db: 2
passwd: "B6vJHlYiTseLj77z" passwd: "Redis@fish2026!"
subscribe: true
mongodb: mongodb:
addr: "mongodb://admin:TESTwfeZYP0kjBdy8DAUdwU@172.104.181.99:57017,172.104.181.99:57018,172.104.181.99:57019/web_91ys?replicaSet=yctest&maxPoolSize=200&connectTimeout=30&authSource=admin" addr: "mongodb://web_huangguo2:xDdEkf6m0HDpkEpxpphi@172.104.52.130:27017,172.104.52.26:27017,172.104.52.242:27017/web_huangguo2?replicaSet=fish0&maxPoolSize=200&connectTimeout=30&authSource=web_huangguo2"
logaddr: "mongodb://admin:TESTwfeZYP0kjBdy8DAUdwU@172.104.181.99:57017,172.104.181.99:57018,172.104.181.99:57019/web_91ys_log?replicaSet=yctest&maxPoolSize=200&connectTimeout=30&authSource=admin" logaddr: "mongodb://web_huangguo2:xDdEkf6m0HDpkEpxpphi@172.104.52.130:27017,172.104.52.26:27017,172.104.52.242:27017/web_huangguo2_log?replicaSet=fish0&maxPoolSize=200&connectTimeout=30&authSource=web_huangguo2"
es: es:
addr: "http://172.104.181.99:9200" addr: "http://139.162.47.194:9200"
user: "elastic" user: "elastic"
pass: "admin123456" pass: "Es@fish2026!"
httpOptions:
dcCtxTimeOut: 10
jwtKey: "2311b15a4da1c80dc541b99abb622233" jwtKey: "2311b15a4da1c80dc541b99abb622233"
tgToken: "" runMod: "prod"
runMod: "dev" resKey: "vEukA&w15z4VAD3kAY#fkL#rBnU!WDhN"
cdnKey: "vEukAw15z4VAD3kAYfkLrBnUWDhN123"
tsAuthKey: "fT5xSg4hltHpzVy6aV9rVECDJ1J1pN" tsAuthKey: "fT5xSg4hltHpzVy6aV9rVECDJ1J1pN"
tgToken: ""
attack:
enable: false
appkey: "kaFtkDJRcchRMTI9"
h5key: "kaFttDJRcahRMTI7"
windowDurationSeconds: 60
pprof: false pprof: false
host: "172.104.181.99" host: "172.104.166.87"
listenAddr: "25120" listenAddr: "20022"
prefetchSubmitUrl: "http://172.104.171.80:9067/master/submit" origDomain: "https://yuan.bbaazz.me/"
aiCenterAppId: 25311 trustedProxies: ""
aiUndressingCallbackUrl: "https://web_mdcomtest-ht.80sygtm.com/api/web/aiorder/strip/callback" bucketVideoAddressV2: "http://139.162.27.29:19996"
upAppId: 8 upAppId: 8
swagger:
host: "172.104.181.99"
user: "mdc"
pass: "2@6A1#9e%9c2"
bucketVideoAddressV2: "http://139.162.22.207:24996"
lsjMediaConf: lsjMediaConf:
appId: "430696" appId: "430696"
apiKey: "ed48e96ce490bc94bd5eb5133dd542d0" apiKey: "ed48e96ce490bc94bd5eb5133dd542d0"
@@ -34,12 +39,8 @@ lsjMediaConf:
m3u8Yuan: "https://zhlsaj.zrr4ij4.site" m3u8Yuan: "https://zhlsaj.zrr4ij4.site"
tsYuan: "https://tssdaa.hlvwcn.cn" tsYuan: "https://tssdaa.hlvwcn.cn"
# 媒资配置
mediaResourceDBCfg: mediaResourceDBCfg:
baseUrl: "https://mediav2-api.htycpc.com"
merchat: "91porn"
secret: "08f1c3ab5e11e9b6c18aa24c06d1eb77"
playletMediaResourceDBCfg:
baseUrl: "https://mediav2-api.htycpc.com" baseUrl: "https://mediav2-api.htycpc.com"
merchat: "91porn" merchat: "91porn"
secret: "08f1c3ab5e11e9b6c18aa24c06d1eb77" secret: "08f1c3ab5e11e9b6c18aa24c06d1eb77"