From 7e123c088fb8d2185545706620d001392f68e3a6 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 12:00:28 +0900 Subject: [PATCH 01/12] =?UTF-8?q?ci=20-=20eapim-portal=20gitea=20actions?= =?UTF-8?q?=20=EC=9B=8C=ED=81=AC=ED=94=8C=EB=A1=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - master / feats/ci-test push 시 트리거 - 세 repo composite 체크아웃 후 빌드 - war 산출물 업로드 --- .gitea/workflows/eapim-portal-ci.yml | 53 ++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .gitea/workflows/eapim-portal-ci.yml diff --git a/.gitea/workflows/eapim-portal-ci.yml b/.gitea/workflows/eapim-portal-ci.yml new file mode 100644 index 0000000..ebff156 --- /dev/null +++ b/.gitea/workflows/eapim-portal-ci.yml @@ -0,0 +1,53 @@ +name: eapim-portal CI + +on: + push: + branches: + - master + - feats/ci-test + +jobs: + build: + runs-on: [self-hosted, linux, eapim-portal] + defaults: + run: + working-directory: eapim-portal + + steps: + - name: Checkout eapim-portal (trigger SHA) + uses: actions/checkout@v4 + with: + path: eapim-portal + + - name: Checkout elink-portal-common (master) + uses: actions/checkout@v4 + with: + repository: djb-eapim/elink-portal-common + ref: master + token: ${{ secrets.GITEA_TOKEN }} + path: elink-portal-common + + - name: Checkout elink-online-core-jpa (master) + uses: actions/checkout@v4 + with: + repository: djb-eapim/elink-online-core-jpa + ref: master + token: ${{ secrets.GITEA_TOKEN }} + path: eapim-online/elink-online-core-jpa + + - name: Verify toolchain + run: | + java -version + gradle --version + + - name: Gradle build (no tests) + run: gradle clean build -x test --no-daemon + + - name: Upload WAR artifacts + uses: actions/upload-artifact@v3 + with: + name: eapim-portal-wars-${{ github.sha }} + path: | + eapim-portal/build/libs/eapim-portal.war + eapim-portal/build/libs/eapim-portal-boot.war + if-no-files-found: error From cdf57c130c809d875aafde6839ea41d6ff1a974d Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 12:20:39 +0900 Subject: [PATCH 02/12] =?UTF-8?q?ci=20-=20actions/checkout=20=EB=8B=A4?= =?UTF-8?q?=EC=A4=91=20=ED=98=B8=EC=B6=9C=20=ED=9A=8C=ED=94=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 두 의존 repo는 raw git clone 으로 체크아웃 - act_runner 0.6.1 액션 캐시 race 우회 --- .gitea/workflows/eapim-portal-ci.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/eapim-portal-ci.yml b/.gitea/workflows/eapim-portal-ci.yml index ebff156..d4dc5d1 100644 --- a/.gitea/workflows/eapim-portal-ci.yml +++ b/.gitea/workflows/eapim-portal-ci.yml @@ -20,20 +20,21 @@ jobs: path: eapim-portal - name: Checkout elink-portal-common (master) - uses: actions/checkout@v4 - with: - repository: djb-eapim/elink-portal-common - ref: master - token: ${{ secrets.GITEA_TOKEN }} - path: elink-portal-common + working-directory: ${{ github.workspace }} + run: | + rm -rf elink-portal-common + git clone --depth=1 --branch master \ + http://oauth2:${{ secrets.GITEA_TOKEN }}@172.30.1.50:3000/djb-eapim/elink-portal-common.git \ + elink-portal-common - name: Checkout elink-online-core-jpa (master) - uses: actions/checkout@v4 - with: - repository: djb-eapim/elink-online-core-jpa - ref: master - token: ${{ secrets.GITEA_TOKEN }} - path: eapim-online/elink-online-core-jpa + working-directory: ${{ github.workspace }} + run: | + mkdir -p eapim-online + rm -rf eapim-online/elink-online-core-jpa + git clone --depth=1 --branch master \ + http://oauth2:${{ secrets.GITEA_TOKEN }}@172.30.1.50:3000/djb-eapim/elink-online-core-jpa.git \ + eapim-online/elink-online-core-jpa - name: Verify toolchain run: | From 36a59b2b64c2f0c2158ffb12b8b4a68a38e3f8d4 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 12:22:41 +0900 Subject: [PATCH 03/12] =?UTF-8?q?ci=20-=20secret=20=EC=9D=B4=EB=A6=84?= =?UTF-8?q?=EC=9D=84=20CI=5FTOKEN=20=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - gitea 가 GITEA_ 접두어를 예약어로 차단 --- .gitea/workflows/eapim-portal-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/eapim-portal-ci.yml b/.gitea/workflows/eapim-portal-ci.yml index d4dc5d1..8ba4988 100644 --- a/.gitea/workflows/eapim-portal-ci.yml +++ b/.gitea/workflows/eapim-portal-ci.yml @@ -24,7 +24,7 @@ jobs: run: | rm -rf elink-portal-common git clone --depth=1 --branch master \ - http://oauth2:${{ secrets.GITEA_TOKEN }}@172.30.1.50:3000/djb-eapim/elink-portal-common.git \ + http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/elink-portal-common.git \ elink-portal-common - name: Checkout elink-online-core-jpa (master) @@ -33,7 +33,7 @@ jobs: mkdir -p eapim-online rm -rf eapim-online/elink-online-core-jpa git clone --depth=1 --branch master \ - http://oauth2:${{ secrets.GITEA_TOKEN }}@172.30.1.50:3000/djb-eapim/elink-online-core-jpa.git \ + http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/elink-online-core-jpa.git \ eapim-online/elink-online-core-jpa - name: Verify toolchain From 53ca4a2a2647d08593de173996da7da06a93407e Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 15:35:39 +0900 Subject: [PATCH 04/12] =?UTF-8?q?ci=20-=20tomcat=20=EB=B0=B0=ED=8F=AC=20?= =?UTF-8?q?=EB=B0=8F=20=ED=97=AC=EC=8A=A4=EC=B2=B4=ED=81=AC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ROOT.war 로 /prod/devportal/webapps 배포 - startup.sh 후 90초 내 GET / 200 기대 - post-clean 으로 shutdown 보장 --- .gitea/workflows/eapim-portal-ci.yml | 75 ++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/.gitea/workflows/eapim-portal-ci.yml b/.gitea/workflows/eapim-portal-ci.yml index 8ba4988..aeb847e 100644 --- a/.gitea/workflows/eapim-portal-ci.yml +++ b/.gitea/workflows/eapim-portal-ci.yml @@ -9,6 +9,12 @@ on: jobs: build: runs-on: [self-hosted, linux, eapim-portal] + env: + JAVA_HOME: /apps/opts/jdk8 + CATALINA_BASE: /prod/devportal + CATALINA_HOME: /prod/apache-tomcat-9.0.116 + CATALINA_PID: /prod/devportal/temp/catalina.pid + DEPLOY_HTTP_PORT: "39130" defaults: run: working-directory: eapim-portal @@ -52,3 +58,72 @@ jobs: eapim-portal/build/libs/eapim-portal.war eapim-portal/build/libs/eapim-portal-boot.war if-no-files-found: error + + - name: Stop tomcat (pre-clean) + working-directory: ${{ github.workspace }} + run: | + if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then + "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true + for i in $(seq 1 30); do + [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null || break + sleep 1 + done + fi + rm -f "$CATALINA_PID" + + - name: Deploy war as ROOT + working-directory: ${{ github.workspace }} + run: | + DEPLOY_DIR="$CATALINA_BASE/webapps" + rm -rf "$DEPLOY_DIR/ROOT" "$DEPLOY_DIR/ROOT.war" + cp eapim-portal/build/libs/eapim-portal.war "$DEPLOY_DIR/ROOT.war" + ls -la "$DEPLOY_DIR" + + - name: Start tomcat and health check (timeout 90s) + working-directory: ${{ github.workspace }} + run: | + LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log" + BEFORE=0 + [ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG") + + mkdir -p "$(dirname $CATALINA_PID)" + "$CATALINA_HOME/bin/startup.sh" + + DEADLINE=$(($(date +%s) + 90)) + STATUS=000 + while [ $(date +%s) -lt $DEADLINE ]; do + STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 http://localhost:$DEPLOY_HTTP_PORT/ 2>/dev/null || echo "000") + if [ "$STATUS" = "200" ]; then + echo "HTTP 200 received from /" + break + fi + if [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | grep -qE "Application listener .* Exception|SEVERE.*startup.Catalina"; then + echo "::error::Startup error detected in log" + tail -c +$((BEFORE+1)) "$LOG" | tail -80 + exit 1 + fi + sleep 2 + done + + if [ "$STATUS" != "200" ]; then + echo "::error::Health check failed within 90s (last HTTP status: $STATUS)" + [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -100 + exit 1 + fi + + echo "--- key boot log lines ---" + tail -c +$((BEFORE+1)) "$LOG" | grep -E "Server startup|Deployment of web" | head -10 || true + + - name: Stop tomcat (post-clean) + if: always() + working-directory: ${{ github.workspace }} + run: | + if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then + "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true + for i in $(seq 1 30); do + [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null || break + sleep 1 + done + [ -f "$CATALINA_PID" ] && kill -9 "$(cat $CATALINA_PID)" 2>/dev/null || true + fi + rm -f "$CATALINA_PID" From 86336d52f0c6919453fb138272cc46729dec5a54 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 15:41:50 +0900 Subject: [PATCH 05/12] =?UTF-8?q?ci=20-=20tomcat=20=EB=A7=8C=20jdk17=20?= =?UTF-8?q?=EB=A1=9C=20=EC=8B=A4=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 빌드는 jdk8, 톰캣 startup/shutdown 만 jdk17 - JAVA_HOME_TOMCAT 환경변수로 분리 --- .gitea/workflows/eapim-portal-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/eapim-portal-ci.yml b/.gitea/workflows/eapim-portal-ci.yml index aeb847e..1a779e8 100644 --- a/.gitea/workflows/eapim-portal-ci.yml +++ b/.gitea/workflows/eapim-portal-ci.yml @@ -11,6 +11,7 @@ jobs: runs-on: [self-hosted, linux, eapim-portal] env: JAVA_HOME: /apps/opts/jdk8 + JAVA_HOME_TOMCAT: /apps/opts/jdk17 CATALINA_BASE: /prod/devportal CATALINA_HOME: /prod/apache-tomcat-9.0.116 CATALINA_PID: /prod/devportal/temp/catalina.pid @@ -63,7 +64,7 @@ jobs: working-directory: ${{ github.workspace }} run: | if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then - "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true + JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true for i in $(seq 1 30); do [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null || break sleep 1 @@ -87,7 +88,7 @@ jobs: [ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG") mkdir -p "$(dirname $CATALINA_PID)" - "$CATALINA_HOME/bin/startup.sh" + JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/startup.sh" DEADLINE=$(($(date +%s) + 90)) STATUS=000 @@ -119,7 +120,7 @@ jobs: working-directory: ${{ github.workspace }} run: | if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then - "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true + JAVA_HOME=$JAVA_HOME_TOMCAT "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true for i in $(seq 1 30); do [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null || break sleep 1 From b38ca6fe0b85649dc0d94e215306d530977dea42 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 15:48:08 +0900 Subject: [PATCH 06/12] =?UTF-8?q?-=20KJB-SafeDB=20=EC=9E=94=EC=97=AC=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=A0=9C=EA=B1=B0=20-=20Atomikos=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EB=B0=8F=20=EB=A1=9C=EA=B9=85=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.gradle | 6 +----- src/main/resources/application.yml | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/settings.gradle b/settings.gradle index 6406d23..1332172 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,8 +4,4 @@ include 'elink-online-core-jpa' include 'elink-portal-common' project (':elink-online-core-jpa').projectDir = new File(settingsDir, "../eapim-online/elink-online-core-jpa") -project (':elink-portal-common').projectDir = new File(settingsDir, "../elink-portal-common") - - -//include 'kjb-safedb' -//project (':kjb-safedb').projectDir = new File(settingsDir, "../kjb-safedb") \ No newline at end of file +project (':elink-portal-common').projectDir = new File(settingsDir, "../elink-portal-common") \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fe9308b..0ee4f8c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -38,7 +38,7 @@ spring: enabled: true atomikos: properties: - log-base-dir: /Log/eapim/portal + log-base-dir: /logs/atomikos log-base-name: adp_tx thymeleaf: @@ -82,7 +82,7 @@ portal: allowed-extensions: pdf,doc,docx,xls,xlsx,ppt,pptx,hwp,gif,jpg,jpeg,png logging: - log-path: /Log/App/eapim/ + log-path: /logs auth-ttl: 300 auth: From fb28a31da1295c61a348ff328e97eb8b0d7925b3 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 16:16:48 +0900 Subject: [PATCH 07/12] =?UTF-8?q?-=20EMS/Gateway=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EC=86=8C=EC=8A=A4=20JNDI=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=A0=84=ED=99=98=20-=20Hibernate=20Diale?= =?UTF-8?q?ct=20=EB=B0=8F=20NamingStrategy=20=EC=A0=81=EC=9A=A9=20-=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20Proxy=20=EB=B0=8F=20?= =?UTF-8?q?=EB=A1=9C=EA=B9=85=20=EC=84=A4=EC=A0=95=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 44 ++++++++------------------ 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 3bff6e4..f244786 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -21,41 +21,23 @@ spring: ems: datasource: - jdbc-url: jdbc:oracle:thin:@//192.168.240.177:1598/DAPM -# jdbc-url: jdbc:oracle:thin:@//localhost:1599/DAPM -# jdbc-url: jdbc:oracle:thin:@//192.168.240.177:1599/DAPM -# jdbc-url: jdbc:oracle:thin:@//192.168.240.177:1599/PAPM - driver-class-name: oracle.jdbc.OracleDriver - username: EMSAPP - password: elink1234 + jndi-name: jdbc/dsOBP_EMS + schema: EMSAPP + hibernate-dialect: org.hibernate.dialect.Oracle12cDialect + hibernate-physical-naming-strategy: com.eactive.apim.portal.common.entity.CustomPhysicalNamingStrategy + entity-package: com.eactive.apim.portal gateway: datasource: - jdbc-url: jdbc:oracle:thin:@//192.168.240.177:1598/DAPM -# jdbc-url: jdbc:oracle:thin:@//localhost:1599/DAPM -# jdbc-url: jdbc:oracle:thin:@//192.168.240.177:1599/DAPM -# jdbc-url: jdbc:oracle:thin:@//192.168.240.177:1599/PAPM - driver-class-name: oracle.jdbc.OracleDriver - username: AGWAPP - password: elink1234 + jndi-name: jdbc/dsOBP_AGW + schema: AGWAPP + + hibernate-dialect: org.hibernate.dialect.Oracle12cDialect + hibernate-physical-naming-strategy: com.eactive.apim.portal.common.entity.CustomPhysicalNamingStrategy + entity-package: com.eactive.eai.data.entity.onl + portal: auth-virtual-code: 654321 - test-auth-notice-enabled: true - -logging: - level: - org.hibernate.SQL: DEBUG - org.hibernate.type.descriptor.sql.BasicBinder: TRACE - -proxy: - targets: - stg: http://localhost:10000/monitoring - prod: http://localhost:10000/monitoring - -# stg: http://inter-ndapiap01.k-bank.com:7090/monitoring -# prod: http://inter-ndapiap01.k-bank.com:7090/monitoring - timeout: - connect: 5000 - read: 5000 + test-auth-notice-enabled: true \ No newline at end of file From efb88caab528c4bd9c4d482843303860018cccf0 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 16:19:16 +0900 Subject: [PATCH 08/12] =?UTF-8?q?ci=20-=20tomcat=20=EA=B2=BD=EB=A1=9C=20/p?= =?UTF-8?q?rod/eapim=20=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - CATALINA_BASE / CATALINA_HOME / CATALINA_PID 갱신 --- .gitea/workflows/eapim-portal-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/eapim-portal-ci.yml b/.gitea/workflows/eapim-portal-ci.yml index 1a779e8..72a3d9d 100644 --- a/.gitea/workflows/eapim-portal-ci.yml +++ b/.gitea/workflows/eapim-portal-ci.yml @@ -12,9 +12,9 @@ jobs: env: JAVA_HOME: /apps/opts/jdk8 JAVA_HOME_TOMCAT: /apps/opts/jdk17 - CATALINA_BASE: /prod/devportal - CATALINA_HOME: /prod/apache-tomcat-9.0.116 - CATALINA_PID: /prod/devportal/temp/catalina.pid + CATALINA_BASE: /prod/eapim/devportal + CATALINA_HOME: /prod/eapim/apache-tomcat-9.0.116 + CATALINA_PID: /prod/eapim/devportal/temp/catalina.pid DEPLOY_HTTP_PORT: "39130" defaults: run: From 06fdcb8bb664a19eb06eb37b36bde9f9caa91ca4 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 16:36:04 +0900 Subject: [PATCH 09/12] =?UTF-8?q?ci=20-=20=EB=A1=9C=EA=B9=85=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=ED=86=B5=EC=9D=BC=EC=84=B1=20=ED=99=95=EB=B3=B4=20?= =?UTF-8?q?=EB=B0=8F=20=EC=88=98=EC=A0=95=20-=20=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=20/Log/App=20=E2=86=92=20/?= =?UTF-8?q?logs/eapim=20=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback-debug.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/logback-debug.xml b/src/main/resources/logback-debug.xml index db0b928..d905718 100644 --- a/src/main/resources/logback-debug.xml +++ b/src/main/resources/logback-debug.xml @@ -1,5 +1,5 @@ - + From cce9753e3687ebaa2d09e1d552e030d7a6f87b14 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 16:38:10 +0900 Subject: [PATCH 10/12] =?UTF-8?q?ci=20-=20=EB=A1=9C=EA=B9=85=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20/logs=20=E2=86=92=20/logs/eapim=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0ee4f8c..7140b7a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -82,7 +82,7 @@ portal: allowed-extensions: pdf,doc,docx,xls,xlsx,ppt,pptx,hwp,gif,jpg,jpeg,png logging: - log-path: /logs + log-path: /logs/eapim auth-ttl: 300 auth: From 357d609552982cce4e6b13b8e083c72f55e5a590 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 18:58:04 +0900 Subject: [PATCH 11/12] =?UTF-8?q?fix=20-=20jndi=20lookup=20=EC=97=90=20res?= =?UTF-8?q?ourceRef=20true=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - java:comp/env 네임스페이스 자동 prepend - tomcat ContextResource 매칭 위함 --- .../eactive/apim/portal/config/BaseDatasourceConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/eactive/apim/portal/config/BaseDatasourceConfiguration.java b/src/main/java/com/eactive/apim/portal/config/BaseDatasourceConfiguration.java index b3d4c01..9b6e10d 100644 --- a/src/main/java/com/eactive/apim/portal/config/BaseDatasourceConfiguration.java +++ b/src/main/java/com/eactive/apim/portal/config/BaseDatasourceConfiguration.java @@ -27,6 +27,7 @@ public class BaseDatasourceConfiguration { protected DataSource jndiLookup(String jndiName) throws NamingException { JndiObjectFactoryBean bean = new JndiObjectFactoryBean(); bean.setJndiName(jndiName); + bean.setResourceRef(true); bean.setProxyInterface(DataSource.class); bean.afterPropertiesSet(); return (DataSource) bean.getObject(); From 6a1fade68dc05e3b602dbd81c86aea04d91a7c80 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 9 Jun 2026 19:08:19 +0900 Subject: [PATCH 12/12] =?UTF-8?q?log=20-=20jndi-name=20=EB=AF=B8=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EC=8B=9C=20warn=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - portal / gateway datasource 둘다 적용 - 직접 접속 모드 진입 사유 명시 --- .../apim/portal/config/GatewayDatasourceConfiguration.java | 2 ++ .../apim/portal/config/PortalDatasourceConfiguration.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/eactive/apim/portal/config/GatewayDatasourceConfiguration.java b/src/main/java/com/eactive/apim/portal/config/GatewayDatasourceConfiguration.java index a5ce76b..e9bc25c 100644 --- a/src/main/java/com/eactive/apim/portal/config/GatewayDatasourceConfiguration.java +++ b/src/main/java/com/eactive/apim/portal/config/GatewayDatasourceConfiguration.java @@ -57,6 +57,8 @@ public class GatewayDatasourceConfiguration extends BaseDatasourceConfiguration } catch (NamingException e) { log.warn("JNDI lookup failed.", e); } + } else { + log.warn("gateway.datasource.jndi-name 이 설정되어 있지 않음 - 직접 접속 모드로 진행"); } log.info("개발환경을 위해 JNDI 대신 직접 DB 접속 시도"); diff --git a/src/main/java/com/eactive/apim/portal/config/PortalDatasourceConfiguration.java b/src/main/java/com/eactive/apim/portal/config/PortalDatasourceConfiguration.java index 8e66dd4..19d9b75 100644 --- a/src/main/java/com/eactive/apim/portal/config/PortalDatasourceConfiguration.java +++ b/src/main/java/com/eactive/apim/portal/config/PortalDatasourceConfiguration.java @@ -70,6 +70,8 @@ public class PortalDatasourceConfiguration extends BaseDatasourceConfiguration { } catch (NamingException e) { log.warn("JNDI lookup failed.", e); } + } else { + log.warn("ems.datasource.jndi-name 이 설정되어 있지 않음 - 직접 접속 모드로 진행"); } if (dataSource == null) {