Merge branch 'jsshin' into develop

src/main/java/com/style24/front/biz/service/TsfCustomerService.java

@@ -109,7 +109,7 @@ public class TsfCustomerService {
 	 */
 	@Transactional("shopTxnManager")
 	public void saveCustomerPassword(Customer customer) {
-		customer.setEncodedPasswd(passwordEncoder.encode(customer.getPasswd()));
+		customer.setEncodedPasswd(passwordEncoder.encodeSha256(customer.getPasswd()));
 		coreCustomerService.saveCustomerPassword(customer);
 	}
 
@@ -278,7 +278,7 @@ public class TsfCustomerService {
 		// 1. validation
 		customer.setHypenCellPhone();
 		customer.encryptData();
-		customer.setEncodedPasswd(passwordEncoder.encode(customer.getPasswd()));
+		customer.setEncodedPasswd(passwordEncoder.encodeSha256(customer.getPasswd()));
 
 		customer.setCustStat(TscConstants.CustStat.ACTIVE.value());
 		customer.setCustGb(TscConstants.CustGb.NORMAL.value());

src/main/java/com/style24/front/support/security/TsfAuthenticationProvider.java

@@ -82,8 +82,8 @@ public class TsfAuthenticationProvider implements AuthenticationProvider {
 
 		/// SNS로그인이 아닌 일반로그인 이면
 		if (!loginId.startsWith(TsfConstants.SNSLOGIN_PREFIX)) {
-			log.info("encoded password: {}", passwordEncoder.encode(passwd));
-			boolean isMatch = passwordEncoder.matches(passwd, loginInfo.getPasswd());
+			log.info("encoded password: {}", passwordEncoder.encodeSha256(passwd));
+			boolean isMatch = passwordEncoder.matchesSha256(passwd, loginInfo.getPasswd());
 			log.info("Password is match?: {}", isMatch);
 
 			if (!isMatch) {

src/main/webapp/WEB-INF/views/web/customer/JoinFormWeb.html

@@ -126,7 +126,7 @@
 					<div class="form_field">
 						<label class="input_label sr-only">휴대폰번호</label>
 						<div class="input_wrap form_full">
-							<input type="text" id="cellPhnno" name="cellPhnno" placeholder="휴대폰 인증 해주세요." class="form_control" minlength="10" maxlength="11" required="required" data-valid-type="numeric" data-valid-name="휴대폰"/>
+							<input type="text" id="cellPhnno" name="cellPhnno" placeholder="휴대폰 인증 해주세요." class="form_control" minlength="10" maxlength="11" required="required" data-valid-type="numeric" data-valid-name="휴대폰" readonly="readonly"/>
 							<!-- case (휴대폰번호 형식이 맞지 않을경우,이미 가입되어있는 핸드폰번호일경우) -->
 							<div class="help_block">
 								<!-- 휴대폰번호 형식이 맞지 않을경우 -->