overflow_cloud/central
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader 2018-06-20 15:07:16 +09:00
parent 5f52fc9bf2
commit 5e937bef6f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -50,7 +50,7 @@
<dependency>
<groupId>com.loafle.overflow</groupId>
<artifactId>commons-java</artifactId>
<version>1.0.86-SNAPSHOT</version>
<version>1.0.87-SNAPSHOT</version>
</dependency>
<dependency>

14
src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java
View File

@ -61,7 +61,7 @@ public class CentralMemberService implements MemberService {
throw new OverflowException("EmailNotConfirmedException()", new Throwable());
}
Boolean match = passwordEncoder.matches(signinPw, m.getPassword());
Boolean match = passwordEncoder.matches(signinPw, m.getPw());
if (!match) {
if (m.getSigninFailCount() > 10) {
throw new OverflowException("SigninOverFailedException()", new Throwable());
@ -97,7 +97,7 @@ public class CentralMemberService implements MemberService {
// "special character, lowercase letter, and number, " +
// "and must be at least 6 characters long.");
}
member.setPassword(passwordEncoder.encode(password));
member.setPw(passwordEncoder.encode(password));
if (member.getMetaMemberStatus() == null) {
member.setMetaMemberStatus(MetaMemberStatus.Enum.NOAUTH.to());
@ -192,7 +192,7 @@ public class CentralMemberService implements MemberService {
// "special character, lowercase letter, and number, " +
// "and must be at least 6 characters long.");
}
member.setPassword(passwordEncoder.encode(password));
member.setPw(passwordEncoder.encode(password));
return this.modify(member);
}
@ -230,12 +230,12 @@ public class CentralMemberService implements MemberService {
// "and must be at least 6 characters long.");
}
Boolean match = passwordEncoder.matches(member.getPassword(), preMember.getPassword());
Boolean match = passwordEncoder.matches(member.getPw(), preMember.getPw());
if (!match) {
member.setPassword(passwordEncoder.encode(password));
member.setPw(passwordEncoder.encode(password));
}
} else {
member.setPassword(preMember.getPassword());
member.setPw(preMember.getPw());
}
if (member.getMetaMemberStatus() == null || member.getMetaMemberStatus().getId() <= 0) {
@ -253,7 +253,7 @@ public class CentralMemberService implements MemberService {
Member preMember = this.memberDAO.findByEmail(signinId);
String encodePw = passwordEncoder.encode(signinPw);
Boolean match = passwordEncoder.matches(encodePw, preMember.getPassword());
Boolean match = passwordEncoder.matches(encodePw, preMember.getPw());
if (!match) {
throw new OverflowException("SignInPwNotMatchException", new Throwable());