diff --git a/ruoyi-admin/src/main/resources/templates/system/config/add.html b/ruoyi-admin/src/main/resources/templates/system/config/add.html
index 03fdbc69..fd718e6f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/config/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/config/add.html
@@ -21,7 +21,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/config/config.html b/ruoyi-admin/src/main/resources/templates/system/config/config.html
index 3443bd0a..4f54c222 100644
--- a/ruoyi-admin/src/main/resources/templates/system/config/config.html
+++ b/ruoyi-admin/src/main/resources/templates/system/config/config.html
@@ -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");
}
},
{
diff --git a/ruoyi-admin/src/main/resources/templates/system/config/edit.html b/ruoyi-admin/src/main/resources/templates/system/config/edit.html
index 778a8907..bff71221 100644
--- a/ruoyi-admin/src/main/resources/templates/system/config/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/config/edit.html
@@ -22,7 +22,7 @@
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 1dc86e67..20dbbb74 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -147,7 +147,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 计算时间差
*
- * @param end 最后时间
+ * @param endDate 最后时间
* @param startTime 开始时间
* @return 时间差(天/小时/分钟)
*/
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
index ffcf9d71..8e9db1db 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java
@@ -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();
}