java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

아이디 저장기능 적용

Browse Source
dev_bert
jonghwan76 3 years ago
parent 3bf1eb8cf4
commit da35dddd9d
6 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File

24
.idea/workspace.xml
Unescape View File

@ -9,10 +9,13 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="소셜회원가입 오류수정">
<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/ApiSMSController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.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/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/index/include_nochild.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.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/member_env/setting.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -231,7 +234,7 @@
<workItem from="1650687202332" duration="1688000" />
<workItem from="1650693305284" duration="10783000" />
<workItem from="1650722240024" duration="593000" />
<workItem from="1650776418092" duration="15551000" />
<workItem from="1650776418092" duration="21115000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -534,7 +537,14 @@
<option name="project" value="LOCAL" />
<updated>1650796823828</updated>
</task>
<option name="localTasksCounter" value="44" />
<task id="LOCAL-00044" summary="아이디 비밀번호 찾기 오류 수정">
<created>1650801028670</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1650801028670</updated>
</task>
<option name="localTasksCounter" value="45" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -554,7 +564,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="index_bottom 공유관련 html 스크립트 분리" />
<MESSAGE value="index_bottom 공유관련 html 스크립트 분리-2" />
<MESSAGE value="D-Day 관리기능 적용" />
<MESSAGE value="D-Day 관리기능 적용-2" />
@ -579,6 +588,7 @@
<MESSAGE value="- 체크리스트 오류사항 수정" />
<MESSAGE value="- 기본음악파일 삭제불가처리" />
<MESSAGE value="소셜회원가입 오류수정" />
<option name="LAST_COMMIT_MESSAGE" value="소셜회원가입 오류수정" />
<MESSAGE value="아이디 비밀번호 찾기 오류 수정" />
<option name="LAST_COMMIT_MESSAGE" value="아이디 비밀번호 찾기 오류 수정" />
</component>
</project>

4
src/main/java/com/backoffice/m/login/M_LoginController.java
Unescape View File

@ -490,7 +490,7 @@ public class M_LoginController extends AbstractControllerManager{
}else{
ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_MEMBER_IS_NULL); // json result code
gmUtil.redirectParamFlash(ra, DataMap.fromNameValue(new String[]{"phone_num","script_msg"}, new String[]{RenaStringUtil.getData(paramMap, "member_id"),"로그인에 실패했습니다"}));
gmUtil.redirectParamFlash(ra, DataMap.fromNameValue(new String[]{"phone_num","script_msg"}, new String[]{RenaStringUtil.getData(paramMap, "member_id"),"아이디 또는 비밀번호를 확인해 주세요."}));
}
}
}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
@ -540,7 +540,7 @@ public class M_LoginController extends AbstractControllerManager{
redirect_url = "redirect:" + action_url;
}else{
ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_MEMBER_IS_NULL); // json result code
gmUtil.redirectParamFlash(ra, DataMap.fromNameValue(new String[]{"phone_num","script_msg"}, new String[]{RenaStringUtil.getData(paramMap, "member_id"),"로그인에 실패했습니다"}));
gmUtil.redirectParamFlash(ra, DataMap.fromNameValue(new String[]{"phone_num","script_msg"}, new String[]{RenaStringUtil.getData(paramMap, "member_id"),"아이디 또는 비밀번호를 확인해 주세요."}));
}
}
}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}

13
src/main/webapp/WEB-INF/views/ftl/m/index/include_nochild.ftl
Unescape View File

