From 28359fbf23b481f09a450dbb1b28c1ce6fb97312 Mon Sep 17 00:00:00 2001
From: Yun <yun@yun.ink>
Date: Sun, 14 Sep 2025 23:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cluster.go               | 12 ++++++------
 priority/version_test.go |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cluster.go b/cluster.go
index 050e712..b46ab9c 100644
--- a/cluster.go
+++ b/cluster.go
@@ -283,9 +283,11 @@ func (c *Cluster) getNextTime() {
 	clusterWorkerList.Range(func(key, value interface{}) bool {
 		val := value.(timerStr)
 
-		nextTime, _ := GetNextTime(time.Now().In(c.location), *val.JobData)
-
-		// fmt.Println(val.ExtendData, val.JobData, nextTime)
+		nextTime, err := GetNextTime(time.Now().In(c.location), *val.JobData)
+		if err != nil {
+			c.logger.Errorf(c.ctx, "获取下次执行时间失败:%s %s", val.TaskId, err.Error())
+			return true
+		}
 
 		// 内部判定是否重复
 		cacheKey := fmt.Sprintf("%s_%s_%d", c.keyPrefix, val.TaskId, nextTime.UnixMilli())
@@ -302,7 +304,6 @@ func (c *Cluster) getNextTime() {
 			// 重试2次还是失败就不执行了
 			return true
 		}
-		// fmt.Println("计算时间1", val.ExtendData, time.UnixMilli(nextTime.UnixMilli()).Format("2006-01-02 15:04:05"))
 
 		// redis lua脚本，尝试设置nx锁时间为一分钟，如果能设置进去则添加到有序集合zsetKey
 		script := `
@@ -464,13 +465,12 @@ func (c *Cluster) doTask(ctx context.Context, taskId string) {
 		c.logger.Errorf(ctx, "doTask timer:任务不存在:%s", taskId)
 		return
 	}
-	t,ok := val.(timerStr)
+	t, ok := val.(timerStr)
 	if !ok {
 		c.logger.Errorf(ctx, "doTask timer:任务不存在:%s", taskId)
 		return
 	}
 
-
 	// 这里加一个全局锁
 	lock := lockx.NewGlobalLock(ctx, c.redis, taskId)
 	tB := lock.Lock()
diff --git a/priority/version_test.go b/priority/version_test.go
index b3028c2..9bc310c 100644
--- a/priority/version_test.go
+++ b/priority/version_test.go
@@ -59,8 +59,8 @@ func TestVersionToPriority(t *testing.T) {
 		{
 			name:    "zero version part",
 			version: "1.0.3",
-			want:    0,
-			wantErr: true,
+			want:    1000003000000,
+			wantErr: false,
 		},
 		{
 			name:    "zero version part 2",