@@ -619,8 +621,6 @@
-
-
@@ -644,6 +644,8 @@
-
+
+
+
\ 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/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
index ddeae49..e0e69dd 100644
--- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
+++ b/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
diff --git a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
index d157d0c..4312c2c 100644
--- a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
+++ b/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
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
index ac09378..9f2ff63 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
@@ -88,48 +88,45 @@
${item['name']!} (${item['gender_ko']!})
${(item['past_day'])!}일 (${(item['past_day']?number/7)!}주 ${(item['past_day']?number%7)!}일/${item['past_month']!}개월 ${(item['past_day']?number%7)!}일)
+
+ <#if item['d_day_year']? has_content>
+
+ <#else>
+
+
+
<#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>
-
- ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-
+ ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
<#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>
-
- ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-
+ ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
<#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>
-
- ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-
+ ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
<#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>
-
- ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-
+ ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
<#elseif item['day365'] lt 0>
<#if item['diff_d_day'] gt 0>
-
- ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
-
+ ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
<#else>
설정된 D-Day가 없습니다.
-
+
@@ -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']}");
// 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;
+ }
+
+ }
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