adjust

server/payserver/service/wxpay.go

@@ -24,11 +24,16 @@ type expireSession struct {
 	SessionTime int64
 	Time        int64
 }
+
+type mediaidInfo struct {
+	mediaId string
+	time    int64
+}
 type wxpay struct {
 	gamesGoods   q5.ConcurrentMap[int64, map[int64]GoodsInfo] //[gameid, [goodsid]goodsinfo]
 	accessTokens q5.ConcurrentMap[int64, TokenInfo]           //[gameid, TokenInfo]
 	expireInfo   q5.ConcurrentMap[string, *expireSession]     //[accountid, expireSession]
-	mediaInfo    q5.ConcurrentMap[int64, string]              //[gameid, mediaid]
+	mediaInfo    q5.ConcurrentMap[int64, mediaidInfo]        //[gameid, mediainfo]
 	refreshflag  bool
 	ctx          context.Context
 	client       *core.Client

server/payserver/service/wxpay_prepare.go

@@ -63,13 +63,25 @@ func (wp *wxpay) initMch() {
 }
 
 func (wp *wxpay) checkGameMediaId() {
-	wp.mediaInfo = q5.ConcurrentMap[int64, string]{}
+	wp.mediaInfo = q5.ConcurrentMap[int64, mediaidInfo]{}
-	uploadtime := int64(0)
+	gamecout := 0
+	mt.Table.Wxconfig.Traverse(func(w *mt.Wxconfig) bool {
+		gamecout++
+		return true
+	})
+
 	for {
 		nowtime := f5.GetApp().GetRealSeconds()
-		if wp.mediaInfo.GetSize() == 0 || q5.GetDaySeconds(uploadtime, 8) != q5.GetDaySeconds(nowtime, 8) {
-			// uploader := fileuploader.ImageUploader{Client: wp.client}
 		mt.Table.Wxconfig.Traverse(func(w *mt.Wxconfig) bool {
+			info, _ := wp.mediaInfo.Load(w.GetGameid())
+			if info == nil {
+				info = &mediaidInfo{}
+			}
+			
+			if q5.GetDaySeconds(info.time, 8) == q5.GetDaySeconds(nowtime, 8) && len(info.mediaId) != 0 {
+				return true
+			}
+
 			filename := q5.SafeToString(w.GetGameid()) + ".jpg"
 			fullfilename := fmt.Sprintf("../res/gamepics/%s", filename)
 
@@ -99,9 +111,13 @@ func (wp *wxpay) checkGameMediaId() {
 			}
 			writer.Close()
 
-				refreshed := false
+			desurl := "https://api.weixin.qq.com/cgi-bin/media/upload"
+			urls := mt.Table.Config.GetWxUrl()
+			if len(urls) > 0 {
+				desurl = fmt.Sprintf("https://%s/cgi-bin/media/upload", urls[0])
+			}
 			f5.GetHttpCliMgr().SendGoStylePost(
-					"https://api.weixin.qq.com/cgi-bin/media/upload",
+				desurl,
 				map[string]string{
 					"access_token": accesstoken.Token,
 					"type":         "image",
@@ -125,37 +141,16 @@ func (wp *wxpay) checkGameMediaId() {
 						return
 					}
 
-						wp.mediaInfo.Store(w.GetGameid(), rspObj.MediaId)
+					info.mediaId = rspObj.MediaId
+					info.time = nowtime
+					wp.mediaInfo.Store(w.GetGameid(), *info)
 					f5.GetSysLog().Debug("upload refresh media ok:%s, %s", filename, rspObj.MediaId)
-						refreshed = true
 				})
 
-				if refreshed {
-					return true
-				}
-
-				// file, err := os.Open(fullfilename)
-				// if err != nil {
-				// 	f5.GetSysLog().Error("file error:%s", filename)
-				// 	return false
-				// }
-				// defer file.Close()
-
-				// resp, result, err := uploader.Upload(wp.ctx, file, filename, consts.ImageJPG)
-				// if err == nil {
-				// 	wp.mediaInfo.Store(w.GetGameid(), *resp.MediaId)
-				// 	f5.GetSysLog().Debug("refresh media ok:%s, %s", filename, *resp.MediaId)
-				// } else {
-				// 	f5.GetSysLog().Error("refresh media err:%s, %s", filename, result.Response.Status)
-				// }
-
 			return true
 		})
 
-			uploadtime = nowtime
+		if wp.mediaInfo.GetSize() != gamecout {
-		}
-
-		if wp.mediaInfo.GetSize() == 0 {
 			time.Sleep(time.Second)
 		} else {
 			time.Sleep(time.Minute)