From 8b733c457e521e7e2ef34b2f606b756504be329e Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Wed, 20 Apr 2022 03:10:43 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=84=ED=99=94=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EB=A7=8C=EB=A3=8C=20=EC=B9=B4=EC=9A=B4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=A0=81=EC=9A=A9(=EC=9D=B8=EC=A6=9D=EB=A7=8C?=
 =?UTF-8?q?=EB=A3=8C=EC=8B=9C=20=EC=9D=B8=EC=A6=9D=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=84=EC=86=A1=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99=20=EC=B2=98=EB=A6=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 24 +++++++----
 .../WEB-INF/views/ftl/m/include/confirm.ftl   |  5 ++-
 .../views/ftl/m/login/view_find_id_02.ftl     |  4 ++
 .../m/login/view_join_member_01_confirm.ftl   | 40 ++++++++++++++++++-
 .../ftl/m/login/view_pw_reset_phone_02.ftl    |  4 ++
 5 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bdf11c4..e969ee3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,10 +9,12 @@
     <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="d-day 체크리스트 사항 수정">
       <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/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/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_d_day.ftl" 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_find_id_02.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01_confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01_confirm.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -220,7 +222,8 @@
       <workItem from="1650099253570" duration="21674000" />
       <workItem from="1650210956375" duration="846000" />
       <workItem from="1650243545918" duration="874000" />
-      <workItem from="1650278800214" duration="17415000" />
+      <workItem from="1650278800214" duration="17684000" />
+      <workItem from="1650385175659" duration="2438000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -488,7 +491,14 @@
       <option name="project" value="LOCAL" />
       <updated>1650292837211</updated>
     </task>
-    <option name="localTasksCounter" value="39" />
+    <task id="LOCAL-00039" summary="d-day 체크리스트 사항 수정">
+      <created>1650298188595</created>
+      <option name="number" value="00039" />
+      <option name="presentableId" value="LOCAL-00039" />
+      <option name="project" value="LOCAL" />
+      <updated>1650298188596</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -508,7 +518,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="계정 동기화 기능 수정" />
     <MESSAGE value="홈화면 퍼블리싱 기능 적용" />
     <MESSAGE value="카카오,네이버 로그인 연동 설정 - 개발사이트(가온앤 아이디)" />
     <MESSAGE value="데이터 연동작업" />
@@ -533,6 +542,7 @@
     <MESSAGE value="회원가입 밸리데이션 및 유효성체크 보완 - 2" />
     <MESSAGE value="공유기능 퍼블리싱 및 기능 적용" />
     <MESSAGE value="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함." />
-    <option name="LAST_COMMIT_MESSAGE" value="이유식당 홈 기록이미지 노출변경(최초 등록된것으로), 이후에 대표이미지로 변경해야함." />
+    <MESSAGE value="d-day 체크리스트 사항 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="d-day 체크리스트 사항 수정" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl
index 7a3893f..b6de9e7 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl
@@ -11,7 +11,8 @@
             if(s_time <= 0){
                 stop_timer();
 
-                Swal.fire({ text: "다시 인증해주시기 바랍니다.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+                // Swal.fire({ text: "다시 인증해주시기 바랍니다.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+                Swal.fire({text: '인증 시간이 만료 되었습니다. 다시 인증해 주시기 바랍니다.'}).then((result)=>{ history.back(); })
             }else{
                 --s_time;
 
@@ -163,7 +164,7 @@
                     dataType:'json',
                     error:function(request,status,error){
                         alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
-                        // stop_timer();
+                        stop_timer();
                     },
                     success:function(result){
                         console.log(result);
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl
index 16b2cb2..8a3766b 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl
@@ -23,6 +23,7 @@
       <p>인증코드</p>
       <div class="input_search_phone">
         <input type="text" maxlength="4" id="check_num" name="check_num" placeholder="인증코드를 입력하세요" class="input_box" />
+        남은시간 <span id="id_limit_time"></span>
       </div>
       <div class="input_search_phone_btn">
         <a href="javascript:ajax_confirm_sms();">인증코드 확인</a>
@@ -39,4 +40,7 @@
 </body>
 
 <#include "/m/include/confirm.ftl">
+<script>
+  start_timer();
+</script>
 <#include "/m/include/index_bottom.ftl">
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01_confirm.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01_confirm.ftl
index 8d89fb6..0abdd69 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01_confirm.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01_confirm.ftl
@@ -31,10 +31,12 @@
                 <div class="input_phone">
                     <input readonly type="number" id="phone" name="phone" value="${Session.rm_member['phone']!}" class="input_box" onfocus="this.placeholder=''"
                            onblur="this.placeholder='전화번호를 입력하세요'" />
+                    <p>* 번호로 인증코드를 발송하였습니다.</p>
                 </div>
                 <h5>인증코드</h5>
                 <div class="input_sign_phone">
-                    <input type="text" maxlength="4" id="check_num" name="check_num" class="input_box" />
+                    <input type="text" maxlength="4" id="check_num" name="check_num" placeholder="인증코드를 입력해 주세요." class="input_box" />
+                    남은시간 <span id="id_limit_time"></span>
                 </div>
 
                 <div class="input_search_phone_btn">
@@ -56,6 +58,40 @@
     var s_time = 180;
     var timer_check;
 
+    start_timer = function() {
+        stop_timer();
+
+        timer_check = setInterval(function() {
+
+            if(s_time <= 0){
+                stop_timer();
+
+                // Swal.fire({ text: "다시 인증해주시기 바랍니다.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+                Swal.fire({text: '인증 시간이 만료 되었습니다. 다시 인증해 주시기 바랍니다.'}).then((result)=>{ history.back(); })
+            }else{
+                --s_time;
+
+                var min = parseInt((s_time%3600)/60);
+                var sec = s_time%60;
+                if(sec > -1){
+                    var remain_time = min + ":" + (sec < 10 ? "0" + sec : sec);
+
+                    // console.log('min:' + min + ' sec:' + sec + ' remain_time:' + remain_time);
+                    $('#id_limit_time').text(remain_time);
+                }
+            }
+
+        }, 1000);
+    };
+
+    stop_timer = function(){
+        clearInterval(timer_check);
+        s_time = 180;
+        is_loading = false;
+    };
+
+    start_timer();
+
     function ajax_confirm_sms() {
         if (is_loading == false) {
             is_loading = true;
@@ -93,7 +129,7 @@
                             // Swal.fire({ text: "인증되었습니다.", icon: 'success', showConfirmButton: false, timer: 1500 }); // success
                             location.href='${URL_ROOT}/m/login/view_join_member_02.do';
                         }else{
-                            Swal.fire({ text: "인증에 실패했습니다. 인증번호가 맞지 않거나 인증시간 3분 초과입니다.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+                            Swal.fire({ text: "인증에 실패했습니다.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
                             is_loading = false;
                         }
 
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl
index e122a05..195834d 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl
@@ -23,6 +23,7 @@
 			<p>인증코드</p>
 			<div class="input_search_phone">
 				<input type="text" maxlength="4" id="check_num" name="check_num" placeholder="인증코드를 입력하세요" class="input_box" />
+				남은시간 <span id="id_limit_time"></span>
 			</div>
 			<div class="input_search_phone_btn">
 				<a href="javascript:ajax_confirm_pw_sms();">인증코드 확인</a>
@@ -39,4 +40,7 @@
 </body>
 
 <#include "/m/include/confirm.ftl">
+<script>
+	start_timer();
+</script>
 <#include "/m/include/index_bottom.ftl">
\ No newline at end of file