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/qna/event/InquiryCommentCreatedEvent.java

@@ -1,56 +0,0 @@
-package com.eactive.apim.portal.qna.event;
-
-import com.eactive.apim.portal.template.entity.MessageCode;
-import com.eactive.apim.portal.template.service.MessageEventHandler;
-import com.eactive.apim.portal.template.service.MessageRecipient;
-import com.eactive.apim.portal.template.service.MessageSendEvent;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Component
-public class InquiryCommentCreatedEvent implements MessageEventHandler {
-
-    public static final MessageCode KEY = MessageCode.INQUIRY_COMMENT_CREATED;
-
-    @Override
-    public MessageCode getKey() {
-        return KEY;
-    }
-
-    @Override
-    public boolean allowAdditionalRecipients() {
-        return true;
-    }
-
-    @Override
-    public String getDisplayName() {
-        return "Q&A 댓글 등록 알림";
-    }
-
-    @Override
-    public String getDescription() {
-        return "<div>사용 가능 변수: </div><br/>"
-                + "<div> - userName: 수신자 이름 </div><br/>"
-                + "<div> - userId: 수신자 ID </div><br/>"
-                + "<div> - inquiryId: 문의 ID </div><br/>"
-                + "<div> - inquirySubject: 문의 제목 </div><br/>"
-                + "<div> - commentContent: 댓글 본문 </div><br/>"
-                + "<div> - writerName: 작성자 이름 </div><br/>";
-    }
-
-    @Override
-    public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
-        Map<String, String> requestParams = new HashMap<>();
-        requestParams.put("inquiryId", toStr(params.get("inquiryId")));
-        requestParams.put("inquirySubject", toStr(params.get("inquirySubject")));
-        requestParams.put("commentContent", toStr(params.get("commentContent")));
-        requestParams.put("writerName", toStr(params.get("writerName")));
-        return new MessageSendEvent(source, KEY, recipient, requestParams);
-    }
-
-    private String toStr(Object value) {
-        return value == null ? "" : value.toString();
-    }
-}

src/main/java/com/eactive/apim/portal/qna/event/InquiryCreatedEvent.java

@@ -23,21 +23,11 @@ public class InquiryCreatedEvent implements MessageEventHandler {
     @Override
     public MessageSendEvent createEvent(Object source, MessageRecipient recipient, Map<String, Object> params) {
         Map<String, String> requestParams = new HashMap<>();
-        String subject = toStr(params.get("inquirySubject"));
+        requestParams.put("inquiryId", (String) params.get("inquiryId"));
-        if (subject.isEmpty()) {
+        requestParams.put("subject", (String) params.get("subject"));
-            subject = toStr(params.get("subject"));
-        }
-        requestParams.put("inquiryId", toStr(params.get("inquiryId")));
-        requestParams.put("inquirySubject", subject);
-        requestParams.put("subject", subject);
-        requestParams.put("writerName", toStr(params.get("writerName")));
         return new MessageSendEvent(source, KEY, recipient, requestParams);
     }
 
-    private String toStr(Object value) {
-        return value == null ? "" : value.toString();
-    }
-
     @Override
     public MessageCode getKey() {
         return KEY;
@@ -54,9 +44,7 @@ public class InquiryCreatedEvent implements MessageEventHandler {
                 + "<div> - userName: 수신자 이름 </div><br/>"
                 + "<div> - userId: 수신자 ID (이메일) </div><br/>"
                 + "<div> - inquiryId: 질문 ID </div><br/>"
-                + "<div> - inquirySubject: 질문 제목 </div><br/>"
+                + "<div> - subject: 제목 </div><br/>";
-                + "<div> - subject: 질문 제목 (별칭) </div><br/>"
-                + "<div> - writerName: 작성자 이름 </div><br/>";
     }
 }
 

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

@@ -25,18 +25,11 @@ public enum MessageCode {
     MANAGER_WITH_ORG_REGISTER_APPROVED("법인관리자 및 법인 등록 승인", "FM_APIM007", Channels.EMAIL),
     MANAGER_WITH_ORG_REGISTER_REJECTED("법인관리자 및 법인 등록 거절", "FM_APIM008", Channels.EMAIL),
 
+
     // 관리자 영역
     APP_REGISTER_APPROVED("앱 등록 승인", "FM_APIM009", Channels.EMAIL),
     APP_REGISTER_REJECTED("앱 등록 거절", "FM_APIM010", Channels.EMAIL),
 
-    // Q&A 등록/댓글 등록 알림 (DJBank 커스텀 — portal-admin 수신)
-    INQUIRY_CREATED("Q&A 등록 알림", null, Channels.NONE),
-    INQUIRY_COMMENT_CREATED("Q&A 댓글 등록 알림", null, Channels.NONE),
-    
-    // 제주은행
-    API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.SWING),
-    INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.SWING),
-
 
     // 미 사용, 미 분류
     @Deprecated
