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
f265312c
Commit
f265312c
authored
Jun 18, 2021
by
季圣华
Browse files
用户模块优化
parent
88bf94a8
Changes
1
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
View file @
f265312c
...
@@ -45,6 +45,9 @@ public class UserController {
...
@@ -45,6 +45,9 @@ public class UserController {
@Value
(
"${manage.roleId}"
)
@Value
(
"${manage.roleId}"
)
private
Integer
manageRoleId
;
private
Integer
manageRoleId
;
@Value
(
"${demonstrate.open}"
)
private
boolean
demonstrateOpen
;
@Resource
@Resource
private
UserService
userService
;
private
UserService
userService
;
...
@@ -57,6 +60,7 @@ public class UserController {
...
@@ -57,6 +60,7 @@ public class UserController {
@Resource
@Resource
private
RedisService
redisService
;
private
RedisService
redisService
;
private
static
final
String
TEST_USER
=
"jsh"
;
private
static
String
SUCCESS
=
"操作成功"
;
private
static
String
SUCCESS
=
"操作成功"
;
private
static
String
ERROR
=
"操作失败"
;
private
static
String
ERROR
=
"操作失败"
;
private
static
final
String
HTTP
=
"http://"
;
private
static
final
String
HTTP
=
"http://"
;
...
@@ -225,7 +229,7 @@ public class UserController {
...
@@ -225,7 +229,7 @@ public class UserController {
String
oldPassword
=
Tools
.
md5Encryp
(
oldpwd
);
String
oldPassword
=
Tools
.
md5Encryp
(
oldpwd
);
String
md5Pwd
=
Tools
.
md5Encryp
(
password
);
String
md5Pwd
=
Tools
.
md5Encryp
(
password
);
//必须和原始密码一致才可以更新密码
//必须和原始密码一致才可以更新密码
if
(
user
.
getLoginName
().
equals
(
"jsh"
)){
if
(
demonstrateOpen
&&
user
.
getLoginName
().
equals
(
TEST_USER
)){
flag
=
3
;
//jsh用户不能修改密码
flag
=
3
;
//jsh用户不能修改密码
info
=
"jsh用户不能修改密码"
;
info
=
"jsh用户不能修改密码"
;
}
else
if
(
oldPassword
.
equalsIgnoreCase
(
user
.
getPassword
()))
{
}
else
if
(
oldPassword
.
equalsIgnoreCase
(
user
.
getPassword
()))
{
...
...
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