djb_apistatus_incident 엔티티/리포지토리 신설

- DjbApistatusIncident / Api / Timeline 3개 엔티티
- IncidentKind / IncidentState enum
- EMSADM 스키마 1:1 매핑, Spring Data JPA 리포지토리

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

build.gradle

@@ -114,8 +114,6 @@ dependencies {
     api group: 'commons-io', name: 'commons-io', version: '2.11.0'
 
 
-    compileOnly files('libs/damo-manager.jar')
-
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.10'

src/main/java/com/eactive/apim/portal/agreements/entity/AgreementType.java

@@ -4,10 +4,8 @@ package com.eactive.apim.portal.agreements.entity;
 public enum AgreementType {
     TERMS_OF_USE("TERMS_OF_USE", "이용약관"),
     PRIVACY_POLICY("PRIVACY_POLICY", "개인정보처리방침"),
-    PRIVACY_COLLECT("PRIVACY_COLLECT", "개인정보수집동의서"),
     PRIVACY_COLLECT_IND("PRIVACY_COLLECT_IND", "개인용 개인정보수집동의서"),
-    PRIVACY_COLLECT_ORG("PRIVACY_COLLECT_ORG", "법인용 개인정보수집동의서"),
+    PRIVACY_COLLECT_ORG("PRIVACY_COLLECT_ORG", "법인용 개인정보수집동의서");
-    NOTIFICATION_CONSENT("NOTIFICATION_CONSENT", "알림 수신 동의서");
 
     private final String code;
     private final String description;

src/main/java/com/eactive/apim/portal/agreements/service/AgreementsService.java

@@ -6,7 +6,6 @@ import com.eactive.apim.portal.agreements.entity.AgreementsId;
 import com.eactive.apim.portal.agreements.entity.AgreementsStatus;
 import com.eactive.apim.portal.agreements.repository.AgreementsRepository;
 import com.eactive.apim.portal.common.exception.NotFoundException;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,7 +16,6 @@ import java.util.Optional;
 
 @Service
 @Transactional
-@Slf4j
 public class AgreementsService {
 
     private static final String NOT_FOUND_MESSAGE = "해당 버전의 약관이 존재하지 않습니다.";
@@ -113,7 +111,6 @@ public class AgreementsService {
     public List<Agreements> findAllAgreementsSortPublishedOn(AgreementType agreementType) {
         List<Agreements> agreements = agreementsRepository.findAllByAgreementsTypeOrderByPublishedOnDesc(agreementType);
         if(agreements.isEmpty()) {
-            log.error("해당 약관 종류의 약관이 존재하지 않습니다. agreementType={}", agreementType);
             throw new IllegalStateException(NOT_FOUND_BY_DATE_MESSAGE);
         }
         return agreements;

src/main/java/com/eactive/apim/portal/app/entity/Credential.java

@@ -16,7 +16,6 @@ import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.LazyCollection;
@@ -24,7 +23,6 @@ import org.hibernate.annotations.LazyCollectionOption;
 import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 
-@EqualsAndHashCode(callSuper = false)
 @Entity
 @Data
 @Table(name = "ptl_credential")

src/main/java/com/eactive/apim/portal/common/entity/Auditable.java

@@ -1,7 +1,7 @@
 package com.eactive.apim.portal.common.entity;
 
-import com.eactive.apim.portal.jpa.PersonalDataEncryptConverter;
 import com.eactive.eai.data.converter.LocalDateTimeToStringConverter14;
+import kjb.safedb.KjbNotRnnoJpaAttributeConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.data.annotation.CreatedBy;
@@ -34,7 +34,7 @@ public abstract class Auditable {
      * 최초등록자ID
      */
     @Column(name = "created_by")
-    @Convert(converter = PersonalDataEncryptConverter.class)
+    @Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
     @CreatedBy
     private String createdBy;
 
@@ -50,7 +50,7 @@ public abstract class Auditable {
      * 최종수정자ID
      */
     @Column(name = "LAST_MODIFIED_BY")
-    @Convert(converter = PersonalDataEncryptConverter.class)
+    @Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
     @LastModifiedBy
     private String lastModifiedBy;
 

src/main/java/com/eactive/apim/portal/invitation/entity/UserInvitation.java

@@ -1,7 +1,6 @@
 package com.eactive.apim.portal.invitation.entity;
 
 import com.eactive.apim.portal.invitation.entity.UserInvitationEnums.InvitationStatus;
-import com.eactive.apim.portal.jpa.PersonalDataEncryptConverter;
 import com.eactive.eai.data.converter.LocalDateTimeToStringConverter14;
 import lombok.Data;
 import org.hibernate.annotations.Comment;
@@ -30,15 +29,10 @@ public class UserInvitation {
     @Comment("기관ID")
     private String orgId;
 
-    @Column(name = "INVITATION_EMAIL", length = 256)
+    @Column(name = "INVITATION_EMAIL", length = 30, nullable = false)
     @Comment("초대이메일")
     private String invitationEmail;
 
-    @Column(name = "INVITATION_MOBILE", length = 256)
-    @Convert(converter = PersonalDataEncryptConverter.class)
-    @Comment("초대휴대폰")
-    private String invitationMobile;
-
     @Column(name = "INVITATION_DATE", length = 14, nullable = false)
     @Convert(converter = LocalDateTimeToStringConverter14.class)
     @Comment("초대일시")

src/main/java/com/eactive/apim/portal/invitation/repository/UserInvitationRepository.java

@@ -22,11 +22,4 @@ public interface UserInvitationRepository extends JpaRepository<UserInvitation,
     Optional<UserInvitation> findFirstByInvitationEmailAndOrgIdAndStatus(String email, String orgId, InvitationStatus status);
 
     Optional<UserInvitation> findFirstByInvitationEmailAndOrgId(String email, String orgId);
-
-    // 휴대폰 번호 기반 초대 조회 (INVITATION_MOBILE 은 결정적 암호화로 저장되어 equality 조회 가능)
-    Optional<UserInvitation> findFirstByInvitationMobileAndStatus(String mobile, InvitationStatus status);
-
-    Optional<UserInvitation> findFirstByInvitationMobileAndOrgIdAndStatus(String mobile, String orgId, InvitationStatus status);
-
-    Optional<UserInvitation> findFirstByInvitationMobileAndOrgId(String mobile, String orgId);
 }

src/main/java/com/eactive/apim/portal/jpa/PersonalDataEncryptConverter.java

@@ -1,115 +0,0 @@
-package com.eactive.apim.portal.jpa;
-
-import com.eactive.ext.djb.DamoManager;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
-
-@Slf4j
-@Converter
-public class PersonalDataEncryptConverter implements AttributeConverter<String, String> {
-
-
-    /**
-     * 암호화
-     * @param attribute  the entity attribute value to be converted
-     * @return
-     */
-    @Override
-    public String convertToDatabaseColumn(String attribute) {
-        String originalAttribute = attribute;
-        if (StringUtils.isNotEmpty(attribute)) {
-            attribute = DamoManager.getInstance().encrypt(attribute);
-
-            if (log.isDebugEnabled()) {
-                //  originalAttribute 홀수 글자 마스킹
-                StringBuilder sb = new StringBuilder();
-                for (int i = 0; i < originalAttribute.length(); i++) {
-                    if (i % 2 == 0) {
-                        sb.append(originalAttribute.charAt(i));
-                    } else {
-                        sb.append("*");
-                    }
-                }
-
-                originalAttribute = sb.toString();
-                log.debug("DB 암호화 : {} -> {}", originalAttribute, attribute);
-            }
-        }
-
-        return attribute;
-
-    }
-
-    /**
-     * 복호화
-     * @param dbData  the data from the database column to be
-     *                converted
-     * @return
-     */
-    @Override
-    public String convertToEntityAttribute(String dbData) {
-
-        String dbDataOriginal = dbData;
-        if (StringUtils.isNotEmpty(dbData)) {
-            if (this.isEncrypted(dbData)) {
-                try {
-                    dbData = DamoManager.getInstance().decrypt(dbData);
-                } catch (Exception e) {
-                    // 복호화 실패시 원본 반환
-                    String logData = dbData.length() <= 3 ? dbData : dbData.substring(0, 3) + "...";
-                    log.warn("DB 복호화 실패: 복호화하지 않고 원본 반환. dbData={} (Length : {})",  logData, dbData.length());
-                    return dbData;
-                }
-            } else {
-                log.debug("DB 복호화 경고: Base64 형식이 아님. 복호화하지 않고 원본 반환. dbData={}", dbData);
-            }
-        }
-
-        log.debug("DB 복호화 : {} -> {}", dbDataOriginal, dbData);
-
-        return dbData;
-    }
-
-    /**
-     * 현재 damo-manager 가 bypass 모드(무변환)인지 여부.
-     * bypass 면 {@code encrypt}/{@code decrypt} 가 원문을 그대로 반환하므로 암호화/정규화가 no-op 이 된다.
-     * 레거시 평문 일괄 암호화 같은 마이그레이션 작업은 이 경우 의미가 없으므로 호출 측에서 차단해야 한다.
-     */
-    public boolean isBypassMode() {
-        return DamoManager.getInstance().isBypassMode();
-    }
-
-    /**
-     * 암호화 여부 확인(base64 인코딩 여부로 판단, 또는 0-9, - 로 구성된 경우 암호화 되지 않은 걸로 판단(연락처))
-     * @param data
-     * @return
-     */
-    private boolean isEncrypted(String data) {
-        if (StringUtils.isEmpty(data)) {
-            return false;
-        }
-
-        // 숫자, - 로만 구성된 경우 암호화 되지 않은 걸로 판단 (ex: 연락처)
-        if (data.matches("^[0-9-]+$")) {
-            return false;
-        }
-
-        data = data.trim();
-
-        // Base64 형식 체크
-        if (!data.matches("^[A-Za-z0-9+/]+={0,2}$")) {
-            return false;
-        }
-
-        // Base64 길이 체크 (4의 배수)
-        if (data.length() % 4 != 0) {
-            return false;
-        }
-
-
-        return true;
-    }
-}

src/main/java/com/eactive/apim/portal/portalorg/entity/PortalOrg.java

@@ -91,8 +91,4 @@ public class PortalOrg extends Auditable implements Serializable, com.eactive.ea
     @Column(name = "sc_phone_number", length = 20)
     @Comment("고객센터연락처")
     private String scPhoneNumber;
-
-    @Column(name = "reverse_proxy_path", length = 255)
-    @Comment("리버스 프록시 경로")
-    private String reverseProxyPath;
 }

src/main/java/com/eactive/apim/portal/portaluser/entity/PortalUser.java

@@ -1,12 +1,13 @@
 package com.eactive.apim.portal.portaluser.entity;
 
 import com.eactive.apim.portal.common.entity.Auditable;
-import com.eactive.apim.portal.jpa.PersonalDataEncryptConverter;import com.eactive.apim.portal.portalorg.entity.PortalOrg;
+import com.eactive.apim.portal.portalorg.entity.PortalOrg;
 import com.eactive.apim.portal.portaluser.entity.PortalUserEnums.ApprovalStatus;
 import com.eactive.apim.portal.portaluser.entity.PortalUserEnums.RoleCode;
 import com.eactive.apim.portal.portaluser.entity.PortalUserEnums.UserStatus;
 import java.io.Serializable;
 
+import kjb.safedb.KjbNotRnnoJpaAttributeConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.Comment;
@@ -21,7 +22,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = true)
 
 @Entity
-@Table(name = "PTL_USER")
+@Table(name = "ptl_user")
 public class PortalUser extends Auditable implements Serializable, com.eactive.eai.data.Data {
     private static final long serialVersionUID = 1L;
 
@@ -33,7 +34,7 @@ public class PortalUser extends Auditable implements Serializable, com.eactive.e
 
     @Column(name = "login_id", length = 200, nullable = false)
     @Comment("로그인ID")
-    @Convert(converter = PersonalDataEncryptConverter.class)
+    @Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
     private String loginId;
 
     @Column(name = "password_hash", length = 60)
@@ -46,17 +47,17 @@ public class PortalUser extends Auditable implements Serializable, com.eactive.e
 
     @Column(name = "phone_number", length = 50)
     @Comment("전화번호")
-    @Convert(converter = PersonalDataEncryptConverter.class)
+    @Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
     private String phoneNumber;
 
     @Column(name = "mobile_number", length = 50)
     @Comment("휴대폰 번호")
-    @Convert(converter = PersonalDataEncryptConverter.class)
+    @Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
     private String mobileNumber;
 
     @Column(name = "email_addr", length = 200)
     @Comment("이메일주소")
-    @Convert(converter = PersonalDataEncryptConverter.class)
+    @Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
     private String emailAddr;
 
     @ManyToOne(fetch = FetchType.EAGER)

src/main/java/com/eactive/apim/portal/portaluser/entity/TwoFactorAuth.java

@@ -1,7 +1,7 @@
 package com.eactive.apim.portal.portaluser.entity;
 
-import com.eactive.apim.portal.jpa.PersonalDataEncryptConverter;
 import com.eactive.eai.data.converter.LocalDateTimeToStringConverter14;
+import kjb.safedb.KjbNotRnnoJpaAttributeConverter;
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
@@ -25,14 +25,9 @@ public class TwoFactorAuth {
     private String id;
 
     @Column(name = "recipient", length = 255)
-    @Convert(converter = PersonalDataEncryptConverter.class)
+    @Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
     private String recipient;
 
-    // recipient 가 암호화 컬럼이라 값으로 동등 조회/중복정리가 불가능하므로,
-    // recipient 평문의 결정적 해시(HMAC-SHA256, hex)를 별도 조회 키로 둔다. (비암호화)
-    @Column(name = "recipient_key", length = 64)
-    private String recipientKey;
-
     @Column(name = "auth_number", length = 255)
     private String authNumber;
 
@@ -54,14 +49,6 @@ public class TwoFactorAuth {
         this.recipient = recipient;
     }
 
-    public String getRecipientKey() {
-        return recipientKey;
-    }
-
-    public void setRecipientKey(String recipientKey) {
-        this.recipientKey = recipientKey;
-    }
-
     public String getAuthNumber() {
         return authNumber;
     }

src/main/java/com/eactive/apim/portal/portaluser/repository/PortalUserRepository.java

@@ -28,11 +28,6 @@ public interface PortalUserRepository extends BaseRepository<PortalUser, String>
 
     boolean existsByLoginId(String loginId);
 
-    boolean existsByMobileNumber(String mobileNumber);
-
-    // 휴대폰 번호 기반 기존 회원 조회 (mobileNumber 는 유니크 제약이 없어 다건 가능)
-    List<PortalUser> findAllByMobileNumber(String mobileNumber);
-
     @Query("SELECT u FROM PortalUser u WHERE u.portalOrg = :org AND u.userStatus != :status")
     Page<PortalUser> findActiveUsers(@Param("org") PortalOrg org, @Param("status") PortalUserEnums.UserStatus status, Pageable pageable);
 
@@ -41,12 +36,5 @@ public interface PortalUserRepository extends BaseRepository<PortalUser, String>
     long countByPortalOrg(PortalOrg portalOrg);
 
     Optional<PortalUser> findByUserName(String userName);
-
-    // 암복
-    @Query(
-            value = "select * from ${ems.datasource.schema}.ptl_user where email_addr = :emailAddr",
-            nativeQuery = true
-    )
-    Optional<PortalUser> findByEmailAddrRaw(@Param("emailAddr") String emailAddr);
 }
 

src/main/java/com/eactive/apim/portal/portaluser/repository/TwoFactorAuthRepository.java

@@ -6,16 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.Optional;
 
 public interface TwoFactorAuthRepository extends JpaRepository<TwoFactorAuth, String> {
-
-    // recipientKey(결정적 해시) 기반 조회/정리. recipient 가 암호화 컬럼이라 값 동등 조회가 깨지는 문제를 우회한다.
-    Optional<TwoFactorAuth> findByRecipientKey(String recipientKey);
-
-    void deleteAllByRecipientKey(String recipientKey);
-
-    // 아래 두 메서드는 recipient(암호화 컬럼) 기반이라 신뢰할 수 없음 — 신규 코드에서는 RecipientKey 버전을 사용할 것.
-    @Deprecated
     Optional<TwoFactorAuth> findByRecipient(String recipientKey);
 
-    @Deprecated
     void deleteAllByRecipient(String recipient);
 }

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

@@ -49,7 +49,6 @@ public class Inquiry extends Auditable {
 
     /**
      * 문의 상태 (예: 대기중, 답변 완료 등)
-     * @DjbInquiryStatus 참조
      */
     @Column(name = "INQUIRY_STATUS", length = 32)
     private String inquiryStatus;

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

@@ -25,6 +25,7 @@ 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),
@@ -33,10 +34,11 @@ public enum MessageCode {
     INQUIRY_CREATED("Q&A 등록 알림", null, Channels.NONE),
     INQUIRY_COMMENT_CREATED("Q&A 댓글 등록 알림", null, Channels.NONE),
     
-    // 제주은행
+    
-    API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.SWING),
+    // API상태 모니터링
-    INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.SWING),
+    API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.MESSENGER),
-    ADMIN_VERIFICATION_MOBILEPHONE("관리자포탈 휴대폰 번호 인증", "FM_APIM013", Channels.KAKAO_ALIMTALK),
+    // 유량제어 토큰 획득 실패
+    INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.MESSENGER),
 
 
     // 미 사용, 미 분류
@@ -120,7 +122,7 @@ public enum MessageCode {
         NONE            (0b0000),
         EMAIL           (0b0001),
         KAKAO_ALIMTALK  (0b0010),
-        SWING		(0b0100),
+        MESSENGER		(0b0100),
         ;
 
         @Getter

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

@@ -1,9 +1,9 @@
 package com.eactive.apim.portal.template.entity;
 
 
-import com.eactive.apim.portal.jpa.PersonalDataEncryptConverter;
 import com.eactive.apim.portal.portaluser.entity.PortalUser;
 import com.eactive.eai.data.converter.LocalDateTimeToStringConverter14;
+import kjb.safedb.KjbNotRnnoJpaAttributeConverter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -53,10 +53,10 @@ public class MessageRequest implements Serializable {
 
     private String username;
 
-    @Convert(converter = PersonalDataEncryptConverter.class)
+    @Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
     private String email;
 
-    @Convert(converter = PersonalDataEncryptConverter.class)
+    @Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
     private String phone;
 
     @ManyToOne(fetch = FetchType.EAGER)
@@ -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/MessageRecipient.java

@@ -11,8 +11,7 @@ import lombok.*;
 @Builder
 public class MessageRecipient {
     private String username;
-    private String userId; 
+    private String userId; //email
-    private String email;
     private String phone;
     private String messengerId;
 
@@ -20,8 +19,7 @@ public class MessageRecipient {
     public static MessageRecipient of(PortalUser user) {
         MessageRecipient recipient = new MessageRecipient();
         recipient.setUsername(user.getUserName());
-        recipient.setUserId(user.getLoginId());
+        recipient.setUserId(user.getEmailAddr());
-        recipient.setEmail(user.getEmailAddr());
         recipient.setPhone(user.getPhoneNumber());
         return recipient;
     }

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

@@ -59,7 +59,7 @@ public class MessageSendService {
         List<MessageRecipient> recipients = new ArrayList<>();
 
         for (UserInfo user : template.getAdditionalRecipients()) {
-            MessageRecipient messageRecipient = new MessageRecipient(user.getUsername(), user.getUserid(), user.getEmad(), user.getCphnno(), user.getUserid());
+            MessageRecipient messageRecipient = new MessageRecipient(user.getUsername(), user.getUserid(), user.getCphnno(), user.getUserid());
             recipients.add(messageRecipient);
         }
 
@@ -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,14 +105,13 @@ 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");
             MessageRequest messengerRequest = new MessageRequest();
             messengerRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode()));
             messengerRequest.setSubject(subject);
@@ -121,11 +120,7 @@ public class MessageSendService {
             messengerRequest.setRequestDate(LocalDateTime.now());
             messengerRequest.setUsername(user.getUsername());
             messengerRequest.setMessengerId(user.getUserId());
-            messengerRequest.setEaiInterfaceId(swingEaiInterfaceId);
-            messengerRequest.setServiceId(portalProperties.get("ums.messenger.tx_id"));
-            messengerRequest.setMessageType("MESSENGER");
             messageRequestRepository.save(messengerRequest);
-            logger.debug(messengerRequest.toString());
         }
     }
 

src/main/java/com/eactive/apim/portal/user/entity/UserInfo.java

@@ -1,20 +1,28 @@
 package com.eactive.apim.portal.user.entity;
 
-import com.eactive.apim.portal.jpa.PersonalDataEncryptConverter;
+import java.io.Serializable;
-import com.eactive.eai.data.converter.LocalDateTimeToStringConverter14;
+import java.time.LocalDateTime;
-import com.eactive.eai.data.converter.StringTrimConverter;
+
-import com.eactive.eai.data.entity.AbstractEntity;
+import javax.persistence.Cacheable;
-import lombok.Data;
+import javax.persistence.Column;
-import lombok.EqualsAndHashCode;
+import javax.persistence.Convert;
-import lombok.NonNull;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Comment;
 import org.springframework.data.annotation.LastModifiedDate;
 
-import javax.persistence.*;
+import com.eactive.eai.data.converter.LocalDateTimeToStringConverter14;
-import java.io.Serializable;
+import com.eactive.eai.data.converter.StringTrimConverter;
-import java.time.LocalDateTime;
+import com.eactive.eai.data.entity.AbstractEntity;
+import kjb.safedb.KjbNotRnnoJpaAttributeConverter;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NonNull;
 
 @Data
 @EqualsAndHashCode(onlyExplicitlyIncluded = true, callSuper = true)
@@ -46,7 +54,7 @@ public class UserInfo extends AbstractEntity<String> implements Serializable {
 
 	@Column(length = 40)
 	@Comment("휴대폰 번호")
-	@Convert(converter = PersonalDataEncryptConverter.class)
+	@Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
 	private String cphnno;
 
 	@Column(length = 40)
@@ -55,7 +63,7 @@ public class UserInfo extends AbstractEntity<String> implements Serializable {
 
 	@Column(length = 100)
 	@Comment("이메일 주소")
-	@Convert(converter = PersonalDataEncryptConverter.class)
+	@Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
 	private String emad;
 
 	@Column(length = 3)

src/main/java/com/eactive/apim/portal/user/entity/UserLog.java

@@ -1,11 +1,18 @@
 package com.eactive.apim.portal.user.entity;
 
-import com.eactive.apim.portal.jpa.PersonalDataEncryptConverter;
 import com.eactive.eai.data.converter.LocalDateTimeToStringConverter14;
-import lombok.Data;
-
-import javax.persistence.*;
 import java.time.LocalDateTime;
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import kjb.safedb.KjbNotRnnoJpaAttributeConverter;
+import lombok.Data;
 
 @TableGenerator(
     name = "USER_LOGIN_LOG_GEN",
@@ -25,7 +32,7 @@ public class UserLog {
     private Long logId;
 
     @Column(name = "login_id", nullable = false)
-    @Convert(converter = PersonalDataEncryptConverter.class)
+    @Convert(converter = KjbNotRnnoJpaAttributeConverter.class)
     private String loginId;
 
     @Column(name = "login_time")

src/main/java/kjb/safedb/KjbNotRnnoJpaAttributeConverter.java

@@ -0,0 +1,116 @@
+package kjb.safedb;
+
+//import com.eactive.ext.kjb.safedb.KjbSafedbWrapper;
+//import com.eactive.ext.kjb.safedb.SafeDBColumns;
+//import com.eactive.ext.kjb.safedb.Utils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+@Converter
+@Slf4j
+public class KjbNotRnnoJpaAttributeConverter implements AttributeConverter<String, String> {
+    private static final Logger needFixLogger = LoggerFactory.getLogger("eapim.portal.needfix");
+
+    /**
+     * 암호화
+     * @param attribute  the entity attribute value to be converted
+     * @return
+     */
+    @Override
+    public String convertToDatabaseColumn(String attribute) {
+//        log.debug("DB 암호화 #1 - {} / {}", attribute, SafeDBColumns.NOT_RNNO);
+
+//        String originalAttribute = attribute;
+//        if (StringUtils.isNotEmpty(attribute)) {
+//            KjbSafedbWrapper wrapper = KjbSafedbWrapper.getInstance();
+//            attribute = wrapper.encryptNotRnnoString(attribute);
+//
+//            if (log.isDebugEnabled()) {
+//                //  originalAttribute 홀수 글자 마스킹
+//                StringBuilder sb = new StringBuilder();
+//                for (int i = 0; i < originalAttribute.length(); i++) {
+//                    if (i % 2 == 0) {
+//                        sb.append(originalAttribute.charAt(i));
+//                    } else {
+//                        sb.append("*");
+//                    }
+//                }
+//
+//                originalAttribute = sb.toString();
+//                log.debug("DB 암호화 #2 : {} -> {}", originalAttribute, attribute);
+//            }
+//        }
+
+        return attribute;
+    }
+
+    /**
+     * 복호화
+     * @param dbData  the data from the database column to be
+     *                converted
+     * @return
+     */
+    @Override
+    public String convertToEntityAttribute(String dbData) {
+//        log.debug("DB 복호화 #1 - {} / {}", dbData, SafeDBColumns.NOT_RNNO);
+
+//        String dbDataOriginal = dbData;
+//        if (StringUtils.isNotEmpty(dbData)) {
+//            if (this.isEncrypted(dbData)) {
+//                KjbSafedbWrapper safeDBWrapper = KjbSafedbWrapper.getInstance();
+//                try {
+//                    dbData = safeDBWrapper.decryptNotRnno(dbData);
+//                } catch (Exception e) {
+//                    // 복호화 실패시 원본 반환
+//                    String logData = dbData.length() <= 3 ? dbData : dbData.substring(0, 3) + "...";
+//                    log.warn("DB 복호화 실패: 복호화하지 않고 원본 반환. dbData={} (Length : {})",  logData, dbData.length());
+//                    needFixLogger.warn("DB 복호화 실패: 복호화하지 않고 원본 반환. dbData={} (Length : {})",  logData, dbData.length(), e);
+//                    return dbData;
+//                }
+//            } else {
+//                log.debug("DB 복호화 경고: Base64 형식이 아님. 복호화하지 않고 원본 반환. dbData={}", dbData);
+//            }
+//        }
+
+//        log.debug("DB 복호화 #2 : {} -> {}", dbDataOriginal, dbData);
+
+        return dbData;
+    }
+
+    /**
+     * 암호화 여부 확인(base64 인코딩 여부로 판단, 또는 0-9, - 로 구성된 경우 암호화 되지 않은 걸로 판단(연락처))
+     * @param data
+     * @return
+     */
+    private boolean isEncrypted(String data) {
+//        if (StringUtils.isEmpty(data)) {
+//            return false;
+//        }
+//
+//        // 숫자, - 로만 구성된 경우 암호화 되지 않은 걸로 판단 (ex: 연락처)
+//        if (data.matches("^[0-9-]+$")) {
+//            return false;
+//        }
+//
+//        data = data.trim();
+//
+//        // Base64 형식 체크
+//        if (!Utils.isBase64(data)) {
+//            return false;
+//        }
+//
+//        // Base64 길이 체크 (4의 배수)
+//        if (data.length() % 4 != 0) {
+//            return false;
+//        }
+//
+//
+//        return true;
+    	return false;
+    }
+}