From db2a45f5aa9edc99c875de1f5cae21d074fc2d6f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 15:59:19 +0800
Subject: [PATCH] 旧版登录功能 加密修复

---
 src/main/java/com/moral/service/impl/AccountServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 1da082a..c54317f 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -2,7 +2,6 @@
 
 import static com.moral.common.bean.Constants.IS_DELETE_FALSE;
 import static com.moral.common.bean.Constants.IS_DELETE_TRUE;
-import static com.moral.common.util.Crypto.md5;
 import static com.moral.common.util.ResourceUtil.getValue;
 import static org.apache.commons.lang3.StringUtils.isNumeric;
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -50,9 +49,11 @@
 		Map<String, Object> result = new HashMap<String, Object>();
 		Account account = new Account();
 		account.setAccountName((String) parameters.get("account"));
-		account.setPassword(encoder.encode((String) parameters.get("password")));
+		String rawPassword = (String) parameters.get("password");
+//		account.setPassword(encoder.encode((String) parameters.get("password")));
 		account = accountMapper.selectOne(account);
-		if (isEmpty(account)) {
+		boolean isValid = account == null ? false:encoder.matches(rawPassword,account.getPassword());
+		if (!isValid) {
 			result.put("msg", "���������������������������������");
 		} else {
 			if (IS_DELETE_FALSE.equals(account.getIsDelete())) {

--
Gitblit v1.8.0