From 1ca4879df9cc3c22181b2a200aa4b793116d3d35 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期六, 19 十月 2024 16:23:55 +0800
Subject: [PATCH] fix id

---
 main.go |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/main.go b/main.go
index b943870..a71a4de 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,6 @@
 	"data_msg_push_server/config"
 	"data_msg_push_server/service"
 
-	"fmt"
 	"time"
 
 	"basic.com/valib/logger.git"
@@ -42,6 +41,7 @@
 
 func doServer() {
 	total := 0
+	retryCount := 0
 	for {
 		t, err := service.GetTotal()
 		if err != nil {
@@ -49,8 +49,8 @@
 			return
 		}
 		total = t
-		logger.Debug("鏈彂閫佺殑鏁版嵁鎬婚噺锛�", total)
-		if total == 0 {
+		logger.Debugf("鏈彂閫佺殑鏁版嵁鎬婚噺:%d, 閲嶈瘯娆℃暟:%d", total, retryCount)
+		if total == 0 || retryCount > 10 {
 			break
 		} else {
 			for {
@@ -60,21 +60,23 @@
 					url := config.Options.ServerUrl
 					result, err1 := service.GetData()
 					if err1 != nil {
-						logger.Warn(err1.Error())
-						break
+						logger.Warn("鑾峰彇es鏁版嵁澶辫触,", err1.Error())
+						return
 					}
 
-					id, errs2 := service.SendData(result, url)
-					logger.Debug("鎺ㄩ�佺殑鏁版嵁 id: ", id)
-					if errs2 == nil {
-						//delStatus := service.DeleteData(id)
-						markStatus := service.MarkData(id)
-						fmt.Println(markStatus)
+					id, err := service.SendData(result, url)
+					logger.Debug("鎺ㄩ�佺殑鏁版嵁 id: ", result.PicId)
+					if err == nil {
+						markStatus := service.MarkData(result.PicId)
 						logger.Debug("璁板綍鎺ㄩ�佺姸鎬� markStatus: ", markStatus)
+					} else {
+						logger.Debugf("鎺ㄩ�佺殑鏁版嵁澶辫触 id: %s, err:%s", id, err.Error())
+						time.Sleep(5 * time.Second)
+						retryCount += 1
 					}
 					break
 				} else {
-					logger.Debug("鏈嶅姟绔繛鎺ュけ璐�,5绉掑悗灏濊瘯閲嶆柊杩炴帴銆傘�傘��")
+					logger.Debug("鏈嶅姟绔繛鎺ュけ璐�, 5绉掑悗灏濊瘯閲嶆柊杩炴帴銆傘�傘��")
 					time.Sleep(5 * time.Second)
 				}
 			}

--
Gitblit v1.8.0