Merge branch 'card007' into develop

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

@@ -104,3 +104,25 @@ naverPay:
     port.address: http://sandbox.api.naver.com/Checkout/MallService5
     service.name: MallService5
     version: 5.0
+
+#카카오 API
+kakao:
+    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=
+    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

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

@@ -15,12 +15,14 @@ spring:
 
 logging:
     config: classpath:log/logback-locp.xml
-    
+
+# SSL Server
+has-ssl: true
+
 domain:
-    scm: //lpscm.wivismall.com
-    front: //lpfront.wivismall.com
-    image: //image.wivismall.com/speedy_image-wivismall
-    uximage: //lpscm.wivismall.com
+    front: //lpfront.style24.com
+    image: //image.istyle24.com/Upload
+    uximage: //lpscm.style24.com
 
 upload:
     dext.target.path: /WIDE/workspace/files/data/style24/dext
@@ -28,48 +30,29 @@ upload:
         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: //lpimage.style24.com
+        view: //image.istyle24.com/Upload
     goods:
         target.path: /WIDE/workspace/files/data/style24/Upload/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //lpimage.style24.com/Upload/ProductImage
+        view: //image.istyle24.com/Upload/ProductImage
     image:
         target.path: /WIDE/workspace/files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //lpimage.style24.com
+        view: //image.istyle24.com/Upload
     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: //lpimage.style24.com/sample
+        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: //lpfront.wivismall.com
-    image.url: //lpfront.wivismall.com/image/mailing
-    template.path: /WIDE/workspace/webapps/wivis/wivismall.admin/src/main/webapp/WEB-INF/mail
-# 사방넷 API
-sabangnet:
-    xml:
-        path: /WIDE/workspace/webapps/wivis/wivismall.admin/src/main/webapp/sabangnet
-        url: http://112.172.147.34:88
+download.path: /WIDE/workspace/files/data/style24
 
 # PG
 pg:
@@ -96,4 +79,41 @@ 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/
+    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
 

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

@@ -0,0 +1,101 @@
+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
+logging:
+    config: classpath:log/logback-stage.xml
+
+domain:
+    front: //stage-www.style24.com
+    image: //image.istyle24.com/Upload
+    uximage: //stage-scm.style24.com
+
+upload:
+    dext.target.path: /files/data/style24/dext
+
+    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
+
+# PG
+pg:
+    kcp:
+        log.dir: /logs/style24/kcpLogs/scm
+        gw:
+            url: testpaygw.kcp.co.kr
+            port: 8090
+        js.url: https://testpay.kcp.co.kr/plugin/payplus_web.jsp
+        server: false
+        site:
+            cd: U3476
+            key:
+            name: ISTYLE TEST
+        log.level: 3
+        module.type: 01
+        tx.mode: 0
+        receipt.url : https://testadmin8.kcp.co.kr/assist/bill.BillActionNew.do
+
+# 네이버페이 API
+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
+    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/
+    order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/
+    access.license: 01000100005b15bb8faab722d100d589f34bd64843659e37a168b3617443c4f52a3fda45b8
+    secret.key: AQABAADtZ/jOC1Y3LNsyI0TWwCMvPfrg0sqM9pnxliSegbjSqQ==
+    port.address: http://sandbox.api.naver.com/Checkout/MallService5
+    service.name: MallService5
+    version: 5.0

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:
@@ -26,7 +23,7 @@ spring:
                 172.30.90.112:6381
                 172.30.90.113:6381
 logging:
-    config: classpath:log/logback-run.xml
+    config: classpath:log/logback-style.xml
 
 domain:
     front: //www.style24.com
@@ -69,36 +66,60 @@ pg:
     kcp:
         log.dir: /logs/style24/kcpLogs/scm
         gw:
-            url: testpaygw.kcp.co.kr
+            url: paygw.kcp.co.kr
             port: 8090
-        js.url: https://testpay.kcp.co.kr/plugin/payplus_web.jsp
-        server: false
+        user.type: PGNW
+        js.url: https://pay.kcp.co.kr/plugin/payplus_web.jsp
+        server: true
         site:
             cd: U3476
-            key:
-            name: ISTYLE TEST
+            key: 4aVa--.Xz8Fc78nwYPsrmmY__
+            name: ISTYLE
         log.level: 3
         module.type: 01
         tx.mode: 0
-        receipt.url : https://testadmin8.kcp.co.kr/assist/bill.BillActionNew.do
+        receipt.url : https://admin8.kcp.co.kr/assist/bill.BillActionNew.do
 
 # 네이버페이 API
 naverPay:
-    apiUrl: https://dev.apis.naver.com/
+    apiUrl: https://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
+        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: 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/
-    order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/
-    access.license: 01000100005b15bb8faab722d100d589f34bd64843659e37a168b3617443c4f52a3fda45b8
-    secret.key: AQABAADtZ/jOC1Y3LNsyI0TWwCMvPfrg0sqM9pnxliSegbjSqQ==
-    port.address: http://sandbox.api.naver.com/Checkout/MallService5
+    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
+    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

src/main/resources/config/application.yml

@@ -62,37 +62,6 @@ cj:
         tel2: 1544
         tel3: 4097
 
-#카카오 API
-kakao:
-    # 카카오페이 운영정보
-    #    cid : 운영cid정보 없음
-    #    appId: 442702
-    #    appName: 아이스타일24
-    #    companyName: 예스이십사
-    #    nativeAppKey: 5d97db2ee36fa0e121d962b2531ae0c1
-    #    restApiKey: 46d601394bd887cbada3cf00fdddef54
-    #    javascriptKey: b3c9ee69171042c3637e8d714a4c8a75
-    #    adminKey: 7cc33b2ef96d785c4caf3376f9dc9254
-    # 카카오페이 운영정보
-    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=
-    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
   
 # 네이버페이 API
 naverPay:

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

@@ -49,7 +49,6 @@
 
 	<root level="${LOG_LEVEL}">
 		<appender-ref ref="CONSOLE"/>
-		<appender-ref ref="FILE"/>
 	</root>
 
 </configuration>

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/scm"/>
+	<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_scm.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_scm.%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/scm"/>
+	<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_scm.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_scm.%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>