diff --git a/build.gradle b/build.gradle index d8587a5..826982d 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.1.13" + implementation "com.kri.common:starter:beta.1.1.24" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/notihub/server/common/consts/NotihubConst.java b/src/main/java/com/kri/notihub/server/common/consts/NotihubConst.java index 8e2321a..620430b 100644 --- a/src/main/java/com/kri/notihub/server/common/consts/NotihubConst.java +++ b/src/main/java/com/kri/notihub/server/common/consts/NotihubConst.java @@ -2,7 +2,9 @@ package com.kri.notihub.server.common.consts; import com.kri.notihub.server.common.enums.SendType; import java.util.List; +import lombok.NoArgsConstructor; +@NoArgsConstructor public final class NotihubConst { public static final String NATION_CODE = "82"; @@ -30,6 +32,4 @@ public final class NotihubConst { public static final short KKO_AT_STANDBY = 7900; public static final short KKO_AT_SUCCESS = 7000; - private NotihubConst() { - } } diff --git a/src/main/java/com/kri/notihub/server/controller/TemplateController.java b/src/main/java/com/kri/notihub/server/controller/TemplateController.java index 21ccbbc..39b00f8 100644 --- a/src/main/java/com/kri/notihub/server/controller/TemplateController.java +++ b/src/main/java/com/kri/notihub/server/controller/TemplateController.java @@ -84,12 +84,14 @@ public class TemplateController { @Valid @RequestBody TemplateDto template, RequestUserContext ctx ) { - String newHtml = fileService.syncOnSave( - template.getItrntPrjctCd(), - template.getTmplatIdx(), - template.getTmplatBody() - ); - template.setTmplatBody(newHtml); + if (template.getTmplatTy() == SendType.EMAIL) { + String newHtml = fileService.syncOnSave( + template.getItrntPrjctCd(), + template.getTmplatIdx(), + template.getTmplatBody() + ); + template.setTmplatBody(newHtml); + } return templateService.updateTemplate(template, ctx.getUserId()); } diff --git a/src/main/java/com/kri/notihub/server/persistence/entity/TUnitPriceEntity.java b/src/main/java/com/kri/notihub/server/persistence/entity/TUnitPriceEntity.java new file mode 100644 index 0000000..868ad04 --- /dev/null +++ b/src/main/java/com/kri/notihub/server/persistence/entity/TUnitPriceEntity.java @@ -0,0 +1,54 @@ +package com.kri.notihub.server.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.Instant; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; + +@Getter +@Setter +@Entity +@Table(name = "t_unit_price") +public class TUnitPriceEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "unit_price_idx", nullable = false) + private Integer id; + + @NotNull + @Column(name = "send_ty", nullable = false) + private Short sendTy; + + @NotNull + @Column(name = "send_corp", nullable = false) + private Short sendCorp; + + @NotNull + @Column(name = "price", nullable = false) + private Integer price; + + @NotNull + @Column(name = "is_use", nullable = false) + private Boolean use; + + @Size(max = 32) + @NotNull + @Column(name = "reg_user", nullable = false, length = 32) + private String regUser; + + @NotNull + @ColumnDefault("CURRENT_TIMESTAMP") + @Column(name = "reg_dt", nullable = false) + private Instant regDt; + + +} \ No newline at end of file diff --git a/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java b/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java index 1a6468f..003efe3 100644 --- a/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java +++ b/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java @@ -75,8 +75,13 @@ public abstract class AbstractPringoSendService extends AbstractSendService { return SendInternalResultDto.of(cmid, SendStatusType.STANDBY, NotihubConst.EMAIL_STANDBY); } else { - PringoJsonSendRequestDto pringoReq = buildPringoSendRequest(sendEml, sendNm, msgTitle, - msgBody, dest); + PringoJsonSendRequestDto pringoReq = buildPringoSendRequest( + sendEml, + sendNm, + msgTitle, + msgBody, + dest + ); return sendPringoEmail(pringoReq); } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index dea13bb..54cbf55 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,6 +1,14 @@ kri: body-image: public-base-url: https://noti-hub.kric.com/body-image + auth: + apikey: + # apikey 보관 DB(MySQL) + db: + url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/kri_common?characterEncoding=UTF-8 + username: kriit + password: it#51304 + driver-class-name: com.mysql.cj.jdbc.Driver spring: datasource: diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 20fd753..e089423 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -4,6 +4,14 @@ kri: initial-delay-ms: 3000 body-image: public-base-url: http://localhost:4011/body-image + auth: + apikey: + # apikey 보관 DB(MySQL) + db: + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/kri_common?characterEncoding=UTF-8 + username: kriit + password: it#51304 + driver-class-name: com.mysql.cj.jdbc.Driver spring: datasource: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index dea13bb..4be310c 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,7 +1,14 @@ kri: body-image: public-base-url: https://noti-hub.kric.com/body-image - + auth: + apikey: + # apikey 보관 DB(MySQL) + db: + url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/kri_common?characterEncoding=UTF-8 + username: kriit + password: it#51304 + driver-class-name: com.mysql.cj.jdbc.Driver spring: datasource: #private 도메인 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cf4000d..39259da 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -58,12 +58,6 @@ kri: - 127.0.0.1/32 - 0:0:0:0:0:0:0:1 - 211.254.145.130 - # apikey 보관 DB(MySQL) - db: - url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/kri_common?characterEncoding=UTF-8 - username: kriit - password: it#51304 - driver-class-name: com.mysql.cj.jdbc.Driver security: enabled: true @@ -91,8 +85,6 @@ kri: web: enabled: true # 공통 Web 구성 사용 여부 (기본 true) - webmvc: - enabled: true # 공통 Webmvc 구성 사용 여부 (기본 true) redis: enabled: false # RedisQueueHelper 사용 시 true scheduling: