Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
8a7dcf8a
Commit
8a7dcf8a
authored
Oct 25, 2021
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正错别字
parent
0c30ffa1
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
...c/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
+1
-1
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
...n/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
+2
-2
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
+2
-2
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/index.vue
+1
-1
ruoyi-ui/src/views/monitor/cache/index.vue
ruoyi-ui/src/views/monitor/cache/index.vue
+1
-1
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
+1
-1
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/role/index.vue
+2
-2
No files found.
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
View file @
8a7dcf8a
...
@@ -27,5 +27,5 @@ public @interface RepeatSubmit
...
@@ -27,5 +27,5 @@ public @interface RepeatSubmit
/**
/**
* 提示消息
* 提示消息
*/
*/
public
String
message
()
default
"不允许重复提交,请稍
后
再试"
;
public
String
message
()
default
"不允许重复提交,请稍
候
再试"
;
}
}
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
View file @
8a7dcf8a
...
@@ -61,7 +61,7 @@ public class RateLimiterAspect
...
@@ -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
...
@@ -71,7 +71,7 @@ public class RateLimiterAspect
}
}
catch
(
Exception
e
)
catch
(
Exception
e
)
{
{
throw
new
RuntimeException
(
"服务器限流异常,请稍
后
再试"
);
throw
new
RuntimeException
(
"服务器限流异常,请稍
候
再试"
);
}
}
}
}
...
...
ruoyi-ui/src/layout/components/Settings/index.vue
View file @
8a7dcf8a
...
@@ -162,7 +162,7 @@ export default {
...
@@ -162,7 +162,7 @@ export default {
this
.
sideTheme
=
val
;
this
.
sideTheme
=
val
;
},
},
saveSetting
()
{
saveSetting
()
{
this
.
$modal
.
loading
(
"
正在保存到本地,请稍
后
...
"
);
this
.
$modal
.
loading
(
"
正在保存到本地,请稍
候
...
"
);
this
.
$cache
.
local
.
set
(
this
.
$cache
.
local
.
set
(
"
layout-setting
"
,
"
layout-setting
"
,
`{
`{
...
@@ -178,7 +178,7 @@ export default {
...
@@ -178,7 +178,7 @@ export default {
setTimeout
(
this
.
$modal
.
closeLoading
(),
1000
)
setTimeout
(
this
.
$modal
.
closeLoading
(),
1000
)
},
},
resetSetting
()
{
resetSetting
()
{
this
.
$modal
.
loading
(
"
正在清除设置缓存并刷新,请稍
后
...
"
);
this
.
$modal
.
loading
(
"
正在清除设置缓存并刷新,请稍
候
...
"
);
this
.
$cache
.
local
.
remove
(
"
layout-setting
"
)
this
.
$cache
.
local
.
remove
(
"
layout-setting
"
)
setTimeout
(
"
window.location.reload()
"
,
1000
)
setTimeout
(
"
window.location.reload()
"
,
1000
)
}
}
...
...
ruoyi-ui/src/views/index.vue
View file @
8a7dcf8a
...
@@ -590,7 +590,7 @@
...
@@ -590,7 +590,7 @@
<li>
修复表格时间为空出现的异常
</li>
<li>
修复表格时间为空出现的异常
</li>
<li>
添加Jackson日期反序列化时区配置
</li>
<li>
添加Jackson日期反序列化时区配置
</li>
<li>
调整根据用户权限加载菜单数据树形结构
</li>
<li>
调整根据用户权限加载菜单数据树形结构
</li>
<li>
调整成功登
陆
不恢复按钮,防止多次点击
</li>
<li>
调整成功登
录
不恢复按钮,防止多次点击
</li>
<li>
修改用户个人资料同步缓存信息
</li>
<li>
修改用户个人资料同步缓存信息
</li>
<li>
修复页面同时出现el-upload和Editor不显示处理
</li>
<li>
修复页面同时出现el-upload和Editor不显示处理
</li>
<li>
修复在角色管理页修改菜单权限偶尔未选中问题
</li>
<li>
修复在角色管理页修改菜单权限偶尔未选中问题
</li>
...
...
ruoyi-ui/src/views/monitor/cache/index.vue
View file @
8a7dcf8a
...
@@ -139,7 +139,7 @@ export default {
...
@@ -139,7 +139,7 @@ export default {
},
},
// 打开加载层
// 打开加载层
openLoading
()
{
openLoading
()
{
this
.
$modal
.
loading
(
"
正在加载缓存监控数据,请稍
后
!
"
);
this
.
$modal
.
loading
(
"
正在加载缓存监控数据,请稍
候
!
"
);
},
},
},
},
};
};
...
...
ruoyi-ui/src/views/monitor/server/index.vue
View file @
8a7dcf8a
...
@@ -196,7 +196,7 @@ export default {
...
@@ -196,7 +196,7 @@ export default {
},
},
// 打开加载层
// 打开加载层
openLoading
()
{
openLoading
()
{
this
.
$modal
.
loading
(
"
正在加载服务监控数据,请稍
后
!
"
);
this
.
$modal
.
loading
(
"
正在加载服务监控数据,请稍
候
!
"
);
}
}
}
}
};
};
...
...
ruoyi-ui/src/views/system/role/index.vue
View file @
8a7dcf8a
...
@@ -200,7 +200,7 @@
...
@@ -200,7 +200,7 @@
ref=
"menu"
ref=
"menu"
node-key=
"id"
node-key=
"id"
:check-strictly=
"!form.menuCheckStrictly"
:check-strictly=
"!form.menuCheckStrictly"
empty-text=
"加载中,请稍
后
"
empty-text=
"加载中,请稍
候
"
:props=
"defaultProps"
:props=
"defaultProps"
></el-tree>
></el-tree>
</el-form-item>
</el-form-item>
...
@@ -245,7 +245,7 @@
...
@@ -245,7 +245,7 @@
ref=
"dept"
ref=
"dept"
node-key=
"id"
node-key=
"id"
:check-strictly=
"!form.deptCheckStrictly"
:check-strictly=
"!form.deptCheckStrictly"
empty-text=
"加载中,请稍
后
"
empty-text=
"加载中,请稍
候
"
:props=
"defaultProps"
:props=
"defaultProps"
></el-tree>
></el-tree>
</el-form-item>
</el-form-item>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment