广告修改

This commit is contained in:
谢宇宁
2026-10-28 17:40:27 +07:00
parent 41a45c8975
commit 9c0695b305
22 changed files with 516 additions and 186 deletions
+5
View File
@@ -105,6 +105,11 @@ type AdvitiseData struct {
TitleList []Advertisement `json:"titleList"`
PlayList []Advertisement `json:"playList"`
PauseyList []Advertisement `json:"pauseyList"`
// 本站后台(webhg2api)的字段名:横幅 / 播放页小图标 / 首页小图标
VideoTopList []Advertisement `json:"videoTopList"`
VideoDownList []Advertisement `json:"videoDownList"`
AppInfoAList []Advertisement `json:"appInfoAList"`
AppInfoBList []Advertisement `json:"appInfoBList"`
}
// Advertisement 对应 swagger proxy.AdvitiseInfo。
+41 -44
View File
@@ -8,33 +8,35 @@ import (
// AppConfigVM 注入全站页面的公共配置(字段名与接口 newAddressInfo / seoInfo 对齐)。
type AppConfigVM struct {
// Config 为 data.config 原样字段(页脚社交等优先用此对象)。
Config ConfigInfo `json:"config"`
ForeverURLAddr string `json:"foreverUrlAddr"`
NewURLAddr string `json:"newUrlAddr"`
NewURLAddr1 string `json:"newUrlAddr1"`
NewURLAddr2 string `json:"newUrlAddr2"`
GmailAddr string `json:"gmailAddr"`
QQ string `json:"qq"`
TGGroup string `json:"tgGroup"`
Telegram string `json:"telegram"`
TelegramAdd string `json:"telegramAdd"`
PotaoGroup string `json:"potaoGroup"`
CustomerServiceHost string `json:"customerServiceHost"`
AppAddr string `json:"appAddr"`
OfficialAppAddr string `json:"officialAppAddr"`
PDFAddr string `json:"pdfAddr"`
TwitterAddr string `json:"twitterAddr"`
GitAddr string `json:"gitAddr"`
FreeVPN string `json:"freeVPN"`
SeoInfo SeoInfo `json:"seoInfo,omitempty"`
SeoNavInfo SeoNavInfo `json:"seoNavInfo,omitempty"`
NavPageList []NavPageItem `json:"navPageList,omitempty"`
Advitise AdvitiseData `json:"advitise"`
DetailTopList []Advertisement `json:"detailTopList,omitempty"`
NineGridList []Advertisement `json:"nineGridList,omitempty"`
DetailBannerList []Advertisement `json:"detailbannerList,omitempty"`
BottomBanner []Advertisement `json:"bottomBanner,omitempty"`
DialogList []Advertisement `json:"dialogList,omitempty"`
Config ConfigInfo `json:"config"`
ForeverURLAddr string `json:"foreverUrlAddr"`
NewURLAddr string `json:"newUrlAddr"`
NewURLAddr1 string `json:"newUrlAddr1"`
NewURLAddr2 string `json:"newUrlAddr2"`
GmailAddr string `json:"gmailAddr"`
QQ string `json:"qq"`
TGGroup string `json:"tgGroup"`
Telegram string `json:"telegram"`
TelegramAdd string `json:"telegramAdd"`
PotaoGroup string `json:"potaoGroup"`
CustomerServiceHost string `json:"customerServiceHost"`
AppAddr string `json:"appAddr"`
OfficialAppAddr string `json:"officialAppAddr"`
PDFAddr string `json:"pdfAddr"`
TwitterAddr string `json:"twitterAddr"`
GitAddr string `json:"gitAddr"`
FreeVPN string `json:"freeVPN"`
SeoInfo SeoInfo `json:"seoInfo,omitempty"`
SeoNavInfo SeoNavInfo `json:"seoNavInfo,omitempty"`
NavPageList []NavPageItem `json:"navPageList,omitempty"`
Advitise AdvitiseData `json:"advitise"`
// 网页只用后台「站点」的 5 个广告位:
// 弹窗 / 9宫格(弹窗广告后弹出)/ 详情横幅 / 播放页小图标 / 首页小图标
DialogList []Advertisement `json:"dialogList,omitempty"`
NineGridList []Advertisement `json:"nineGridList,omitempty"`
DetailBannerList []Advertisement `json:"detailbannerList,omitempty"`
AList []Advertisement `json:"AList,omitempty"`
BList []Advertisement `json:"BList,omitempty"`
}
// BuildAppConfigVM 从上游配置组装前端可用字段;社交/地址优先取 data.config。
@@ -65,11 +67,12 @@ func BuildAppConfigVM(info *ConfigInfoResp) AppConfigVM {
FreeVPN: sanitizeURL(cfg.FreeVPN),
NavPageList: buildNavPageList(info.NavPageList),
Advitise: info.Advitise,
DetailTopList: buildAdvertisementList(info.Advitise.DetailTopList),
NineGridList: buildAdvertisementList(info.Advitise.NineGridList),
DetailBannerList: buildAdvertisementList(info.Advitise.DetailBannerList),
BottomBanner: buildAdvertisementList(info.Advitise.BottomBanner),
DialogList: buildAdvertisementList(info.Advitise.DialogList),
NineGridList: buildAdvertisementList(info.Advitise.NineGridList),
// 本站后台用 videoTopList / appInfoAList / appInfoBList;兼容 detailbannerList / AList / BList 命名
DetailBannerList: firstAdvertisementList(info.Advitise.VideoTopList, info.Advitise.DetailBannerList),
AList: firstAdvertisementList(info.Advitise.AppInfoAList, info.Advitise.AList),
BList: firstAdvertisementList(info.Advitise.AppInfoBList, info.Advitise.BList),
SeoInfo: SeoInfo{
Title: strings.TrimSpace(info.SeoInfo.Title),
Description: strings.TrimSpace(info.SeoInfo.Description),
@@ -142,20 +145,14 @@ func buildAdvertisementList(list []Advertisement) []Advertisement {
return out
}
// NineGridRow 按首页设计每行返回两个 banner,超出当前行时返回空切片。
func (c AppConfigVM) NineGridRow(row int) []Advertisement {
if row < 0 {
return nil
// firstAdvertisementList 返回第一个有可用广告的列表(按字段优先级)。
func firstAdvertisementList(lists ...[]Advertisement) []Advertisement {
for _, list := range lists {
if built := buildAdvertisementList(list); len(built) > 0 {
return built
}
}
start := row * 2
if start >= len(c.NineGridList) {
return nil
}
end := start + 2
if end > len(c.NineGridList) {
end = len(c.NineGridList)
}
return c.NineGridList[start:end]
return nil
}
// QRText 应用下载二维码及跳转地址:仅使用应用下载地址 appAddr。
+47
View File
@@ -0,0 +1,47 @@
package configser
import "testing"
func TestBuildAppConfigVMMapsSiteAdSlots(t *testing.T) {
vm := BuildAppConfigVM(&ConfigInfoResp{
Advitise: AdvitiseData{
DialogList: []Advertisement{{ID: "dialog", Images: "https://cdn.example.com/dialog.gif"}},
NineGridList: []Advertisement{{ID: "grid", Images: "https://cdn.example.com/grid.gif"}, {ID: "grid-empty", Images: " "}},
VideoTopList: []Advertisement{
{ID: " top ", Images: " https://cdn.example.com/top.gif ", Link: " https://example.com/top "},
{ID: "top-empty", Images: " "},
},
DetailBannerList: []Advertisement{{ID: "legacy-banner", Images: "https://cdn.example.com/legacy.gif"}},
AppInfoAList: []Advertisement{{ID: "a", Images: "https://cdn.example.com/a.gif"}},
AList: []Advertisement{{ID: "legacy-a", Images: "https://cdn.example.com/legacy-a.gif"}},
BList: []Advertisement{{ID: "b", Images: "https://cdn.example.com/b.gif"}},
},
})
if len(vm.DialogList) != 1 || vm.DialogList[0].ID != "dialog" {
t.Fatalf("DialogList = %#v", vm.DialogList)
}
if len(vm.NineGridList) != 1 || vm.NineGridList[0].ID != "grid" {
t.Fatalf("NineGridList = %#v, want images-only items", vm.NineGridList)
}
// 详情横幅优先本站后台字段 videoTopList,并清洗空格 / 过滤无图
if len(vm.DetailBannerList) != 1 || vm.DetailBannerList[0].ID != "top" || vm.DetailBannerList[0].Link != "https://example.com/top" {
t.Fatalf("DetailBannerList = %#v", vm.DetailBannerList)
}
// 播放页小图标优先 appInfoAList;首页小图标无 appInfoBList 时回退 BList
if len(vm.AList) != 1 || vm.AList[0].ID != "a" {
t.Fatalf("AList = %#v", vm.AList)
}
if len(vm.BList) != 1 || vm.BList[0].ID != "b" {
t.Fatalf("BList = %#v", vm.BList)
}
}
func TestBuildAppConfigVMFallsBackToLegacyBannerField(t *testing.T) {
vm := BuildAppConfigVM(&ConfigInfoResp{
Advitise: AdvitiseData{DetailBannerList: []Advertisement{{ID: "banner", Images: "https://cdn.example.com/banner.gif"}}},
})
if len(vm.DetailBannerList) != 1 || vm.DetailBannerList[0].ID != "banner" {
t.Fatalf("DetailBannerList = %#v, want detailbannerList fallback", vm.DetailBannerList)
}
}