Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -2238,17 +2238,27 @@ public class TsfOrderService {
 		conn.setRequestMethod("POST");
 		conn.addRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
 
+		// Protocol 처리
+		String hasSsl = env.getProperty("has-ssl");
+		String protocol;
+
+		if ("true".equals(hasSsl)) {
+			protocol = "https:";
+		} else {
+			protocol = "http:";
+		}
+
 		// 네이버페이 기본정보
-		String shopId			= env.getProperty("naverPay.shop.id");								// shopId
-		String certificationKey	= env.getProperty("naverPay.certification.key");					// 네이버페이 인증키
-		String goodsUrl 		= env.getProperty("domain.front");									// 상품 경로
+		String shopId			= env.getProperty("naverPay.shop.id");											// shopId
+		String certificationKey	= env.getProperty("naverPay.certification.key");								// 네이버페이 인증키
+		String goodsUrl 		= protocol + env.getProperty("domain.front");									// 상품 경로
 		goodsUrl			   += "/goods/detail/form?goodsCd=" + goods.getGoodsCd();
 		if ("Y".equals(goods.getSelfGoodsYn())) {
 			goodsUrl		   += "&colorCd=" + goods.getColorCd();
 		} else {
 			goodsUrl		   += "&colorCd=XX";
 		}
-		String goodsImgUrl		= env.getProperty("upload.goods.view") + "/" + goods.getSysImgNm();	// 상품 이미지 경로
+		String goodsImgUrl		= protocol + env.getProperty("upload.goods.view") + "/" + goods.getSysImgNm();	// 상품 이미지 경로
 
 		// 상품정보 설정
 		StringBuilder sb = new StringBuilder();

src/main/java/com/style24/front/biz/web/TsfDisplayController.java

@@ -9,9 +9,6 @@ import java.util.HashMap;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.style24.persistence.domain.eigene.Eigeneai;
-import com.style24.persistence.domain.eigene.Item;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mobile.device.Device;
@@ -24,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.util.GagaCookieUtil;
 import com.style24.core.biz.service.TscEnvsetService;
 import com.style24.core.biz.service.TscLookbookService;
 import com.style24.core.support.env.TscConstants;
@@ -53,6 +52,7 @@ import com.style24.persistence.domain.Popup;
 import com.style24.persistence.domain.SearchKeyword;
 import com.style24.persistence.domain.Social;
 import com.style24.persistence.domain.eigene.Eigeneai.Result;
+import com.style24.persistence.domain.eigene.Item;
 import com.style24.persistence.domain.searchengine.AutoCompleteResponse;
 import com.style24.persistence.domain.searchengine.Filter;
 import com.style24.persistence.domain.searchengine.GoodsListResponse;
@@ -61,9 +61,6 @@ import com.style24.persistence.domain.searchengine.SearchEngine;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.util.GagaCookieUtil;
-
 /**
  * 전시 Controller
  * 
@@ -1575,4 +1572,13 @@ public class TsfDisplayController extends TsfBaseController {
 
 		return itemList;
 	}
+
+	@GetMapping("/test")
+	public ModelAndView searchSample() {
+		ModelAndView mav = new ModelAndView();
+
+		mav.setViewName(super.getDeviceViewName("display/SearchSampleForm"));
+
+		return mav;
+	}
 }

src/main/java/com/style24/front/support/config/TsfErrorConfig.java

@@ -1,21 +0,0 @@
-package com.style24.front.support.config;
-
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Error Configuration
- * 
- * @author gagamel
- * @since 2021. 8. 19
- */
-@Configuration
-public class TsfErrorConfig {
-
-//	@Bean
-//	public ConfigurableServletWebServerFactory webServerFactory() {
-//		TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
-//		factory.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/error"));
-//		return factory;
-//	}
-
-}

src/main/java/com/style24/front/support/startup/TsfServletInitializer.java

@@ -11,14 +11,6 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
  */
 public class TsfServletInitializer extends SpringBootServletInitializer {
 
-	public TsfServletInitializer() {
-		super();
-
-		// 기본적으로 Spring boot에서는 에러를 처리하는 ErrorPageFilter가 자동으로 동작한다.
-		// 이를 동작하지 않도록 설정
-		setRegisterErrorPageFilter(false);
-	}
-
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
 		return application.sources(TsfApplication.class);

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

@@ -3989,34 +3989,57 @@
 	<!-- 상품추가정보 목록 -->
 	<select id="getGoodsAddInfoList" parameterType="Goods" resultType="Item">
 		/* TsfGoods.getGoodsAddInfoList */
-		SELECT Z.COUNT                                                                              /*view건수*/
-		     , Z.ITEM_ID                                                                            /*상품코드*/
-		     , Z.IMAGE_URL
-		     , Z.ITEM_NAME
-		     , Z.ITEM_URL
-		     , Z.CATEGORY_ID
-		     , G.LIST_PRICE                                                       AS ORIGINAL_PRICE /*정상가*/
-		     , FN_GET_BENEFIT_PRICE(#{frontGb},G.GOODS_CD,G.CURR_PRICE,#{custGb}) AS SALE_PRICE     /*현재판매가*/
-		     , BG.BRAND_GROUP_NO                                                  AS BRAND_ID       /*브랜드ID(브랜드그룹번호)*/
-		     , CASE WHEN BG.DISP_NM_LANG = 'EN' THEN BG.BRAND_GROUP_ENM
-		            ELSE BG.BRAND_GROUP_KNM END                                   AS BRAND_NAME     /*브랜드명(브랜드그룹명)*/
+		SELECT SUM(X.COUNT)                                                             AS COUNT
+		     , X.ITEM_ID
+		     , X.IMAGE_URL
+		     , X.ITEM_NAME
+		     , X.ITEM_URL
+		     , MAX(X.CATEGORY_ID)                                                       AS CATEGORY_ID
+		     , X.ORIGINAL_PRICE
+		     , X.SALE_PRICE
+		     , X.BRAND_ID
+		     , X.BRAND_NAME
+		     , X.WISH_CNT
+		FROM (SELECT Z.COUNT                                                                              /*view건수*/
+		           , Z.ITEM_ID                                                                            /*상품코드*/
+		           , Z.IMAGE_URL
+		           , Z.ITEM_NAME
+		           , Z.ITEM_URL
+		           , CASE Z.CATEGORY_ID WHEN 'null' THEN 0
+		                                ELSE Z.CATEGORY_ID
+		              END                                                               AS CATEGORY_ID
+		           , G.LIST_PRICE                                                       AS ORIGINAL_PRICE /*정상가*/
+		           , FN_GET_BENEFIT_PRICE(#{frontGb},G.GOODS_CD,G.CURR_PRICE,#{custGb}) AS SALE_PRICE     /*현재판매가*/
+		           , BG.BRAND_GROUP_NO                                                  AS BRAND_ID       /*브랜드ID(브랜드그룹번호)*/
+		           , CASE WHEN BG.DISP_NM_LANG = 'EN' THEN BG.BRAND_GROUP_ENM
+		                  ELSE BG.BRAND_GROUP_KNM END                                   AS BRAND_NAME     /*브랜드명(브랜드그룹명)*/
+		           ,
 		     <choose>
 		         <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
-		     , IF(W.GOODS_CD IS NULL,0,1)                                         AS WISH_CNT       /*위시리스트담긴상품*/
+		             IF(W.GOODS_CD IS NULL,0,1)                                         AS WISH_CNT       /*위시리스트담긴상품*/
 		         </when>
 		         <otherwise>
-		     , 0                                                                  AS WISH_CNT       /*위시리스트담긴상품*/
+		             0                                                                  AS WISH_CNT       /*위시리스트담긴상품*/
 		         </otherwise>
 		     </choose>
-		FROM   (
-		        ${sql}
-		       ) Z
-		INNER JOIN TB_GOODS G ON Z.ITEM_ID = G.GOODS_CD
-		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		LEFT OUTER JOIN TB_WISHLIST W ON Z.ITEM_ID = W.GOODS_CD
-		                             AND IFNULL(#{custNo}, 0) = W.CUST_NO
-		ORDER  BY Z.RK
+		      FROM   (
+		              ${sql}
+		             ) Z
+		      INNER JOIN TB_GOODS G ON Z.ITEM_ID = G.GOODS_CD
+		      INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		      INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		      LEFT OUTER JOIN TB_WISHLIST W ON Z.ITEM_ID = W.GOODS_CD
+		                                   AND IFNULL(#{custNo}, 0) = W.CUST_NO
+		      ORDER  BY Z.RK) X
+		GROUP BY X.ITEM_ID
+		       , X.IMAGE_URL
+		       , X.ITEM_NAME
+		       , X.ITEM_URL
+		       , X.ORIGINAL_PRICE
+		       , X.SALE_PRICE
+		       , X.BRAND_ID
+		       , X.BRAND_NAME
+		       , X.WISH_CNT
 	</select>
 	
 	<!-- 상세용 컨텐츠 목록  -->

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

@@ -75,12 +75,13 @@
 
 	<!-- Global site tag (gtag.js) - Google Analytics -->
 	<!-- Global site tag (gtag.js) - Google Analytics -->
-	<script async src="https://www.googletagmanager.com/gtag/js?id=AW-865781638"></script>
+	<script async src="https://www.googletagmanager.com/gtag/js?id=G-MQWD9VX4KH"></script>
 	<script>
 		window.dataLayer = window.dataLayer || [];
 		function gtag(){dataLayer.push(arguments);}
 		gtag('js', new Date());
-		gtag('config', 'AW-865781638');
+// 		gtag('config', 'AW-865781638');
+		gtag('config', 'G-MQWD9VX4KH');
 	</script>
 	
 	<th:block th:if="${sessioninfo != null}">

src/main/webapp/WEB-INF/views/web/common/fragments/HeadWeb.html

@@ -80,12 +80,13 @@
 	<script src="https://www.google.com/recaptcha/api.js" async defer></script>
 
 	<!-- Global site tag (gtag.js) - Google Analytics -->
-	<script async src="https://www.googletagmanager.com/gtag/js?id=AW-865781638"></script>
+	<script async src="https://www.googletagmanager.com/gtag/js?id=G-MQWD9VX4KH"></script>
 	<script>
 		window.dataLayer = window.dataLayer || [];
 		function gtag(){dataLayer.push(arguments);}
 		gtag('js', new Date());
-		gtag('config', 'AW-865781638');
+// 		gtag('config', 'AW-865781638');
+		gtag('config', 'G-MQWD9VX4KH');
 	</script>
 	<!--// Global site tag (gtag.js) - Google Analytics -->