Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
24cda113
Commit
24cda113
authored
May 27, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交互动验证管理员账户
parent
bb9bed26
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
TInteractionController.java
...hnmuseum/party/web/controller/TInteractionController.java
+5
-5
No files found.
src/main/java/cn/chnmuseum/party/web/controller/TInteractionController.java
View file @
24cda113
...
@@ -94,12 +94,12 @@ public class TInteractionController extends BaseController {
...
@@ -94,12 +94,12 @@ public class TInteractionController extends BaseController {
resultMap
.
put
(
"message"
,
"用户名不正确!"
);
resultMap
.
put
(
"message"
,
"用户名不正确!"
);
return
resultMap
;
return
resultMap
;
}
}
if
(
AuditOperationEnum
.
DISABLE
.
name
().
equals
(
u
ser
.
getStatus
()))
{
if
(
AuditOperationEnum
.
DISABLE
.
name
().
equals
(
tU
ser
.
getStatus
()))
{
resultMap
.
put
(
"resultCode"
,
"400"
);
resultMap
.
put
(
"resultCode"
,
"400"
);
resultMap
.
put
(
"message"
,
"此帐号已禁用,请联系管理员!"
);
resultMap
.
put
(
"message"
,
"此帐号已禁用,请联系管理员!"
);
return
resultMap
;
return
resultMap
;
}
}
if
(
user
.
getPermanent
()
!=
null
&&
!
u
ser
.
getPermanent
())
{
if
(
tUser
.
getPermanent
()
!=
null
&&
!
tU
ser
.
getPermanent
())
{
if
(
user
.
getEffectiveDate
()
!=
null
&&
user
.
getEffectiveDate
().
isAfter
(
LocalDate
.
now
())
||
user
.
getExiredDate
()
!=
null
&&
user
.
getExiredDate
().
isBefore
(
LocalDate
.
now
()))
{
if
(
user
.
getEffectiveDate
()
!=
null
&&
user
.
getEffectiveDate
().
isAfter
(
LocalDate
.
now
())
||
user
.
getExiredDate
()
!=
null
&&
user
.
getExiredDate
().
isBefore
(
LocalDate
.
now
()))
{
resultMap
.
put
(
"resultCode"
,
"400"
);
resultMap
.
put
(
"resultCode"
,
"400"
);
resultMap
.
put
(
"message"
,
"此帐号已失效,请联系管理员!"
);
resultMap
.
put
(
"message"
,
"此帐号已失效,请联系管理员!"
);
...
@@ -108,14 +108,14 @@ public class TInteractionController extends BaseController {
...
@@ -108,14 +108,14 @@ public class TInteractionController extends BaseController {
}
}
//密码解密
//密码解密
String
s
=
AESUtils
.
aesDecrypt
(
tInteraction
.
getPassword
());
String
s
=
AESUtils
.
aesDecrypt
(
tInteraction
.
getPassword
());
byte
[]
salt
=
u
ser
.
getPasswordSalt
();
byte
[]
salt
=
tU
ser
.
getPasswordSalt
();
String
s1
=
new
String
(
SHA256PasswordEncryptionService
.
createPasswordHash
(
s
,
salt
));
String
s1
=
new
String
(
SHA256PasswordEncryptionService
.
createPasswordHash
(
s
,
salt
));
if
(!
s1
.
equals
(
new
String
(
u
ser
.
getPasswordHash
())))
{
if
(!
s1
.
equals
(
new
String
(
tU
ser
.
getPasswordHash
())))
{
resultMap
.
put
(
"resultCode"
,
"400"
);
resultMap
.
put
(
"resultCode"
,
"400"
);
resultMap
.
put
(
"message"
,
"密码不正确!"
);
resultMap
.
put
(
"message"
,
"密码不正确!"
);
return
resultMap
;
return
resultMap
;
}
}
List
<
Role
>
roles
=
roleService
.
selectRoleByUserId
(
u
ser
.
getId
());
List
<
Role
>
roles
=
roleService
.
selectRoleByUserId
(
tU
ser
.
getId
());
List
<
String
>
roleIds
=
roles
.
stream
().
map
(
Role:
:
getId
).
collect
(
Collectors
.
toList
());
List
<
String
>
roleIds
=
roles
.
stream
().
map
(
Role:
:
getId
).
collect
(
Collectors
.
toList
());
if
(!
roleIds
.
contains
(
"17"
))
{
if
(!
roleIds
.
contains
(
"17"
))
{
resultMap
.
put
(
"resultCode"
,
"400"
);
resultMap
.
put
(
"resultCode"
,
"400"
);
...
...
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