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
bdd70fe8
Commit
bdd70fe8
authored
Sep 02, 2021
by
季圣华
Browse files
优化登录接口
parent
c2f90db8
Changes
2
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
View file @
bdd70fe8
...
@@ -87,7 +87,7 @@ public class UserController {
...
@@ -87,7 +87,7 @@ public class UserController {
int
userStatus
=
-
1
;
int
userStatus
=
-
1
;
try
{
try
{
redisService
.
deleteObjectBySession
(
request
,
"userId"
);
redisService
.
deleteObjectBySession
(
request
,
"userId"
);
userStatus
=
userService
.
validateUser
(
loginName
,
Tools
.
md5Encryp
(
password
)
)
;
userStatus
=
userService
.
validateUser
(
loginName
,
password
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
logger
.
error
(
">>>>>>>>>>>>>用户 "
+
loginName
+
" 登录 login 方法 访问服务层异常===="
,
e
);
logger
.
error
(
">>>>>>>>>>>>>用户 "
+
loginName
+
" 登录 login 方法 访问服务层异常===="
,
e
);
...
@@ -223,14 +223,12 @@ public class UserController {
...
@@ -223,14 +223,12 @@ public class UserController {
String
oldpwd
=
jsonObject
.
getString
(
"oldpassword"
);
String
oldpwd
=
jsonObject
.
getString
(
"oldpassword"
);
String
password
=
jsonObject
.
getString
(
"password"
);
String
password
=
jsonObject
.
getString
(
"password"
);
User
user
=
userService
.
getUser
(
userId
);
User
user
=
userService
.
getUser
(
userId
);
String
oldPassword
=
Tools
.
md5Encryp
(
oldpwd
);
String
md5Pwd
=
Tools
.
md5Encryp
(
password
);
//必须和原始密码一致才可以更新密码
//必须和原始密码一致才可以更新密码
if
(
demonstrateOpen
&&
user
.
getLoginName
().
equals
(
TEST_USER
)){
if
(
demonstrateOpen
&&
user
.
getLoginName
().
equals
(
TEST_USER
)){
flag
=
3
;
//jsh用户不能修改密码
flag
=
3
;
//jsh用户不能修改密码
info
=
"jsh用户不能修改密码"
;
info
=
"jsh用户不能修改密码"
;
}
else
if
(
old
Passwor
d
.
equalsIgnoreCase
(
user
.
getPassword
()))
{
}
else
if
(
old
pw
d
.
equalsIgnoreCase
(
user
.
getPassword
()))
{
user
.
setPassword
(
md5Pw
d
);
user
.
setPassword
(
passwor
d
);
flag
=
userService
.
updateUserByObj
(
user
);
//1-成功
flag
=
userService
.
updateUserByObj
(
user
);
//1-成功
info
=
"修改成功"
;
info
=
"修改成功"
;
}
else
{
}
else
{
...
...
jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
View file @
bdd70fe8
...
@@ -496,7 +496,7 @@ public class UserService {
...
@@ -496,7 +496,7 @@ public class UserService {
throw
new
BusinessRunTimeException
(
ExceptionConstants
.
USER_NAME_LIMIT_USE_CODE
,
throw
new
BusinessRunTimeException
(
ExceptionConstants
.
USER_NAME_LIMIT_USE_CODE
,
ExceptionConstants
.
USER_NAME_LIMIT_USE_MSG
);
ExceptionConstants
.
USER_NAME_LIMIT_USE_MSG
);
}
else
{
}
else
{
ue
.
setPassword
(
Tools
.
md5Encryp
(
ue
.
getPassword
())
)
;
ue
.
setPassword
(
ue
.
getPassword
());
ue
.
setIsystem
(
BusinessConstants
.
USER_NOT_SYSTEM
);
ue
.
setIsystem
(
BusinessConstants
.
USER_NOT_SYSTEM
);
if
(
ue
.
getIsmanager
()
==
null
)
{
if
(
ue
.
getIsmanager
()
==
null
)
{
ue
.
setIsmanager
(
BusinessConstants
.
USER_NOT_MANAGER
);
ue
.
setIsmanager
(
BusinessConstants
.
USER_NOT_MANAGER
);
...
...
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