支付和广告调试

app/api/pingctrl/pingctrl.go

@@ -11,6 +11,7 @@ import (
 	"91porn-server/common/constant"
 	"91porn-server/common/services/message"
 	"91porn-server/common/store"
+	v10 "91porn-server/common/v10"
 	"91porn-server/models/cache/bannerjumpdata"
 	"91porn-server/models/cache/sysconfdata"
 	"91porn-server/models/v/bannerjumpmod"
@@ -32,7 +33,6 @@ import (
 	"91porn-server/common"
 	"91porn-server/common/log"
 	"91porn-server/common/stderr"
-	"91porn-server/common/version"
 	"91porn-server/models/commod"
 	"91porn-server/models/v/sourcemod"
 	"91porn-server/models/v/systemmod"
@@ -248,40 +248,29 @@ 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))
@@ -324,6 +313,7 @@ func DomainList(ctx *gin.Context) {
 				adsList = append(adsList, adsinfo)
 			}
 		}
+		log.Info("JtAdvertiseThreeServer", log.Any("ads", adsList))
 		sysInfo.Ads.AdsList = adsList
 	})
 	common.Go(func() {