Merge branch 'develop' into jmh

src/main/resources/config/application-locp.yml

@@ -17,50 +17,47 @@ logging:
     config: classpath:log/logback-locp.xml
 
 # SSL Server
-has-ssl: false
+has-ssl: true
 
 domain:
+    admin: //lpadmin.style24.com
     front: //lpfront.style24.com
-    image: //image.style24.com/speedy_image-wivismall
+    image: //image.istyle24.com/Upload
     uximage: //image.istyle24.com/Style24
 
 upload:
     default:
-        target.path: /WIDE/workspace/files/data
+        target.path: /WIDE/workspace/files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.style24.com/speedy_image-wivismall
+        view: //image.istyle24.com/Upload
     goods:
-        target.path: /WIDE/workspace/files/data/goods
+        target.path: /WIDE/workspace/files/data/style24/Upload/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.style24.com/speedy_image-wivismall/goods
+        view: //image.istyle24.com/Upload/ProductImage
     image:
-        target.path: /WIDE/workspace/files/data
+        target.path: /WIDE/workspace/files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.style24.com/speedy_image-wivismall
+        view: //image.istyle24.com/Upload
     excel:
-        target.path: /WIDE/workspace/files/data/excel
+        target.path: /WIDE/workspace/files/data/style24
         max.size: 10
         allow.extension: xls|xlsx
-        view: //lpimage.style24.com/excel
+        view: //image.istyle24.com/Upload/excel
+    sample:
+        target.path: /WIDE/workspace/files/data/style24/sample
+        max.size: 10
+        allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
+        view: //image.istyle24.com/Upload/sample
 
 download.path: /WIDE/workspace/files/data
 
-# SMTP(naver의 본인 username과 password, from(메일주소) 입려 후 테스트 하면 됨)
-mail:
-    host: mail.wivis.com
-    #    port: 465
-    username: admin@wivis.com
-    password: dnlqltm1!
-    protocol: smtp
-    #    tls: true
-    auth: true
-    from: admin@wivis.com
-    wivis.url: http://lpfront.style24.com
-    image.url: http://lpfront.style24.com/image/mailing
-    template.path: /WIDE/workspace/webapps/wivis/wivismall.front/src/main/webapp/WEB-INF/mail
+# USAFE 보증보험 정보
+usafe.guarantee:
+    mall.id: istyle2400
+    send.url: https://gateway.usafe.co.kr/esafe/guartrn.asp
 
 # PG
 pg:
@@ -87,3 +84,48 @@ naverPay:
     payUrl:
         web : pay.naver.com
         mob : m.pay.naver.com
+    shop.id: istyle2424
+    button.key: 5DF64042-EF37-45F1-878E-67C7098135E6
+    button.pc.js.url: https://pay.naver.com/customer/js/naverPayButton.js
+    button.mobile.js.url: https://pay.naver.com/customer/js/mobile/naverPayButton.js
+    common.certification.key: s_3799db3bf4af
+    certification.key: 2BC5E173-2840-4B48-BC7D-FF770005DD76
+    order.api.url: https://api.pay.naver.com/o/customer/api/order/v20/register
+    order.pc.url: https://order.pay.naver.com/customer/buy/
+    order.mobile.url: https://m.pay.naver.com/o/customer/buy/
+    zzim.api.url: https://pay.naver.com/customer/api/wishlist.nhn
+    zzim.popup.url: https://pay.naver.com/customer/wishlistPopup.nhn
+    zzim.mobile.url: https://m.pay.naver.com/mobile/customer/wishList.nhn
+    access.license:
+    secret.key:
+    port.address: http://ec.api.naver.com/Checkout/MallService5
+    service.name: MallService5
+    version: 5.0
+
+#카카오 API
+kakao:
+    cid : CT22482324
+    appId: 442702
+    appName: 아이스타일24
+    companyName: 예스이십사
+    nativeAppKey: 5d97db2ee36fa0e121d962b2531ae0c1
+    restApiKey: 46d601394bd887cbada3cf00fdddef54
+    javascriptKey: b3c9ee69171042c3637e8d714a4c8a75
+    adminKey: 7cc33b2ef96d785c4caf3376f9dc9254
+    addressApiRequestUrl : https://dapi.kakao.com/v2/local/search/address.json?page=1&query=
+    login.callbackUrl: /signin/snsLoginCallback?snsType=KK
+    tokenUrl: https://kauth.kakao.com/oauth/token
+    userInfoUrl: https://kapi.kakao.com/v2/user/me
+    authorizeUrl: https://kauth.kakao.com/oauth/authorize
+    unlinkUrl : https://kapi.kakao.com/v1/user/unlink
+    paymentReadyUrl : https://kapi.kakao.com/v1/payment/ready
+    paymentRedirectUrl : /order/kakao/payment/request
+    approvePaymentUrl : https://kapi.kakao.com/v1/payment/approve
+    paymentOrderUrl : https://kapi.kakao.com/v1/payment/order
+    cancelPaymentUrl : https://kapi.kakao.com/v1/payment/cancel
+
+# 검색엔진(NHN다이퀘스트)
+search:
+    engine:
+        diquest.ip: 133.186.171.33
+        diquest.port: 44555

