github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

优化代码

pull/467/MERGE
RuoYi 2023-08-12 16:21:23 +08:00
parent e4585f5dcb
commit 2ebedeb5df
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/templates/system/config/add.html
View File

@ -21,7 +21,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">参数键值：</label>
<div class="col-sm-8">
<input id="configValue" name="configValue" class="form-control" type="text" required>
<textarea id="configValue" name="configValue" class="form-control" rows="4" required></textarea>
</div>
</div>
<div class="form-group">

14
ruoyi-admin/src/main/resources/templates/system/config/config.html
View File

@ -87,26 +87,30 @@
field: 'configName',
title: '参数名称',
formatter: function(value, row, index) {
return $.table.tooltip(value);
return $.table.tooltip(value);
}
},
{
field: 'configKey',
title: '参数键名',
formatter: function(value, row, index) {
return $.table.tooltip(value);
return $.table.tooltip(value);
}
},
{
field: 'configValue',
title: '参数键值'
title: '参数键值',
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value, 10, "open");
}
},
{
field: 'configType',
title: '系统内置',
align: 'center',
formatter: function(value, row, index) {
return $.table.selectDictLabel(datas, value);
return $.table.selectDictLabel(datas, value);
}
},
{
@ -114,7 +118,7 @@
title: '备注',
align: 'center',
formatter: function(value, row, index) {
return $.table.tooltip(value, 10, "open");
return $.table.tooltip(value, 10, "open");
}
},
{

2
ruoyi-admin/src/main/resources/templates/system/config/edit.html
View File

@ -22,7 +22,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">参数键值：</label>
<div class="col-sm-8">
<input id="configValue" name="configValue" th:field="*{configValue}" class="form-control" type="text" required>
<textarea id="configValue" name="configValue" class="form-control" rows="4" required>[[*{configValue}]]</textarea>
</div>
</div>
<div class="form-group">

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

@ -147,7 +147,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 计算时间差
*
* @param end 最后时间
* @param endDate 最后时间
* @param startTime 开始时间
* @return 时间差（天/小时/分钟）
*/

2
ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
View File

@ -118,7 +118,7 @@ public class SysLoginService
if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
{
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark())));
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked")));
throw new UserBlockedException();
}