overflow_backup_2018_0455/overflow_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
snoop 2017-08-24 15:29:33 +09:00
commit 00b1cb7a4f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/loafle/overflow/module/member/service/MemberService.java
View File

@ -41,7 +41,7 @@ public class MemberService {
return m;
}
public Member signup(Member member) {
public Member signup(Member member, String pw) {
Member isMember = this.memberDAO.findByEmail(member.getEmail());
@ -50,7 +50,7 @@ public class MemberService {
}
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
member.setPw(passwordEncoder.encode(member.getPw()));
member.setPw(passwordEncoder.encode(pw));
if (member.getStatus() == null) {
member.setStatus(new MetaMemberStatus((short) 1));

2
src/test/java/com/loafle/overflow/module/member/service/MemberServiceTest.java
View File

@ -37,7 +37,7 @@ public class MemberServiceTest {
m.setName("administrator");
m.setPhone("00000000");
Member res = this.memberService.signup(m);
Member res = this.memberService.signup(m,"!@#$qwer1234");
Assert.assertNotNull(res);
}