Merge remote-tracking branch 'origin/master'

This commit is contained in:
snoop 2017-08-14 16:48:38 +09:00
commit e9d9b7eee4

View File

@ -1,5 +1,6 @@
package com.loafle.overflow.module.member.service;
import com.loafle.overflow.module.email.service.EmailAuthService;
import com.loafle.overflow.module.member.dao.MemberDAO;
import com.loafle.overflow.module.member.exception.EmailNotConfirmedException;
import com.loafle.overflow.module.member.exception.SignInIdNotExistException;
@ -19,6 +20,9 @@ public class MemberService {
@Autowired
private MemberDAO memberDAO;
@Autowired
private EmailAuthService emailAuthService;
public Member signin(String signinId, String signinPw) throws SignInIdNotExistException, EmailNotConfirmedException, SignInPwNotExactException {
Member m = this.memberDAO.findByEmail(signinId);
@ -47,7 +51,12 @@ public class MemberService {
if (member.getStatus() == null) {
member.setStatus(new MetaMemberStatus((short) 1));
}
return this.memberDAO.save(member);
Member resMember = this.memberDAO.save(member);
this.emailAuthService.sendEmailByMember(member.getId(), member.getEmail());
return resMember;
}
public void signout(Member member) {