Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
28bceda6
Commit
28bceda6
authored
Sep 22, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正文字错误
parent
69829827
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
...ruoyi/web/controller/monitor/SysLogininforController.java
+4
-4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
...ain/java/com/ruoyi/common/core/domain/entity/SysUser.java
+4
-4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
...in/java/com/ruoyi/common/core/domain/model/LoginUser.java
+1
-1
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
...ava/com/ruoyi/framework/manager/factory/AsyncFactory.java
+1
-1
sql/ry_20200920.sql
sql/ry_20200920.sql
+2
-2
No files found.
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
View file @
28bceda6
...
...
@@ -38,18 +38,18 @@ public class SysLogininforController extends BaseController
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 @@ public class SysLogininforController extends BaseController
}
@PreAuthorize
(
"@ss.hasPermi('monitor:logininfor:remove')"
)
@Log
(
title
=
"登
陆
日志"
,
businessType
=
BusinessType
.
CLEAN
)
@Log
(
title
=
"登
录
日志"
,
businessType
=
BusinessType
.
CLEAN
)
@DeleteMapping
(
"/clean"
)
public
AjaxResult
clean
()
{
...
...
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View file @
28bceda6
...
...
@@ -68,12 +68,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
;
/** 部门对象 */
...
...
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
View file @
28bceda6
...
...
@@ -22,7 +22,7 @@ public class LoginUser implements UserDetails
private
String
token
;
/**
* 登
陆
时间
* 登
录
时间
*/
private
Long
loginTime
;
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
View file @
28bceda6
...
...
@@ -25,7 +25,7 @@ public class AsyncFactory
private
static
final
Logger
sys_user_logger
=
LoggerFactory
.
getLogger
(
"sys-user"
);
/**
* 记录登
陆
信息
* 记录登
录
信息
*
* @param username 用户名
* @param status 状态
...
...
sql/ry_20200920.sql
View file @
28bceda6
...
...
@@ -52,8 +52,8 @@ create table sys_user (
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
'更新者'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment