계정관리 퍼블리싱 적용-1

dev_bert
jonghwan76 3 years ago
parent 00d7b162e0
commit 81b5990de1

@ -9,30 +9,10 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="회원가입 오류 수정">
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw_20220411.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_01.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_result_20220411.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_01.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_02.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_01.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_20220411.ftl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/webapp/m/img/img.svg" afterDir="false" />
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이디/비밀번호 찾기 적용">
<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/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/webapp/WEB-INF/views/ftl/m/include/confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_no_result.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_no_result.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_result.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_result.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.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_20220402.ftl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_20220402.ftl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/m/html/3. 비밀번호 찾기(ppt9).html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/m/html/3. 비밀번호 찾기(ppt9).html" 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" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -223,7 +203,7 @@
<workItem from="1649570725292" duration="12891000" />
<workItem from="1649642776611" duration="10336000" />
<workItem from="1649670553832" duration="574000" />
<workItem from="1649678553834" duration="10396000" />
<workItem from="1649678553834" duration="14874000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -393,7 +373,14 @@
<option name="project" value="LOCAL" />
<updated>1649651774910</updated>
</task>
<option name="localTasksCounter" value="25" />
<task id="LOCAL-00025" summary="아이디/비밀번호 찾기 적용">
<created>1649689766053</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1649689766053</updated>
</task>
<option name="localTasksCounter" value="26" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -437,6 +424,7 @@
<MESSAGE value="D-Day 관리기능 적용-2" />
<MESSAGE value="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1" />
<MESSAGE value="회원가입 오류 수정" />
<option name="LAST_COMMIT_MESSAGE" value="회원가입 오류 수정" />
<MESSAGE value="아이디/비밀번호 찾기 적용" />
<option name="LAST_COMMIT_MESSAGE" value="아이디/비밀번호 찾기 적용" />
</component>
</project>

@ -7,80 +7,62 @@
<h1 class="header_title">계정관리</h1>
<a href="#" class="side_Rbtn hidden"></a>
</header>
<main class="m_set_account m_set_account_name">
<div class="l_list">
<h1 class="l_title">현재 설정된 닉네임</h1>
<div class="p_list_item p_border_box">
<div class="p_input_box">
<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>
<form name="frmMember" id="frmMember" method="post">
<div id="search_id" class="search_id">
<div class="search_phone">
<h3>현재 설정된 닉네임</h3>
<div class="input_search_phone">
<input readonly type="text" id="nickname_now" name="nickname_now" value="<#if Session.rm_member?has_content>${Session.rm_member['nickname']!}</#if>" class="input_box" />
</div>
</div>
</div>
<div class="l_list">
<form name="frmMember" id="frmMember" method="post">
<h1 class="l_title">새로운 닉네임</h1>
<div class="p_list_item p_border_box">
<div class="p_input_box">
<input type="text" id="nickname" name="nickname" class="required" data-tit="이름" placeholder="변경하실 닉네임을 입력해 주세요." maxlength="25">
</div>
<p>새로운 닉네임</p>
<div class="input_search_phone">
<input type="text" id="nickname" name="nickname" maxlength="25" placeholder="변경하실 닉네임을 입력해 주세요." class="input_box" />
</div>
<div class="m_set_account_btn"><button type="submit" id="codechk_btn" name="" class="btns blue_btn">변경하기</button></div>
</form>
<div class="input_search_phone_btn">
<a href="javascript:fncSubmit();">변경하기</a>
</div>
</div>
</div>
<#include "/m/include/index_bottom_info.ftl">
</main>
</form>
</div>
<script>
var member = {
init: function(){
$('#frmMember').on('submit',function(e){
var childname = $('#nickname').val()
if(SNUtil.strByteLength(childname) < 1 || SNUtil.strByteLength(childname) > 30){
Swal.fire({
text: '이름은 1글자 이상 25글자 이하로 다시 입력해주세요.'
}).then((result)=>{ $('#nickname').focus() })
e.preventDefault()
}else{
var data = $('#frmMember').serialize()
$.ajax({
url:'${URL_ROOT}/m/member_env/ajax_update_member_nickname.do',
type: 'post',
data: data,
dataType: 'json',
error:function(request,status,error){
Swal.fire({text: '오류가 발생했습니다'})
e.preventDefault()
return;
}.bind('this'),
success:function(result){
var RESULT = result.RESULT
if(RESULT == 0){ //0:RESULT_SUCCESS
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})
}else{
Swal.fire({text: '변경에 실패했습니다'})
}
}.bind('this'),
})
e.preventDefault()
return;
}
})
}
function fncSubmit() {
var childname = $('#nickname').val()
if(SNUtil.strByteLength(childname) < 1 || SNUtil.strByteLength(childname) > 30){
Swal.fire({
text: '이름은 1글자 이상 25글자 이하로 다시 입력해주세요.'
}).then((result)=>{ $('#nickname').focus() })
e.preventDefault()
}else{
var data = $('#frmMember').serialize()
$.ajax({
url:'${URL_ROOT}/m/member_env/ajax_update_member_nickname.do',
type: 'post',
data: data,
dataType: 'json',
error:function(request,status,error){
Swal.fire({text: '오류가 발생했습니다'})
e.preventDefault()
return;
}.bind('this'),
success:function(result){
var RESULT = result.RESULT
if(RESULT == 0){ //0:RESULT_SUCCESS
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})
}else{
Swal.fire({text: '변경에 실패했습니다'})
}
}.bind('this'),
})
return;
}
}
$(function(){
member.init()
})
</script>
</script>
<#include "/m/member_env/include_return_url.ftl">

