Compare commits
3 Commits
20260713_개발배포
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 6651e0e809 | |||
| 62291c9e57 | |||
| 138621f2d0 |
@@ -0,0 +1,129 @@
|
||||
name: eapim-portal CI (from elink-online-core-jpa)
|
||||
|
||||
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-online-core-jpa (trigger SHA)
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
path: eapim-online/elink-online-core-jpa
|
||||
|
||||
- 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-portal-common (master)
|
||||
working-directory: ${{ github.workspace }}
|
||||
run: |
|
||||
rm -rf elink-portal-common
|
||||
git clone --depth=1 --branch master \
|
||||
http://oauth2:${{ secrets.CI_TOKEN }}@172.30.1.50:3000/djb-eapim/elink-portal-common.git \
|
||||
elink-portal-common
|
||||
|
||||
- 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"
|
||||
@@ -4,8 +4,6 @@ import com.eactive.eai.data.entity.AbstractEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.Comment;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.EmbeddedId;
|
||||
@@ -17,8 +15,9 @@ import javax.persistence.Table;
|
||||
@EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = true)
|
||||
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
// @DynamicInsert 제거 : null이 아닌 컬럼만으로 INSERT SQL을 매번 새로 생성하므로
|
||||
// 행마다 SQL 문자열이 달라져 Hibernate JDBC 배치(batch_size)가 동작하지 않는다.
|
||||
// 로그 테이블은 항상 전체 컬럼을 INSERT 하므로 정적 SQL이 유리하다.
|
||||
@Table(name = "http_adapter_extra_log")
|
||||
@org.hibernate.annotations.Table(appliesTo = "http_adapter_extra_log", comment = "http 헤더 로그")
|
||||
public class HttpAdapterExtraLog extends AbstractEntity<HttpAdapterExtraLogId> {
|
||||
|
||||
+9
-1
@@ -11,7 +11,15 @@ import com.eactive.eai.data.jpa.BaseRepository;
|
||||
interface TransformLoaderRepository
|
||||
extends DataLoaderRepository<TransformEntity>, BaseRepository<TransformEntity, String> {
|
||||
|
||||
@Query("from TransformEntity t inner join fetch t.transformItemEntities where t.useyn = '1' order by t.cnvsnname")
|
||||
/**
|
||||
* 변환 마스터(TSEAITR01) 전체 로딩.
|
||||
*
|
||||
* 변환 항목 매핑(TSEAITR03)이 한 건도 없는 변환도 로딩 대상에 포함시키기 위해 left join fetch 를 사용한다.
|
||||
* inner join fetch 로 조회할 경우 TSEAITR03 이 비어 있는 변환은 결과에서 통째로 누락되어,
|
||||
* 온라인 서버 기동 후 해당 변환 호출 시 "전문레이아웃매핑(변환)정보를 찾을 수 없음" 오류가 발생한다.
|
||||
* (매핑 항목이 없는 변환은 TransformValidator 가 기동 시 warn 으로 남긴다)
|
||||
*/
|
||||
@Query("from TransformEntity t left join fetch t.transformItemEntities where t.useyn = '1' order by t.cnvsnname")
|
||||
@Override
|
||||
Stream<TransformEntity> loadAll();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user