From 2ebedeb5df1db4d9759e02e5f6aece999a45adc3 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 12 Aug 2023 16:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/config/add.html     |  2 +-
 .../resources/templates/system/config/config.html  | 14 +++++++++-----
 .../resources/templates/system/config/edit.html    |  2 +-
 .../java/com/ruoyi/common/utils/DateUtils.java     |  2 +-
 .../framework/shiro/service/SysLoginService.java   |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

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 @@
         <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">
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 @@
             <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">
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();
         }