Compare commits
1 Commits
3668cc89b2
...
master_ord
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
305d5d226c |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
#Thu May 28 20:40:11 KST 2026
|
||||
gradle.version=8.2.1
|
||||
Binary file not shown.
Binary file not shown.
8
.idea/.gitignore
generated
vendored
8
.idea/.gitignore
generated
vendored
@@ -1,8 +0,0 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
16
.idea/compiler.xml
generated
16
.idea/compiler.xml
generated
@@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<annotationProcessing>
|
||||
<profile name="Gradle Imported" enabled="true">
|
||||
<outputRelativeToContentRoot value="true" />
|
||||
<processorPath useClasspath="false">
|
||||
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-configuration-processor/3.1.2/613d07277e91a8ed609d45f6b528809eadd1fef7/spring-boot-configuration-processor-3.1.2.jar" />
|
||||
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.28/a2ff5da8bcd8b1b26f36b806ced63213362c6dcc/lombok-1.18.28.jar" />
|
||||
</processorPath>
|
||||
<module name="sake.main" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
<bytecodeTargetLevel target="17" />
|
||||
</component>
|
||||
</project>
|
||||
19
.idea/gradle.xml
generated
19
.idea/gradle.xml
generated
@@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="delegatedBuild" value="true" />
|
||||
<option name="testRunner" value="GRADLE" />
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleJvm" value="17" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
</set>
|
||||
</option>
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
20
.idea/jarRepositories.xml
generated
20
.idea/jarRepositories.xml
generated
@@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RemoteRepositoriesConfiguration">
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="jboss.community" />
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="MavenRepo" />
|
||||
<option name="name" value="MavenRepo" />
|
||||
<option name="url" value="https://repo.maven.apache.org/maven2/" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
||||
65
.idea/libraries-with-intellij-classes.xml
generated
65
.idea/libraries-with-intellij-classes.xml
generated
@@ -1,65 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="libraries-with-intellij-classes">
|
||||
<option name="intellijApiContainingLibraries">
|
||||
<list>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="ideaIU" />
|
||||
<option name="groupId" value="com.jetbrains.intellij.idea" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="ideaIU" />
|
||||
<option name="groupId" value="com.jetbrains" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="ideaIC" />
|
||||
<option name="groupId" value="com.jetbrains.intellij.idea" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="ideaIC" />
|
||||
<option name="groupId" value="com.jetbrains" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="pycharmPY" />
|
||||
<option name="groupId" value="com.jetbrains.intellij.pycharm" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="pycharmPY" />
|
||||
<option name="groupId" value="com.jetbrains" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="pycharmPC" />
|
||||
<option name="groupId" value="com.jetbrains.intellij.pycharm" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="pycharmPC" />
|
||||
<option name="groupId" value="com.jetbrains" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="clion" />
|
||||
<option name="groupId" value="com.jetbrains.intellij.clion" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="clion" />
|
||||
<option name="groupId" value="com.jetbrains" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="riderRD" />
|
||||
<option name="groupId" value="com.jetbrains.intellij.rider" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="riderRD" />
|
||||
<option name="groupId" value="com.jetbrains" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="goland" />
|
||||
<option name="groupId" value="com.jetbrains.intellij.goland" />
|
||||
</LibraryCoordinatesState>
|
||||
<LibraryCoordinatesState>
|
||||
<option name="artifactId" value="goland" />
|
||||
<option name="groupId" value="com.jetbrains" />
|
||||
</LibraryCoordinatesState>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
8
.idea/misc.xml
generated
8
.idea/misc.xml
generated
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="FrameworkDetectionExcludesConfiguration">
|
||||
<file type="web" url="file://$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" />
|
||||
</project>
|
||||
6
.idea/vcs.xml
generated
6
.idea/vcs.xml
generated
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
42
Jenkinsfile
vendored
42
Jenkinsfile
vendored
@@ -8,7 +8,7 @@ pipeline {
|
||||
environment {
|
||||
SERVER_IP = "${DEPLOY_WAS_SERVER_IP}"
|
||||
SERVER_USER = "tomcat"
|
||||
TOMCAT_HOME = "${ENVIRONMENT == 'dev' ? '/usr/local/tomcat' : '/usr/local/tomcat'}"
|
||||
TOMCAT_HOME = "${ENVIRONMENT == 'dev' ? '/var/lib/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' ? 'ubuntu' : 'ubuntu'}"
|
||||
NGINX_USER = "${ENVIRONMENT == 'dev' ? 'dev1' : '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: ['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_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_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: '배포 대상 선택')
|
||||
@@ -84,26 +84,6 @@ pipeline {
|
||||
}
|
||||
}
|
||||
|
||||
stage('Web Server block activate') {
|
||||
when {
|
||||
expression { params.DEPLOY_TARGET in ['ALL', 'WAS_ONLY'] }
|
||||
}
|
||||
steps {
|
||||
script {
|
||||
// Nginx 서버에 점검 페이지로 블록 설정
|
||||
sshCommand remote: [
|
||||
name: 'Nginx Server',
|
||||
host: "${env.NGINX_SERVER_IP}",
|
||||
user: "${env.NGINX_USER}",
|
||||
identityFile: "${env.SSH_KEY_PATH}",
|
||||
allowAnyHosts: true
|
||||
], command: "/etc/nginx/weboff.sh"
|
||||
|
||||
echo "점검 web서버 config 구동"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Prepare and Deploy Static Resources') {
|
||||
when {
|
||||
expression { params.DEPLOY_TARGET in ['ALL', 'WEB_ONLY'] }
|
||||
@@ -274,20 +254,6 @@ pipeline {
|
||||
${env.TOMCAT_HOME}/bin/startup.sh
|
||||
"""
|
||||
|
||||
// Nginx 서버에 정상 페이지로 블록 해제
|
||||
sshCommand remote: [
|
||||
name: 'Nginx Server',
|
||||
host: "${env.NGINX_SERVER_IP}",
|
||||
user: "${env.NGINX_USER}",
|
||||
identityFile: "${env.SSH_KEY_PATH}",
|
||||
allowAnyHosts: true
|
||||
], command: """
|
||||
sleep 30
|
||||
/etc/nginx/webon.sh
|
||||
"""
|
||||
|
||||
echo "점검 web서버 config 구동"
|
||||
|
||||
echo "Deploy 완료 (${params.ENVIRONMENT} 환경, ${env.GIT_BRANCH} 브랜치)"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,106 +0,0 @@
|
||||
{
|
||||
"groups": [
|
||||
{
|
||||
"name": "kakao",
|
||||
"type": "com.wb.domainserver.util.communicate.KakaoProperties",
|
||||
"sourceType": "com.wb.domainserver.util.communicate.KakaoProperties"
|
||||
},
|
||||
{
|
||||
"name": "pagination",
|
||||
"type": "com.wb.domainserver.common.prop.PaginationProperties",
|
||||
"sourceType": "com.wb.domainserver.common.prop.PaginationProperties"
|
||||
},
|
||||
{
|
||||
"name": "secured.path",
|
||||
"type": "com.wb.domainserver.security.config.SecurityPathProperties",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.admin",
|
||||
"type": "com.wb.domainserver.security.config.SecurityPathProperties$Admin",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.batch",
|
||||
"type": "com.wb.domainserver.security.config.SecurityPathProperties$Batch",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.common",
|
||||
"type": "com.wb.domainserver.security.config.SecurityPathProperties$Common",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.solmal",
|
||||
"type": "com.wb.domainserver.security.config.SecurityPathProperties$Solmal",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties"
|
||||
},
|
||||
{
|
||||
"name": "spring.datasource.gcone.hikari",
|
||||
"type": "javax.sql.DataSource",
|
||||
"sourceType": "com.wb.domainserver.common.config.GconeDataSourceConfig",
|
||||
"sourceMethod": "ADataSource()"
|
||||
},
|
||||
{
|
||||
"name": "spring.datasource.sure.hikari",
|
||||
"type": "javax.sql.DataSource",
|
||||
"sourceType": "com.wb.domainserver.common.config.SureDataSourceConfig",
|
||||
"sourceMethod": "BDataSource()"
|
||||
}
|
||||
],
|
||||
"properties": [
|
||||
{
|
||||
"name": "kakao.keys",
|
||||
"type": "java.util.Map<java.lang.String,java.lang.String>",
|
||||
"sourceType": "com.wb.domainserver.util.communicate.KakaoProperties"
|
||||
},
|
||||
{
|
||||
"name": "pagination.page-size",
|
||||
"type": "java.lang.Integer",
|
||||
"description": "한 페이지당 노출되는 페이지 수",
|
||||
"sourceType": "com.wb.domainserver.common.prop.PaginationProperties"
|
||||
},
|
||||
{
|
||||
"name": "pagination.page-unit",
|
||||
"type": "java.lang.Integer",
|
||||
"description": "한 페이지당 게시되는 게시물 건 수",
|
||||
"sourceType": "com.wb.domainserver.common.prop.PaginationProperties"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.admin.anonmymous",
|
||||
"type": "java.util.List<java.lang.String>",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties$Admin"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.admin.authenticated",
|
||||
"type": "java.util.List<java.lang.String>",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties$Admin"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.batch.accessip",
|
||||
"type": "java.util.List<java.lang.String>",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties$Batch"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.batch.uri",
|
||||
"type": "java.util.List<java.lang.String>",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties$Batch"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.common.resources",
|
||||
"type": "java.util.List<java.lang.String>",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties$Common"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.solmal.anonmymous",
|
||||
"type": "java.util.List<java.lang.String>",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties$Solmal"
|
||||
},
|
||||
{
|
||||
"name": "secured.path.solmal.authenticated",
|
||||
"type": "java.util.List<java.lang.String>",
|
||||
"sourceType": "com.wb.domainserver.security.config.SecurityPathProperties$Solmal"
|
||||
}
|
||||
],
|
||||
"hints": []
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user