feat: 同步 huangguo2-server 的 11 个非基线提交

按意图重做在 huakui 代码底： - 删除数据埋点逻辑：移除 pub/dataReport、reportser、srv_report、 eventmod、上报定时任务及注册/登录/点赞/收藏/评论/解锁/订单处的上报调用和 reportSdkConfig 配置下发 - app 认证改为按设备ID识别用户：去掉 token 校验、Register/Login/ ResetPassword/GuestLogin 接口，新增 ResolveDeviceUser 和设备缓存 - 广告改为按 AppId 从媒资中心拉取：pub/storage 新增 QueryAdvitise， UpdateAdvitiseData 替代 UpdateAdvitiseDataFromJt - 后台登录取消谷歌二次验证，密码正确即登录 - 短剧/专题 slug 改为 10 位大小写字母+数字混合 - 本地 app.yaml/web.yaml 保留 HKDJNET_* 模板（不提交生产凭据） Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-10-16 12:59:14 +08:00
parent 85c0071fd8
commit e7179da072
48 changed files with 346 additions and 2933 deletions
@@ -1,97 +1,61 @@
 package configser

 import (
-	"hkdj-web-server/app/api/proto"
-	"hkdj-web-server/app/appg"
-	"hkdj-web-server/pub/adcenter"
+	"context"
 	"hkdj-web-server/pub/common/log"
 	"hkdj-web-server/pub/common/netutil"
+	"hkdj-web-server/pub/pubdef"
+	"hkdj-web-server/pub/storage"
 	"hkdj-web-server/pub/storage/proxy"
-	"strconv"
+	"net/http"
 )

-// UpdateAdvitiseDataFromJt 从广告中心拉取福利页广告
-func UpdateAdvitiseDataFromJt() {
+// UpdateAdvitiseData 从媒资中心按 AppId 拉取广告，图片拼接 CDN 后写入缓存
+func UpdateAdvitiseData(ctx context.Context) {
 	config := GetConfigInfo()
-	var resp proto.AdvitiseData
-	jtAds, err := adcenter.JtAdvertiseThreeServer(appg.Conf.AdCenter.ApiDomain, appg.Conf.AdCenter.MerchantCode, appg.Conf.AdCenter.AppCode, appg.Conf.AdCenter.AesKey)
-	if err != nil {
-		log.Error("JtAdvertiseThreeServer error occur", log.E(err))
+	queryAdvitiseReq := &proxy.AppAdvitiseInfoReq{
+		Id: pubdef.AppId,
+	}
+	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))
+		}
 		return
 	}
-	adMap := make(map[string]adcenter.AdCacheInfo)
-	for _, loc := range jtAds {
-		pos, err := strconv.Atoi(loc.AdvertiseLocationCode)
-		if err != nil {
-			log.Error("广告位置代码错误，必须为数字", log.Any("code", loc.AdvertiseLocationCode))
-			continue
-		}
-		//if pos < 100001 {
-		//	continue
-		//}
-		ads := make([]proxy.AdvitiseInfo, 0)
-		for _, ad := range loc.AdDetailInfoList {
-			//extra := ad.GetExtraData()
-			ads = append(ads, proxy.AdvitiseInfo{
-				Id:       ad.AdvertiseCode,
-				Location: int64(pos),
-				Title:    ad.AdvertiseName,
-				Images:   netutil.MergeURL(config.ImgCdn, ad.GetCoverLsj()),
-				Link:     ad.GetRealLink(),
-			})
-			adMap[ad.AdvertiseCode] = adcenter.AdCacheInfo{
-				AdvertiseCode:         ad.AdvertiseCode,
-				CustomerCode:          ad.CustomerCode,
-				AdvertiseName:         ad.AdvertiseName,
-				AdvertiseUrl:          ad.AdvertiseUrl,
-				AdvertiseIcon:         ad.AdvertiseIcon,
-				AdvertiseType:         ad.AdvertiseType,
-				AdMode:                ad.AdMode,
-				AppCode:               ad.AppCode,
-				LocationType:          ad.LocationType,
-				AdvertiseDesc:         ad.AdvertiseDesc,
-				PageType:              ad.PageType,
-				StartTimeStamp:        ad.StartTimeStamp,
-				EndTimeStamp:          ad.EndTimeStamp,
-				Sort:                  ad.Sort,
-				AdExtData:             ad.AdExtData,
-				DeptCode:              loc.DeptCode,
-				MerchantCode:          loc.MerchantCode,
-				AdvertiseLocationCode: loc.AdvertiseLocationCode,
-				AdvertiseLocationName: loc.AdvertiseLocationName,
-				DisplayMode:           loc.DisplayMode,
-				AdvertiseHeight:       loc.AdvertiseHeight,
-				AdvertiseWidth:        loc.AdvertiseWidth,
-				MaterialType:          loc.MaterialType,
-				AdLimit:               loc.AdLimit,
-			}
-		}
-		switch pos {
-		case 1: //弹窗
-			resp.DialogList = ads
-		case 2: // 应用

-			resp.NineGridList = ads
-		case 3: // 横幅
-			resp.DetailbannerList = ads
-
-		case 12:
-			resp.AList = ads
-		case 13:
-			resp.BList = ads
-		}
+	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)
 	}
