[update] fix conflict

Author: zicorn

internal/utils/cache/redis.go

@@ -497,11 +497,22 @@ func Expire(key string, time time.Duration, context ...redis.Cmdable) (bool, err
 	return getCmdable(context...).Expire(ctx, serialKey(key), time).Result()
 }
 
-func Transaction(fn func(redis.Pipeliner) error) error {
+func Transaction(fn func(redis.Pipeliner) error, keys ...string) error {
 	if client == nil {
 		return ErrDBNotInit
 	}
 
+	// 如果没有提供 keys，则返回错误
+	if len(keys) == 0 {
+		return errors.New("redis: Watch requires at least one key")
+	}
+
+	// 将 keys 进行序列化处理
+	watchKeys := make([]string, len(keys))
+	for i, key := range keys {
+		watchKeys[i] = serialKey(key)
+	}
+
 	return client.Watch(ctx, func(tx *redis.Tx) error {
 		_, err := tx.TxPipelined(ctx, func(p redis.Pipeliner) error {
 			return fn(p)
@@ -510,7 +521,7 @@ func Transaction(fn func(redis.Pipeliner) error) error {
 			return nil
 		}
 		return err
-	})
+	}, watchKeys...)
 }
 
 func Publish(channel string, message any, context ...redis.Cmdable) error {

internal/utils/cache/redis_test.go

@@ -54,7 +54,7 @@ func TestRedisTransaction(t *testing.T) {
 		}
 
 		return errors.New("test transaction error")
-	})
+	}, strings.Join([]string{TEST_PREFIX, "key"}, ":"))
 
 	if err == nil {
 		t.Errorf("transaction should return error")
@@ -90,7 +90,7 @@ func TestRedisTransaction(t *testing.T) {
 		}
 
 		return nil
-	})
+	}, strings.Join([]string{TEST_PREFIX, "key"}, ":"))
 
 	if err != nil {
 		t.Errorf("transaction should not return error")