diff --git a/Jenkinsfile b/Jenkinsfile index cbf811e3..cb121f94 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { environment { SERVER_IP = "${DEPLOY_WAS_SERVER_IP}" SERVER_USER = "tomcat" - TOMCAT_HOME = "${ENVIRONMENT == 'dev' ? '/var/lib/tomcat' : '/usr/local/tomcat'}" + TOMCAT_HOME = "${ENVIRONMENT == 'dev' ? '/usr/local/tomcat' : '/usr/local/tomcat'}" APP_NAME = "sakemall" ROOT_NAME = "ROOT" DEPLOY_PATH = "${TOMCAT_HOME}/webapps" @@ -21,7 +21,7 @@ pipeline { GIT_BRANCH = "${ENVIRONMENT == 'dev' ? 'develop' : 'master'}" NGINX_STATIC_PATH = "/var/www/sopmall" NGINX_SERVER_IP = "${DEPLOY_WEB_SERVER_IP}" - NGINX_USER = "${ENVIRONMENT == 'dev' ? 'dev1' : 'ubuntu'}" + NGINX_USER = "${ENVIRONMENT == 'dev' ? 'ubuntu' : 'ubuntu'}" // SSH_KEY_PATH = "C:/Users/CHAMDAHAN-41/.ssh/id_rsa" } @@ -41,8 +41,8 @@ pipeline { properties([ parameters([ choice(name: 'ENVIRONMENT', choices: ['dev'], description: '배포할 어플리케이션 profile 선택'), - choice(name: 'DEPLOY_WAS_SERVER_IP', choices: ['00.00.00.00'], description: 'WAR 배포할 서버IP 선택'), - choice(name: 'DEPLOY_WEB_SERVER_IP', choices: ['00.00.00.00'], description: 'STATIC RESOURCE 배포할 서버IP 선택'), + choice(name: 'DEPLOY_WAS_SERVER_IP', choices: ['10.2.0.129'], description: 'WAR 배포할 서버IP 선택'), + choice(name: 'DEPLOY_WEB_SERVER_IP', choices: ['10.2.1.226'], description: 'STATIC RESOURCE 배포할 서버IP 선택'), // choice(name: 'DEPLOY_TARGET', choices: ['ALL', 'WEB_ONLY', 'WAS_ONLY', 'PROPERTY_ONLY'], description: '배포 대상 선택'), string(name: 'GIT_REPO', defaultValue: 'http://115.68.207.90:3000/itfirst/sake.git', description: 'Git 레파지토리 URL'), choice(name: 'DEPLOY_TARGET', choices: ['ALL', 'WEB_ONLY', 'WAS_ONLY'], description: '배포 대상 선택') diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 60b0bae8..c444ac13 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -58,7 +58,7 @@ spring: gcone: hikari: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://115.68.176.232:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false + jdbc-url: jdbc:mysql://115.68.231.30:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false username: sakeone password: dnlfxjtm13@$ minimumIdle: 1 @@ -66,11 +66,11 @@ spring: idleTimeout: 30000 #30초 maxLifetime: 1800000 #30분 connectionTimeout: 30000 - poolName: gconedDevPool + poolName: SakeDevPool sure: hikari: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://115.68.176.232:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false + jdbc-url: jdbc:mysql://115.68.231.30:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false username: sakeone password: dnlfxjtm13@$ minimumIdle: 1 @@ -85,7 +85,7 @@ spring: show-sql: true servlet: multipart: - max-file-size: 10MB + max-file-size: 15MB max-request-size: -1 mybatis: @@ -111,7 +111,7 @@ sopmalfo: rtrn: /data/gcone/rtrnFile extensions: images: .gif,.jpg,.jpeg,.png - cdnurl: http://dev.img.soju1sake1.com + cdnurl: https://19d28cf7178139ad.kinxzone.com pagination: @@ -353,11 +353,11 @@ mngrfo: fileupload: uploaddirs: goods: C:/file/temp - doc: /docFile - web: /webFile + doc: /data/gcone/docFile + web: /data/gcone/webFile extensions: images: .gif,.jpg,.jpeg,.png - cdnurl: http://dev.img.soju1sake1.com + cdnurl: https://19d28cf7178139ad.kinxzone.com subsvc: dft-goods-optn-innb: 5 @@ -367,7 +367,7 @@ secret: host: - img: http://dev.img.soju1sake1.com + img: https://19d28cf7178139ad.kinxzone.com naverpay: order: @@ -380,7 +380,7 @@ naverpay: real-url: https://pay.naver.com mail: - host: mail.sake1jan.com + host: 10.2.1.76 port: 587 username: custom@sake1jan.com password: mail13@$ @@ -420,7 +420,7 @@ bankda: css-cours : css/theme/themeAF.css #선물하기 URL -presenturl : dev.svc.soju1sake1.com +presenturl : devsvc.soju1sake1.com # 출고 택배사 구분 EXPORT, (택배사 구분코드 HDRYCPN) # 송장번호 %INVCNB% 치환 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 765d6d5e..c8e22b23 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -58,7 +58,7 @@ spring: gcone: hikari: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://115.68.176.232:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false + jdbc-url: jdbc:mysql://115.68.231.30:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false username: sakeone password: dnlfxjtm13@$ minimumIdle: 1 @@ -66,11 +66,11 @@ spring: idleTimeout: 30000 #30초 maxLifetime: 1800000 #30분 connectionTimeout: 30000 - poolName: gconedDevPool + poolName: SakeDevPool sure: hikari: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://115.68.176.232:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false + jdbc-url: jdbc:mysql://115.68.231.30:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false username: sakeone password: dnlfxjtm13@$ minimumIdle: 1 @@ -111,7 +111,7 @@ sopmalfo: rtrn: /data/gcone/rtrnFile extensions: images: .gif,.jpg,.jpeg,.png - cdnurl: https://19b0bde6dcdc15ad.kinxzone.com + cdnurl: https://19d28cf7178139ad.kinxzone.com pagination: @@ -357,8 +357,8 @@ mngrfo: web: /data/gcone/webFile extensions: images: .gif,.jpg,.jpeg,.png - cdnurl: https://19b0bde6dcdc15ad.kinxzone.com - upurl: https://www.soju1sake1.com + dnurl: https://19d28cf7178139ad.kinxzone.com + # upurl: https://www.soju1sake1.com subsvc: dft-goods-optn-innb: 5 @@ -367,7 +367,7 @@ secret: host: - img: https://19b0bde6dcdc15ad.kinxzone.com/ + img: https://19d28cf7178139ad.kinxzone.com naverpay: order: @@ -380,7 +380,7 @@ naverpay: real-url: https://pay.naver.com mail: - host: mail.sake1jan.com + host: 10.2.1.76 port: 587 username: custom@sake1jan.com password: mail13@$ @@ -420,7 +420,7 @@ bankda: css-cours : css/theme/themeAF.css #선물하기 URL -presenturl : dev.svc.gcone.co.kr +presenturl : devsvc.soju1sake1.com # 출고 택배사 구분 EXPORT, (택배사 구분코드 HDRYCPN) # 송장번호 %INVCNB% 치환