diff --git a/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java b/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java index 4b44a3fb..82ff4e6a 100644 --- a/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java +++ b/src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java @@ -44,9 +44,8 @@ public class AppUserPrizeExchangeController { @PostMapping("/exchange") @ApiOperation("兑换") public Result exchange(@RequestAttribute("userId") Long userId, @RequestBody UserPrizeExchange entity) { - //userPrizeExchangeService.exchange(userId, entity); - //return Result.success(); - return Result.error("奖品正在路上,请耐心等待"); + userPrizeExchangeService.exchange(userId, entity); + return Result.success(); } @Login diff --git a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java index 88614d05..b2129794 100644 --- a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java +++ b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java @@ -350,10 +350,9 @@ public class RedisServiceImpl implements RedisService { @Override public boolean setCreateOrderFlagAndCheckLimit(Long userId, Long orderId) { - String key = "createOrder:" + userId; - redisTemplate.opsForSet().add(key, orderId.toString()); - redisUtils.expire(key, 60); - Set members = redisTemplate.opsForSet().members(key); - return members != null && members.size() > 22; + String key = "createOrder:" + userId + ":" + orderId; + redisTemplate.opsForValue().set(key, orderId.toString(), 60, TimeUnit.SECONDS); + Set keys = redisTemplate.keys("createOrder:" + userId + ":*"); + return keys != null && keys.size() > 22; } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 53f06f32..930d7734 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -123,7 +123,7 @@ logging: limit: urlRate: 10 # 同一用户单url每秒限制次数 - ipJumpLimit: 4 # 同一ip每分钟跳动次数 + ipJumpLimit: 6 # 同一ip每分钟跳动次数 # 指定sharding-jdbc雪花算法的工作机器ID snowflake: