From 539a7077cbf638a5aa9ae5e46c17be96daba7d9b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 02 Jul 2018 10:54:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 71 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 1680f0c..87ee342 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -2,20 +2,16 @@
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;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import javax.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -38,7 +34,8 @@
@Service
public class AccountServiceImpl implements AccountService {
-
+ @Resource
+ private BCryptPasswordEncoder encoder;
@Resource
private AccountMapper accountMapper;
@@ -47,15 +44,17 @@
@Resource
private OrganizationMapper organizationMapper;
-
+
@Override
public Map<String, Object> screenLogin(Map<String, Object> parameters) {
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")));
+ 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())) {
@@ -75,7 +74,10 @@
account.setAccountName(accountName);
return accountMapper.selectOne(account);
}
-
+ @Override
+ public Account getAccountById(Integer id){
+ return accountMapper.selectByPrimaryKey(id);
+ }
@Override
public void setOrgIdsByAccount(Map<String, Object> parameters) {
String accountId = (String) parameters.get("accountId");
@@ -121,14 +123,16 @@
organizationIds.add(account.getOrganizationId());
}
}
- example = new Example(Organization.class);
- example.or().andIn("id", organizationIds);
- List<Organization> organizations = organizationMapper.selectByExample(example);
- for (Account account : accounts) {
- for (Organization organization : organizations) {
- if (account.getOrganizationId() == organization.getId()) {
- account.setOrganization(organization);
- break;
+ if(!ObjectUtils.isEmpty(organizationIds)){
+ example = new Example(Organization.class);
+ example.or().andIn("id", organizationIds);
+ List<Organization> organizations = organizationMapper.selectByExample(example);
+ for (Account account : accounts) {
+ for (Organization organization : organizations) {
+ if (account.getOrganizationId() == organization.getId()) {
+ account.setOrganization(organization);
+ break;
+ }
}
}
}
@@ -139,10 +143,14 @@
@Override
@Transactional
public Integer saveOrUpdateAccount(Account account) {
+ // ������������
+ if(!StringUtils.isBlank(account.getPassword())){
+ account.setPassword(encoder.encode(account.getPassword()));
+ }
if (ObjectUtils.isEmpty(account.getId())) {
account.setIsDelete(Constants.IS_DELETE_FALSE);
account.setCreateTime(new Date());
- account.setPassword(Crypto.md5(ResourceUtil.getValue("password")));
+ account.setPassword(encoder.encode(ResourceUtil.getValue("password")));
return accountMapper.insertSelective(account);
} else {
return accountMapper.updateByPrimaryKeySelective(account);
@@ -166,4 +174,25 @@
return accountMapper.selectCount(account);
}
+ @Override
+ public Optional<Account> queryAccountByName(String accountName) {
+ Account account = accountMapper.getByAccountName(accountName);
+ return Optional.ofNullable(account);
+ }
+
+ @Override
+ public Account companyLogin(Map<String, Object> parameters) {
+ Account account = new Account();
+ account.setIsDelete(Constants.IS_DELETE_FALSE);
+ account.setAccountName(parameters.get("account").toString());
+ account = accountMapper.selectOne(account);
+ if (ObjectUtils.isEmpty(account)) {
+ throw new BusinessException("���������������������������������������");
+ }
+ if (!encoder.matches(parameters.get("password").toString(), account.getPassword())) {
+ throw new BusinessException("���������������������������������");
+ }
+ account.setPassword(parameters.get("password").toString());
+ return account;
+ }
}
--
Gitblit v1.8.0