ci - tomcat 경로 /prod/eapim 으로 이동

- CATALINA_BASE / CATALINA_HOME / CATALINA_PID 갱신
ci - tomcat 만 jdk17 로 실행
2026-06-09 16:19:43 +09:00 · 2026-06-09 15:42:45 +09:00 · 2026-06-09 15:36:58 +09:00 · 2026-06-09 12:23:09 +09:00 · 2026-06-09 12:20:49 +09:00 · 2026-06-09 12:00:48 +09:00
9 changed files with 175 additions and 17 deletions
@@ -0,0 +1,130 @@
+name: eapim-portal CI (from elink-portal-common)
+
+on:
+  push:
+    branches:
+      - master
+      - feats/ci-test
+
+jobs:
+  build:
+    runs-on: [self-hosted, linux, eapim-portal]
+    env:
+      JAVA_HOME: /apps/opts/jdk8
+      JAVA_HOME_TOMCAT: /apps/opts/jdk17
+      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:
+        working-directory: eapim-portal
+
+    steps:
+      - name: Checkout elink-portal-common (trigger SHA)
+        uses: actions/checkout@v4
+        with:
+          path: elink-portal-common
+
+      - name: Checkout eapim-portal (master)
+        working-directory: ${{ github.workspace }}
+        run: |
+          rm -rf eapim-portal
+          git clone --depth=1 --branch master \
+            http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/eapim-portal.git \
+            eapim-portal
+
+      - name: Checkout elink-online-core-jpa (master)
+        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.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/elink-online-core-jpa.git \
+            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
+
+      - name: Stop tomcat (pre-clean)
+        working-directory: ${{ github.workspace }}
+        run: |
+          if [ -f "$CATALINA_PID" ] && kill -0 "$(cat $CATALINA_PID)" 2>/dev/null; then
+            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
+            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)"
+          JAVA_HOME=$JAVA_HOME_TOMCAT "$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
+            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
+            done
+            [ -f "$CATALINA_PID" ] && kill -9 "$(cat $CATALINA_PID)" 2>/dev/null || true
+          fi
+          rm -f "$CATALINA_PID"
@@ -87,6 +87,9 @@ dependencies {
    api "com.querydsl:querydsl-apt:${queryDslVersion}"
    api "org.mapstruct:mapstruct:1.5.5.Final", "org.projectlombok:lombok:1.18.28"

+    // JDK 11+ 에서 javax.annotation.* 가 제거되어 (JEP 320) 명시 의존성 필요
+    api 'javax.annotation:javax.annotation-api:1.3.2'
+
    // project > properties > Java Compiler > Annoation Processing
    annotationProcessor "org.projectlombok:lombok:1.18.28", "org.projectlombok:lombok-mapstruct-binding:0.2.0", "org.mapstruct:mapstruct-processor:1.5.5.Final", "com.querydsl:querydsl-apt:${queryDslVersion}:jpa", "jakarta.persistence:jakarta.persistence-api:2.2.3", "jakarta.annotation:jakarta.annotation-api:1.3.5"

@@ -5,9 +5,10 @@ import com.eactive.eai.data.converter.LocalDateTimeToStringConverter17;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;

 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;

@@ -25,12 +26,12 @@ public class Approver implements Serializable, com.eactive.eai.data.Data {

    @ManyToOne
    @MapsId("approval")
-    @JoinColumn(name = "APPROVAL_ID", nullable = false)
+    @JoinColumn(name = "APPROVAL_ID", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
    private Approval approval;

-    @NotNull
    @ManyToOne
-    @JoinColumn(name = "USER_ID", nullable = false)
+    @JoinColumn(name = "USER_ID", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @NotFound(action = NotFoundAction.IGNORE)
    private UserInfo user;

    @Enumerated(value = STRING)
@@ -45,7 +45,7 @@ public class ProcessingState implements ApprovalState {
            boolean statusChanged = false;
            // Update current approver status and track if it changed
            for (Approver approver : approval.getApprovers()) {
-                if (approver.getUser().getId().equals(approverId) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
+                if (approver.getUser() != null && approverId.equals(approver.getUser().getId()) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
                    approver.setApproverStatus(ApproverStatus.APPROVED);
                    approver.setApprovedDate(LocalDateTime.now());
                    statusChanged = true;
@@ -76,7 +76,7 @@ public class ProcessingState implements ApprovalState {
        String approverId = (String) options.getOrDefault(ApprovalConstants.APPROVER, "");
        if (isAuthorizedApprover(approval, approverId, options)) {
            approval.getApprovers().forEach(approver -> {
-                if(approver.getUser().getId().equals(approverId)) {
+                if(approver.getUser() != null && approverId.equals(approver.getUser().getId())) {
                    approver.setApproverStatus(ApproverStatus.DENIED);
                    approver.setApprovedDate(LocalDateTime.now());
                    String message = (String) options.getOrDefault("message", "");
@@ -48,7 +48,7 @@ public class RequestedState implements ApprovalState {

            // Update current approver status and track if it changed
            for (Approver approver : approval.getApprovers()) {
-                if (approver.getUser().getId().equals(approverId) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
+                if (approver.getUser() != null && approverId.equals(approver.getUser().getId()) && !ApproverStatus.APPROVED.equals(approver.getApproverStatus())) {
                    approver.setApproverStatus(ApproverStatus.APPROVED);
                    approver.setApprovedDate(LocalDateTime.now());
                    statusChanged = true;
@@ -78,7 +78,7 @@ public class RequestedState implements ApprovalState {
        String approverId = (String) options.getOrDefault(ApprovalConstants.APPROVER, "");
        if (isAuthorizedApprover(approval, approverId, options)) {
            approval.getApprovers().forEach(approver -> {
-                if (approver.getUser().getId().equals(approverId)) {
+                if (approver.getUser() != null && approverId.equals(approver.getUser().getId())) {
                    approver.setApproverStatus(ApproverStatus.DENIED);
                    approver.setApprovedDate(LocalDateTime.now());
                    String message = (String) options.getOrDefault("message", "");
@@ -97,7 +97,7 @@ public class RequestedState implements ApprovalState {
        String approverId = (String) options.getOrDefault(ApprovalConstants.APPROVER, "");
        if (isAuthorizedApprover(approval, approverId, options)) {
            approval.getApprovers().forEach(approver -> {
-                if (approver.getUser().getId().equals(approverId)) {
+                if (approver.getUser() != null && approverId.equals(approver.getUser().getId())) {
                    approver.setApproverStatus(ApproverStatus.CANCELED);
                    approver.setApprovedDate(LocalDateTime.now());
                }
@@ -3,6 +3,7 @@ package com.eactive.apim.portal.file.service;
 import static com.eactive.apim.portal.file.service.StorageType.FILESYSTEM;

 import com.eactive.apim.portal.portalproperty.service.PortalPropertyService;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -1,12 +1,27 @@
 package com.eactive.apim.portal.portalNotice.entity;

-import com.eactive.apim.portal.common.entity.Auditable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.JoinColumnOrFormula;
+import org.hibernate.annotations.JoinColumnsOrFormulas;
+import org.hibernate.annotations.JoinFormula;

-import javax.persistence.*;
+import com.eactive.apim.portal.common.entity.Auditable;
+import com.eactive.apim.portal.monitoringcode.entity.MonitoringCode;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;

@Data
@EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = true)
@@ -48,4 +63,14 @@ public class PortalNotice extends Auditable {
    @Comment("작성자이름")
    private String inquirerName;
    
+    @Column(name = "fix_yn", length = 1, nullable = false)
+    @Comment("상단고정여부")
+    private String fixYn;    
+
+    @Column(name = "notice_type", length = 1, nullable = false)
+    @Comment("게시유형")
+    private String noticeType;
+    
+    
+
 }
@@ -79,7 +79,8 @@ public class Inquiry extends Auditable {
     * 응답자
     */
    @ManyToOne
-    @JoinColumn(name = "RESPONDER_ID")
+    @JoinColumn(name = "RESPONDER_ID", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @NotFound(action = NotFoundAction.IGNORE)
    private UserInfo responder;

    @Column(name = "ATTACH_FILE")
@@ -1,11 +1,8 @@
 package com.eactive.apim.portal.template.service;

 import com.eactive.apim.portal.portaluser.entity.PortalUser;
-import kjb.safedb.KjbNotRnnoJpaAttributeConverter;
 import lombok.*;

-import javax.persistence.Convert;
-
@Data
@ToString
@EqualsAndHashCode
Author	SHA1	Message	Date
Rinjae	33f17af194	ci - tomcat 경로 /prod/eapim 으로 이동 eapim-portal CI (from elink-portal-common) / build (push) Has been cancelled Details - CATALINA_BASE / CATALINA_HOME / CATALINA_PID 갱신	2026-06-09 16:19:43 +09:00
Rinjae	b85d439794	ci - tomcat 만 jdk17 로 실행 - 빌드는 jdk8, 톰캣 startup/shutdown 만 jdk17 - JAVA_HOME_TOMCAT 환경변수로 분리	2026-06-09 15:42:45 +09:00
Rinjae	35efc46545	ci - tomcat 배포 및 헬스체크 추가 - ROOT.war 로 /prod/devportal/webapps 배포 - startup.sh 후 90초 내 GET / 200 기대 - post-clean 으로 shutdown 보장	2026-06-09 15:36:58 +09:00
Rinjae	a2a379ec4f	ci - secret 이름을 CI_TOKEN 으로 변경 - gitea 가 GITEA_ 접두어를 예약어로 차단	2026-06-09 12:23:09 +09:00
Rinjae	2c15334ff2	ci - actions/checkout 다중 호출 회피 - 두 의존 repo는 raw git clone 으로 체크아웃 - act_runner 0.6.1 액션 캐시 race 우회	2026-06-09 12:20:49 +09:00
Rinjae	6ccfa31b90	ci - eapim-portal gitea actions 워크플로 추가 - master / feats/ci-test push 시 트리거 - 세 repo composite 체크아웃 후 빌드 - war 산출물 업로드	2026-06-09 12:00:48 +09:00
Rinjae	9725a19b35	- K8sUtil 파일 삭제 - 승인관리 완전삭제 기능 추가 - DJBank로 명칭 업데이트	2026-05-21 09:52:34 +09:00
eastargh	5cb490722c	공지사항 칼럼 추가	2026-05-08 10:20:36 +09:00