Commit 34475143 authored by 许润龙's avatar 许润龙

Merge branch 'dev-activity-faw' into 'uat'

Dev activity faw

See merge request !62
parents 5792d9c0 c68e3f07
...@@ -22,7 +22,7 @@ public class FawActivityDTO { ...@@ -22,7 +22,7 @@ public class FawActivityDTO {
@Min(value = 1, message = "当前页最小1") @Min(value = 1, message = "当前页最小1")
private Integer current; private Integer current;
@Max(value = 500, message = "分页大小最大500") @Max(value = 1000, message = "分页大小最大1000")
private Integer size; private Integer size;
private String publishDateStart; private String publishDateStart;
......
...@@ -55,13 +55,13 @@ public class BaseService { ...@@ -55,13 +55,13 @@ public class BaseService {
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
// String header = "token"; String header = "token";
// String fawKey = String.format("%s:%s:limit", dataType, header); String fawKey = String.format("%s:%s:limit", dataType, header);
// RRateLimiter rateLimiter = redissonClient.getRateLimiter(fawKey); RRateLimiter rateLimiter = redissonClient.getRateLimiter(fawKey);
// rateLimiter.trySetRate(RateType.OVERALL, limit, limitPeriod, RateIntervalUnit.SECONDS); rateLimiter.trySetRate(RateType.OVERALL, limit, limitPeriod, RateIntervalUnit.SECONDS);
// if (!rateLimiter.tryAcquire(1, waiting, TimeUnit.MILLISECONDS)) { if (!rateLimiter.tryAcquire(1, waiting, TimeUnit.MILLISECONDS)) {
// return BaseController.error("10010", "您的请求太过频繁,请稍后再试!"); return BaseController.error("10010", "您的请求太过频繁,请稍后再试!");
// } }
return null; return null;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment