From fa62357bd3afad26c11b3729379fb315c288c905 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 30 Sep 2025 15:44:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20NPE=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/applicationContext-jpa.xml | 5 ++--- .../eai/rms/onl/apim/approval/PortalApprovalManService.java | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/WebContent/WEB-INF/applicationContext-jpa.xml b/WebContent/WEB-INF/applicationContext-jpa.xml index 74bc75b..cd7fa7d 100644 --- a/WebContent/WEB-INF/applicationContext-jpa.xml +++ b/WebContent/WEB-INF/applicationContext-jpa.xml @@ -92,10 +92,9 @@ none true - true + false trace - ${hibernate.dialect:org.hibernate.dialect.Oracle12cDialect} - + ${hibernate.dialect:org.hibernate.dialect.Oracle12cDialect} 100 100 diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java index ebee7ca..4545ea5 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java @@ -142,6 +142,10 @@ public class PortalApprovalManService extends BaseService { AppRequest appRequest = optRequest.get(); appApprovalUI.setRequestType(appRequest.getType()); + // null 처리 필요 + if (appRequest.getApiGroupList() == null || appRequest.getApiGroupList().isEmpty()) { + appRequest.setApiGroupList(""); + } String[] apiGroupList = appRequest.getApiGroupList().split(","); for (String apiGroupId : apiGroupList) { apiGroupService.findByIdWithApiList(apiGroupId).ifPresent(apiGroup -> From 6b859e052e6eeaf3e7fdd2863a51a523b5d4cd0f Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 1 Oct 2025 22:07:55 +0900 Subject: [PATCH 2/2] jenkinsfile update --- kjb-docs/build.jenkinsfile | 96 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 kjb-docs/build.jenkinsfile diff --git a/kjb-docs/build.jenkinsfile b/kjb-docs/build.jenkinsfile new file mode 100644 index 0000000..741de3d --- /dev/null +++ b/kjb-docs/build.jenkinsfile @@ -0,0 +1,96 @@ +pipeline { + agent { label 'apipod01' } + + environment { + // Java 환경 설정 + JAVA_HOME = '/App/jenkins/jdks/jdk1.8.0_441' + PATH = "${JAVA_HOME}/bin:${env.PATH}" + + // Gradle 환경 설정 + GRADLE_HOME = '/App/jenkins/gradle-8.7' + GRADLE_USER_HOME = '/App/jenkins/gradle-home' + // GRADLE_OPTS = '--offline' + + // Git 저장소 정보 + GIT_SERVER = '192.168.240.178:18081' + GIT_CREDENTIALS_ID = 'git-ssh-credentials' + + // 프로젝트 디렉토리 구조 + PROJECT_HOME = '/Data/jenkins/eapim' + + BRANCH = 'jenkins_with_weblogic' + } + + + stages { + stage('Git pull') { + steps { + echo "[admin] Git pull from branch: ${BRANCH}" + dir("${PROJECT_HOME}/eapim-admin") { + git url: "ssh://git@${GIT_SERVER}/eapim/eapim-admin", branch: "${BRANCH}", credentialsId: "${GIT_CREDENTIALS_ID}" + } + + + echo "[online-core] Git pull from branch: ${BRANCH}" + dir("${PROJECT_HOME}/eapim-online/elink-online-core") { + git url: "ssh://git@${GIT_SERVER}/eapim/elink-online-core", branch: "${BRANCH}", credentialsId: "${GIT_CREDENTIALS_ID}" + } + + echo "[online-core-jpa] Git pull from branch: ${BRANCH}" + dir("${PROJECT_HOME}/eapim-online/elink-online-core-jpa") { + git url: "ssh://git@${GIT_SERVER}/eapim/elink-online-core-jpa", branch: "${BRANCH}", credentialsId: "${GIT_CREDENTIALS_ID}" + } + + + echo "[online-transformer] Git pull from branch: ${BRANCH}" + dir("${PROJECT_HOME}/eapim-online/elink-online-transformer") { + git url: "ssh://git@${GIT_SERVER}/eapim/elink-online-transformer", branch: "${BRANCH}", credentialsId: "${GIT_CREDENTIALS_ID}" + } + + echo "[online-common] Git pull from branch: ${BRANCH}" + dir("${PROJECT_HOME}/eapim-online/elink-online-common") { + git url: "ssh://git@${GIT_SERVER}/eapim/elink-online-common", branch: "${BRANCH}", credentialsId: "${GIT_CREDENTIALS_ID}" + } + + echo "[online-emsclient] Git pull from branch: ${BRANCH}" + dir("${PROJECT_HOME}/eapim-online/elink-online-emsclient") { + git url: "ssh://git@${GIT_SERVER}/eapim/elink-online-emsclient", branch: "${BRANCH}", credentialsId: "${GIT_CREDENTIALS_ID}" + } + + echo "[portal-common] Git pull from branch: ${BRANCH}" + dir("${PROJECT_HOME}/eapim-online/elink-portal-common") { + git url: "ssh://git@${GIT_SERVER}/eapim/elink-portal-common", branch: "${BRANCH}", credentialsId: "${GIT_CREDENTIALS_ID}" + } + + + echo "[kjb-safedb] Git pull from branch: ${BRANCH}" + dir("${PROJECT_HOME}/kjb-safedb") { + git url: "ssh://git@${GIT_SERVER}/eapim/kjb-safedb", branch: "${BRANCH}", credentialsId: "${GIT_CREDENTIALS_ID}" + } + } + } + + + + stage('Build') { + steps { + tool name: 'Oracle-JDK-1.8', type: 'hudson.model.JDK' + + echo "[admin] Build project" + dir("${PROJECT_HOME}/eapim-admin") { + sh '${GRADLE_HOME}/bin/gradle clean build -x test -Pprofile=weblogic' + } + } + } + + + stage('Archive WAR') { + steps { + echo "[admin] Archive WAR file" + dir("${PROJECT_HOME}/eapim-admin/build/libs") { + archiveArtifacts artifacts: '*.war', fingerprint: true + } + } + } + } +} \ No newline at end of file