From ff70230efa7576ec0928f9ca30d306951c2d7f83 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Sun, 3 Apr 2022 17:37:17 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=89=EB=84=A4=EC=9E=84=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=EA=B8=B0=EB=8A=A5=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 49 +++++++-----------
 .../m/member_env/M_Member_envController.java  | 50 ++++++++++++++++++-
 .../sqlmap/api/com.backoffice.api.bf.xml      |  1 +
 .../sqlmap/m/login/com.backoffice.m.login.xml |  3 ++
 .../ftl/m/member_env/view_set_account.ftl     |  8 +--
 .../m/member_env/view_set_account_name.ftl    | 22 ++++----
 .../ftl/m/member_env/view_set_account_pw.ftl  |  8 +--
 src/main/webapp/static/js/common.js           |  2 +-
 8 files changed, 91 insertions(+), 52 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 630cca5..930171c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,37 +9,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="음악설정 수정&#10;부모정보 변경 삭제">
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_no_result.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_result.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_20220402.ftl" afterDir="false" />
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/APIMemberController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/APIMemberController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/ApiSMSBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/ApiSMSBO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/ApiSMSBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/bo/ApiSMSBOImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/mail/MailForPwd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/mail/MailForPwd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.sms.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.sms.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_20220207.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_20220401.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_02.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_02.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_20210121.ftl" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_20220207.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_20220402.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_favorite_word_20220301.ftl" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_favorite_word_20220327.ftl" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music_20220301.ftl" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_record_order_20220301.ftl" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/static/js/common.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/common.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -221,7 +199,8 @@
       <workItem from="1648554891169" duration="4461000" />
       <workItem from="1648720402622" duration="2770000" />
       <workItem from="1648786659469" duration="28242000" />
-      <workItem from="1648875329000" duration="22927000" />
+      <workItem from="1648875329000" duration="23079000" />
+      <workItem from="1648963023291" duration="7348000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -300,7 +279,14 @@
       <option name="project" value="LOCAL" />
       <updated>1648822833746</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경">
+      <created>1648908705168</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1648908705168</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -331,6 +317,7 @@
     <MESSAGE value="추천홈메이드이유식 &gt; 팝업 &gt; 연관식품 삭제" />
     <MESSAGE value="예방접종 표시 오류 수정" />
     <MESSAGE value="음악설정 수정&#10;부모정보 변경 삭제" />
-    <option name="LAST_COMMIT_MESSAGE" value="음악설정 수정&#10;부모정보 변경 삭제" />
+    <MESSAGE value="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경" />
+    <option name="LAST_COMMIT_MESSAGE" value="비밀번호 찾기 기능 적용&#10;로그인 회원가입 형식 변경" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/member_env/M_Member_envController.java b/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
index 7ff4a5c..9a41c56 100644
--- a/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
+++ b/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
@@ -231,7 +231,55 @@ public class M_Member_envController extends AbstractControllerManager{
 		}
 
 		return result;
