Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
92b3d21d
Commit
92b3d21d
authored
Feb 28, 2019
by
qiankunpingtai
Browse files
在ie模式下无法获取返回的user信息,在返回的数据中明确添加上user信息
parent
ed7e7742
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/jsh/erp/controller/UserController.java
View file @
92b3d21d
...
...
@@ -36,6 +36,7 @@ public class UserController {
HttpServletRequest
request
)
{
logger
.
info
(
"============用户登录 login 方法调用开始=============="
);
String
msgTip
=
""
;
User
user
=
null
;
BaseResponseInfo
res
=
new
BaseResponseInfo
();
try
{
String
username
=
loginame
.
trim
();
...
...
@@ -81,7 +82,7 @@ public class UserController {
default
:
try
{
//验证通过 ,可以登录,放入session,记录登录日志
User
user
=
userService
.
getUserByUserName
(
username
);
user
=
userService
.
getUserByUserName
(
username
);
// logService.create(new Logdetails(user, "登录系统", model.getClientIp(),
// new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户:" + username + " 登录系统", username + " 登录系统"));
msgTip
=
"user can login"
;
...
...
@@ -93,6 +94,13 @@ public class UserController {
}
Map
<
String
,
Object
>
data
=
new
HashMap
<
String
,
Object
>();
data
.
put
(
"msgTip"
,
msgTip
);
/**
* 在IE模式下,无法获取到user数据,
* 在此处明确添加上user信息
* */
if
(
user
!=
null
){
data
.
put
(
"user"
,
user
);
}
res
.
code
=
200
;
res
.
data
=
data
;
logger
.
info
(
"===============用户登录 login 方法调用结束==============="
);
...
...
Write
Preview
Supports
Markdown
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