huangge1199/RuoYi-Vue-Oracle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正文字错误

Browse Source
This commit is contained in:
RuoYi 2020-09-22 11:06:45 +08:00
parent 738ff7c1ac
commit 49e17e2b4d
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/ry_20200920.sql
View File

@ -104,8 +104,8 @@ comment on column sys_user.avatar is '头像路径';
comment on column sys_user.password is '密码'; comment on column sys_user.password is '密码';
comment on column sys_user.status is '帐号状态（0正常 1停用）'; comment on column sys_user.status is '帐号状态（0正常 1停用）';
comment on column sys_user.del_flag is '删除标志（0代表存在 2代表删除）'; comment on column sys_user.del_flag is '删除标志（0代表存在 2代表删除）';
comment on column sys_user.login_ip is '最后登陆IP'; comment on column sys_user.login_ip is '最后登录IP';
comment on column sys_user.login_date is '最后登陆时间'; comment on column sys_user.login_date is '最后登录时间';
comment on column sys_user.create_by is '创建者'; comment on column sys_user.create_by is '创建者';
comment on column sys_user.create_time is '创建时间'; comment on column sys_user.create_time is '创建时间';
comment on column sys_user.update_by is '更新者'; comment on column sys_user.update_by is '更新者';

2
src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
View File

@ -25,7 +25,7 @@ public class AsyncFactory
private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user"); private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user");
/** /**
* 记录登陆信息 * 记录登录信息
* *
* @param username 用户名 * @param username 用户名
* @param status 状态 * @param status 状态

2
src/main/java/com/ruoyi/framework/security/LoginUser.java
View File

@ -22,7 +22,7 @@ public class LoginUser implements UserDetails
private String token; private String token;
/** /**
* 登陆时间 * 登录时间
*/ */
private Long loginTime; private Long loginTime;

8
src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
View File

@ -38,18 +38,18 @@ public class SysLogininforController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
@Log(title = "登陆日志", businessType = BusinessType.EXPORT) @Log(title = "登录日志", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('monitor:logininfor:export')") @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
@GetMapping("/export") @GetMapping("/export")
public AjaxResult export(SysLogininfor logininfor) public AjaxResult export(SysLogininfor logininfor)
{ {
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor); List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class); ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
return util.exportExcel(list, "登陆日志"); return util.exportExcel(list, "登录日志");
} }
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "登陆日志", businessType = BusinessType.DELETE) @Log(title = "登录日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}") @DeleteMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds) public AjaxResult remove(@PathVariable Long[] infoIds)
{ {
@ -57,7 +57,7 @@ public class SysLogininforController extends BaseController
} }
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
@Log(title = "登陆日志", businessType = BusinessType.CLEAN) @Log(title = "登录日志", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean") @DeleteMapping("/clean")
public AjaxResult clean() public AjaxResult clean()
{ {

8
src/main/java/com/ruoyi/project/system/domain/SysUser.java
View File

@ -69,12 +69,12 @@ public class SysUser extends BaseEntity
/** 删除标志（0代表存在 2代表删除） */ /** 删除标志（0代表存在 2代表删除） */
private String delFlag; private String delFlag;
/** 最后登陆IP */ /** 最后登录IP */
@Excel(name = "最后登陆IP", type = Type.EXPORT) @Excel(name = "最后登录IP", type = Type.EXPORT)
private String loginIp; 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; private Date loginDate;
/** 部门对象 */ /** 部门对象 */