Merge remote-tracking branch 'origin/master'

This commit is contained in:
jazz
2025-12-16 16:00:55 +09:00
2 changed files with 5 additions and 5 deletions

4
Jenkinsfile vendored
View File

@@ -9,10 +9,10 @@ pipeline {
SERVER_IP = "${DEPLOY_WAS_SERVER_IP}"
SERVER_USER = "tomcat"
TOMCAT_HOME = "${ENVIRONMENT == 'dev' ? '/var/lib/tomcat' : '/usr/local/tomcat'}"
APP_NAME = "sake"
APP_NAME = "sakemall"
ROOT_NAME = "ROOT"
DEPLOY_PATH = "${TOMCAT_HOME}/webapps"
PROPERTY_PATH = "${DEPLOY_PATH}/${APP_NAME}/WEB-INF/classes"
PROPERTY_PATH = "${DEPLOY_PATH}/${ROOT_NAME}/WEB-INF/classes"
BACKUP_PATH = "${DEPLOY_PATH}/backup"
WAR_FILE = "${APP_NAME}.war"
DEPLOY_FILE = "${DEPLOY_PATH}/${WAR_FILE}"

View File

@@ -111,7 +111,7 @@ sopmalfo:
rtrn: /data/gcone/rtrnFile
extensions:
images: .gif,.jpg,.jpeg,.png
cdnurl: http://img.soju1sake1.com
cdnurl: https://19b0bde6dcdc15ad.kinxzone.com/
pagination:
@@ -357,7 +357,7 @@ mngrfo:
web: /webFile
extensions:
images: .gif,.jpg,.jpeg,.png
cdnurl: http://img.soju1sake1.com
cdnurl: https://19b0bde6dcdc15ad.kinxzone.com/
secret:
@@ -365,7 +365,7 @@ secret:
host:
img: http://img.soju1sake1.com
img: https://19b0bde6dcdc15ad.kinxzone.com/
naverpay:
order: