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

- CATALINA_BASE / CATALINA_HOME / CATALINA_PID 갱신

src/main/java/com/eactive/apim/portal/approval/entity/Approval.java

@@ -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;  //예상완료일
 }

src/main/java/com/eactive/apim/portal/approval/statemachine/ApprovalState.java

@@ -28,8 +28,4 @@ public interface ApprovalState extends Serializable {
     }
 
     String getDescription();
-
-    default String getCode() {
-        return toString();
-    }
 }

src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java

@@ -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);
-    }
-}

src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java

@@ -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

src/main/java/com/eactive/apim/portal/template/service/MessageSendService.java

@@ -111,17 +111,20 @@ public class MessageSendService {
             logger.debug(emailRequest.toString());
         }
 
-        if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
+        //메신저는 사용하지 않아서 주석 처리함.
-            MessageRequest messengerRequest = new MessageRequest();
+//        if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
-            messengerRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode()));
+//            MessageRequest messengerRequest = new MessageRequest();
-            messengerRequest.setSubject(subject);
+//            messengerRequest.setMessageCode(MessageRequestEnums.MessageCode.valueOf(template.getMessageCode()));
-            String messengerTemplate = buildMessage(template.getMessengerTemplate(), messageParams);
+//            messengerRequest.setSubject(subject);
-            messengerRequest.setMessage(messengerTemplate);
+//            String messengerTemplate = buildMessage(template.getMessengerTemplate(), messageParams);
-            messengerRequest.setRequestDate(LocalDateTime.now());
+//            messengerRequest.setMessage(messengerTemplate);
-            messengerRequest.setUsername(user.getUsername());
+//            messengerRequest.setRequestDate(LocalDateTime.now());
-            messengerRequest.setMessengerId(user.getUserId());
+//            messengerRequest.setUsername(user.getUsername());
-            messageRequestRepository.save(messengerRequest);
+//            messengerRequest.setMessengerId(user.getMessengerId());
-        }
+//            messengerRequest.setEaiInterfaceId();
+//            messengerRequest.setServiceId();
+//            messageRequestRepository.save(messengerRequest);
+//        }
     }
 
     private void updateMessageParams(MessageRecipient user, Map<String, String> messageParams) {