Merge branch 'devs' of https://gitlab.com/big.imcloud/badyfeed/bf.git into devs

.idea/workspace.xml

@@ -9,10 +9,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="연동완료후 이동 URL 수정">
+    <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/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" 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/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" 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" />
@@ -254,21 +255,8 @@
       <workItem from="1651850876348" duration="8000" />
       <workItem from="1651995870891" duration="2261000" />
       <workItem from="1652058308312" duration="456000" />
-      <workItem from="1652060536329" duration="2801000" />
+      <workItem from="1652060536329" duration="3124000" />
-    </task>
+      <workItem from="1652100883750" duration="5192000" />
-    <task id="LOCAL-00016" summary="카카오,네이버 로그인 연동 설정 - 개발사이트(가온앤 아이디)">
-      <created>1649163766799</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1649163766799</updated>
-    </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>
     </task>
     <task id="LOCAL-00018" summary="퍼블리싱 기능 적용&#10;1. 설정하기&#10; - 인증코드 확인&#10; - 계정연동 하기&#10; - 기록 카테고리 수정&#10; - 자주쓰는 표현 수정&#10; &#10;2. 로그인화면">
       <created>1649264283460</created>
@@ -599,7 +587,21 @@
       <option name="project" value="LOCAL" />
       <updated>1652066405558</updated>
     </task>
-    <option name="localTasksCounter" value="65" />
+    <task id="LOCAL-00065" summary="연동완료후 이동 URL 수정-2">
+      <created>1652066536512</created>
+      <option name="number" value="00065" />
+      <option name="presentableId" value="LOCAL-00065" />
+      <option name="project" value="LOCAL" />
+      <updated>1652066536512</updated>
+    </task>
+    <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">
@@ -619,8 +621,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="d-day 체크리스트 사항 수정" />
-    <MESSAGE value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
     <MESSAGE value="- 체크리스트 오류사항 수정" />
     <MESSAGE value="- 기본음악파일 삭제불가처리" />
     <MESSAGE value="소셜회원가입 오류수정" />
@@ -644,6 +644,8 @@
     <MESSAGE value="메모리 &gt; 주간 중복 동일 카테고리 간격제거" />
     <MESSAGE value="연동계정 취소하기시 확인 창" />
     <MESSAGE value="연동완료후 이동 URL 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="연동완료후 이동 URL 수정" />
+    <MESSAGE value="연동완료후 이동 URL 수정-2" />
+    <MESSAGE value="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정" />
   </component>
 </project>

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
+	public String view_login(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, HttpServletResponse response, RedirectAttributes ra) {
-			, 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();}
 

src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml

@@ -391,9 +391,18 @@
 					 )
 					 WHEN cis_1.cd_no = 'BF_NU_TP_3' THEN
 					 (
-						SELECT ifnull(concat(ifnull(tn.prd_nm, ''),' ', tn1.eat_qty, 'ml 섭취'),'')
+						SELECT
+							concat(
+									case
+										when tn1.db_dn_tp = 'bf' then ifnull(tb.prd_nm, '')
+										when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '')
+										end
+									,' '
+									,tn1.eat_qty, 'ml 섭취'
+								)
 						FROM tbl_bf_daily_nutrition_3 tn1 
-						INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no 
+					    LEFT OUTER JOIN tbl_db_nutrient tb ON tn1.db_dn_no = tb.dn_no
+						LEFT OUTER JOIN tbl_db_sf_commerce tc on tn1.db_dn_no = tc.dbc_no
 						WHERE tn1.dn_no = x.dn_no
 					 )
 					 WHEN cis_1.cd_no = 'BF_NU_TP_5' THEN

src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml

@@ -242,9 +242,17 @@
 					)
 				when c.cd_no = 'BF_NU_TP_3' THEN
 					(select
-						 concat(ifnull(tn.prd_nm, ''),' ', tn1.eat_qty, 'ml 섭취')
+						 concat(
+								 case
+									 when tn1.db_dn_tp = 'bf' then ifnull(tb.prd_nm, '')
+									 when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '')
+									 end
+							 ,' '
+							 ,tn1.eat_qty, 'ml 섭취'
+							 )
 					 from tbl_bf_daily_nutrition_3 tn1
