From c6f02392cbad2917e526503ca43d91aa5c9bce62 Mon Sep 17 00:00:00 2001 From: Dingxindong Date: Wed, 7 Dec 2022 15:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E5=BC=95?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=A7=A3=E5=86=B3=E6=BD=9C?= =?UTF-8?q?=E5=9C=A8=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alipay/impl/AlipayMiniProgramAccountServiceImpl.java | 1 - .../handler/deduplication/limit/SlideWindowLimitService.java | 4 ++-- .../java/com/java3y/austin/support/utils/RedisUtils.java | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/alipay/impl/AlipayMiniProgramAccountServiceImpl.java b/austin-handler/src/main/java/com/java3y/austin/handler/alipay/impl/AlipayMiniProgramAccountServiceImpl.java index 4fa1d56..a23ef71 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/alipay/impl/AlipayMiniProgramAccountServiceImpl.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/alipay/impl/AlipayMiniProgramAccountServiceImpl.java @@ -6,7 +6,6 @@ import com.alipay.api.AlipayConfig; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.domain.AlipayOpenAppMiniTemplatemessageSendModel; import com.alipay.api.request.AlipayOpenAppMiniTemplatemessageSendRequest; -import com.java3y.austin.common.constant.SendAccountConstant; import com.java3y.austin.common.dto.account.AlipayMiniProgramAccount; import com.java3y.austin.handler.alipay.AlipayMiniProgramAccountService; import com.java3y.austin.handler.domain.alipay.AlipayMiniProgramParam; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java index 5bdad1c..ff3d04a 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SlideWindowLimitService.java @@ -12,7 +12,7 @@ import org.springframework.scripting.support.ResourceScriptSource; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; -import java.util.Arrays; +import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -56,7 +56,7 @@ public class SlideWindowLimitService extends AbstractLimitService { String key = LIMIT_TAG + deduplicationSingleKey(service, taskInfo, receiver); String scoreValue = String.valueOf(IdUtil.getSnowflake().nextId()); String score = String.valueOf(nowTime); - if (redisUtils.execLimitLua(redisScript, Arrays.asList(key), String.valueOf(param.getDeduplicationTime() * 1000), score, String.valueOf(param.getCountNum()), scoreValue)) { + if (redisUtils.execLimitLua(redisScript, Collections.singletonList(key), String.valueOf(param.getDeduplicationTime() * 1000), score, String.valueOf(param.getCountNum()), scoreValue)) { filterReceiver.add(receiver); } diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java index f8977de..0b73201 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java @@ -170,13 +170,14 @@ public class RedisUtils { try { Long execute = redisTemplate.execute(redisScript, keys, args); - + if (execute == null) { + return false; + } return CommonConstant.TRUE.equals(execute.intValue()); } catch (Exception e) { log.error("redis execLimitLua fail! e:{}", Throwables.getStackTraceAsString(e)); } - return false; }