- 广告获取改走 versionUrl /api/stat/advitise/v2/get(appId=12),移除 adcenter(Jt) 调用;新增 /api/app/ads/click 异步上报点击;proto.AdvitiseData 别名为 proxy.AdvitiseData,AList/BList 字段改名 AppInfoAList/AppInfoBList。 - web 后台登录取消谷歌验证码(srv_mwacc.AccLogin 去掉 code 参数),密码正确即 发放 token。 - app 端取消注册/登录/找回密码/游客登录接口及密码、token 相关代码;鉴权中间件 不再校验 token,按 X-User-Agent 中的 devID 识别用户,首次访问自动建号, Redis 缓存 10 分钟;修改资料不再支持改密码。 - app m3u8 ticket 校验失败不再降级到 fallback 路径,仍按原 m3u8Name 返回。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
114 lines
3.1 KiB
Go
114 lines
3.1 KiB
Go
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/storage/proxy"
|
|
)
|
|
|
|
// 广告中心应用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 未配置")
|
|
}
|
|
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
|
|
})
|
|
|
|
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
|
|
}
|