@ -7,21 +7,21 @@
<div class="bxslider-wrapper" style="visibility: hidden; opacity: 0;">
<ul class="main_pofile_slider">
<li>
<div class="main_pofile_txt">
<div onclick="fncGoRegisterBaby()" style="cursor:pointer" class="main_pofile_txt">
<h2>아이를 등록하세요</h2>
<p>0세 0개월(남)</p>
</div>
<div class="main_pofile_img">
<p><a href="#"><img src="${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png" alt="프로필 사진" /></a></p>
<p><a href="javascript:fncGoRegisterBaby()"><img src="${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png" alt="프로필 사진" /></a></p>
</div>
</li>
<li>
<div class="main_pofile_txt">
<div onclick="fncGoRegisterBaby()" style="cursor:pointer" class="main_pofile_txt">
<h2>아이를 등록하세요</h2>
<p>0세 0개월(남)</p>
</div>
<div class="main_pofile_img">
<p><a href="#"><img src="${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png" alt="프로필 사진" /></a></p>
<p><a href="javascript:fncGoRegisterBaby()"><img src="${URL_STATIC_ROOT}/m/img/main/main_profile_img02.png" alt="프로필 사진" /></a></p>
</div>
</li>
</ul>
@ -129,4 +129,9 @@
<!-- //main_cont_result -->
</div>
<script>
function fncGoRegisterBaby() {
location.href = "${URL_ROOT}/m/bf_family_baby/view_bf_family_baby.do?return_url=list_bf_family_baby";
}
</script>
<!-- //main_cont -->

24
src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
Unescape View File

@ -40,6 +40,9 @@
<input type="password" id="password" name="password" value="" maxlength="20" <#if model['phone_num']?exists>${model['temp_pwd']!}</#if>" class="" placeholder="비밀번호 입력">
</label>
</div>
<p>
<input type="checkbox" id="remember" name="remember"><label for="remember" style="padding-left:5px" class="lang">아이디 저장</label>
</p>
</div>
</form>
<div id="naver_id_login" style="display:none"></div>
@ -172,13 +175,15 @@
if($('#member_id').val() == ""){
alert('이메일을 입력해주세요');
$('#member_id').focus();
}else if($('#password').val() == ""){
} else if($('#password').val() == ""){
alert('비밀번호를 입력해주세요');
$('#password').focus();
}else{
setCookie('member_id', $('#member_id').val(), 365);
sessionStorage.setItem('member_id', $('#member_id').val())
} else {
if($("#remember").is(":checked")) {
setCookie('member_id', $('#member_id').val(), 365);
} else {
setCookie('member_id', "", 365);
}
$('#frmJoin').submit();
}
}
@ -196,10 +201,15 @@
if(sessionStorage.getItem('member_id')){
$('#member_id').val(sessionStorage.getItem('member_id'));
}else if(getCookie('member_id')){
setCookie('member_id', $('#member_id').val(), 365);
$('#member_id').val(getCookie('member_id'));
$("#remember").prop("checked", true);
// setCookie('member_id', $('#member_id').val(), 365);
}
<#if model['script_msg']?has_content>
<#if model['script_msg']?has_content>
setCookie('member_id', "", 365);
$("#remember").prop("checked", false);
Swal.fire({
text: "${model['script_msg']}",
icon: 'warning',

2
src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl
Unescape View File

@ -15,7 +15,7 @@
<a href="${URL_ROOT}/m/member_env/setting_nm.do?return_url=setting&view_nm=view_set_account" class="more_item">계정 관리</a>
</div>
<div class="list_item">
<a href="${URL_ROOT}/m/bf_family_baby/list_bf_family_baby.do?return_url=setting" class="more_item">아이 정보 변경</a>
<a href="${URL_ROOT}/m/bf_family_baby/list_bf_family_baby.do?return_url=setting" class="more_item">아이 정보 입력/변경</a>
</div>
</div>

2
src/main/webapp/m/html/4-4.회원가입-계정연동(ppt20).html
Unescape View File

@ -33,7 +33,7 @@
<div class="l_list">
<div class="cont_account">
<div class="view_account">
<p> 같은 아이 정보를 가지고 이유식당을 사용하시는 계정이 있으신가요? </p>
<p> 같은 아이 정보로 사용하시는 이유식당 계정이 있으신가요? </p>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save