合并冲突

utils/lock/distrubtLock.go

@@ -63,7 +63,7 @@ func renewLock(key, holder string, expiration int) {
 		script := redis.NewScript(`
             local key = KEYS[1]
 			local clientId = ARGV[1]
-			local expiration = tonumber(ARGV[2])
+			local expiration = tonumber(ARGV[2]
             if redis.call("get", KEYS[1]) == ARGV[1] then
                 redis.call("SET", key, clientId, "EX", expiration)
 				 return 1