huangge1199/RuoYi-Vue-Oracle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正别字

Browse Source
This commit is contained in:
RuoYi 2021-10-25 10:15:41 +08:00
parent d93b1016a2
commit 8367517ede
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ruoyi/common/utils/Threads.java
View File

@ -36,7 +36,7 @@ public class Threads
* 停止线程池 * 停止线程池
* 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务. * 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务.
* 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数. * 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数.
* 如果仍人超時，則強制退出. * 如果仍然超時，則強制退出.
* 另对在shutdown时线程本身被调用中断做了处理. * 另对在shutdown时线程本身被调用中断做了处理.
*/ */
public static void shutdownAndAwaitTermination(ExecutorService pool) public static void shutdownAndAwaitTermination(ExecutorService pool)

4
src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
View File

@ -61,7 +61,7 @@ public class RateLimiterAspect
Long number = redisTemplate.execute(limitScript, keys, count, time); Long number = redisTemplate.execute(limitScript, keys, count, time);
if (StringUtils.isNull(number) || number.intValue() > count) if (StringUtils.isNull(number) || number.intValue() > count)
{ {
throw new ServiceException("访问过于频繁，请稍后再试"); throw new ServiceException("访问过于频繁，请稍候再试");
} }
log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), key); log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), key);
} }
@ -71,7 +71,7 @@ public class RateLimiterAspect
} }
catch (Exception e) catch (Exception e)
{ {
throw new RuntimeException("服务器限流异常，请稍后再试"); throw new RuntimeException("服务器限流异常，请稍候再试");
} }
} }