-	}	
+	}
+
+
+	/**
+	 * 사용자 닉네임 변경 - snut97
+	 * @param model
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value="ajax_update_member_nickname")
+	@ResponseBody
+	public HashMap<String, Object> ajax_update_member_nickname(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, HttpServletResponse response) {
+		DataMap paramMap = gmUtil.getDataMapFromRequest(request);
+		HashMap<String, Object> result = new HashMap<String, Object>();
+		result.put("RESULT", ConstantResultCode.RESULT_INIT);
+
+		try {
+			boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap);
+			if(is_login == false) {
+				result.put("RESULT", ConstantResultCode.RESULT_SESSION_OUT);
+			}else{
+				HttpSession session = request.getSession(false);
+				DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
+				paramMap.copyFromDataMapByKeys(rm_mem, new String[]{"member_id"});
+
+				if(loginBO.update_member(paramMap) <= 0) {
+					result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);
+				} else {
+					rm_mem = loginBO.select_member(rm_mem);
+					DataMap.putToModel(model, "rm_mem", rm_mem);
+
+					session = request.getSession(false);
+					if(session == null) session = request.getSession(true);
+					session.setAttribute(M_Util.SESSION_RM_MEMBER, rm_mem);
+
+					gmUtil.setSessionForMobileMember(request, paramMap);
+
+					result.put("RESULT", ConstantResultCode.RESULT_SUCCESS);
+				}
+
+			}
+		} catch (Exception ex1) {
+			ex1.printStackTrace();
+			result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);
+		}
+
+		return result;
+	}
 	
 	@RequestMapping(value="ajax_update_member_pwd")
 	@ResponseBody
diff --git a/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml b/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml
index bd28c3c..6852bba 100644
--- a/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml
+++ b/src/main/resources/sqlmap/api/com.backoffice.api.bf.xml
@@ -26,6 +26,7 @@
 		SELECT 
 			 x.member_id
 			,x.name
+			,x.nickname
 			,x.birthday
 			,x.gender
 			,x.password
diff --git a/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml b/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml
index 78389bb..1f541aa 100644
--- a/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml
+++ b/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml
@@ -24,6 +24,7 @@
 		SELECT 
 			 x.member_id
 			,x.name
+			,x.nickname
 			,x.birthday
 			,x.gender
 			,x.password
@@ -61,6 +62,7 @@
 		SELECT 
 			 x.member_id
 			,x.name
+			,x.nickname
 			,x.birthday
 			,x.gender
 			,x.password
@@ -137,6 +139,7 @@
         SET 
              mod_dt = NOW()
              <isNotEmpty property="name">,name = #name#</isNotEmpty>
+             <isNotEmpty property="nickname">,nickname = #nickname#</isNotEmpty>
              <isNotEmpty property="birthday">,birthday = #birthday#</isNotEmpty>
              <isNotEmpty property="gender">,gender = #gender#</isNotEmpty>
              <isNotEmpty property="password">,password = #password#</isNotEmpty>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl
index 83717d5..0fc55ef 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account.ftl
@@ -32,7 +32,7 @@
 				</p>
 				<div class="set_account_list">
 					<a href="${URL_ROOT}/m/member_env/setting_nm.do?view_nm=view_set_account_name&return_url=view_set_account" class="list_item">
-						<span class="emphasis_tit">이름</span> 변경
+						<span class="emphasis_tit">닉네임</span> 변경
 					</a>
 					<a href="javascript:fncGoSetPwd();" class="list_item">
 						<span class="emphasis_tit">비밀번호</span> 변경
@@ -40,9 +40,9 @@
 					<a href="${URL_ROOT}/m/member_env/setting_nm.do?view_nm=view_set_account_phone&return_url=view_set_account" class="list_item">
 						<span class="emphasis_tit">휴대전화 번호</span> 변경
 					</a>
-					<a href="${URL_ROOT}/m/member_env/setting_nm.do?view_nm=view_set_account_mail&return_url=view_set_account" class="list_item">
-						<span class="emphasis_tit">이메일</span> 변경
-					</a>
+<#--					<a href="${URL_ROOT}/m/member_env/setting_nm.do?view_nm=view_set_account_mail&return_url=view_set_account" class="list_item">-->
+<#--						<span class="emphasis_tit">이메일</span> 변경-->
+<#--					</a>-->
 					<a href="${URL_ROOT}/m/member_env/setting_nm.do?view_nm=view_set_account_memberleave&return_url=view_set_account" class="list_item">
 						<span class="emphasis_tit">계정</span> 삭제
 					</a>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl
index 1101b0e..9c56666 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl
@@ -9,19 +9,19 @@
 		</header>
 		<main class="m_set_account m_set_account_name">
 			<div class="l_list">
-				<h1 class="l_title">현재 설정된 이름</h1>
+				<h1 class="l_title">현재 설정된 닉네임</h1>
 				<div class="p_list_item p_border_box">
 					<div class="p_input_box">
-						<input type="text" id="name_now" name="name_now"  class="emphasis_tit" placeholder="" value="<#if Session.rm_member?has_content>${Session.rm_member['name']!}</#if>" readonly>
+						<input type="text" id="nickname_now" name="nickname_now"  class="emphasis_tit" placeholder="" value="<#if Session.rm_member?has_content>${Session.rm_member['nickname']!}</#if>" readonly>
 					</div>
 				</div>
 			</div>
 			<div class="l_list">
 				<form name="frmMember" id="frmMember" method="post">
-					<h1 class="l_title">변경하실 이름을 입력해주세요</h1>
+					<h1 class="l_title">새로운 닉네임</h1>
 					<div class="p_list_item p_border_box">
 						<div class="p_input_box">
-							<input type="text" id="name" name="name" class="required" data-tit="이름" placeholder="이름 입력" maxlength="10">
+							<input type="text" id="nickname" name="nickname" class="required" data-tit="이름" placeholder="변경하실 닉네임을 입력해 주세요." maxlength="25">
 						</div>
 					</div>
 					<div class="m_set_account_btn"><button type="submit" id="codechk_btn" name="" class="btns blue_btn">변경하기</button></div>
@@ -36,16 +36,16 @@
 		init: function(){
 			$('#frmMember').on('submit',function(e){
 
-				var childname = $('#name').val()				
+				var childname = $('#nickname').val()
 				if(SNUtil.strByteLength(childname) < 1 || SNUtil.strByteLength(childname) > 30){
 					Swal.fire({
-						text: '이름은 1글자 이상 10글자 이하로 다시 입력해주세요.'
-					}).then((result)=>{ $('#name').focus() })
+						text: '이름은 1글자 이상 25글자 이하로 다시 입력해주세요.'
+					}).then((result)=>{ $('#nickname').focus() })
 					e.preventDefault()
 				}else{
 					var data = $('#frmMember').serialize()
 					$.ajax({
-						url:'${URL_ROOT}/m/member_env/ajax_update_member_name.do',
+						url:'${URL_ROOT}/m/member_env/ajax_update_member_nickname.do',
 						type: 'post',
 						data: data,
 						dataType: 'json',
@@ -57,9 +57,9 @@
 						success:function(result){								
 							var RESULT = result.RESULT
 							if(RESULT == 0){ //0:RESULT_SUCCESS
-								Swal.fire({text: '변경되었습니다'}).then((result) => { 
-									$('#name_now').val($('#name').val())
-									$('#name').val('')
+								Swal.fire({text: '변경되었습니다.'}).then((result) => {
+									$('#nickname_now').val($('#nickname').val())
+									$('#nickname').val("");
 								})
 							}else if(RESULT == 5){ //5: RESULT_CUSTOM_MSG
 		 						Swal.fire({html: result.MSG})
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl
index 84f41d6..35c0194 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl
@@ -13,7 +13,7 @@
 					<h1 class="l_title">현재 비밀번호 입력해주세요</h1>
 					<div class="p_list_item p_border_box">
 						<div class="p_input_box">
-							<input type="password" id="password_now" name="password_now" class="required" data-tit="현재 비밀번호" placeholder="현재 비밀번호 입력">
+							<input type="password" id="password_now" name="password_now" class="required" data-tit="현재 비밀번호" placeholder="현재 비밀번호를 입력해 주세요.">
 						</div>
 					</div>
 				</div>
@@ -21,12 +21,12 @@
 					<h1 class="l_title">새로운 비밀번호 입력해주세요</h1>
 					<div class="p_list_item p_border_box">
 						<div class="p_input_box border_b">
-							<input type="password" id="password_1" name="password_1" class="required" data-tit="비밀번호" placeholder="비밀번호 입력" >
+							<input type="password" id="password_1" name="password_1" class="required" data-tit="비밀번호" placeholder="영문/숫자/특수문자 2조합 9~15자 이내로 작성해 주세요." >
 						</div>
 					</div>
 					<div class="p_list_item p_border_box">
 						<div class="p_input_box">
-							<input type="password" id="password_2" name="password_2" class="required" data-tit="비밀번호 재입력" placeholder="비밀번호 재입력" >
+							<input type="password" id="password_2" name="password_2" class="required" data-tit="비밀번호 재입력" placeholder="비밀번호를 확인해 주세요." >
 						</div>
 					</div>
 					<div class="m_set_account_btn"><button type="submit" id="" name="" class="btns blue_btn">변경하기</button></div>
@@ -64,7 +64,7 @@
 					e.preventDefault()
 					return;
 				}else if(!SNUtil.regPw.test($("#password_1").val())){
-					Swal.fire({text: '6-12자 이내의 비밀번호를 입력해주세요'})
+					Swal.fire({text: '6-15자 이내의 비밀번호를 입력해주세요'})
 					this.is_loading = false
 					e.preventDefault()
 					return;
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 137b582..1e742e5 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -325,7 +325,7 @@ var SNUtil = {
     regEmoji : /([\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF])/g,
     regEmail : /^[0-9a-zA-Z]([-_\.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_\.]?[0-9a-zA-Z])*\.[a-zA-Z]{2,3}$/i,
     regPh : /^01(?:0|1|[6-9])(\d{3}|\d{4})(\d{4})$/,
-    regPw : /^[A-Za-z0-9!\*@#$%^&+=]{6,12}$/,
+    regPw : /^[A-Za-z0-9!\*@#$%^&+=]{6,15}$/,
     
     initInputAction: function(){
         var varUA = navigator.userAgent.toLowerCase()