From f1e25082a58c8cb57dd45d226d3a94f4af4a0677 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 15:07:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index d441f1f..1da082a 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -50,7 +50,7 @@
Map<String, Object> result = new HashMap<String, Object>();
Account account = new Account();
account.setAccountName((String) parameters.get("account"));
- account.setPassword(md5((String) parameters.get("password")));
+ account.setPassword(encoder.encode((String) parameters.get("password")));
account = accountMapper.selectOne(account);
if (isEmpty(account)) {
result.put("msg", "���������������������������������");
@@ -170,8 +170,7 @@
@Override
public Optional<Account> queryAccountByName(String accountName) {
- Account account = new Account();
- account.setAccountName(accountName);
- return Optional.ofNullable(accountMapper.selectOne(account));
+ Account account = accountMapper.getByAccountName(accountName);
+ return Optional.ofNullable(account);
}
}
--
Gitblit v1.8.0