RuoYi 4 rokov pred
rodič
commit
b277995c64

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -52,7 +52,7 @@ public class SysLogininforController extends BaseController
         return getDataTable(list);
     }
 
-    @Log(title = "登日志", businessType = BusinessType.EXPORT)
+    @Log(title = "登日志", businessType = BusinessType.EXPORT)
     @RequiresPermissions("monitor:logininfor:export")
     @PostMapping("/export")
     @ResponseBody
@@ -60,11 +60,11 @@ public class SysLogininforController extends BaseController
     {
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
         ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
-        return util.exportExcel(list, "登日志");
+        return util.exportExcel(list, "登日志");
     }
 
     @RequiresPermissions("monitor:logininfor:remove")
-    @Log(title = "登日志", businessType = BusinessType.DELETE)
+    @Log(title = "登日志", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     @ResponseBody
     public AjaxResult remove(String ids)
@@ -73,7 +73,7 @@ public class SysLogininforController extends BaseController
     }
     
     @RequiresPermissions("monitor:logininfor:remove")
-    @Log(title = "登日志", businessType = BusinessType.CLEAN)
+    @Log(title = "登日志", businessType = BusinessType.CLEAN)
     @PostMapping("/clean")
     @ResponseBody
     public AjaxResult clean()

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -76,7 +76,7 @@ public class SysUserOnlineController extends BaseController
             }
             if (sessionId.equals(ShiroUtils.getSessionId()))
             {
-                return error("当前登用户无法强退");
+                return error("当前登用户无法强退");
             }
             onlineSessionDAO.delete(onlineSession);
             online.setStatus(OnlineStatus.off_line);

+ 1 - 1
ruoyi-admin/src/main/resources/templates/demo/form/tabs_panels.html

@@ -334,7 +334,7 @@
             <div class="col-sm-6">
                 <div class="jumbotron">
                     <h1>超大屏幕</h1>
-                    <p>Bootstrap 支持的另一个特性,超大屏幕(Jumbotron)。顾名思义该组件可以增加标题的大小,并为登页面内容添加更多的外边距(margin)。使用超大屏幕(Jumbotron)的步骤如下:</p>
+                    <p>Bootstrap 支持的另一个特性,超大屏幕(Jumbotron)。顾名思义该组件可以增加标题的大小,并为登页面内容添加更多的外边距(margin)。使用超大屏幕(Jumbotron)的步骤如下:</p>
                     <div class="alert alert-warning">
                         <ol>
                             <li>创建一个带有 class .jumbotron. 的容器</li>

+ 2 - 2
ruoyi-admin/src/main/resources/templates/main.html

@@ -707,7 +707,7 @@
 									<div id="v21" class="panel-collapse collapse">
 										<div class="panel-body">
 										   <ol>
-										        <li>新增登超时提醒</li>
+										        <li>新增登超时提醒</li>
 										        <li>修复定时器热部署转换问题</li>
 										        <li>修复登录验证码校验无效问题</li>
 												<li>定时任务新增立即执行一次</li>
@@ -778,7 +778,7 @@
 										<div class="panel-body">
 										   <ol>
 												<li>优化登录失败刷新验证码</li>
-												<li>新增用户登地址时间</li>
+												<li>新增用户登地址时间</li>
 												<li>修复ajax超时退出问题</li>
 												<li>新增html调用数据字典(若依首创)</li>
 												<li>调整系统部分样式</li>

+ 1 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

@@ -81,7 +81,7 @@ public class AsyncFactory
     }
 
     /**
-     * 记录登信息
+     * 记录登信息
      * 
      * @param username 用户名
      * @param status 状态

+ 4 - 4
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java

@@ -73,12 +73,12 @@ public class SysUser extends BaseEntity
     /** 删除标志(0代表存在 2代表删除) */
     private String delFlag;
 
-    /** 最后登IP */
-    @Excel(name = "最后登IP", type = Type.EXPORT)
+    /** 最后登IP */
+    @Excel(name = "最后登IP", type = Type.EXPORT)
     private String loginIp;
 
-    /** 最后登时间 */
-    @Excel(name = "最后登时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    /** 最后登时间 */
+    @Excel(name = "最后登时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
     /** 部门对象 */