sync: port tangguo_server upstream changes

Ported 7 commits (3a79d6a..3dcf693) from tangguo_server:
- 版本控制: comment out 2FA in admin.go
- 支付和广告调试: pay/ad refactor across appg/adser/rechargeser/pingctrl
- 对接统计: add bili_sync statistics endpoint
- 代码优化: ginUtil improvements
- 修改es/修改appID/代码调整: cumulative updates

Preserved hgmj-local differences:
- ES table prefix stays 91jd_ (not tangguo_)
- BillPlatformID stays 91短剧 (not 糖果短剧)
- admin googauth label stays @91短剧
- appg.go retains LouFengH5/DataBuriedPoint fields
- rechargeser.go retains reportser event reporting

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
2026-10-08 17:18:41 +08:00
co-authored by Claude Opus 4.7
parent 625e89c15d
commit 97f679d130
18 changed files with 750 additions and 218 deletions
+12 -22
View File
@@ -12,6 +12,7 @@ import (
"91jd-server/common/constant"
"91jd-server/common/services/message"
"91jd-server/common/store"
v10 "91jd-server/common/v10"
"91jd-server/models/cache/bannerjumpdata"
"91jd-server/models/cache/sysconfdata"
"91jd-server/models/v/bannerjumpmod"
@@ -33,7 +34,6 @@ import (
"91jd-server/common"
"91jd-server/common/log"
"91jd-server/common/stderr"
"91jd-server/common/version"
"91jd-server/models/commod"
"91jd-server/models/v/sourcemod"
"91jd-server/models/v/systemmod"
@@ -249,40 +249,30 @@ func DomainList(ctx *gin.Context) {
})
common.Go(func() {
defer wg.Done()
builId := v10.ExtractPureEngChar(ua.BuildID)
//版本、广告、公告
verResp, _, annouResp, _, _, _, err := versionser.AdvVersionAnnounThreeServer(ua.Ver, ua.SysType)
versionResp, err := VersionThreeServer(ua.Ver, ua.SysType, builId, ua.BuildID)
if err != nil {
log.Error("VersionThreeServer", log.E(err))
return
}
for k, v := range annouResp {
v.Href = activityclient.ReplaceActivityDomain(v.Href, user, wallet)
annouResp[k] = v
}
//版本业务
//安卓不做限制;iOS 端版本 <= 1.11.2 不下发版本信息
skipVer := false
if ua.SysType == constant.SysTypeIOS {
if cur, err := version.New(ua.Ver); err == nil && cur.LTE(version.MustNew("1.11.2")) {
skipVer = true
}
}
if len(verResp.DownloadLink) > 0 && !skipVer {
if versionResp.HasNewVersion {
versionBody := []*versionmod.VersionBody{
&versionmod.VersionBody{
VersionName: verResp.ServerVersion,
VersionName: versionResp.ServerVersion,
Platform: ua.SysType,
Description: verResp.Description,
ForcedUpdate: verResp.IsForceUpdate,
URL: verResp.DownloadLink[0],
IosUrl: verResp.DownloadLink[0],
Description: versionResp.Description,
ForcedUpdate: versionResp.IsForceUpdate,
URL: versionResp.DownloadLink[0],
IosUrl: versionResp.DownloadLink[0],
}}
sysInfo.Ver = versionBody
}
//公告
sysInfo.Ads.AnnounList = annouResp
})
common.Go(func() {
defer wg.Done()
jtAds, err := adser.JtAdvertiseThreeServer()
if err != nil {
log.Error("JtAdvertiseThreeServer error occur", log.E(err))