diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index 41c2c457d..c18c860dd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/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 list = logininforService.selectLogininforList(logininfor); ExcelUtil util = new ExcelUtil(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() diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index 8d17731a9..e01dc1c84 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/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); diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/tabs_panels.html b/ruoyi-admin/src/main/resources/templates/demo/form/tabs_panels.html index 7e52e1986..d8cdf2a31 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/form/tabs_panels.html +++ b/ruoyi-admin/src/main/resources/templates/demo/form/tabs_panels.html @@ -334,7 +334,7 @@

超大屏幕

-

Bootstrap 支持的另一个特性,超大屏幕(Jumbotron)。顾名思义该组件可以增加标题的大小,并为登陆页面内容添加更多的外边距(margin)。使用超大屏幕(Jumbotron)的步骤如下:

+

Bootstrap 支持的另一个特性,超大屏幕(Jumbotron)。顾名思义该组件可以增加标题的大小,并为登录页面内容添加更多的外边距(margin)。使用超大屏幕(Jumbotron)的步骤如下:

  1. 创建一个带有 class .jumbotron. 的容器
  2. diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index de96f88f8..5f6e167ba 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -707,7 +707,7 @@
      -
    1. 新增登陆超时提醒
    2. +
    3. 新增登录超时提醒
    4. 修复定时器热部署转换问题
    5. 修复登录验证码校验无效问题
    6. 定时任务新增立即执行一次
    7. @@ -778,7 +778,7 @@
      1. 优化登录失败刷新验证码
      2. -
      3. 新增用户登陆地址时间
      4. +
      5. 新增用户登录地址时间
      6. 修复ajax超时退出问题
      7. 新增html调用数据字典(若依首创)
      8. 调整系统部分样式
      9. diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java index cd2d68118..e12bbf6d2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java @@ -81,7 +81,7 @@ public class AsyncFactory } /** - * 记录登陆信息 + * 记录登录信息 * * @param username 用户名 * @param status 状态 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java index 5d4332b3c..098d9d962 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java +++ b/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; /** 部门对象 */