From 28bceda630948af4184bce48f68c0279695a56d9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 22 九月 2020 11:09:18 +0800
Subject: [PATCH] 修正文字错误
---
sql/ry_20200920.sql | 4 ++--
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 8 ++++----
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java | 8 ++++----
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
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 560c4b5..14f57fd 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
@@ -38,18 +38,18 @@
return getDataTable(list);
}
- @Log(title = "登陆日志", businessType = BusinessType.EXPORT)
+ @Log(title = "登录日志", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
@GetMapping("/export")
public AjaxResult export(SysLogininfor logininfor)
{
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
- return util.exportExcel(list, "登陆日志");
+ return util.exportExcel(list, "登录日志");
}
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
- @Log(title = "登陆日志", businessType = BusinessType.DELETE)
+ @Log(title = "登录日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds)
{
@@ -57,7 +57,7 @@
}
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
- @Log(title = "登陆日志", businessType = BusinessType.CLEAN)
+ @Log(title = "登录日志", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
public AjaxResult clean()
{
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index f7e68e7..4c35925 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -68,12 +68,12 @@
/** 删除标志（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;
/** 部门对象 */
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
index a8b1126..d389ff8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -22,7 +22,7 @@
private String token;
/**
- * 登陆时间
+ * 登录时间
*/
private Long loginTime;
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 3d6cef9..57af9bb 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
@@ -25,7 +25,7 @@
private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user");
/**
- * 记录登陆信息
+ * 记录登录信息
*
* @param username 用户名
* @param status 状态
diff --git a/sql/ry_20200920.sql b/sql/ry_20200920.sql
index 4d8614f..ef8a19e 100644
--- a/sql/ry_20200920.sql
+++ b/sql/ry_20200920.sql
@@ -52,8 +52,8 @@
password varchar(100) default '' comment '密码',
status char(1) default '0' comment '帐号状态（0正常 1停用）',
del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）',
- login_ip varchar(50) default '' comment '最后登陆IP',
- login_date datetime comment '最后登陆时间',
+ login_ip varchar(50) default '' comment '最后登录IP',
+ login_date datetime comment '最后登录时间',
create_by varchar(64) default '' comment '创建者',
create_time datetime comment '创建时间',
update_by varchar(64) default '' comment '更新者',
--
Gitblit v1.9.2