@ -7,105 +7,74 @@
<h1 class="header_title">계정관리</h1>
<a href="#" class="side_Rbtn hidden"></a>
</header>
<main class="m_set_account m_set_account_password">
<form name="frmMember" id="frmMember" method="post">
<div class="l_list">
<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="현재 비밀번호를 입력해 주세요.">
</div>
<form name="frmMember" id="frmMember" method="post">
<div id="search_id" class="search_id">
<div class="search_phone">
<h3>현재 비밀번호</h3>
<div class="input_search_phone">
<input type="password" id="password_now" name="password_now" value="" maxlength="15" placeholder="현재 비밀번호를 입력해 주세요." class="input_box" />
</div>
</div>
<div class="l_list">
<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="영문/숫자/특수문자 2조합 9~15자 이내로 작성해 주세요." >
</div>
<p>새로운 비밀번호</p>
<div class="input_search_phone" style="padding-bottom:10px">
<input type="password" id="password_1" name="password_1" maxlength="15" placeholder="영문/숫자/특수문자 2조합 9~15자 이내로 작성해 주세요." class="input_box" />
</div>
<div class="input_search_phone" style="padding-top:0px">
<input type="password" id="password_2" name="password_2" maxlength="15" placeholder="비밀번호를 확인해 주세요." class="input_box" />
</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="비밀번호를 확인해 주세요." >
</div>
<div class="input_search_phone_btn">
<a href="javascript:fncSubmit();">변경하기</a>
</div>
<div class="m_set_account_btn"><button type="submit" id="" name="" class="btns blue_btn">변경하기</button></div>
</div>
</form>
<#include "/m/include/index_bottom_info.ftl">
</main>
</div>
</form>
</div>
<script>
var member = {
is_loading: false,
init: function(){
$('#frmMember').on('submit',function(e){
if(this.is_loading) {
e.preventDefault()
return;
}
if (!SNValidator.validateWithAlert('#frmMember')) {
this.is_loading = false
e.preventDefault()
return;
}else if($('#password_1').val() != $('#password_2').val()){
Swal.fire({text: '입력하신 비밀번호가 서로 다릅니다'})
this.is_loading = false
e.preventDefault()
return;
}else if($('#password_1').val() == $('#password_now').val()){
Swal.fire({text: '기존 비밀번호와 다른 비밀번호를 입력하세요'})
this.is_loading = false
e.preventDefault()
return;
}else if(!SNUtil.regPw.test($("#password_1").val())){
Swal.fire({text: '6-15자 이내의 비밀번호를 입력해주세요'})
this.is_loading = false
e.preventDefault()
return;
}
var data = $('#frmMember').serialize()
$.ajax({
url:'${URL_ROOT}/m/member_env/ajax_update_member_pwd.do',
type: 'post',
data: data,
dataType: 'json',
error:function(request,status,error){
this.is_loading = false
Swal.fire({text: '오류가 발생했습니다'})
e.preventDefault()
return;
}.bind('this'),
success:function(result){
console.log(result)
this.is_loading = false;
var RESULT = result.RESULT
if(RESULT == 0){ //0:RESULT_SUCCESS
Swal.fire({html: '변경되었습니다<br/>새로운 비밀번호로 다시 로그인 해주세요'}).then((result) => { location.href="${URL_ROOT}/m/login/view_login.do" })
}else if(RESULT == 5){ //5: RESULT_CUSTOM_MSG
Swal.fire({html: result.MSG})
}else{
Swal.fire({text: '변경에 실패했습니다'})
}
}.bind('this'),
})
function fncSubmit() {
if($('#password_1').val() != $('#password_2').val()){
Swal.fire({text: '입력하신 비밀번호가 서로 다릅니다'})
this.is_loading = false
e.preventDefault()
return;
}else if($('#password_1').val() == $('#password_now').val()){
Swal.fire({text: '기존 비밀번호와 다른 비밀번호를 입력하세요'})
this.is_loading = false
e.preventDefault()
return;
}else if(!SNUtil.regPw.test($("#password_1").val())){
Swal.fire({text: '6-15자 이내의 비밀번호를 입력해주세요'})
this.is_loading = false
e.preventDefault()
return;
}
var data = $('#frmMember').serialize()
$.ajax({
url:'${URL_ROOT}/m/member_env/ajax_update_member_pwd.do',
type: 'post',
data: data,
dataType: 'json',
error:function(request,status,error){
this.is_loading = false
Swal.fire({text: '오류가 발생했습니다'})
e.preventDefault()
return;
})
}
}.bind('this'),
success:function(result){
console.log(result)
this.is_loading = false;
var RESULT = result.RESULT
if(RESULT == 0){ //0:RESULT_SUCCESS
Swal.fire({html: '변경되었습니다<br/>새로운 비밀번호로 다시 로그인 해주세요'}).then((result) => { location.href="${URL_ROOT}/m/login/view_login.do" })
}else if(RESULT == 5){ //5: RESULT_CUSTOM_MSG
Swal.fire({html: result.MSG})
}else{
Swal.fire({text: '변경에 실패했습니다'})
}
}.bind('this'),
})
}
$(function(){
member.init()
})
</script>
</script>
<#include "/m/member_env/include_return_url.ftl">

Loading…
Cancel
Save