From 5e937bef6f5cfaa0a3cabcb48f9e42c7f872bc87 Mon Sep 17 00:00:00 2001
From: crusader <crusader@loafle.com>
Date: Wed, 20 Jun 2018 15:07:16 +0900
Subject: [PATCH] ing

---
 pom.xml                                            |  2 +-
 .../member/service/CentralMemberService.java       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index e69eec7..25f5ea0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java b/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java
index 4f97518..a294e84 100644
--- a/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java
+++ b/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java
@@ -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());