From a1fb5cf7c46d1605cbf21967a27ad1a728cee91a Mon Sep 17 00:00:00 2001
From: ambition <39669748+Ambition9186@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:50:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B7=B3=E8=BF=87=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E7=89=88=E6=9C=AC=E4=B8=8D=E5=81=9A=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=20(#134)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/types.go | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/client/types.go b/client/types.go
index 5de861614..175baadc4 100644
--- a/client/types.go
+++ b/client/types.go
@@ -349,7 +349,10 @@ func clearOldFiles(dir string, files []*ConfigItemFile) error {
 
 // Execute 统一执行入口
 func (r *Release) Execute(steps ...Function) error {
-	var err error
+	var (
+		err  error
+		skip bool
+	)
 	// 填充appMate数据
 	r.AppMate.CursorID = r.CursorID
 	r.AppMate.StartTime = time.Now().UTC()
@@ -376,17 +379,18 @@ func (r *Release) Execute(steps ...Function) error {
 			}
 		}
 
-		if err = r.sendVersionChangeMessaging(bd); err != nil {
-			logger.Error("description failed to report the client change event",
-				slog.String("client_mode", r.ClientMode.String()), slog.Uint64("biz", uint64(r.BizID)),
-				slog.String("app", r.AppMate.App), logger.ErrAttr(err))
+		// 如果是跳过版本变更则不上报数据
+		if !skip {
+			if err = r.sendVersionChangeMessaging(bd); err != nil {
+				logger.Error("description failed to report the client change event",
+					slog.String("client_mode", r.ClientMode.String()), slog.Uint64("biz", uint64(r.BizID)),
+					slog.String("app", r.AppMate.App), logger.ErrAttr(err))
+			}
 		}
-
 	}()
 
 	// 一定要在该位置
 	// 不然会导致current_release_id是0的问题
-	var skip bool
 	if r.ClientMode == sfs.Watch {
 		skip, err = r.compareRelease()
 		if err != nil {
@@ -394,6 +398,11 @@ func (r *Release) Execute(steps ...Function) error {
 		}
 	}
 
+	// 跳过版本变更
+	if skip {
+		return nil
+	}
+
 	// 发送拉取前事件
 	if err = r.sendVersionChangeMessaging(bd); err != nil {
 		logger.Error("failed to send the pull status event", slog.Uint64("biz", uint64(r.BizID)),
@@ -405,10 +414,6 @@ func (r *Release) Execute(steps ...Function) error {
 		r.loopHeartbeat(bd)
 	}
 
-	if skip {
-		return nil
-	}
-
 	for _, step := range steps {
 		if err = step(); err != nil {
 			return err