Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front.git into develop

src/main/java/com/style24/front/support/interceptor/TsfDefaultInterceptor.java

@@ -7,11 +7,12 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
-import com.gagaframework.web.util.GagaStringUtil;
 import com.style24.front.support.security.session.TsfSession;
 
 import lombok.extern.slf4j.Slf4j;
 
+import com.gagaframework.web.util.GagaStringUtil;
+
 /**
  * 모든 Request에 대한 선처리
  * 
@@ -46,16 +47,13 @@ public class TsfDefaultInterceptor extends HandlerInterceptorAdapter {
 //			return false;
 //		}
 //
-//		// Set Meta Info.
-//		policyService.setMetaInfo(FoConstants.SITE_CD);
-//
 //		String queryString = GagaStringUtil.convertParameterToQueryString(request.getParameterMap());
 //		if (StringUtils.isNotBlank(queryString))
 //			queryString = "?" + queryString;
 //		log.debug("queryString: [{}]", queryString);
-//
-//		// Set APP Info.
-//		this.setAppInfo(request);
+
+		// Set APP Info.
+		this.setAppInfo(request);
 
 		return super.preHandle(request, response, handler);
 	}

src/main/java/com/style24/persistence/mybatis/shop/TsfSocial.xml

@@ -8,8 +8,8 @@
 		     , A.SOCIAL_TYPE
 		     , A.SITE_CD
 		     , A.FRONT_GB
-		     , A.SOCIAL_STDT
-		     , A.SOCIAL_EDDT
+		     , DATE_FORMAT(A.SOCIAL_STDT, '%Y%m%d') AS SOCIAL_STDT
+		     , DATE_FORMAT(A.SOCIAL_EDDT, '%Y%m%d') AS SOCIAL_EDDT
 		     , A.SOCIAL_TNM
 		     , A.USE_YN
 		     , A.APPLY_GB

src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -68,7 +68,7 @@
 	<div id="menuFull">
 		<div class="fullHead">
 			<div class="goHome"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);"><img src="/images/mo/logo_STYLE24_full.png" alt=""></a></div>
-			<a href="javascript:void(0);" class="appSett">AppSetting</a>
+			<a href="javascript:void(0);" class="appSett" th:if="${isApp == true}">AppSetting</a>
 			<a href="javascript:menu_cls();" class="menu_cls">close</a>
 		</div>
 		<div class="fullBody">
@@ -78,6 +78,7 @@
 			</div>
 			<div class="inner">
 				<div class="btn_group btn_group_flex">
+					<div th:if="${sessionInfo == null}"><button type="button" class="btn" onclick="cfnGoToPage(_PAGE_LOGIN);"><span>로그인</span></button></div>
 					<div th:if="${sessionInfo != null}"><button type="button" class="btn" onclick="cfnGoToPage(_PAGE_LOGOUT);"><span>로그아웃</span></button></div>
 					<div><button type="button" class="btn" onclick="cfnGoToPage(_PAGE_FAQ);"><span>고객센터</span></button></div>
 				</div>

src/main/webapp/WEB-INF/views/mob/social/SocialMainFormMob.html

@@ -193,22 +193,15 @@ $(function(){
 	fnSocialListSearch();
     /* 핫딜 countDown */
     function hotdealTimer() {
-        var endTime = new Date(socialInfo.socialEddt); // 남은시간 지정
-            alert("endTime1 :" + endTime);
-            endTime = (Date.parse(endTime) / 1000);
-            alert("endTime2 :" + endTime);
+    		var endTime = socialInfo.socialEddt.toDate("YYYYMMDD");
+   
+            endTime = (Date.parse(endTime) / 1000); // nan
             var now = new Date();
-            alert("now1 :" + now);
             now = (Date.parse(now) / 1000);
-			alert("now2 :" + now);
             var timeLeft = endTime - now;
-            alert("timeLeft :" + timeLeft);
             var days = Math.floor(timeLeft / 86400);
-            alert("days :" + days);
             var hours = Math.floor((timeLeft - (days * 86400)) / 3600);
-            alert("hours :" + hours);
             var minutes = Math.floor((timeLeft - (days * 86400) - (hours * 3600 )) / 60);
-            alert("minutes :" + minutes);
             var seconds = Math.floor((timeLeft - (days * 86400) - (hours * 3600) - (minutes * 60)));
 	
             if (hours < '10') { hours = '0' + hours; }

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -197,7 +197,8 @@ $(function(){
        /* 핫딜 countDown */
     
        function hotdealTimer() {
-           var endTime = new Date(socialInfo.socialEddt); // 남은시간 지정
+    	   		var endTime = socialInfo.socialEddt.toDate("YYYYMMDD");
+           //var endTime = new Date(socialInfo.socialEddt); // 남은시간 지정
 
                endTime = (Date.parse(endTime) / 1000);