-							  left outer join tbl_db_nutrient tn on tn1.db_dn_no = tn.dn_no
+					 left outer join tbl_db_nutrient tb on tn1.db_dn_no = tb.dn_no
+					 left outer join tbl_db_sf_commerce tc on tn1.db_dn_no = tc.dbc_no
 					 where tn1.dn_no = b.dn_no
 					)
 				when c.cd_no = 'BF_NU_TP_5' THEN

src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl

@@ -88,48 +88,45 @@
 													<h2>${item['name']!} (${item['gender_ko']!})</h2>
 													<p>${(item['past_day'])!}일 (${(item['past_day']?number/7)!}주 ${(item['past_day']?number%7)!}일/${item['past_month']!}개월 ${(item['past_day']?number%7)!}일)</p>
 													<p class="d_day">
+
+													<#if item['d_day_year']? has_content>
+														<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
+													<#else>
+														<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day">
+													</#if>
+
 														<#if item['day100'] gt 0>
 															<#if item['diff_d_day'] gt item['day100'] || item['diff_d_day'] lt 0>
 																100일 D-${(item['day100'])!}일,${item['day100date']!}
 															<#elseif item['diff_d_day'] gt 0>
-																<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
+																${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																	${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																</a>
 															</#if>
 														<#elseif item['day200'] gt 0>
 															<#if item['diff_d_day'] gt item['day200'] || item['diff_d_day'] lt 0>
 																200일 D-${(item['day200'])!}일,${item['day200date']!}
 															<#elseif item['diff_d_day'] gt 0>
-																<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
+																${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																	${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																</a>
 															</#if>
 														<#elseif item['day300'] gt 0>
 															<#if item['diff_d_day'] gt item['day300'] || item['diff_d_day'] lt 0>
 																300일 D-${(item['day300'])!}일,${item['day300date']!}
 															<#elseif item['diff_d_day'] gt 0>
-																<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
+																${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																	${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																</a>
 															</#if>
 														<#elseif item['day365'] gt 0>
 															<#if item['diff_d_day'] gt item['day365'] || item['diff_d_day'] lt 0>
 																첫돌 D-${(item['day365'])!}일,${item['day365date']!}
 															<#elseif item['diff_d_day'] gt 0>
-																<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
+																${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																	${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																</a>
 															</#if>
 														<#elseif item['day365'] lt 0>
 															<#if item['diff_d_day'] gt 0>
-																<a style='color:white' href="${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=${item['d_day_year']}&viewMonth=${item['d_day_month']}">
+																${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																	${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-																</a>
 															<#else>
 																설정된 D-Day가 없습니다.
 															</#if>
 														</#if>
-
+														</a>
 													</p>
 												</div>
 												<div class="main_pofile_img">
@@ -373,7 +370,7 @@
 	var smc_index = 0;
 
 	<#if (model['lm_child'])?has_content>
-		smc_index = parseInt("${model['smc_index']}");
+	smc_index = parseInt("${model['smc_index']}");
 	</#if>
 
 	// main_pofile_slider 프로필 슬라이드
@@ -508,6 +505,15 @@
 			clickable: true
 		},
 	});
+
+	function fncGoDday(d_day_year, d_day_month) {
+		if(d_day_year == null) {
+			location.href = "${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day";
+		} else {
+			location.href = "${URL_ROOT}/m/member_env/setting_env_viewnm.do?return_url=setting&view_nm=view_d_day&viewYear=" + d_day_year + "&viewMonth=" + d_day_month;
+		}
+
+	}
 </script>
 
 

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){-->
     <#--    //소셜로그인 체크여부 확인-->

개발참고.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 및 구글메일 전송정보 확인
+ - 홈화면 아이정보 슬라이딩 기능 적용