Merge branch 'develop' into jmh

src/main/java/com/style24/batch/biz/task/TsbStatisticsTask.java

@@ -1,6 +1,5 @@
 package com.style24.batch.biz.task;
 
-import com.style24.batch.biz.job.statistics.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -10,7 +9,9 @@ import com.style24.batch.biz.job.statistics.TsbDateTimeOrderStaticsJob;
 import com.style24.batch.biz.job.statistics.TsbDayOrderStaticsJob;
 import com.style24.batch.biz.job.statistics.TsbInflowStatisticsJob;
 import com.style24.batch.biz.job.statistics.TsbInflowYesterdayStatisticsJob;
+import com.style24.batch.biz.job.statistics.TsbPayStaticsJob;
 import com.style24.batch.biz.job.statistics.TsbSalesSmsSendJob;
+import com.style24.batch.biz.job.statistics.TsbSubPayStaticsJob;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -44,7 +45,6 @@ public class TsbStatisticsTask {
 	@Autowired
 	private TsbSalesSmsSendJob salesSmsSendJob;
 
-
 	/**
 	 * 초 분 시 일 월 주(년)
 	 * 0 0 12 * * ?" : 아무 요일, 매월, 매일 12:00:00
@@ -134,11 +134,20 @@ public class TsbStatisticsTask {
 	}
 
 	/**
-	 * 전일자 매출문자 발송
+	 * 매출문자 발송 (평일은 저녁 8시30분, 11시30분)
+	 */
+	@Scheduled(cron = "${cron.statistics.sales.sms.send1}")
+	@Async
+	public void sendSalesSmsJob1() throws Exception {
+		salesSmsSendJob.runById("cron.statistics.sales.sms.send");
+	}
+
+	/**
+	 * 매출문자 발송 (주말(토/일)은 오전 10시, 오후 2시, 6시, 저녁 10시)
 	 */
-	@Scheduled(cron = "${cron.statistics.sales.sms.send}")
+	@Scheduled(cron = "${cron.statistics.sales.sms.send2}")
 	@Async
-	public void sendSalesSmsJob() throws Exception {
+	public void sendSalesSmsJob2() throws Exception {
 		salesSmsSendJob.runById("cron.statistics.sales.sms.send");
 	}
 

src/main/java/com/style24/batch/biz/web/TsbStatisticsController.java

@@ -63,7 +63,7 @@ public class TsbStatisticsController extends TscBaseController {
 	}
 
 	/**
-	 * 전일자 매출문자 발송
+	 * 매출문자 발송 (평일은 저녁 8시30분, 11시30분, 주말(토/일)은 오전 10시, 오후 2시, 6시, 저녁 10시)
 	 */
 	@GetMapping("/sales/sms/send")
 	@ResponseBody

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

@@ -43,15 +43,6 @@ cron:
     goods:
         benefit.create: 2 22 2 29 2 ?                 #상품 혜택 생성
         benefit.price.create: 2 22 2 29 2 ?           #상품 즉시할인가 생성
-        #ep:
-        #    naver:
-        #        all.goods.create: 2 22 2 29 2 ?      #네이버 전체EP 생성 (1일 1회)
-        #        summary.goods.create: 2 22 2 29 2 ?  #네이버 요약EP 생성 (1시간 1회)
-        #        sell.create: 2 22 2 29 2 ?           #네이버 판매지수EP 생성 (1일 1회)
-        #    daum:
-        #        all.goods.create: 2 22 2 29 2 ?      #다음 전체EP 생성 (1일 1회)
-        #        summary.goods.create: 2 22 2 29 2 ?  #다음 요약EP 생성 (1시간 1회)
-        #        review.create: 2 22 2 29 2 ?         #다음 상품평EP 생성 (1일 1회)
         ep:
             naver:
                 all.goods.create: 0 23 4 * * *             #네이버 전체EP 생성 (1일 1회)
@@ -113,9 +104,9 @@ cron:
     order:
         cart.deadline.expire: 2 22 2 29 2 ?     #만료기간 지난 장바구니 삭제
         deposit.waiting.notify: 2 22 2 29 2 ?   #무통장(가상계좌) 입금대기 알림
-        deposit.deadline.expire: 2 22 2 29 2 ?  #무통장입금 입금기한 만료건 주문 취소
-        gift.deadline.expire: 2 22 2 29 2 ?     #선물하기 배송지 등록기한 만료건 주문 취소
-        pg.kcp.settle.receive: 2 22 2 29 2 ?    #KCP PG 정산 데이터 수신
+        deposit.deadline.expire: 0 40 4 * * *   #무통장입금 입금기한 만료건 주문 취소 (1일 1회)
+        gift.deadline.expire: 0 10 5 * * *      #선물하기 배송지 등록기한 만료건 주문 취소 (1일 1회)
+        #pg.kcp.settle.receive: 2 22 2 29 2 ?    #KCP PG 정산 데이터 수신 (사용안함)
         cart.unpurchase.push: 2 22 2 29 2 ?     #장바구니 미구매 확인(삭제 10일 전) 푸시 송부
         cart.benefit.push: 2 22 2 29 2 ?        #장바구니 혜택 추가 푸시
         wish.benefit.push: 2 22 2 29 2 ?        #위시리스트 혜택 추가 푸시
@@ -128,7 +119,7 @@ cron:
             outgoing.exception.receive: 2 22 2 29 2 ?  #WMS 출고예외 수신
             outgoing.result.receive: 2 22 2 29 2 ?     #WMS 출고결과 수신
             invoice.receive: 2 22 2 29 2 ?             #WMS 운송장번호 수신
-        sweettracker.invoice.retrieve: 0 9/10 * * * *   #스윗트래커 송장상태 조회
+        sweettracker.invoice.retrieve: 0 9/10 * * * *  #스윗트래커 송장상태 조회
         auto.soldout.cancel: 2 22 2 29 2 ?             #자동품절취소
 
     #회수
@@ -144,7 +135,8 @@ cron:
             status.receive: 2 22 2 29 2 ?                #CJ 회수상태 수신
 
     #네이버페이
-    naverPay.order.batch: 2 22 2 29 2 ?                 # 네이버페이 배치 실행
+    naverPay.order.batch: 2 22 2 29 2 ?                  #네이버페이 배치 실행 (20분배치)
+    #naverPay.order.batch: 0 0/20 * 1/1 * *               #네이버페이 배치 실행 (20분배치). 네이버페이 검증 완료 후 access.license와 secret.key 설정 후 주석 해제
 
     #통계
     statistics:
@@ -152,7 +144,10 @@ cron:
         aflink.inflow.yesterday.create: 2 22 2 29 2 ?  #어제일자유입통계
         order.daily.create: 2 22 2 29 2 ?              #주문일자별통계
         order.datetime.create: 2 22 2 29 2 ?           #주문시간대별통계
-        sales.sms.send: 2 22 2 29 2 ?                  #매출문자발송
+        pay.create: 2 22 2 29 2 ?                      #결제수단통계
+        pay.sub.create: 2 22 2 29 2 ?                  #부결제수단통계
+        sales.sms.send1: 2 22 2 29 2 ?                 #매출문자발송 (평일은 저녁 8:30분, 11시)
+        sales.sms.send2: 2 22 2 29 2 ?                 #매출문자발송 (주말(토/일)은 오전 10시, 오후 2시, 6시, 저녁 10시)
 
     #모니터링
     monitoring:
@@ -161,17 +156,19 @@ cron:
 
     # 샵링커
     shoplinker:
-        stock.send10: 2 22 2 29 2 ?        #재고 10시
-        stock.send15: 2 22 2 29 2 ?        #재고 15시
-        order.receive: 2 22 2 29 2 ?       #주문
-        invoice.send: 2 22 2 29 2 ?        #송장
+        stock.send10: 0 0 10 * * *          #재고 10시 (1일 1회)
+        stock.send15: 0 0 15 * * *          #재고 15시 (1일 1회)
+        order.receive: 0 5 5-15 * * MON-FRI #주문 (평일 5시 ~ 15시 5분에 실행)
+        invoice.send: 0 16 * * * *          #송장 (1시간 1회)
 
-# USAFE 보증보험 정보
+# USAFE 보증보험 정보 (TODO: 오픈 시 운영용으로 변경)
 usafe.guarantee:
     mall.id: TEST00
     send.url: http://gateway.usafe.co.kr/esafe/guartrn.asp
+    #mall.id: istyle2400
+    #send.url: https://gateway.usafe.co.kr/esafe/guartrn.asp
 
-# PG
+# PG (TODO: 오픈 시 운영용으로 변경)
 pg:
     kcp:
         log.dir: /logs/style24/kcpLogs/batch
@@ -188,24 +185,36 @@ pg:
         module.type: 01
         tx.mode: 0
         receipt.url : https://testadmin8.kcp.co.kr/assist/bill.BillActionNew.do
+        #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
 
 # 스윗트래커
 sweet:
-      api:
-          tier: istyle24
-         # key: 0C48PI6KnOVVKGHWXyggMA # 개발
-          key: yOzQz11HDMGl4fYSbr9mHw # 운영
-         # url: http://trace-api-dev.sweettracker.net:8102/add_invoice # 개발
-          url: http://trace-api.sweettracker.net/add_invoice # 운영
-          domain:
-                 front: https://www.style24.com
-
-# 네이버페이 API
+    api:
+        tier: istyle24
+        key: yOzQz11HDMGl4fYSbr9mHw
+        url: http://trace-api.sweettracker.net/add_invoice
+        domain:
+            front: https://www.style24.com
+
+# 네이버페이 API (TODO: 오픈 시 운영용으로 변경). 네이버페이 검증 완료 후 access.license와 secret.key 설정 후 주석 해제
 naverPay:
     apiUrl: https://dev.apis.naver.com/
     payUrl:
-        web : test-pay.naver.com
-        mob : test-m.pay.naver.com
+        web: test-pay.naver.com
+        mob: test-m.pay.naver.com
     shop.id: istyle24
     button.key: 3A1578F9-6824-4FCF-AC8D-262318C63227
     button.pc.js.url: https://test-pay.naver.com/customer/js/naverPayButton.js
@@ -220,6 +229,24 @@ naverPay:
     port.address: http://sandbox.api.naver.com/Checkout/MallService5
     service.name: MallService5
     version: 5.0
+    #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/
+    #access.license:
+    #secret.key:
+    #port.address: http://ec.api.naver.com/Checkout/MallService5
+    #service.name: MallService5
+    #version: 5.0
 
 # EP
 ep:
@@ -231,10 +258,12 @@ ep:
         url: https://archive.style24.com/ep/
 
 
-# 샵링커 API(개발계정)
+# 샵링커 API (TODO: 오픈 시 운영용으로 변경)
 shoplinker:
-    customer_id : a0024007
-    shoplinker_id : istyle1
+    customer_id: a0024007  #개발
+    shoplinker_id: istyle1 #개발
+    #customer_id: a0021915  #운영
+    #shoplinker_id: yes2424 #운영
     xml:
         path: /files/data/shoplinker
         view: https://archive.style24.com/shoplinker
@@ -242,9 +271,3 @@ shoplinker:
         stock : /Product/attribute_modify.php?iteminfo_url=
         order : /Order/orderlist.php?iteminfo_url=
         invoice : /Order/delivery.php?iteminfo_url=
-
-# 핑거푸시
-fingerPush:
-    appKey : 3S2C52DCXOO9
-    appSecret : wwRHOmOUvD21vL1t5yqiJh83oL558jV6
-    customerKey : sfG70S5UoMKe

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

@@ -1,17 +0,0 @@
-spring:
-    profiles:
-        active: dev
-    cache:
-        type: redis
-    redis:
-        lettuce:
-            pool:
-                max-active: 10
-                max-idle: 10
-                min-idle: 2
-        host: localhost
-        port: 6379
-        password: 
-
-logging:
-    config: classpath:log/logback-dev.xml

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

@@ -139,21 +139,22 @@ cron:
                 exception.result.receive: 2 22 2 29 2 ? #WMS 회수입고예외 결과 수신 (1시간 1회)
                 result.receive: 2 22 2 29 2 ?           #WMS 회수입고결과 수신 (1시간 1회)
         cj:
-            invoice.receive: 2 22 2 29 2 ?                #CJ 회수송장번호 수신 (1시간 1회)
-            status.receive: 2 22 2 29 2 ?                 #CJ 회수상태 수신 (1시간 1회)
+            invoice.receive: 2 22 2 29 2 ?              #CJ 회수송장번호 수신 (1시간 1회)
+            status.receive: 2 22 2 29 2 ?               #CJ 회수상태 수신 (1시간 1회)
 
     #네이버페이
-    naverPay.order.batch: 2 22 2 29 2 ?               # 네이버페이 배치 실행 (20분배치)
+    naverPay.order.batch: 2 22 2 29 2 ?                 #네이버페이 배치 실행 (20분배치)
 
     #통계
     statistics:
-        aflink.inflow.create: 2 22 2 29 2 ?             #유입통계 (1시간 1회)
+        aflink.inflow.create: 2 22 2 29 2 ?            #유입통계 (1시간 1회)
         aflink.inflow.yesterday.create: 2 22 2 29 2 ?  #어제일자유입통계
-        order.daily.create: 2 22 2 29 2 ?               #주문일자별통계
+        order.daily.create: 2 22 2 29 2 ?              #주문일자별통계
         order.datetime.create: 2 22 2 29 2 ?           #주문시간대별통계
         pay.create: 2 22 2 29 2 ?                      #결제수단통계
-        pay.sub.create: 2 22 2 29 2 ?                   #부결제수단통계
-        sales.sms.send: 2 22 2 29 2 ?                  #매출문자발송
+        pay.sub.create: 2 22 2 29 2 ?                  #부결제수단통계
+        sales.sms.send1: 2 22 2 29 2 ?                 #매출문자발송 (평일은 저녁 8시30분, 11시30분)
+        sales.sms.send2: 2 22 2 29 2 ?                 #매출문자발송 (주말(토/일)은 오전 10시, 오후 2시, 6시, 저녁 10시)
 
     #모니터링
     monitoring:
@@ -194,13 +195,13 @@ pg:
 naverPay:
     apiUrl: https://dev.apis.naver.com/
     payUrl:
-        web : test-pay.naver.com
-        mob : test-m.pay.naver.com
-    shop.id : istyle24
-    button.key : 3A1578F9-6824-4FCF-AC8D-262318C63227
-    button.pc.js.url : https://test-pay.naver.com/customer/js/naverPayButton.js
-    button.mobile.js.url : https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
-    common.certification.key : s_3799db3bf4af-
+        web: test-pay.naver.com
+        mob: test-m.pay.naver.com
+    shop.id: istyle24
+    button.key: 3A1578F9-6824-4FCF-AC8D-262318C63227
+    button.pc.js.url: https://test-pay.naver.com/customer/js/naverPayButton.js
+    button.mobile.js.url: https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
+    common.certification.key: s_3799db3bf4af-
     certification.key: E3122594-C690-4542-B3A0-E74ABD4E8222
     order.api.url: https://test-api.pay.naver.com/o/customer/api/order/v20/register
     order.pc.url: https://test-order.pay.naver.com/customer/buy/
@@ -213,14 +214,15 @@ naverPay:
 
 # 스윗트래커
 sweet:
-      api:
-          tier: istyle24
-         # key: 0C48PI6KnOVVKGHWXyggMA # 개발
-          key: yOzQz11HDMGl4fYSbr9mHw # 운영
-         # url: http://trace-api-dev.sweettracker.net:8102/add_invoice # 개발
-          url: http://trace-api.sweettracker.net/add_invoice # 운영
-          domain:
-                 front: http://ts5000.ipdisk.co.kr
+    api:
+        tier: istyle24
+        key: 0C48PI6KnOVVKGHWXyggMA # 개발
+        #key: yOzQz11HDMGl4fYSbr9mHw # 운영
+        url: http://trace-api-dev.sweettracker.net:8102/add_invoice # 개발
+        #url: http://trace-api.sweettracker.net/add_invoice # 운영
+        domain:
+            front: http://ts5000.ipdisk.co.kr #개발
+        #    front: https://www.style24.com #운영
 
 # EP
 ep:
@@ -232,10 +234,10 @@ ep:
         url: http://ldimage.style24.com/ep/
 
 
-# 샵링커 API(개발계정)
+# 샵링커 API (개발계정)
 shoplinker:
-    customer_id : a0024007
-    shoplinker_id : istyle1
+    customer_id: a0024007
+    shoplinker_id: istyle1
     xml:
         path: /WIDE/workspace/files/data/style24/shoplinker
         view: //ldimage.style24.com/shoplinker
@@ -243,10 +245,3 @@ shoplinker:
         stock : /Product/attribute_modify.php?iteminfo_url=
         order : /Order/orderlist.php?iteminfo_url=
         invoice : /Order/delivery.php?iteminfo_url=
-
-
-# 핑거푸시
-fingerPush:
-    appKey : 3S2C52DCXOO9
-    appSecret : wwRHOmOUvD21vL1t5yqiJh83oL558jV6
-    customerKey : sfG70S5UoMKe

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

@@ -1,71 +0,0 @@
-spring:
-    profiles:
-        active: locp
-    cache:
-        type: redis
-    redis:
-        lettuce:
-            pool:
-                max-active: 10
-                max-idle: 10
-                min-idle: 2
-        host: localhost
-        port: 6379
-        password: 
-
-logging:
-    config: classpath:log/logback-locp.xml
-
-domain:
-    admin: https://lpadmin.style24.com
-
-# USAFE 보증보험 정보
-usafe.guarantee:
-    mall.id: istyle2400
-    send.url: https://gateway.usafe.co.kr/esafe/guartrn.asp
-
-# PG
-pg:
-    kcp:
-        log.dir: /WIDE/workspace/files/data/style24/logs/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
-
-# EP
-ep:
-    goods:
-        img.url: https://image.istyle24.com/Upload/ProductImage/
-        dtl.url: https://www.style24.com/goods/detail/form?goodsCd=
-    file:
-        path: /WIDE/workspace/files/data/style24/ep
-        url: http://ldimage.style24.com/ep/
-
-# 샵링커 API(개발계정)
-shoplinker:
-    customer_id : a0024007
-    shoplinker_id : istyle1
-    xml:
-        path: /WIDE/workspace/files/data/style24/shoplinker
-        view: //ldimage.style24.com/shoplinker
-    url:
-        stock : /Product/attribute_modify.php?iteminfo_url=
-        order : /Order/orderlist.php?iteminfo_url=
-        invoice : /Order/delivery.php?iteminfo_url=
-
-# 핑거푸시
-fingerPush:
-    appKey : 3S2C52DCXOO9
-    appSecret : wwRHOmOUvD21vL1t5yqiJh83oL558jV6
-    customerKey : sfG70S5UoMKe

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

@@ -1,109 +0,0 @@
-spring:
-    profiles:
-        active: run
-    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
-logging:
-    config: classpath:log/logback-run.xml
-
-domain:
-    admin: https://bos.style24.com
-
-upload:
-    goods:
-        target.path: /files/data/style24/ProductImage
-        max.size: 10
-        allow.extension: jpg|gif|jpeg|png
-        view: //image.istyle24.com/Upload/ProductImage
-
-# USAFE 보증보험 정보
-usafe.guarantee:
-    mall.id: istyle2400
-    send.url: https://gateway.usafe.co.kr/esafe/guartrn.asp
-
-# PG
-pg:
-    kcp:
-        log.dir: /logs/style24/kcpLogs/batch
-        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
-
-# EP
-ep:
-    goods:
-        img.url: https://image.istyle24.com/Upload/ProductImage/
-        dtl.url: https://www.style24.com/goods/detail/form?goodsCd=
-    file:
-        path: /files/data/ep
-        url: https://archive.style24.com/ep/
-
-# 네이버페이 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/
-    access.license:
-    secret.key:
-    port.address: http://ec.api.naver.com/Checkout/MallService5
-    service.name: MallService5
-    version: 5.0
-
-# 샵링커 API(개발계정)
-shoplinker:
-    customer_id : a0024007
-    shoplinker_id : istyle1
-    xml:
-        path: /files/data/shoplinker
-        view: https://archive.style24.com/shoplinker
-    url:
-        stock : /Product/attribute_modify.php?iteminfo_url=
-        order : /Order/orderlist.php?iteminfo_url=
-        invoice : /Order/delivery.php?iteminfo_url=
-
-# 핑거푸시
-fingerPush:
-    appKey : 3S2C52DCXOO9
-    appSecret : wwRHOmOUvD21vL1t5yqiJh83oL558jV6
-    customerKey : sfG70S5UoMKe

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

@@ -52,15 +52,6 @@ cron:
                 all.goods.create: 2 22 2 29 2 ?      #다음 전체EP 생성 (1일 1회)
                 summary.goods.create: 2 22 2 29 2 ?  #다음 요약EP 생성 (1시간 1회)
                 review.create: 2 22 2 29 2 ?         #다음 상품평EP 생성 (1일 1회)
-        #ep:
-        #    naver:
-        #        all.goods.create: 0 23 4 * * *             #네이버 전체EP 생성 (1일 1회)
-        #        summary.goods.create: 0 23 0-3,5-23 * * *  #네이버 요약EP 생성 (1시간 1회)
-        #        sell.create: 0 28 4 * * *                  #네이버 판매지수EP 생성 (1일 1회)
-        #    daum:
-        #        all.goods.create: 0 33 4 * * *             #다음 전체EP 생성 (1일 1회)
-        #        summary.goods.create: 0 33 0-3,5-23 * * *  #다음 요약EP 생성 (1시간 1회)
-        #        review.create: 0 38 4 * * *                #다음 상품평EP 생성 (1일 1회)
         reserve:
             titlename.apply: 30 2 * * * *           #상품 예약타이틀명(=세일링문구) 적용 (1시간 1회)
             price.apply: 0 2 * * * *                #상품 예약가격 적용 (1시간 1회)
@@ -131,8 +122,8 @@ cron:
     order:
         cart.deadline.expire: 0 20 4 * * *      #만료기간 지난 장바구니 삭제 (1일 1회)
         deposit.waiting.notify: 0 30 4 * * *    #무통장(가상계좌) 입금대기 알림 (1일 1회)
-        deposit.deadline.expire: 0 40 4 * * *   #무통장입금 입금기한 만료건 주문 취소 (1일 1회)
-        gift.deadline.expire: 0 10 5 * * *      #선물하기 배송지 등록기한 만료건 주문 취소 (1일 1회)
+        deposit.deadline.expire: 2 22 2 29 2 ?  #무통장입금 입금기한 만료건 주문 취소
+        gift.deadline.expire: 2 22 2 29 2 ?     #선물하기 배송지 등록기한 만료건 주문 취소
         #pg.kcp.settle.receive: 2 22 2 29 2 ?    #KCP PG 정산 데이터 수신 (사용안함)
         cart.unpurchase.push: 0 50 4 * * *      #장바구니 미구매 확인(삭제 10일 전) 푸시 송부 (1일 1회)
         cart.benefit.push: 0 0 5 * * *          #장바구니 혜택 추가 푸시 (1일 1회)
@@ -162,17 +153,18 @@ cron:
             status.receive: 0 37 * * * *                 #CJ 회수상태 수신 (1시간 1회)
 
     #네이버페이
-    naverPay.order.batch: 0 0/20 * 1/1 * *               # 네이버페이 배치 실행 (20분배치)
+    naverPay.order.batch: 2 22 2 29 2 ?                  #네이버페이 배치 실행
 
     #통계
     statistics:
-        aflink.inflow.create: 0 17 * * * *             #유입통계 (1시간 1회)
+        aflink.inflow.create: 0 16 * * * *             #유입통계 (1시간 1회)
         aflink.inflow.yesterday.create: 2 22 2 29 2 ?  #어제일자유입통계
-        order.daily.create: 0 17 1 * * *               #주문일자별통계
-        order.datetime.create: 0 44 * * * *            #주문시간대별통계
-        pay.create: 0 10 1 * * *                       #결제수단통계
-        pay.sub.create: 0 20 1 * * *                   #부결제수단통계
-        sales.sms.send: 2 22 2 29 2 ?                  #매출문자발송
+        order.daily.create: 2 22 2 29 2 ?               #주문일자별통계
+        order.datetime.create: 2 22 2 29 2 ?            #주문시간대별통계
+        pay.create: 2 22 2 29 2 ?                       #결제수단통계
+        pay.sub.create: 2 22 2 29 2 ?                   #부결제수단통계
+        sales.sms.send1: 0 30 20,23 * * MON-FRI        #매출문자발송 (평일은 저녁 8시30분, 11시30분)
+        sales.sms.send2: 0 0 10,14,18,22 * * SAT,SUN   #매출문자발송 (주말(토/일)은 오전 10시, 오후 2시, 6시, 저녁 10시)
 
     #모니터링
     monitoring:
@@ -181,17 +173,19 @@ cron:
 
     # 샵링커
     shoplinker:
-        stock.send10: 0 0 10 * * *          #재고 10시 (1일 1회)
-        stock.send15: 0 0 15 * * *          #재고 15시 (1일 1회)
-        order.receive: 0 5 5-15 * * MON-FRI #주문 (1시간 1회)
-        invoice.send: 0 0 * * * *           #송장 (1시간 1회)
+        stock.send10: 2 22 2 29 2 ?        #재고 10시
+        stock.send15: 2 22 2 29 2 ?        #재고 15시
+        order.receive: 2 22 2 29 2 ?       #주문
+        invoice.send: 2 22 2 29 2 ?        #송장
 
-# USAFE 보증보험 정보
+# USAFE 보증보험 정보 (TODO: 오픈 시 운영용으로 변경)
 usafe.guarantee:
     mall.id: TEST00
     send.url: http://gateway.usafe.co.kr/esafe/guartrn.asp
+    #mall.id: istyle2400
+    #send.url: https://gateway.usafe.co.kr/esafe/guartrn.asp
 
-# PG
+# PG (TODO: 오픈 시 운영용으로 변경)
 pg:
     kcp:
         log.dir: /logs/style24/kcpLogs/batch
@@ -208,24 +202,36 @@ pg:
         module.type: 01
         tx.mode: 0
         receipt.url : https://testadmin8.kcp.co.kr/assist/bill.BillActionNew.do
+        #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
 
 # 스윗트래커
 sweet:
-      api:
-          tier: istyle24
-         # key: 0C48PI6KnOVVKGHWXyggMA # 개발
-          key: yOzQz11HDMGl4fYSbr9mHw # 운영
-         # url: http://trace-api-dev.sweettracker.net:8102/add_invoice # 개발
-          url: http://trace-api.sweettracker.net/add_invoice # 운영
-          domain:
-                 front: https://www.style24.com
+    api:
+        tier: istyle24
+        key: yOzQz11HDMGl4fYSbr9mHw
+        url: http://trace-api.sweettracker.net/add_invoice
+        domain:
+            front: https://www.style24.com
 
-# 네이버페이 API
+# 네이버페이 API (TODO: 오픈 시 운영용으로 변경). 네이버페이 검증 완료 후 access.license와 secret.key 설정 후 주석 해제
 naverPay:
     apiUrl: https://dev.apis.naver.com/
     payUrl:
-        web : test-pay.naver.com
-        mob : test-m.pay.naver.com
+        web: test-pay.naver.com
+        mob: test-m.pay.naver.com
     shop.id: istyle24
     button.key: 3A1578F9-6824-4FCF-AC8D-262318C63227
     button.pc.js.url: https://test-pay.naver.com/customer/js/naverPayButton.js
@@ -240,7 +246,25 @@ naverPay:
     port.address: http://sandbox.api.naver.com/Checkout/MallService5
     service.name: MallService5
     version: 5.0
-
+    #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/
+    #access.license:
+    #secret.key:
+    #port.address: http://ec.api.naver.com/Checkout/MallService5
+    #service.name: MallService5
+    #version: 5.0
+    
 # EP
 ep:
     goods:
@@ -250,11 +274,12 @@ ep:
         path: /files/data/ep
         url: https://archive.style24.com/ep/
 
-
-# 샵링커 API(개발계정)
+# 샵링커 API (TODO: 오픈 시 운영용으로 변경)
 shoplinker:
-    customer_id : a0024007
-    shoplinker_id : istyle1
+    customer_id: a0024007  #개발
+    shoplinker_id: istyle1 #개발
+    #customer_id: a0021915  #운영
+    #shoplinker_id: yes2424 #운영
     xml:
         path: /files/data/shoplinker
         view: https://archive.style24.com/shoplinker
@@ -262,9 +287,3 @@ shoplinker:
         stock : /Product/attribute_modify.php?iteminfo_url=
         order : /Order/orderlist.php?iteminfo_url=
         invoice : /Order/delivery.php?iteminfo_url=
-
-# 핑거푸시
-fingerPush:
-    appKey : 3S2C52DCXOO9
-    appSecret : wwRHOmOUvD21vL1t5yqiJh83oL558jV6
-    customerKey : sfG70S5UoMKe

src/main/resources/config/application.yml

@@ -45,10 +45,10 @@ naverPay:
     paymentOrderUrl: /naverpay/payments/v2/list/history
     cancelPaymentUrl: /naverpay/payments/v1/cancel
 
-#카카오 API
+#카카오 API (TODO: 오픈 시 운영용으로 변경)
 kakao:
     # 카카오페이 운영정보
-    #    cid : 운영cid정보 없음
+    #    cid: 운영cid정보 없음
     #    appId: 442702
     #    appName: 아이스타일24
     #    companyName: 예스이십사
@@ -57,22 +57,28 @@ kakao:
     #    javascriptKey: b3c9ee69171042c3637e8d714a4c8a75
     #    adminKey: 7cc33b2ef96d785c4caf3376f9dc9254
     # 카카오페이 운영정보
-    cid : TC0ONETIME
-    appId : 399207
-    appName : 구축용 테스트앱
-    companyName : 예스이십사
-    nativeAppKey : f961e612e07b47aa2d1884714518a194
+    cid: TC0ONETIME
+    appId: 399207
+    appName: 구축용 테스트앱
+    companyName: 예스이십사
+    nativeAppKey: f961e612e07b47aa2d1884714518a194
     restApiKey: b3955cef0328a09156c7e25f18552164
-    javascriptKey : 06cab652ad5d25be2190388d11a88fa4
-    adminKey : a25ca74dde640f3a63a8d8442fe35fcd
-    addressApiRequestUrl : https://dapi.kakao.com/v2/local/search/address.json?page=1&query=
+    javascriptKey: 06cab652ad5d25be2190388d11a88fa4
+    adminKey: a25ca74dde640f3a63a8d8442fe35fcd
+    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
+    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
+
+# 핑거푸시
+fingerPush:
+    appKey: 3S2C52DCXOO9
+    appSecret: wwRHOmOUvD21vL1t5yqiJh83oL558jV6
+    customerKey: sfG70S5UoMKe