@@ -85,6 +78,9 @@ public enum MessageCode {
     @Deprecated // 정확한 용도 모름
     USER_REGISTRATION_REQUEST_USER("사용자 등록 요청 완료", null, Channels.NONE),
 
+    @Deprecated // 정확한 용도 모름
+    INQUIRY_CREATED("QnA 질문 등록", null, Channels.NONE),
+
     @Deprecated
     INQUIRY_RESPONSE("QnA 답변 작성", null, Channels.NONE)
     ;
@@ -119,7 +115,6 @@ public enum MessageCode {
         NONE            (0b0000),
         EMAIL           (0b0001),
         KAKAO_ALIMTALK  (0b0010),
-        SWING		(0b0100),
         ;
 
         @Getter

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

@@ -66,7 +66,7 @@ public class MessageRequest implements Serializable {
     private PortalUser user;
 
     @Comment("UMS 연계용 UID")
-    @Column(name="ums_uid", length = 36)
+    @Column(name="ums_uid", length = 16)
     private String umsUid;
 
     @Column(name = "messenger_id")

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

@@ -78,7 +78,7 @@ public class MessageSendService {
         String subject = buildMessage(template.getSubjectTemplate(), messageParams);
 
         if (template.getEnableSms().equalsIgnoreCase("Y")) {
-            String smsEaiInterfaceId  = portalProperties.get("ums.sms.if_id");
+            String smsEaiInterfaceId  = portalProperties.get("message.integration.eaiId.sms");
             MessageRequest smsRequest = new MessageRequest();
             smsRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode().toUpperCase()));
             smsRequest.setSubject(subject);
@@ -88,14 +88,14 @@ public class MessageSendService {
             smsRequest.setUsername(user.getUsername());
             smsRequest.setPhone(user.getPhone());
             smsRequest.setEaiInterfaceId(smsEaiInterfaceId);
-            smsRequest.setServiceId(portalProperties.get("ums.sms.tx_id"));
+            smsRequest.setServiceId(portalProperties.get("message.integration.template.sms." + template.getMessageCode()));
-            smsRequest.setMessageType("SMS");
+            smsRequest.setMessageType("KAKAO");
             messageRequestRepository.save(smsRequest);
             logger.debug(smsRequest.toString());
         }
 
         if (template.getEnableEmail().equalsIgnoreCase("Y")) {
-            String mailEaiInterfaceId  = portalProperties.get("ums.email.if_id");
+            String mailEaiInterfaceId  = portalProperties.get("message.integration.eaiId.email");
             MessageRequest emailRequest = new MessageRequest();
             emailRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode().toUpperCase()));
             emailRequest.setSubject(subject);
@@ -105,27 +105,26 @@ public class MessageSendService {
             emailRequest.setUsername(user.getUsername());
             emailRequest.setEmail(user.getUserId());
             emailRequest.setEaiInterfaceId(mailEaiInterfaceId);
-            emailRequest.setServiceId(portalProperties.get("ums.email.tx_id"));
+            emailRequest.setServiceId(portalProperties.get("message.integration.template.email." + template.getMessageCode()));
             emailRequest.setMessageType("EMAIL");
             messageRequestRepository.save(emailRequest);
             logger.debug(emailRequest.toString());
         }
 
-        if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
+        //메신저는 사용하지 않아서 주석 처리함.
-            String swingEaiInterfaceId  = portalProperties.get("ums.messenger.if_id");
+//        if (template.getEnableMessenger().equalsIgnoreCase("Y")) {
-            MessageRequest messengerRequest = new MessageRequest();
+//            MessageRequest messengerRequest = new MessageRequest();
-            messengerRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode()));
+//            messengerRequest.setMessageCode(MessageRequestEnums.MessageCode.valueOf(template.getMessageCode()));
-            messengerRequest.setSubject(subject);
+//            messengerRequest.setSubject(subject);
-            String messengerTemplate = buildMessage(template.getMessengerTemplate(), messageParams);
+//            String messengerTemplate = buildMessage(template.getMessengerTemplate(), messageParams);
-            messengerRequest.setMessage(messengerTemplate);
+//            messengerRequest.setMessage(messengerTemplate);
-            messengerRequest.setRequestDate(LocalDateTime.now());
+//            messengerRequest.setRequestDate(LocalDateTime.now());
-            messengerRequest.setUsername(user.getUsername());
+//            messengerRequest.setUsername(user.getUsername());
-            messengerRequest.setMessengerId(user.getUserId());
+//            messengerRequest.setMessengerId(user.getMessengerId());
-            messengerRequest.setEaiInterfaceId(swingEaiInterfaceId);
+//            messengerRequest.setEaiInterfaceId();
-            messengerRequest.setServiceId(portalProperties.get("ums.messenger.tx_id"));
+//            messengerRequest.setServiceId();
-            messengerRequest.setMessageType("MESSENGER");
+//            messageRequestRepository.save(messengerRequest);
-            messageRequestRepository.save(messengerRequest);
+//        }
-        }
     }
 
     private void updateMessageParams(MessageRecipient user, Map<String, String> messageParams) {