src/main/resources/config/application-stage.yml

@@ -0,0 +1,141 @@
+spring:
+    profiles:
+        active: stage
+    cache.type: redis
+    redis:
+        lettuce:
+            pool:
+                max-active: 10
+                max-idle: 10
+                min-idle: 2
+        host: 172.30.90.111
+        port: 6379
+        password:
+        cluster:
+            nodes:
+                172.30.90.111:6379
+                172.30.90.112:6379
+                172.30.90.113:6379
+                172.30.90.111:6380
+                172.30.90.112:6380
+                172.30.90.113:6380
+                172.30.90.111:6381
+                172.30.90.112:6381
+                172.30.90.113:6381
+# SSL Server
+has-ssl: true
+
+logging:
+    config: classpath:log/logback-stage.xml
+
+domain:
+    admin: //stage-bos.style24.com
+    front: //stage-www.style24.com
+    image: //image.istyle24.com/Upload
+    uximage: //image.istyle24.com/Style24
+
+
+upload:
+    default:
+        target.path: /files/data/style24
+        max.size: 10
+        allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
+        view: //image.istyle24.com/Upload
+    goods:
+        target.path: /files/data/style24/ProductImage
+        max.size: 10
+        allow.extension: jpg|gif|jpeg|png
+        view: //image.istyle24.com/Upload/ProductImage
+    image:
+        target.path: /files/data/style24
+        max.size: 10
+        allow.extension: jpg|gif|jpeg|png
+        view: //image.istyle24.com/Upload
+    excel:
+        target.path: /files/data/style24/excel
+        max.size: 10
+        allow.extension: xls|xlsx
+        view: //image.istyle24.com/Upload/excel
+    sample:
+        target.path: /files/data/style24/sample
+        max.size: 10
+        allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
+        view: //image.istyle24.com/Upload/sample
+
+download.path: /files/data/style24
+
+# USAFE 보증보험 정보
+usafe.guarantee:
+    mall.id: istyle2400
+    send.url: https://gateway.usafe.co.kr/esafe/guartrn.asp
+
+# PG
+pg:
+    kcp:
+        log.dir: /logs/style24/kcpLogs/front
+        gw:
+            url: paygw.kcp.co.kr
+            port: 8090
+        user.type: PGNW
+        js.url: https://pay.kcp.co.kr/plugin/payplus_web.jsp
+        server: true
+        site:
+            cd: U3476
+            key: 4aVa--.Xz8Fc78nwYPsrmmY__
+            name: ISTYLE
+        log.level: 3
+        module.type: 01
+        tx.mode: 0
+        receipt.url : https://admin8.kcp.co.kr/assist/bill.BillActionNew.do
+
+# 네이버페이 API
+naverPay:
+    apiUrl: https://apis.naver.com/
+    payUrl:
+        web : pay.naver.com
+        mob : m.pay.naver.com
+    shop.id: istyle2424
+    button.key: 5DF64042-EF37-45F1-878E-67C7098135E6
+    button.pc.js.url: https://pay.naver.com/customer/js/naverPayButton.js
+    button.mobile.js.url: https://pay.naver.com/customer/js/mobile/naverPayButton.js
+    common.certification.key: s_3799db3bf4af
+    certification.key: 2BC5E173-2840-4B48-BC7D-FF770005DD76
+    order.api.url: https://api.pay.naver.com/o/customer/api/order/v20/register
+    order.pc.url: https://order.pay.naver.com/customer/buy/
+    order.mobile.url: https://m.pay.naver.com/o/customer/buy/
+    zzim.api.url: https://pay.naver.com/customer/api/wishlist.nhn
+    zzim.popup.url: https://pay.naver.com/customer/wishlistPopup.nhn
+    zzim.mobile.url: https://m.pay.naver.com/mobile/customer/wishList.nhn
+    access.license:
+    secret.key:
+    port.address: http://ec.api.naver.com/Checkout/MallService5
+    service.name: MallService5
+    version: 5.0
+
+#카카오 API
+kakao:
+    cid : CT22482324 
+    appId: 442702
+    appName: 아이스타일24
+    companyName: 예스이십사
+    nativeAppKey: 5d97db2ee36fa0e121d962b2531ae0c1
+    restApiKey: 46d601394bd887cbada3cf00fdddef54
+    javascriptKey: b3c9ee69171042c3637e8d714a4c8a75
+    adminKey: 7cc33b2ef96d785c4caf3376f9dc9254
+    addressApiRequestUrl : https://dapi.kakao.com/v2/local/search/address.json?page=1&query=
+    login.callbackUrl: /signin/snsLoginCallback?snsType=KK
+    tokenUrl: https://kauth.kakao.com/oauth/token
+    userInfoUrl: https://kapi.kakao.com/v2/user/me
+    authorizeUrl: https://kauth.kakao.com/oauth/authorize
+    unlinkUrl : https://kapi.kakao.com/v1/user/unlink
+    paymentReadyUrl : https://kapi.kakao.com/v1/payment/ready
+    paymentRedirectUrl : /order/kakao/payment/request
+    approvePaymentUrl : https://kapi.kakao.com/v1/payment/approve
+    paymentOrderUrl : https://kapi.kakao.com/v1/payment/order
+    cancelPaymentUrl : https://kapi.kakao.com/v1/payment/cancel
+
+# 검색엔진(NHN다이퀘스트)
+search:
+    engine:
+        diquest.ip: 133.186.171.33
+        diquest.port: 44555

src/main/resources/config/application-style.yml

@@ -8,9 +8,6 @@ spring:
                 max-active: 10
                 max-idle: 10
                 min-idle: 2
-#        host: 172.30.87.5
-#        port: 6379
-#        password: MdxpyGtipZSci6VhTpFdklXxb4Qv7zxEq3Jqg3ULekg=
         host: 172.30.90.111
         port: 6379
         password:
@@ -29,7 +26,7 @@ spring:
 has-ssl: true
 
 logging:
-    config: classpath:log/logback-run.xml
+    config: classpath:log/logback-style.xml
 
 domain:
     admin: //bos.style24.com

src/main/resources/log/logback-stage.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration scan="true">
+	<property name="LOG_HOME" value="./logs/style24/front"/>
+	<property name="LOG_LEVEL" value="INFO"/>
+	
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<charset>utf-8</charset>
+			<pattern>[%d] [%thread] %-5level %logger{32} : %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_HOME}/style24_front.log</file>
+		<encoder>
+			<charset>utf-8</charset>
+			<pattern>[%d] [%thread] %-5level %logger{32} : %msg%n</pattern>
+		</encoder>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_HOME}/style24_front.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
+			<!-- keep 30 days' worth of history -->
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+	</appender>
+
+	<logger name="org.springframework" level="ERROR"/>
+	
+	<!-- SQL문과 해당 SQL을 실행시키는데 수행된 시간 정보(milliseconds)를 포함한다. -->
+	<logger name="jdbc.sqltiming" level="INFO" additivity="false">
+		<appender-ref ref="CONSOLE"/>
+	</logger>
+
+	<root level="${LOG_LEVEL}">
+		<appender-ref ref="CONSOLE"/>
+	</root>
+
+</configuration>

src/main/resources/log/logback-style.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration scan="true">
+	<property name="LOG_HOME" value="./logs/style24/front"/>
+	<property name="LOG_LEVEL" value="INFO"/>
+	
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<charset>utf-8</charset>
+			<pattern>[%d] [%thread] %-5level %logger{32} : %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_HOME}/style24_front.log</file>
+		<encoder>
+			<charset>utf-8</charset>
+			<pattern>[%d] [%thread] %-5level %logger{32} : %msg%n</pattern>
+		</encoder>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_HOME}/style24_front.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
+			<!-- keep 30 days' worth of history -->
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+	</appender>
+
+	<logger name="org.springframework" level="ERROR"/>
+	
+	<!-- SQL문과 해당 SQL을 실행시키는데 수행된 시간 정보(milliseconds)를 포함한다. -->
+	<logger name="jdbc.sqltiming" level="INFO" additivity="false">
+		<appender-ref ref="CONSOLE"/>
+	</logger>
+
+	<root level="${LOG_LEVEL}">
+		<appender-ref ref="CONSOLE"/>
+	</root>
+
+</configuration>

src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html

@@ -157,6 +157,7 @@
 <!--									<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_BEST_MAIN);">-->
 <!--										<h2 th:text="${contentsTitle}"></h2>-->
 <!--									</a>-->
+									<!-- //2021.08.30 card007 메인 잇 아이템 전체보기 주석처리 추후 주석 제거 필요 -->
 <!--								</th:block>-->
 								</div>
 								<div class="inner_head">

src/main/webapp/WEB-INF/views/web/display/MallMainFormWeb.html

@@ -160,6 +160,7 @@
 <!--						<th:block th:each="ContentsData, ContentsStat : ${mainLayoutData.ContentsList}">-->
 							<!-- 2021.08.30 card007 메인 잇 아이템 전체보기 주석처리 추후 주석 제거 필요 -->
 <!--							<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_BEST_MAIN);"><span>전체보기</span></a>-->
+							<!-- //2021.08.30 card007 메인 잇 아이템 전체보기 주석처리 추후 주석 제거 필요 -->
 <!--						</th:block>-->
 						</div>
 						<div class="cont_body">

src/main/webapp/WEB-INF/views/web/goods/GoodsDealDetailFormWeb.html

@@ -457,7 +457,7 @@
 		</div>
 		<!-- // 이 상품과 함께 본 상품 -->
 		</th:block>
-		<!-- 2021.08.30 card007 추천솔루션 관련 주석처리 추후 주석 제거 필요 -->
+		<!-- //2021.08.30 card007 추천솔루션 관련 주석처리 추후 주석 제거 필요 -->
 	</div>
 	<!-- 상품썸네일 크게보기 팝업 -->
 	<div class="pd_pop full_pop pd_itemthumb_pop" id="pdItemThumbPop" th:if="${(goodsImgList != null and !goodsImgList.empty)}" >