+
 	CacheMgr.Lock.Lock()
 	defer CacheMgr.Lock.Unlock()
-	CacheMgr.Advitise = resp
-	CacheMgr.AdvitiseMap = adMap
+	CacheMgr.Advitise = data
 }

-func GetAdvertiseLocation(adverId string) (res adcenter.AdCacheInfo) {
-	CacheMgr.Lock.RLock()
-	defer CacheMgr.Lock.RUnlock()
-	if ad, ok := CacheMgr.AdvitiseMap[adverId]; ok {
-		res = ad
+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)
+		}
 	}
-	return
 }
@@ -4,11 +4,9 @@ import (
 	"context"
 	"hkdj-web-server/app/api/proto"
 	"hkdj-web-server/app/service/translationser"
-	"hkdj-web-server/pub/adcenter"
 	"hkdj-web-server/pub/common/log"
 	"hkdj-web-server/pub/common/netutil"
 	"hkdj-web-server/pub/common/srvdef"
-	"hkdj-web-server/pub/dataReport"
 	"hkdj-web-server/pub/models/announcementmod"
 	"hkdj-web-server/pub/models/cfg"
 	"hkdj-web-server/pub/models/ipblackmod"
@@ -36,7 +34,6 @@ type CacheInfo struct {
 	Lock            sync.RWMutex     // 读写锁
 	Config          proto.ConfigInfo // 系统配置缓存
 	Advitise        proto.AdvitiseData
-	AdvitiseMap     map[string]adcenter.AdCacheInfo
 	TagCategoryList []proto.VideoTagCategoryData
 	TotalHistory    int64
 	IpBlackMaps     map[string]struct{}
@@ -61,16 +58,15 @@ func init() {

 func Start() {
 	ctx := context.Background()
-	dataReport.StartSDKConfigCron()
 	UpdateConfigInfo(ctx)
-	UpdateAdvitiseDataFromJt()
+	UpdateAdvitiseData(ctx)
 	updateIpBlack()
 	updateTagsCache()
 	updateAppRichTexts()
 	updateAnnouncements()
 	_, _ = skdCron.AddFunc("0 */5 * * * ?", func() {
 		UpdateConfigInfo(ctx)
-		UpdateAdvitiseDataFromJt()
+		UpdateAdvitiseData(ctx)
 		updateIpBlack()
 		updateTagsCache()
 		updateAppRichTexts()
@@ -155,7 +151,6 @@ func UpdateConfigInfo(ctx context.Context) {
 	config.DHSiteName = sysCfg.DHSiteName
 	config.DHTitle = sysCfg.DHTitle
 	config.ActressBackGround = netutil.MergeURL(sysCfg.ImgAppCdn, sysCfg.ActressBackGround)
-	config.ReportSDKConfig = dataReport.GetSDKDomainConfig()
 	config.WatermarkImage = sysCfg.WatermarkImage
 	config.CustomerServiceHost = sysCfg.CustomerServiceHost
 	config.ChannelCode = sysCfg.ChannelCode
@@ -562,7 +557,6 @@ func GetVideoTagCategoryDataList() []proto.VideoTagCategoryData {
 	return rsl
 }
 func Stop() {
-	dataReport.StopSDKConfigCron()
 	skdCron.Stop()
 }