Commit 28bceda630948af4184bce48f68c0279695a56d9

Authored by RuoYi
1 parent 69829827

修正文字错误

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
... ... @@ -38,18 +38,18 @@ public class SysLogininforController extends BaseController
38 38 return getDataTable(list);
39 39 }
40 40  
41   - @Log(title = "登陆日志", businessType = BusinessType.EXPORT)
  41 + @Log(title = "登录日志", businessType = BusinessType.EXPORT)
42 42 @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
43 43 @GetMapping("/export")
44 44 public AjaxResult export(SysLogininfor logininfor)
45 45 {
46 46 List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
47 47 ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
48   - return util.exportExcel(list, "登陆日志");
  48 + return util.exportExcel(list, "登录日志");
49 49 }
50 50  
51 51 @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
52   - @Log(title = "登陆日志", businessType = BusinessType.DELETE)
  52 + @Log(title = "登录日志", businessType = BusinessType.DELETE)
53 53 @DeleteMapping("/{infoIds}")
54 54 public AjaxResult remove(@PathVariable Long[] infoIds)
55 55 {
... ... @@ -57,7 +57,7 @@ public class SysLogininforController extends BaseController
57 57 }
58 58  
59 59 @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
60   - @Log(title = "登陆日志", businessType = BusinessType.CLEAN)
  60 + @Log(title = "登录日志", businessType = BusinessType.CLEAN)
61 61 @DeleteMapping("/clean")
62 62 public AjaxResult clean()
63 63 {
... ...
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
... ... @@ -68,12 +68,12 @@ public class SysUser extends BaseEntity
68 68 /** 删除标志(0代表存在 2代表删除) */
69 69 private String delFlag;
70 70  
71   - /** 最后登陆IP */
72   - @Excel(name = "最后登陆IP", type = Type.EXPORT)
  71 + /** 最后登录IP */
  72 + @Excel(name = "最后登录IP", type = Type.EXPORT)
73 73 private String loginIp;
74 74  
75   - /** 最后登陆时间 */
76   - @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
  75 + /** 最后登录时间 */
  76 + @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
77 77 private Date loginDate;
78 78  
79 79 /** 部门对象 */
... ...
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
... ... @@ -22,7 +22,7 @@ public class LoginUser implements UserDetails
22 22 private String token;
23 23  
24 24 /**
25   - * 登陆时间
  25 + * 登录时间
26 26 */
27 27 private Long loginTime;
28 28  
... ...
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
... ... @@ -25,7 +25,7 @@ public class AsyncFactory
25 25 private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user");
26 26  
27 27 /**
28   - * 记录登陆信息
  28 + * 记录登录信息
29 29 *
30 30 * @param username 用户名
31 31 * @param status 状态
... ...
sql/ry_20200920.sql
... ... @@ -52,8 +52,8 @@ create table sys_user (
52 52 password varchar(100) default '' comment '密码',
53 53 status char(1) default '0' comment '帐号状态(0正常 1停用)',
54 54 del_flag char(1) default '0' comment '删除标志(0代表存在 2代表删除)',
55   - login_ip varchar(50) default '' comment '最后登陆IP',
56   - login_date datetime comment '最后登陆时间',
  55 + login_ip varchar(50) default '' comment '最后登录IP',
  56 + login_date datetime comment '最后登录时间',
57 57 create_by varchar(64) default '' comment '创建者',
58 58 create_time datetime comment '创建时间',
59 59 update_by varchar(64) default '' comment '更新者',
... ...