merge master into develop - CscListRForm.jsp FAQ 아코디언 버그 수정

- CscListRForm.jsp 117번줄: data 변수 덮어쓰기 방지
  data = JSON.parse(...) → const parsed = JSON.parse(...)
- fn_branch_bbsctt_posble 호출 시 parsed 전달로 변경
- 원인: data 변수 재사용으로 data.result.moveAt 접근 불가

.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu May 28 20:40:11 KST 2026
+gradle.version=8.2.1

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/compiler.xml

@@ -0,0 +1,16 @@
+<?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>

.idea/gradle.xml

@@ -0,0 +1,19 @@
+<?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>

.idea/jarRepositories.xml

@@ -0,0 +1,20 @@
+<?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>

.idea/libraries-with-intellij-classes.xml

@@ -0,0 +1,65 @@
+<?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>

.idea/misc.xml

@@ -0,0 +1,8 @@
+<?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>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

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: '배포 대상 선택')
@@ -84,6 +84,26 @@ 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'] }
@@ -254,6 +274,20 @@ 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} 브랜치)"
                 }
             }

build/classes/java/main/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,106 @@
+{
+  "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": []
+}