Commit 24cda113 authored by nie'hong's avatar nie'hong

提交互动验证管理员账户

parent bb9bed26
...@@ -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(user.getStatus())) { if (AuditOperationEnum.DISABLE.name().equals(tUser.getStatus())) {
resultMap.put("resultCode", "400"); resultMap.put("resultCode", "400");
resultMap.put("message", "此帐号已禁用,请联系管理员!"); resultMap.put("message", "此帐号已禁用,请联系管理员!");
return resultMap; return resultMap;
} }
if (user.getPermanent() != null && !user.getPermanent()) { if (tUser.getPermanent() != null && !tUser.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 = user.getPasswordSalt(); byte[] salt = tUser.getPasswordSalt();
String s1 = new String(SHA256PasswordEncryptionService.createPasswordHash(s, salt)); String s1 = new String(SHA256PasswordEncryptionService.createPasswordHash(s, salt));
if (!s1.equals(new String(user.getPasswordHash()))) { if (!s1.equals(new String(tUser.getPasswordHash()))) {
resultMap.put("resultCode", "400"); resultMap.put("resultCode", "400");
resultMap.put("message", "密码不正确!"); resultMap.put("message", "密码不正确!");
return resultMap; return resultMap;
} }
List<Role> roles = roleService.selectRoleByUserId(user.getId()); List<Role> roles = roleService.selectRoleByUserId(tUser.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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment