diff --git a/build.gradle b/build.gradle index 98e0e42..11d7ec9 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.0.68" + implementation "com.kri.common:starter:beta.1.1.02" 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/enums/ChannelType.java b/src/main/java/com/kri/notihub/server/common/enums/ChannelType.java index 964afa1..bc7ba48 100644 --- a/src/main/java/com/kri/notihub/server/common/enums/ChannelType.java +++ b/src/main/java/com/kri/notihub/server/common/enums/ChannelType.java @@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/notihub/server/common/enums/SendCorpType.java b/src/main/java/com/kri/notihub/server/common/enums/SendCorpType.java index 629b26f..4a00827 100644 --- a/src/main/java/com/kri/notihub/server/common/enums/SendCorpType.java +++ b/src/main/java/com/kri/notihub/server/common/enums/SendCorpType.java @@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/notihub/server/common/enums/SendEmailType.java b/src/main/java/com/kri/notihub/server/common/enums/SendEmailType.java index e03fb73..65f0995 100644 --- a/src/main/java/com/kri/notihub/server/common/enums/SendEmailType.java +++ b/src/main/java/com/kri/notihub/server/common/enums/SendEmailType.java @@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/notihub/server/common/enums/SendKkoAtType.java b/src/main/java/com/kri/notihub/server/common/enums/SendKkoAtType.java index a6c7e9b..d5b2d5b 100644 --- a/src/main/java/com/kri/notihub/server/common/enums/SendKkoAtType.java +++ b/src/main/java/com/kri/notihub/server/common/enums/SendKkoAtType.java @@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/notihub/server/common/enums/SendSmsType.java b/src/main/java/com/kri/notihub/server/common/enums/SendSmsType.java index f7a0678..bec67ae 100644 --- a/src/main/java/com/kri/notihub/server/common/enums/SendSmsType.java +++ b/src/main/java/com/kri/notihub/server/common/enums/SendSmsType.java @@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/notihub/server/common/enums/SendStatusType.java b/src/main/java/com/kri/notihub/server/common/enums/SendStatusType.java index 9aa85dd..312f991 100644 --- a/src/main/java/com/kri/notihub/server/common/enums/SendStatusType.java +++ b/src/main/java/com/kri/notihub/server/common/enums/SendStatusType.java @@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/notihub/server/common/enums/SendType.java b/src/main/java/com/kri/notihub/server/common/enums/SendType.java index 8911667..e901296 100644 --- a/src/main/java/com/kri/notihub/server/common/enums/SendType.java +++ b/src/main/java/com/kri/notihub/server/common/enums/SendType.java @@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/notihub/server/common/enums/TemplateEventType.java b/src/main/java/com/kri/notihub/server/common/enums/TemplateEventType.java index 8f798bf..63220d8 100644 --- a/src/main/java/com/kri/notihub/server/common/enums/TemplateEventType.java +++ b/src/main/java/com/kri/notihub/server/common/enums/TemplateEventType.java @@ -1,6 +1,6 @@ package com.kri.notihub.server.common.enums; -import com.kri.common.enums.CodeEnum; +import com.kri.common.feature.enums.CodeEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/notihub/server/common/external/pringo/PringoApiClient.java b/src/main/java/com/kri/notihub/server/common/external/pringo/PringoApiClient.java index 55ec7f4..6bb46f5 100644 --- a/src/main/java/com/kri/notihub/server/common/external/pringo/PringoApiClient.java +++ b/src/main/java/com/kri/notihub/server/common/external/pringo/PringoApiClient.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.kri.common.http.ExternalApiClient; -import com.kri.common.http.ExternalApiResponse; +import com.kri.common.feature.http.ExternalApiClient; +import com.kri.common.feature.http.ExternalApiResponse; import com.kri.notihub.server.common.external.pringo.dto.PringoJsonReturnErrorDto; import com.kri.notihub.server.common.external.pringo.dto.PringoJsonReturnItemDto; import com.kri.notihub.server.common.external.pringo.dto.PringoJsonReturnRequestDto; diff --git a/src/main/java/com/kri/notihub/server/common/external/pringo/dto/PringoJsonReturnRequestDto.java b/src/main/java/com/kri/notihub/server/common/external/pringo/dto/PringoJsonReturnRequestDto.java index 9ead600..ab4a77d 100644 --- a/src/main/java/com/kri/notihub/server/common/external/pringo/dto/PringoJsonReturnRequestDto.java +++ b/src/main/java/com/kri/notihub/server/common/external/pringo/dto/PringoJsonReturnRequestDto.java @@ -1,7 +1,7 @@ package com.kri.notihub.server.common.external.pringo.dto; import com.fasterxml.jackson.annotation.JsonProperty; -import com.kri.common.util.StringUtil; +import com.kri.common.feature.util.StringUtil; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -44,4 +44,4 @@ public class PringoJsonReturnRequestDto { throw new IllegalArgumentException("return_key is required."); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java b/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java index c240102..791a3ca 100644 --- a/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java +++ b/src/main/java/com/kri/notihub/server/common/util/TemplateContentSanitizer.java @@ -1,6 +1,6 @@ package com.kri.notihub.server.common.util; -import com.kri.common.util.StringUtil; +import com.kri.common.feature.util.StringUtil; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.template.TemplateBasicDto; import java.nio.charset.StandardCharsets; @@ -168,4 +168,4 @@ public final class TemplateContentSanitizer { public record SanitizedTemplate(SendType type, String title, String body) { } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/notihub/server/controller/ReportController.java b/src/main/java/com/kri/notihub/server/controller/ReportController.java index 9724066..299f24a 100644 --- a/src/main/java/com/kri/notihub/server/controller/ReportController.java +++ b/src/main/java/com/kri/notihub/server/controller/ReportController.java @@ -1,8 +1,8 @@ package com.kri.notihub.server.controller; -import com.kri.common.webmvc.RequestUserContext; -import com.kri.common.webmvc.page.PageRequestDto; -import com.kri.common.webmvc.page.PageResponseDto; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.common.feature.web.page.PageRequestDto; +import com.kri.common.feature.web.page.PageResponseDto; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.report.BulkSendInfoDto; diff --git a/src/main/java/com/kri/notihub/server/controller/SendEmailController.java b/src/main/java/com/kri/notihub/server/controller/SendEmailController.java index 71ec135..03bc89a 100644 --- a/src/main/java/com/kri/notihub/server/controller/SendEmailController.java +++ b/src/main/java/com/kri/notihub/server/controller/SendEmailController.java @@ -1,6 +1,6 @@ package com.kri.notihub.server.controller; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.web.RequestUserContext; import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto; import com.kri.notihub.server.dto.send.BulkSendResponseDto; import com.kri.notihub.server.dto.send.EmailPollQueueResponseDto; diff --git a/src/main/java/com/kri/notihub/server/controller/SendKkoAtController.java b/src/main/java/com/kri/notihub/server/controller/SendKkoAtController.java index 80a1432..753589c 100644 --- a/src/main/java/com/kri/notihub/server/controller/SendKkoAtController.java +++ b/src/main/java/com/kri/notihub/server/controller/SendKkoAtController.java @@ -1,6 +1,6 @@ package com.kri.notihub.server.controller; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.web.RequestUserContext; import com.kri.notihub.server.dto.send.BizppurioCursorResponseDto; import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto; import com.kri.notihub.server.dto.send.BulkSendResponseDto; diff --git a/src/main/java/com/kri/notihub/server/controller/SendSmsController.java b/src/main/java/com/kri/notihub/server/controller/SendSmsController.java index 0e91d82..a80b76b 100644 --- a/src/main/java/com/kri/notihub/server/controller/SendSmsController.java +++ b/src/main/java/com/kri/notihub/server/controller/SendSmsController.java @@ -1,6 +1,6 @@ package com.kri.notihub.server.controller; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.web.RequestUserContext; import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto; import com.kri.notihub.server.dto.send.BulkSendResponseDto; import com.kri.notihub.server.dto.send.SendRequestBulkDto; 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 ec4f753..21ccbbc 100644 --- a/src/main/java/com/kri/notihub/server/controller/TemplateController.java +++ b/src/main/java/com/kri/notihub/server/controller/TemplateController.java @@ -1,6 +1,6 @@ package com.kri.notihub.server.controller; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.web.RequestUserContext; import com.kri.notihub.server.common.enums.ChannelType; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.template.TemplateBasicDto; diff --git a/src/main/java/com/kri/notihub/server/dto/report/SendInfoDto.java b/src/main/java/com/kri/notihub/server/dto/report/SendInfoDto.java index 12b98e9..93fb5f7 100644 --- a/src/main/java/com/kri/notihub/server/dto/report/SendInfoDto.java +++ b/src/main/java/com/kri/notihub/server/dto/report/SendInfoDto.java @@ -1,6 +1,6 @@ package com.kri.notihub.server.dto.report; -import com.kri.common.excel.ExcelColumn; +import com.kri.common.feature.excel.ExcelColumn; import com.kri.notihub.server.common.enums.SendStatusType; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.persistence.entity.TSendEntity; diff --git a/src/main/java/com/kri/notihub/server/dto/send/EmailPollQueueItemDto.java b/src/main/java/com/kri/notihub/server/dto/send/EmailPollQueueItemDto.java index a46bc65..9edc9fe 100644 --- a/src/main/java/com/kri/notihub/server/dto/send/EmailPollQueueItemDto.java +++ b/src/main/java/com/kri/notihub/server/dto/send/EmailPollQueueItemDto.java @@ -1,7 +1,7 @@ package com.kri.notihub.server.dto.send; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.feature.datetime.DateTimeUtil; import io.swagger.v3.oas.annotations.media.Schema; import java.time.Instant; import java.time.LocalDateTime; @@ -38,4 +38,4 @@ public class EmailPollQueueItemDto { .triggerAt(DateTimeUtil.toKstLocalDateTime(Instant.ofEpochMilli(triggerAtEpochMs))) .build(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/notihub/server/dto/send/SendRequestSingleDto.java b/src/main/java/com/kri/notihub/server/dto/send/SendRequestSingleDto.java index 071a665..e8fdd75 100644 --- a/src/main/java/com/kri/notihub/server/dto/send/SendRequestSingleDto.java +++ b/src/main/java/com/kri/notihub/server/dto/send/SendRequestSingleDto.java @@ -1,7 +1,7 @@ package com.kri.notihub.server.dto.send; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kri.common.datetime.LenientLocalDateTime; +import com.kri.common.feature.datetime.LenientLocalDateTime; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/kri/notihub/server/persistence/entity/TBulkSendEntity.java b/src/main/java/com/kri/notihub/server/persistence/entity/TBulkSendEntity.java index 0597ba6..b64ed5a 100644 --- a/src/main/java/com/kri/notihub/server/persistence/entity/TBulkSendEntity.java +++ b/src/main/java/com/kri/notihub/server/persistence/entity/TBulkSendEntity.java @@ -1,6 +1,6 @@ package com.kri.notihub.server.persistence.entity; -import com.kri.common.jpa.BaseUuidEntity; +import com.kri.common.feature.jpa.BaseUuidEntity; import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -45,6 +45,7 @@ public class TBulkSendEntity extends BaseUuidEntity { @NotNull @Column(name = "is_resve", nullable = false) + @Builder.Default private Boolean resve = false; @NotNull @@ -118,4 +119,4 @@ public class TBulkSendEntity extends BaseUuidEntity { protected int idLength() { return 32; // cmid가 32면 생략해도 되지만 명시해두면 안전 } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/notihub/server/persistence/entity/TSendEntity.java b/src/main/java/com/kri/notihub/server/persistence/entity/TSendEntity.java index 246a7d3..f7f21e3 100644 --- a/src/main/java/com/kri/notihub/server/persistence/entity/TSendEntity.java +++ b/src/main/java/com/kri/notihub/server/persistence/entity/TSendEntity.java @@ -56,6 +56,7 @@ public class TSendEntity { @NotNull @Column(name = "is_resve", nullable = false) + @Builder.Default private boolean resve = false; @NotNull @@ -261,4 +262,4 @@ public class TSendEntity { .regDt(regDt) .build(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/notihub/server/persistence/entity/TTmplatEntity.java b/src/main/java/com/kri/notihub/server/persistence/entity/TTmplatEntity.java index bc96966..b8f1c24 100644 --- a/src/main/java/com/kri/notihub/server/persistence/entity/TTmplatEntity.java +++ b/src/main/java/com/kri/notihub/server/persistence/entity/TTmplatEntity.java @@ -106,6 +106,7 @@ public class TTmplatEntity { @NotNull @ColumnDefault("0") @Column(name = "is_del", nullable = false) + @Builder.Default private Boolean del = false; @Size(max = 32) @@ -156,4 +157,4 @@ public class TTmplatEntity { this.modUser = modUser; this.modDt = modDt; } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/notihub/server/scheduler/BizLogResultScheduler.java b/src/main/java/com/kri/notihub/server/scheduler/BizLogResultScheduler.java index 1613b72..db8383b 100644 --- a/src/main/java/com/kri/notihub/server/scheduler/BizLogResultScheduler.java +++ b/src/main/java/com/kri/notihub/server/scheduler/BizLogResultScheduler.java @@ -1,7 +1,7 @@ package com.kri.notihub.server.scheduler; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.util.StringUtil; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.util.StringUtil; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.SendStatusType; import com.kri.notihub.server.common.enums.SendType; diff --git a/src/main/java/com/kri/notihub/server/scheduler/SendReservationEmailScheduler.java b/src/main/java/com/kri/notihub/server/scheduler/SendReservationEmailScheduler.java index 453fe95..e46b1fb 100644 --- a/src/main/java/com/kri/notihub/server/scheduler/SendReservationEmailScheduler.java +++ b/src/main/java/com/kri/notihub/server/scheduler/SendReservationEmailScheduler.java @@ -1,6 +1,6 @@ package com.kri.notihub.server.scheduler; -import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.common.external.pringo.PringoApiClient; diff --git a/src/main/java/com/kri/notihub/server/service/AbstractBizppurioSendService.java b/src/main/java/com/kri/notihub/server/service/AbstractBizppurioSendService.java index 7943fca..ec771d1 100644 --- a/src/main/java/com/kri/notihub/server/service/AbstractBizppurioSendService.java +++ b/src/main/java/com/kri/notihub/server/service/AbstractBizppurioSendService.java @@ -1,6 +1,6 @@ package com.kri.notihub.server.service; -import com.kri.common.util.CommonUtil; +import com.kri.common.feature.util.CommonUtil; import com.kri.notihub.server.common.enums.ChannelType; import com.kri.notihub.server.common.enums.SendStatusType; import com.kri.notihub.server.common.enums.SendType; 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 b0023ac..1a6468f 100644 --- a/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java +++ b/src/main/java/com/kri/notihub/server/service/AbstractPringoSendService.java @@ -1,8 +1,8 @@ package com.kri.notihub.server.service; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.util.CommonUtil; -import com.kri.common.util.NumericUtil; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.util.CommonUtil; +import com.kri.common.feature.util.NumericUtil; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.ChannelType; import com.kri.notihub.server.common.enums.SendStatusType; diff --git a/src/main/java/com/kri/notihub/server/service/AbstractSendService.java b/src/main/java/com/kri/notihub/server/service/AbstractSendService.java index 442945b..cbb0ed6 100644 --- a/src/main/java/com/kri/notihub/server/service/AbstractSendService.java +++ b/src/main/java/com/kri/notihub/server/service/AbstractSendService.java @@ -2,8 +2,8 @@ package com.kri.notihub.server.service; import static org.apache.commons.lang3.StringUtils.firstNonBlank; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.BusinessException; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.ChannelType; import com.kri.notihub.server.common.enums.SendStatusType; diff --git a/src/main/java/com/kri/notihub/server/service/EmailResultUpdater.java b/src/main/java/com/kri/notihub/server/service/EmailResultUpdater.java index d9d9f03..bda10bd 100644 --- a/src/main/java/com/kri/notihub/server/service/EmailResultUpdater.java +++ b/src/main/java/com/kri/notihub/server/service/EmailResultUpdater.java @@ -1,7 +1,7 @@ package com.kri.notihub.server.service; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.util.NumericUtil; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.util.NumericUtil; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.SendStatusType; import com.kri.notihub.server.common.external.pringo.PringoApiClient; diff --git a/src/main/java/com/kri/notihub/server/service/FileService.java b/src/main/java/com/kri/notihub/server/service/FileService.java index 625dc0a..ae3adbc 100644 --- a/src/main/java/com/kri/notihub/server/service/FileService.java +++ b/src/main/java/com/kri/notihub/server/service/FileService.java @@ -1,7 +1,7 @@ package com.kri.notihub.server.service; -import com.kri.common.file.FileUtil; -import com.kri.common.util.CommonUtil; +import com.kri.common.feature.file.FileUtil; +import com.kri.common.feature.util.CommonUtil; import java.io.IOException; import java.nio.file.DirectoryStream; import java.nio.file.Files; diff --git a/src/main/java/com/kri/notihub/server/service/ReportService.java b/src/main/java/com/kri/notihub/server/service/ReportService.java index 4d9aa19..b71a979 100644 --- a/src/main/java/com/kri/notihub/server/service/ReportService.java +++ b/src/main/java/com/kri/notihub/server/service/ReportService.java @@ -1,10 +1,10 @@ package com.kri.notihub.server.service; -import com.kri.common.excel.ExcelMapper; -import com.kri.common.web.BusinessException; -import com.kri.common.webmvc.page.PageRequestDto; -import com.kri.common.webmvc.page.PageResponseDto; -import com.kri.common.webmvc.page.Pageables; +import com.kri.common.feature.excel.ExcelMapper; +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.page.PageRequestDto; +import com.kri.common.feature.web.page.PageResponseDto; +import com.kri.common.feature.web.page.Pageables; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.report.BulkSendInfoDto; diff --git a/src/main/java/com/kri/notihub/server/service/TemplateService.java b/src/main/java/com/kri/notihub/server/service/TemplateService.java index d530562..f657039 100644 --- a/src/main/java/com/kri/notihub/server/service/TemplateService.java +++ b/src/main/java/com/kri/notihub/server/service/TemplateService.java @@ -1,8 +1,8 @@ package com.kri.notihub.server.service; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.util.StringUtil; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.util.StringUtil; +import com.kri.common.feature.web.BusinessException; import com.kri.notihub.server.common.consts.NotihubConst; import com.kri.notihub.server.common.enums.ChannelType; import com.kri.notihub.server.common.enums.SendType; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b0ac45b..7d01a4b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -87,7 +87,6 @@ kri: temp-expire-hours: 24 temp-cleanup-cron: "0 0 0 * * *" # 매일 00:00(초 분 시 일 월 요일) -common: web: enabled: true # 공통 Web 구성 사용 여부 (기본 true) webmvc: