From 9e3d42fcf124a5dcb33373c5d7207a9eab5d9732 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Mon, 9 May 2022 23:34:05 +0900
Subject: [PATCH] =?UTF-8?q?1.=20=EB=82=A8=EC=9D=80=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EA=B8=B0=EB=A1=9D=202.=20=EC=86=8C=EC=85=9C=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=B0=8F=20redirect?=
 =?UTF-8?q?=20=EC=A0=95=EB=B3=B4=20=ED=94=84=EB=A1=9C=ED=8D=BC=ED=8B=B0=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 30 +++++++++----------
 .../backoffice/m/login/M_LoginController.java |  5 ++--
 .../WEB-INF/views/ftl/m/login/view_login.ftl  | 12 +++-----
 개발참고.txt                              |  8 +++++
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 54abce2..4bc1893 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,11 +9,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="연동완료후 이동 URL 수정-2">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.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/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$/개발참고.txt" beforeDir="false" afterPath="$PROJECT_DIR$/개발참고.txt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -256,14 +256,7 @@
       <workItem from="1651995870891" duration="2261000" />
       <workItem from="1652058308312" duration="456000" />
       <workItem from="1652060536329" duration="3124000" />
-      <workItem from="1652100883750" duration="4593000" />
-    </task>
-    <task id="LOCAL-00017" summary="데이터 연동작업">
-      <created>1649174166224</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1649174166224</updated>
+      <workItem from="1652100883750" duration="5192000" />
     </task>
     <task id="LOCAL-00018" summary="퍼블리싱 기능 적용&#10;1. 설정하기&#10; - 인증코드 확인&#10; - 계정연동 하기&#10; - 기록 카테고리 수정&#10; - 자주쓰는 표현 수정&#10; &#10;2. 로그인화면">
       <created>1649264283460</created>
@@ -601,7 +594,14 @@
       <option name="project" value="LOCAL" />
       <updated>1652066536512</updated>
     </task>
-    <option name="localTasksCounter" value="66" />
+    <task id="LOCAL-00066" summary="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정">
+      <created>1652106063064</created>
+      <option name="number" value="00066" />
+      <option name="presentableId" value="LOCAL-00066" />
+      <option name="project" value="LOCAL" />
+      <updated>1652106063064</updated>
+    </task>
+    <option name="localTasksCounter" value="67" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -621,7 +621,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
     <MESSAGE value="- 체크리스트 오류사항 수정" />
     <MESSAGE value="- 기본음악파일 삭제불가처리" />
     <MESSAGE value="소셜회원가입 오류수정" />
@@ -646,6 +645,7 @@
     <MESSAGE value="연동계정 취소하기시 확인 창" />
     <MESSAGE value="연동완료후 이동 URL 수정" />
     <MESSAGE value="연동완료후 이동 URL 수정-2" />
-    <option name="LAST_COMMIT_MESSAGE" value="연동완료후 이동 URL 수정-2" />
+    <MESSAGE value="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/login/M_LoginController.java b/src/main/java/com/backoffice/m/login/M_LoginController.java
index ee3e0db..a80be22 100644
--- a/src/main/java/com/backoffice/m/login/M_LoginController.java
+++ b/src/main/java/com/backoffice/m/login/M_LoginController.java
@@ -3,7 +3,6 @@ package com.backoffice.m.login;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-
 import com.backoffice.api.bo.ApiSMSBO;
 import com.backoffice.constants.ConstantSystem;
 import com.backoffice.m.member_env.M_Member_envBO;
@@ -62,8 +61,7 @@ public class M_LoginController extends AbstractControllerManager{
 	M_Util gmUtil = new M_Util();
 	
 	@RequestMapping(value="view_login")	
-	public String view_login(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, HttpServletResponse response
-			, RedirectAttributes ra) {	
+	public String view_login(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, HttpServletResponse response, RedirectAttributes ra) {
 		
 		DataMap paramMap = gmUtil.getDataMapFromRequest(request);
 
@@ -87,6 +85,7 @@ public class M_LoginController extends AbstractControllerManager{
 		
 		try{
 			boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap);
+			paramMap.put("WEB_URL",ConstantSystem.WEB_URL);	//WEB URL세팅 - 소셜로그인을 위하여.
 
 		}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
 
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
index 9af3194..abfe5ae 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl
@@ -90,7 +90,7 @@
     var naver_id_login = new naver_id_login(_naverKey, _naverCallUrl);
     var naver_state = naver_id_login.getUniqState();
     naver_id_login.setButton("white", 3, 40);
-    naver_id_login.setDomain("http://devops.lookylooks.ai:14288");
+    naver_id_login.setDomain("${model['WEB_URL']}");
     naver_id_login.setState(naver_state);
     naver_id_login.setPopup();
     naver_id_login.init_naver_id_login();
@@ -106,7 +106,9 @@
             // window.open(url, 'naverloginpop', 'titlebar=1, resizable=1, scrollbars=yes, width=600, height=550');
             location.href = url;
         } else if(l_type == "K") {
-            loginWithKakao();
+            Kakao.Auth.authorize({
+                redirectUri: '${model['WEB_URL']}/bf/m/login/kakaoLogin_callback.do'
+            });
             /*
             //카카오는 여기로 바로 redirect 한다.
             Kakao.Auth.login({
@@ -123,12 +125,6 @@
         }
     }
 
-    function loginWithKakao() {
-        Kakao.Auth.authorize({
-            redirectUri: 'http://devops.lookylooks.ai:14288/bf/m/login/kakaoLogin_callback.do'
-        })
-    }
-
     // 소셜 로그인 callback 정보 받기
     <#--function fn_L_loginCallback(socialType, key){-->
     <#--    //소셜로그인 체크여부 확인-->
diff --git a/개발참고.txt b/개발참고.txt
index 4cd9d04..d802f15 100644
--- a/개발참고.txt
+++ b/개발참고.txt
@@ -93,3 +93,11 @@ http://devops.lookylooks.ai:14288/bf/m/bf_food/list_bf_homemade_recommend_ajax?p
 
  - 자동로그인 웹URL - POST or GET
  http://devops.lookylooks.ai:14288/m/login/loginAutoMobile?member_id=1651069631295
+
+
+# 해야할일
+ - 디비 import
+ - 서버 배포
+ - SNS(네이버, 카카오) 개발자 센터 URL 등록
+ - SMS 및 구글메일 전송정보 확인
+ - 홈화면 아이정보 슬라이딩 기능 적용
\ No newline at end of file