From 8a7dcf8a80583eb5710a336c89be63541c3054f0 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 25 Oct 2021 10:26:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E5=88=AB=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/ruoyi/common/annotation/RepeatSubmit.java | 2 +-
.../java/com/ruoyi/framework/aspectj/RateLimiterAspect.java | 4 ++--
ruoyi-ui/src/layout/components/Settings/index.vue | 4 ++--
ruoyi-ui/src/views/index.vue | 2 +-
ruoyi-ui/src/views/monitor/cache/index.vue | 2 +-
ruoyi-ui/src/views/monitor/server/index.vue | 2 +-
ruoyi-ui/src/views/system/role/index.vue | 4 ++--
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
index 40830052..1e277435 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
@@ -27,5 +27,5 @@ public @interface RepeatSubmit
/**
* 提示消息
*/
- public String message() default "不允许重复提交，请稍后再试";
+ public String message() default "不允许重复提交，请稍候再试";
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
index 5020d000..7b8ccf1d 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
@@ -61,7 +61,7 @@ public class RateLimiterAspect
Long number = redisTemplate.execute(limitScript, keys, count, time);
if (StringUtils.isNull(number) || number.intValue() > count)
{
- throw new ServiceException("访问过于频繁，请稍后再试");
+ throw new ServiceException("访问过于频繁，请稍候再试");
}
log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), key);
}
@@ -71,7 +71,7 @@ public class RateLimiterAspect
}
catch (Exception e)
{
- throw new RuntimeException("服务器限流异常，请稍后再试");
+ throw new RuntimeException("服务器限流异常，请稍候再试");
}
}
diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/ruoyi-ui/src/layout/components/Settings/index.vue
index 4dff1d0c..bd2f553c 100644
--- a/ruoyi-ui/src/layout/components/Settings/index.vue
+++ b/ruoyi-ui/src/layout/components/Settings/index.vue
@@ -162,7 +162,7 @@ export default {
this.sideTheme = val;
},
saveSetting() {
- this.$modal.loading("正在保存到本地，请稍后...");
+ this.$modal.loading("正在保存到本地，请稍候...");
this.$cache.local.set(
"layout-setting",
`{
@@ -178,7 +178,7 @@ export default {
setTimeout(this.$modal.closeLoading(), 1000)
},
resetSetting() {
- this.$modal.loading("正在清除设置缓存并刷新，请稍后...");
+ this.$modal.loading("正在清除设置缓存并刷新，请稍候...");
this.$cache.local.remove("layout-setting")
setTimeout("window.location.reload()", 1000)
}
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 00379e5a..46811841 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -590,7 +590,7 @@
<li>修复表格时间为空出现的异常</li>
<li>添加Jackson日期反序列化时区配置</li>
<li>调整根据用户权限加载菜单数据树形结构</li>
- <li>调整成功登陆不恢复按钮，防止多次点击</li>
+ <li>调整成功登录不恢复按钮，防止多次点击</li>
<li>修改用户个人资料同步缓存信息</li>
<li>修复页面同时出现el-upload和Editor不显示处理</li>
<li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
diff --git a/ruoyi-ui/src/views/monitor/cache/index.vue b/ruoyi-ui/src/views/monitor/cache/index.vue
index 22501dc3..cafa28cf 100644
--- a/ruoyi-ui/src/views/monitor/cache/index.vue
+++ b/ruoyi-ui/src/views/monitor/cache/index.vue
@@ -139,7 +139,7 @@ export default {
},
// 打开加载层
openLoading() {
- this.$modal.loading("正在加载缓存监控数据，请稍后！");
+ this.$modal.loading("正在加载缓存监控数据，请稍候！");
},
},
};
diff --git a/ruoyi-ui/src/views/monitor/server/index.vue b/ruoyi-ui/src/views/monitor/server/index.vue
index 503bf9b6..3eaaea0e 100644
--- a/ruoyi-ui/src/views/monitor/server/index.vue
+++ b/ruoyi-ui/src/views/monitor/server/index.vue
@@ -196,7 +196,7 @@ export default {
},
// 打开加载层
openLoading() {
- this.$modal.loading("正在加载服务监控数据，请稍后！");
+ this.$modal.loading("正在加载服务监控数据，请稍候！");
}
}
};
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 6e585586..5110834d 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -200,7 +200,7 @@
ref="menu"
node-key="id"
:check-strictly="!form.menuCheckStrictly"
- empty-text="加载中，请稍后"
+ empty-text="加载中，请稍候"
:props="defaultProps"
></el-tree>
</el-form-item>
@@ -245,7 +245,7 @@
ref="dept"
node-key="id"
:check-strictly="!form.deptCheckStrictly"
- empty-text="加载中，请稍后"
+ empty-text="加载中，请稍候"
:props="defaultProps"
></el-tree>
</el-form-item>