lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2026-03-10 00:13:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 #3631 修复tryLock和unlock中针对Key的序列化方式不一致导致无法unlock的问题
Some checks failed
Publish to Maven Central / build-and-publish (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Copilot
2025-09-23 10:53:09 +08:00
committed by GitHub
parent 6fc17201e1
commit e6a844ab70
2 changed files with 110 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
weixin-java-common/src/main/java/me/chanjar/weixin/common/util/locks/RedisTemplateSimpleDistributedLock.java
View File

@@ -1,18 +1,11 @@
package me.chanjar.weixin.common.util.locks;
import lombok.Getter;
import org.springframework.data.redis.connection.RedisStringCommands;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.script.DefaultRedisScript;
import org.springframework.data.redis.core.script.RedisScript;
import org.springframework.data.redis.core.types.Expiration;
import org.springframework.data.redis.serializer.RedisSerializer;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
@@ -72,17 +65,16 @@ public class RedisTemplateSimpleDistributedLock implements Lock {
value = UUID.randomUUID().toString();
valueThreadLocal.set(value);
}
RedisSerializer<String> keySerializer = (RedisSerializer<String>) redisTemplate.getKeySerializer();
RedisSerializer<String> valueSerializer = (RedisSerializer<String>) redisTemplate.getValueSerializer();
final byte[] keyBytes = Objects.requireNonNull(keySerializer.serialize(key));
final byte[] valueBytes = Objects.requireNonNull(valueSerializer.serialize(value));
List<Object> redisResults = redisTemplate.executePipelined((RedisCallback<String>) connection -> {
connection.set(keyBytes, valueBytes, Expiration.milliseconds(leaseMilliseconds), RedisStringCommands.SetOption.SET_IF_ABSENT);
connection.get(keyBytes);
return null;
});
Object currentLockSecret = redisResults.size() > 1 ? redisResults.get(1) : redisResults.get(0);
return currentLockSecret != null && currentLockSecret.toString().equals(value);
// Use high-level StringRedisTemplate API to ensure consistent key serialization
Boolean lockAcquired = redisTemplate.opsForValue().setIfAbsent(key, value, leaseMilliseconds, TimeUnit.MILLISECONDS);
if (Boolean.TRUE.equals(lockAcquired)) {
return true;
}
// Check if we already hold the lock (reentrant behavior)
String currentValue = redisTemplate.opsForValue().get(key);
return value.equals(currentValue);
}
@Override