diff --git a/build.gradle b/build.gradle index 4544825..e705f96 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.0.70" + implementation "com.kri.common:starter:beta.1.1.01" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/lge/penetration/common/cache/VariableCache.java b/src/main/java/com/kri/lge/penetration/common/cache/VariableCache.java index aaa27e2..ccd5a60 100644 --- a/src/main/java/com/kri/lge/penetration/common/cache/VariableCache.java +++ b/src/main/java/com/kri/lge/penetration/common/cache/VariableCache.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.common.cache; -import com.kri.common.cache.AbstractMapCache; +import com.kri.common.feature.cache.AbstractMapCache; import com.kri.lge.penetration.dto.VariableDto; import com.kri.lge.penetration.persistence.entity.TVariableEntity; import com.kri.lge.penetration.persistence.repository.VariableRepository; diff --git a/src/main/java/com/kri/lge/penetration/common/cache/YearCache.java b/src/main/java/com/kri/lge/penetration/common/cache/YearCache.java index 3d6f469..5c3a5c5 100644 --- a/src/main/java/com/kri/lge/penetration/common/cache/YearCache.java +++ b/src/main/java/com/kri/lge/penetration/common/cache/YearCache.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.common.cache; -import com.kri.common.cache.AbstractListCache; +import com.kri.common.feature.cache.AbstractListCache; import com.kri.lge.penetration.persistence.repository.YearRepository; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/lge/penetration/common/enums/VariableType.java b/src/main/java/com/kri/lge/penetration/common/enums/VariableType.java index f8e3148..e297a0f 100644 --- a/src/main/java/com/kri/lge/penetration/common/enums/VariableType.java +++ b/src/main/java/com/kri/lge/penetration/common/enums/VariableType.java @@ -2,7 +2,7 @@ package com.kri.lge.penetration.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 java.util.Objects; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/lge/penetration/controller/AuthController.java b/src/main/java/com/kri/lge/penetration/controller/AuthController.java index 8257c7d..862d906 100644 --- a/src/main/java/com/kri/lge/penetration/controller/AuthController.java +++ b/src/main/java/com/kri/lge/penetration/controller/AuthController.java @@ -1,7 +1,7 @@ package com.kri.lge.penetration.controller; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; import com.kri.lge.penetration.dto.LoginRequestDto; import com.kri.lge.penetration.dto.LoginResponseDto; import com.kri.lge.penetration.service.AuthService; diff --git a/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java b/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java index 4f383cc..26d785d 100644 --- a/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java +++ b/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.controller; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.web.BusinessException; import com.kri.lge.penetration.common.cache.StatisticsDbCache; import com.kri.lge.penetration.common.cache.VariableCache; import com.kri.lge.penetration.common.cache.YearCache; diff --git a/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java b/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java index ce56fab..f42f50c 100644 --- a/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java +++ b/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.dto; -import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.feature.datetime.DateTimeUtil; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; import lombok.Getter; diff --git a/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java b/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java index 4a70fcf..a433bbc 100644 --- a/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java +++ b/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.dto; -import com.kri.common.auth.dto.JwtUserClaimsDto; +import com.kri.common.feature.auth.dto.JwtUserClaimsDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/kri/lge/penetration/service/AuthService.java b/src/main/java/com/kri/lge/penetration/service/AuthService.java index 7290d4f..68b0030 100644 --- a/src/main/java/com/kri/lge/penetration/service/AuthService.java +++ b/src/main/java/com/kri/lge/penetration/service/AuthService.java @@ -1,8 +1,8 @@ package com.kri.lge.penetration.service; -import com.kri.common.auth.dto.JwtUserClaimsDto; -import com.kri.common.auth.jwt.JwtService; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.auth.dto.JwtUserClaimsDto; +import com.kri.common.feature.auth.jwt.JwtService; +import com.kri.common.feature.web.BusinessException; import com.kri.lge.penetration.common.consts.LgePenetrationConst; import com.kri.lge.penetration.dto.LoginRequestDto; import com.kri.lge.penetration.dto.LoginResponseDto; diff --git a/src/main/java/com/kri/lge/penetration/service/StatisticsService.java b/src/main/java/com/kri/lge/penetration/service/StatisticsService.java index e6aed9e..5f59b0b 100644 --- a/src/main/java/com/kri/lge/penetration/service/StatisticsService.java +++ b/src/main/java/com/kri/lge/penetration/service/StatisticsService.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.service; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.web.BusinessException; import com.kri.lge.penetration.common.cache.StatisticsDbCache; import com.kri.lge.penetration.common.cache.VariableCache; import com.kri.lge.penetration.common.cache.YearCache; diff --git a/src/main/java/com/kri/lge/penetration/service/UploadService.java b/src/main/java/com/kri/lge/penetration/service/UploadService.java index e572e90..301d7bc 100644 --- a/src/main/java/com/kri/lge/penetration/service/UploadService.java +++ b/src/main/java/com/kri/lge/penetration/service/UploadService.java @@ -5,8 +5,8 @@ import static com.kri.lge.penetration.common.consts.LgePenetrationConst.INSERT_C import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.excel.ExcelMapper; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.excel.ExcelMapper; import com.kri.lge.penetration.dto.DataItemDto; import com.kri.lge.penetration.dto.ExcelUploadResultDto; import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository; @@ -243,4 +243,4 @@ public class UploadService { return new ParsedRow(null, reason); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java b/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java index 3f6b145..6a3a1f4 100644 --- a/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java +++ b/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java @@ -1,7 +1,7 @@ package com.kri.lge.penetration.service.file; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.util.CommonUtil; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.util.CommonUtil; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -128,4 +128,4 @@ public abstract class AbstractFileService { Files.deleteIfExists(target); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java b/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java index cfc5198..c4a05ae 100644 --- a/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java +++ b/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java @@ -1,7 +1,7 @@ package com.kri.lge.penetration.service.file; -import com.kri.common.util.CommonUtil; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.util.CommonUtil; +import com.kri.common.feature.web.BusinessException; import com.kri.lge.penetration.config.FileStorageProperties; import java.io.IOException; import java.nio.file.Path; @@ -43,4 +43,4 @@ public class DataFileService extends AbstractFileService { throw BusinessException.internalError("FAIL_DATA_DELETE", e.getMessage()); } } -} \ No newline at end of file +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 79b3777..1990a2a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -52,7 +52,6 @@ kri: file: data-base-dir: ./upload-file/data -common: web: enabled: true # 공통 Web 구성 사용 여부 (기본 true) webmvc: