czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

Browse Source
This commit is contained in:
GYJ
2025-01-14 13:40:51 +08:00
parent 5bb02d0909 e982a06dc3
commit 013234d331
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/sqx/modules/app/controller/AppUserPrizeExchangeController.java
View File

@@ -44,9 +44,8 @@ public class AppUserPrizeExchangeController {
@PostMapping("/exchange") @PostMapping("/exchange")
@ApiOperation("兑换") @ApiOperation("兑换")
public Result exchange(@RequestAttribute("userId") Long userId, @RequestBody UserPrizeExchange entity) { public Result exchange(@RequestAttribute("userId") Long userId, @RequestBody UserPrizeExchange entity) {
//userPrizeExchangeService.exchange(userId, entity); userPrizeExchangeService.exchange(userId, entity);
//return Result.success(); return Result.success();
return Result.error("奖品正在路上，请耐心等待");
} }
@Login @Login

9
src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java
View File

@@ -350,10 +350,9 @@ public class RedisServiceImpl implements RedisService {
@Override @Override
public boolean setCreateOrderFlagAndCheckLimit(Long userId, Long orderId) { public boolean setCreateOrderFlagAndCheckLimit(Long userId, Long orderId) {
String key = "createOrder:" + userId; String key = "createOrder:" + userId + ":" + orderId;
redisTemplate.opsForSet().add(key, orderId.toString()); redisTemplate.opsForValue().set(key, orderId.toString(), 60, TimeUnit.SECONDS);
redisUtils.expire(key, 60); Set<String> keys = redisTemplate.keys("createOrder:" + userId + ":*");
Set<String> members = redisTemplate.opsForSet().members(key); return keys != null && keys.size() > 22;
return members != null && members.size() > 22;
} }
} }

2
src/main/resources/application.yml
View File

@@ -123,7 +123,7 @@ logging:
limit: limit:
urlRate: 10 # 同一用户单url每秒限制次数 urlRate: 10 # 同一用户单url每秒限制次数
ipJumpLimit: 4 # 同一ip每分钟跳动次数 ipJumpLimit: 6 # 同一ip每分钟跳动次数
# 指定sharding-jdbc雪花算法的工作机器ID # 指定sharding-jdbc雪花算法的工作机器ID
snowflake: snowflake: