From 379653e4970ee182af78537bf950a757670c812b Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Tue, 10 Sep 2024 17:49:36 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=ED=86=A1=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=98=EC=98=81=20-=20send=20=20=20=20?= =?UTF-8?q?=20=20=20-=20=EC=B9=B4=EC=B9=B4=EC=98=A4=ED=86=A1=20API?= =?UTF-8?q?=ED=82=A4=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/ctgy/sys/mng/domain/OrgMng.java | 104 ++++++++++-------- .../common/ctgy/sys/mng/model/OrgMngDTO.java | 30 ++++- 2 files changed, 84 insertions(+), 50 deletions(-) diff --git a/src/main/java/cokr/xit/ens/modules/common/ctgy/sys/mng/domain/OrgMng.java b/src/main/java/cokr/xit/ens/modules/common/ctgy/sys/mng/domain/OrgMng.java index 6a2931f..29c6309 100644 --- a/src/main/java/cokr/xit/ens/modules/common/ctgy/sys/mng/domain/OrgMng.java +++ b/src/main/java/cokr/xit/ens/modules/common/ctgy/sys/mng/domain/OrgMng.java @@ -1,20 +1,19 @@ package cokr.xit.ens.modules.common.ctgy.sys.mng.domain; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import lombok.experimental.SuperBuilder; -import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.annotations.UpdateTimestamp; +import java.time.*; -import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Id; import javax.persistence.Table; -import java.time.LocalDateTime; +import javax.persistence.*; + +import org.hibernate.annotations.*; + +import com.fasterxml.jackson.databind.annotation.*; +import com.fasterxml.jackson.datatype.jsr310.deser.*; +import com.fasterxml.jackson.datatype.jsr310.ser.*; + +import lombok.*; +import lombok.experimental.*; //@Data @Entity @@ -39,7 +38,7 @@ public class OrgMng { @Setter private String orgNm; - + @Column(name = "regist_dt", nullable = true) @CreationTimestamp @JsonSerialize(using = LocalDateTimeSerializer.class) @@ -54,20 +53,20 @@ public class OrgMng { private LocalDateTime lastUpdtDt; - + @Column(name = "kko_md_access_token", nullable = true, length = 50) @Setter private String kkoMdAccessToken; - + @Column(name = "kko_md_contract_uuid", nullable = true, length = 50) @Setter private String kkoMdContractUuid; - + @Column(name = "kko_bp_biller_code", nullable = true, length = 30) @Setter private String kkoBpBillerCode; - + @Column(name = "kko_bp_authorization", nullable = true, length = 64) @Setter private String kkoBpAuthorization; @@ -75,113 +74,130 @@ public class OrgMng { @Column(name = "kko_bp_csign_yn", nullable = true, length = 1) @Setter private String kkoBpCsignYn; - + @Column(name = "kko_bp_url_api", nullable = true, length = 100) @Setter private String kkoBpUrlApi; - + @Column(name = "kko_bp_notice_api", nullable = true, length = 100) @Setter private String kkoBpNoticeApi; - + @Column(name = "kko_bp_prepay_api", nullable = true, length = 100) @Setter private String kkoBpPrepayApi; - + @Column(name = "kko_bp_payresult_api", nullable = true, length = 100) @Setter private String kkoBpPayresultApi; - + @Column(name = "kko_at_bsid", nullable = true, length = 30) @Setter private String kkoAtBsid; - + @Column(name = "kko_at_passwd", nullable = true, length = 50) @Setter private String kkoAtPasswd; - + @Column(name = "kko_at_sender_key", nullable = true, length = 50) @Setter private String kkoAtSenderKey; - + // FIXME: 카카오톡 추가 //////////////////////////// + @Column(name = "kakao_partner_rest_api_key", nullable = true, length = 100) + @Setter + private String kakaoPartnerRestApiKey; + + @Column(name = "kakao_dealer_rest_api_key", nullable = true, length = 100) + @Setter + private String kakaoDealerRestApiKey; + + @Column(name = "kakao_dev_settle_id", nullable = true, length = 100) + @Setter + private String kakaoDevSettleId; + + @Column(name = "kakao_prod_settle_id", nullable = true, length = 100) + @Setter + private String kakaoProdSettleId; + // FIXME: 카카오톡 추가 //////////////////////// + @Column(name = "nice_cd_site_code", nullable = true, length = 30) @Setter private String niceCdSiteCode; - + @Column(name = "nice_cd_site_pw", nullable = true, length = 30) @Setter private String niceCdSitePw; - + @Column(name = "nice_cd_client_id", nullable = true, length = 50) @Setter private String niceCdClientId; - + @Column(name = "nice_cd_client_sercet", nullable = true, length = 50) @Setter private String niceCdClientSercet; - + @Column(name = "nv_st_x_naver_client_id", nullable = true, length = 30) @Setter private String nvStXNaverClientId; - + @Column(name = "nv_st_x_naver_client_secret", nullable = true, length = 30) @Setter private String nvStXNaverClientSecret; - + @Column(name = "nv_st_org_id", nullable = true, length = 50) @Setter private String nvStOrgId; - + @Column(name = "nv_bp_partner_id", nullable = true, length = 30) @Setter private String nvBpPartnerId; - + @Column(name = "nv_bp_client_id", nullable = true, length = 30) @Setter private String nvBpClientId; - + @Column(name = "nv_bp_client_secret", nullable = true, length = 30) @Setter private String nvBpClientSecret; - + @Column(name = "nv_bp_notice_api", nullable = true, length = 100) @Setter private String nvBpNoticeApi; - + @Column(name = "nv_bp_prepay_api", nullable = true, length = 100) @Setter private String nvBpPrepayApi; - + @Column(name = "nv_bp_payresult_api", nullable = true, length = 100) @Setter private String nvBpPayresultApi; - + @Column(name = "nv_bp_paycancel_api", nullable = true, length = 100) @Setter private String nvBpPaycancelApi; - + @Column(name = "kt_st_access_token", nullable = true, length = 1000) @Setter private String ktStAccessToken; - + @Column(name = "kt_st_service_cd", nullable = true, length = 5) @Setter private String ktStServiceCd; - - + + @Column(name = "kt_st_service_key", nullable = true, length = 100) @Setter private String ktStServiceKey; - + @Column(name = "kt_st_clientId", nullable = true, length = 50) @Setter private String ktStClientId; - + @Column(name = "kt_st_client_secret", nullable = true, length = 50) @Setter private String ktStClientSecret; diff --git a/src/main/java/cokr/xit/ens/modules/common/ctgy/sys/mng/model/OrgMngDTO.java b/src/main/java/cokr/xit/ens/modules/common/ctgy/sys/mng/model/OrgMngDTO.java index 6b14800..0dfe655 100644 --- a/src/main/java/cokr/xit/ens/modules/common/ctgy/sys/mng/model/OrgMngDTO.java +++ b/src/main/java/cokr/xit/ens/modules/common/ctgy/sys/mng/model/OrgMngDTO.java @@ -1,12 +1,12 @@ package cokr.xit.ens.modules.common.ctgy.sys.mng.model; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Builder; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Pattern; +import javax.validation.constraints.*; + +import org.hibernate.validator.constraints.*; + +import io.swagger.v3.oas.annotations.media.*; +import lombok.*; @Data @Builder @@ -64,6 +64,24 @@ public class OrgMngDTO { @Schema(required = false, title = "(계약정보)발송자키", example = " ") private String kkoAtSenderKey; + // FIXME: 카카오톡 추가 //////////////////////////// + @Length(max = 100, message = "카카오톡 파트너 API 키의 최대 길이를 초과 했습니다.") + @Schema(required = false, title = "카카오톡 파트너 API 키", example = " ") + private String kakaoPartnerRestApiKey; + + @Length(max = 100, message = "카카오톡 딜러 API 키의 최대 길이를 초과 했습니다.") + @Schema(required = false, title = "카카오톡 딜러 API 키", example = " ") + private String kakaoDealerRestApiKey; + + @Length(max = 100, message = "카카오톡 운영 settle ID의 최대 길이를 초과 했습니다.") + @Schema(required = false, title = "카카오톡 개발 settle ID", example = " ") + private String kakaoDevSettleId; + + @Length(max = 100, message = "카카오톡 운영 settle ID의 최대 길이를 초과 했습니다.") + @Schema(required = false, title = "카카오톡 개발 settle ID", example = " ") + private String kakaoProdSettleId; + // FIXME: 카카오톡 추가 //////////////////////// + @Length(max = 30, message = "(계약정보)사이트코드(socket)의 최대 길이를 초과 했습니다.") @Schema(required = false, title = "(계약정보)사이트코드(socket)", example = " ") private String niceCdSiteCode;