6 Commits

Author SHA1 Message Date
Rinjae 33f17af194 ci - tomcat 경로 /prod/eapim 으로 이동
eapim-portal CI (from elink-portal-common) / build (push) Has been cancelled
- 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
5 changed files with 14 additions and 78 deletions
@@ -75,7 +75,4 @@ public class Approval implements Serializable, com.eactive.eai.data.Data {
@Column(length = 17, name = "end_date")
@Convert(converter = LocalDateTimeToStringConverter17.class)
private LocalDateTime approvalDate;
@Column(name = "expect_end_date")
private String expectEndDate; //예상완료일
}
@@ -28,8 +28,4 @@ public interface ApprovalState extends Serializable {
}
String getDescription();
default String getCode() {
return toString();
}
}
@@ -1,50 +0,0 @@
package com.eactive.apim.portal.qna.entity;
import com.eactive.apim.portal.common.entity.Auditable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
@Entity
@Table(name = "PTL_INQUIRY_COMMENT")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(exclude = "inquiry")
public class InquiryComment extends Auditable implements Serializable {
@Id
@Column(name = "id", length = 36, nullable = false)
@GenericGenerator(name = "uuid-gen", strategy = "uuid2")
@GeneratedValue(generator = "uuid-gen", strategy = GenerationType.IDENTITY)
private String id;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "INQUIRY_ID", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private Inquiry inquiry;
@Lob
@Column(name = "COMMENT_DETAIL")
private String commentDetail;
@Column(name = "DEL_YN", length = 1)
private String delYn = "N";
@Column(name = "ADMIN_YN", length = 1)
private String adminYn = "N";
public void markDeleted() {
this.delYn = "Y";
}
public boolean isDeleted() {
return "Y".equals(this.delYn);
}
public boolean isAdmin() {
return "Y".equals(this.adminYn);
}
}
@@ -30,15 +30,6 @@ public enum MessageCode {
APP_REGISTER_APPROVED("앱 등록 승인", "FM_APIM009", Channels.EMAIL),
APP_REGISTER_REJECTED("앱 등록 거절", "FM_APIM010", Channels.EMAIL),
// Q&A 댓글 등록 (DJBank 커스텀)
INQUIRY_COMMENT_CREATED_ADMIN("Q&A 댓글 등록 알림", null, Channels.NONE),
// API상태 모니터링
API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.MESSENGER),
// 유량제어 토큰 획득 실패
INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.MESSENGER),
// 미 사용, 미 분류
@Deprecated
@@ -124,7 +115,6 @@ public enum MessageCode {
NONE (0b0000),
EMAIL (0b0001),
KAKAO_ALIMTALK (0b0010),
MESSENGER (0b0100),
;
@Getter
@@ -111,17 +111,20 @@ public class MessageSendService {
logger.debug(emailRequest.toString());
}
if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
MessageRequest messengerRequest = new MessageRequest();
messengerRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode()));
messengerRequest.setSubject(subject);
String messengerTemplate = buildMessage(template.getMessengerTemplate(), messageParams);
messengerRequest.setMessage(messengerTemplate);
messengerRequest.setRequestDate(LocalDateTime.now());
messengerRequest.setUsername(user.getUsername());
messengerRequest.setMessengerId(user.getUserId());
messageRequestRepository.save(messengerRequest);
}
//메신저는 사용하지 않아서 주석 처리함.
// if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
// MessageRequest messengerRequest = new MessageRequest();
// messengerRequest.setMessageCode(MessageRequestEnums.MessageCode.valueOf(template.getMessageCode()));
// messengerRequest.setSubject(subject);
// String messengerTemplate = buildMessage(template.getMessengerTemplate(), messageParams);
// messengerRequest.setMessage(messengerTemplate);
// messengerRequest.setRequestDate(LocalDateTime.now());
// messengerRequest.setUsername(user.getUsername());
// messengerRequest.setMessengerId(user.getMessengerId());
// messengerRequest.setEaiInterfaceId();
// messengerRequest.setServiceId();
// messageRequestRepository.save(messengerRequest);
// }
}
private void updateMessageParams(MessageRecipient user, Map<String, String> messageParams) {