diff --git a/settings.gradle b/settings.gradle index 9625712..5105c6e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'poten' +rootProject.name = 'bloom' diff --git a/src/main/java/com/be/poten/PotenApplication.java b/src/main/java/com/be/bloom/BloomApplication.java similarity index 63% rename from src/main/java/com/be/poten/PotenApplication.java rename to src/main/java/com/be/bloom/BloomApplication.java index d921410..9c4a6a5 100644 --- a/src/main/java/com/be/poten/PotenApplication.java +++ b/src/main/java/com/be/bloom/BloomApplication.java @@ -1,13 +1,13 @@ -package com.be.poten; +package com.be.bloom; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class PotenApplication { +public class BloomApplication { public static void main(String[] args) { - SpringApplication.run(PotenApplication.class, args); + SpringApplication.run(BloomApplication.class, args); } } diff --git a/src/main/java/com/be/poten/common/exception/BaseException.java b/src/main/java/com/be/bloom/common/exception/BaseException.java similarity index 91% rename from src/main/java/com/be/poten/common/exception/BaseException.java rename to src/main/java/com/be/bloom/common/exception/BaseException.java index 363a5c9..ca2453f 100644 --- a/src/main/java/com/be/poten/common/exception/BaseException.java +++ b/src/main/java/com/be/bloom/common/exception/BaseException.java @@ -1,4 +1,4 @@ -package com.be.poten.common.exception; +package com.be.bloom.common.exception; import lombok.Getter; diff --git a/src/main/java/com/be/poten/common/response/ApiResponse.java b/src/main/java/com/be/bloom/common/response/ApiResponse.java similarity index 97% rename from src/main/java/com/be/poten/common/response/ApiResponse.java rename to src/main/java/com/be/bloom/common/response/ApiResponse.java index dbe534d..bef8753 100644 --- a/src/main/java/com/be/poten/common/response/ApiResponse.java +++ b/src/main/java/com/be/bloom/common/response/ApiResponse.java @@ -1,12 +1,10 @@ -package com.be.poten.common.response; +package com.be.bloom.common.response; import lombok.*; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/be/poten/common/response/ExceptionHandlerAdvice.java b/src/main/java/com/be/bloom/common/response/ExceptionHandlerAdvice.java similarity index 96% rename from src/main/java/com/be/poten/common/response/ExceptionHandlerAdvice.java rename to src/main/java/com/be/bloom/common/response/ExceptionHandlerAdvice.java index 2172487..82c18d1 100644 --- a/src/main/java/com/be/poten/common/response/ExceptionHandlerAdvice.java +++ b/src/main/java/com/be/bloom/common/response/ExceptionHandlerAdvice.java @@ -1,6 +1,6 @@ -package com.be.poten.common.response; +package com.be.bloom.common.response; -import com.be.poten.common.exception.BaseException; +import com.be.bloom.common.exception.BaseException; import lombok.extern.slf4j.Slf4j; import org.springframework.core.NestedExceptionUtils; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/be/poten/config/JasyptConfig.java b/src/main/java/com/be/bloom/config/JasyptConfig.java similarity index 97% rename from src/main/java/com/be/poten/config/JasyptConfig.java rename to src/main/java/com/be/bloom/config/JasyptConfig.java index a275c9c..70121f5 100644 --- a/src/main/java/com/be/poten/config/JasyptConfig.java +++ b/src/main/java/com/be/bloom/config/JasyptConfig.java @@ -1,4 +1,4 @@ -package com.be.poten.config; +package com.be.bloom.config; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import org.jasypt.encryption.StringEncryptor; @@ -10,6 +10,7 @@ @Configuration @EnableEncryptableProperties + public class JasyptConfig { @Value("${jasypt.encryptor.password}") diff --git a/src/main/java/com/be/poten/config/WebConfig.java b/src/main/java/com/be/bloom/config/WebConfig.java similarity index 96% rename from src/main/java/com/be/poten/config/WebConfig.java rename to src/main/java/com/be/bloom/config/WebConfig.java index fc4c695..bbf8ce4 100644 --- a/src/main/java/com/be/poten/config/WebConfig.java +++ b/src/main/java/com/be/bloom/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.be.poten.config; +package com.be.bloom.config; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; diff --git a/src/main/java/com/be/poten/controller/MessageController.java b/src/main/java/com/be/bloom/controller/MessageController.java similarity index 78% rename from src/main/java/com/be/poten/controller/MessageController.java rename to src/main/java/com/be/bloom/controller/MessageController.java index 013be5a..54c2d47 100644 --- a/src/main/java/com/be/poten/controller/MessageController.java +++ b/src/main/java/com/be/bloom/controller/MessageController.java @@ -1,11 +1,11 @@ -package com.be.poten.controller; +package com.be.bloom.controller; -import com.be.poten.common.response.ApiResponse; -import com.be.poten.dto.message.GetMessageResponseDto; -import com.be.poten.dto.message.MessageRequestDto; -import com.be.poten.dto.message.PostMessageResponseDto; -import com.be.poten.dto.message.UpdateMessageRequestDto; -import com.be.poten.service.MessageService; +import com.be.bloom.common.response.ApiResponse; +import com.be.bloom.dto.message.GetMessageResponseDto; +import com.be.bloom.dto.message.MessageRequestDto; +import com.be.bloom.dto.message.PostMessageResponseDto; +import com.be.bloom.dto.message.UpdateMessageRequestDto; +import com.be.bloom.service.MessageService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/be/poten/controller/TestController.java b/src/main/java/com/be/bloom/controller/TestController.java similarity index 92% rename from src/main/java/com/be/poten/controller/TestController.java rename to src/main/java/com/be/bloom/controller/TestController.java index 83d81d1..683daca 100644 --- a/src/main/java/com/be/poten/controller/TestController.java +++ b/src/main/java/com/be/bloom/controller/TestController.java @@ -1,6 +1,6 @@ -package com.be.poten.controller; +package com.be.bloom.controller; -import com.be.poten.service.TestService; +import com.be.bloom.service.TestService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/be/poten/domain/Message.java b/src/main/java/com/be/bloom/domain/Message.java similarity index 80% rename from src/main/java/com/be/poten/domain/Message.java rename to src/main/java/com/be/bloom/domain/Message.java index 561588d..89a31fe 100644 --- a/src/main/java/com/be/poten/domain/Message.java +++ b/src/main/java/com/be/bloom/domain/Message.java @@ -1,10 +1,10 @@ -package com.be.poten.domain; +package com.be.bloom.domain; -import com.be.poten.dto.ClovaRequestDto.PostClovaResponseDto; -import com.be.poten.dto.message.MessageRequestDto; -import com.be.poten.dto.message.UpdateMessageRequestDto; -import com.be.poten.utils.JsonUtils; -import com.be.poten.utils.StringUtils; +import com.be.bloom.dto.ClovaRequestDto.PostClovaResponseDto; +import com.be.bloom.dto.message.MessageRequestDto; +import com.be.bloom.dto.message.UpdateMessageRequestDto; +import com.be.bloom.utils.JsonUtils; +import com.be.bloom.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/be/poten/dto/ClovaRequestDto/ClovaRequest.java b/src/main/java/com/be/bloom/dto/ClovaRequestDto/ClovaRequest.java similarity index 91% rename from src/main/java/com/be/poten/dto/ClovaRequestDto/ClovaRequest.java rename to src/main/java/com/be/bloom/dto/ClovaRequestDto/ClovaRequest.java index 1d1ec3d..f45d283 100644 --- a/src/main/java/com/be/poten/dto/ClovaRequestDto/ClovaRequest.java +++ b/src/main/java/com/be/bloom/dto/ClovaRequestDto/ClovaRequest.java @@ -1,4 +1,4 @@ -package com.be.poten.dto.ClovaRequestDto; +package com.be.bloom.dto.ClovaRequestDto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/be/poten/dto/ClovaRequestDto/ClovaRequestMessage.java b/src/main/java/com/be/bloom/dto/ClovaRequestDto/ClovaRequestMessage.java similarity index 80% rename from src/main/java/com/be/poten/dto/ClovaRequestDto/ClovaRequestMessage.java rename to src/main/java/com/be/bloom/dto/ClovaRequestDto/ClovaRequestMessage.java index ff9ee4b..f8f742d 100644 --- a/src/main/java/com/be/poten/dto/ClovaRequestDto/ClovaRequestMessage.java +++ b/src/main/java/com/be/bloom/dto/ClovaRequestDto/ClovaRequestMessage.java @@ -1,4 +1,4 @@ -package com.be.poten.dto.ClovaRequestDto; +package com.be.bloom.dto.ClovaRequestDto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/be/poten/dto/ClovaRequestDto/ClovaStudyRequest.java b/src/main/java/com/be/bloom/dto/ClovaRequestDto/ClovaStudyRequest.java similarity index 88% rename from src/main/java/com/be/poten/dto/ClovaRequestDto/ClovaStudyRequest.java rename to src/main/java/com/be/bloom/dto/ClovaRequestDto/ClovaStudyRequest.java index a365d61..57b3420 100644 --- a/src/main/java/com/be/poten/dto/ClovaRequestDto/ClovaStudyRequest.java +++ b/src/main/java/com/be/bloom/dto/ClovaRequestDto/ClovaStudyRequest.java @@ -1,4 +1,4 @@ -package com.be.poten.dto.ClovaRequestDto; +package com.be.bloom.dto.ClovaRequestDto; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/be/poten/dto/ClovaRequestDto/PostClovaResponseDto.java b/src/main/java/com/be/bloom/dto/ClovaRequestDto/PostClovaResponseDto.java similarity index 79% rename from src/main/java/com/be/poten/dto/ClovaRequestDto/PostClovaResponseDto.java rename to src/main/java/com/be/bloom/dto/ClovaRequestDto/PostClovaResponseDto.java index 12cac00..c73b99e 100644 --- a/src/main/java/com/be/poten/dto/ClovaRequestDto/PostClovaResponseDto.java +++ b/src/main/java/com/be/bloom/dto/ClovaRequestDto/PostClovaResponseDto.java @@ -1,4 +1,4 @@ -package com.be.poten.dto.ClovaRequestDto; +package com.be.bloom.dto.ClovaRequestDto; import lombok.Data; diff --git a/src/main/java/com/be/poten/dto/message/GetMessageResponseDto.java b/src/main/java/com/be/bloom/dto/message/GetMessageResponseDto.java similarity index 82% rename from src/main/java/com/be/poten/dto/message/GetMessageResponseDto.java rename to src/main/java/com/be/bloom/dto/message/GetMessageResponseDto.java index ea1faa5..9cf5ebe 100644 --- a/src/main/java/com/be/poten/dto/message/GetMessageResponseDto.java +++ b/src/main/java/com/be/bloom/dto/message/GetMessageResponseDto.java @@ -1,4 +1,4 @@ -package com.be.poten.dto.message; +package com.be.bloom.dto.message; import lombok.Data; diff --git a/src/main/java/com/be/poten/dto/message/MessageRequestDto.java b/src/main/java/com/be/bloom/dto/message/MessageRequestDto.java similarity index 91% rename from src/main/java/com/be/poten/dto/message/MessageRequestDto.java rename to src/main/java/com/be/bloom/dto/message/MessageRequestDto.java index 80c254a..6cec172 100644 --- a/src/main/java/com/be/poten/dto/message/MessageRequestDto.java +++ b/src/main/java/com/be/bloom/dto/message/MessageRequestDto.java @@ -1,4 +1,4 @@ -package com.be.poten.dto.message; +package com.be.bloom.dto.message; import lombok.Data; diff --git a/src/main/java/com/be/poten/dto/message/PostMessageResponseDto.java b/src/main/java/com/be/bloom/dto/message/PostMessageResponseDto.java similarity index 84% rename from src/main/java/com/be/poten/dto/message/PostMessageResponseDto.java rename to src/main/java/com/be/bloom/dto/message/PostMessageResponseDto.java index 7a686c0..b963690 100644 --- a/src/main/java/com/be/poten/dto/message/PostMessageResponseDto.java +++ b/src/main/java/com/be/bloom/dto/message/PostMessageResponseDto.java @@ -1,6 +1,6 @@ -package com.be.poten.dto.message; +package com.be.bloom.dto.message; -import com.be.poten.domain.Message; +import com.be.bloom.domain.Message; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/be/poten/dto/message/UpdateMessageRequestDto.java b/src/main/java/com/be/bloom/dto/message/UpdateMessageRequestDto.java similarity index 80% rename from src/main/java/com/be/poten/dto/message/UpdateMessageRequestDto.java rename to src/main/java/com/be/bloom/dto/message/UpdateMessageRequestDto.java index 03a5544..f0d8460 100644 --- a/src/main/java/com/be/poten/dto/message/UpdateMessageRequestDto.java +++ b/src/main/java/com/be/bloom/dto/message/UpdateMessageRequestDto.java @@ -1,4 +1,4 @@ -package com.be.poten.dto.message; +package com.be.bloom.dto.message; import lombok.Data; diff --git a/src/main/java/com/be/poten/mapper/MessageMapper.java b/src/main/java/com/be/bloom/mapper/MessageMapper.java similarity index 56% rename from src/main/java/com/be/poten/mapper/MessageMapper.java rename to src/main/java/com/be/bloom/mapper/MessageMapper.java index c6eafc2..ac31275 100644 --- a/src/main/java/com/be/poten/mapper/MessageMapper.java +++ b/src/main/java/com/be/bloom/mapper/MessageMapper.java @@ -1,8 +1,7 @@ -package com.be.poten.mapper; +package com.be.bloom.mapper; -import com.be.poten.domain.Message; -import com.be.poten.dto.message.GetMessageResponseDto; -import com.be.poten.dto.message.UpdateMessageRequestDto; +import com.be.bloom.domain.Message; +import com.be.bloom.dto.message.GetMessageResponseDto; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/be/poten/mapper/TestMapper.java b/src/main/java/com/be/bloom/mapper/TestMapper.java similarity index 79% rename from src/main/java/com/be/poten/mapper/TestMapper.java rename to src/main/java/com/be/bloom/mapper/TestMapper.java index eefe82d..08b5859 100644 --- a/src/main/java/com/be/poten/mapper/TestMapper.java +++ b/src/main/java/com/be/bloom/mapper/TestMapper.java @@ -1,4 +1,4 @@ -package com.be.poten.mapper; +package com.be.bloom.mapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/be/poten/service/MessageService.java b/src/main/java/com/be/bloom/service/MessageService.java similarity index 92% rename from src/main/java/com/be/poten/service/MessageService.java rename to src/main/java/com/be/bloom/service/MessageService.java index 6fc80d5..ba764e6 100644 --- a/src/main/java/com/be/poten/service/MessageService.java +++ b/src/main/java/com/be/bloom/service/MessageService.java @@ -1,17 +1,17 @@ -package com.be.poten.service; - -import com.be.poten.common.exception.BaseException; -import com.be.poten.domain.Message; -import com.be.poten.dto.ClovaRequestDto.ClovaRequest; -import com.be.poten.dto.ClovaRequestDto.ClovaRequestMessage; -import com.be.poten.dto.ClovaRequestDto.ClovaStudyRequest; -import com.be.poten.dto.ClovaRequestDto.PostClovaResponseDto; -import com.be.poten.dto.message.MessageRequestDto; -import com.be.poten.dto.message.GetMessageResponseDto; -import com.be.poten.dto.message.PostMessageResponseDto; -import com.be.poten.dto.message.UpdateMessageRequestDto; -import com.be.poten.mapper.MessageMapper; -import com.be.poten.utils.SignitureUtils; +package com.be.bloom.service; + +import com.be.bloom.common.exception.BaseException; +import com.be.bloom.domain.Message; +import com.be.bloom.dto.ClovaRequestDto.ClovaRequest; +import com.be.bloom.dto.ClovaRequestDto.ClovaRequestMessage; +import com.be.bloom.dto.ClovaRequestDto.ClovaStudyRequest; +import com.be.bloom.dto.ClovaRequestDto.PostClovaResponseDto; +import com.be.bloom.dto.message.MessageRequestDto; +import com.be.bloom.dto.message.GetMessageResponseDto; +import com.be.bloom.dto.message.PostMessageResponseDto; +import com.be.bloom.dto.message.UpdateMessageRequestDto; +import com.be.bloom.mapper.MessageMapper; +import com.be.bloom.utils.SignitureUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpEntity; diff --git a/src/main/java/com/be/poten/service/TestService.java b/src/main/java/com/be/bloom/service/TestService.java similarity index 94% rename from src/main/java/com/be/poten/service/TestService.java rename to src/main/java/com/be/bloom/service/TestService.java index 521311a..7b3dd70 100644 --- a/src/main/java/com/be/poten/service/TestService.java +++ b/src/main/java/com/be/bloom/service/TestService.java @@ -1,8 +1,8 @@ -package com.be.poten.service; +package com.be.bloom.service; -import com.be.poten.dto.ClovaRequestDto.ClovaRequest; -import com.be.poten.dto.ClovaRequestDto.ClovaRequestMessage; -import com.be.poten.mapper.TestMapper; +import com.be.bloom.dto.ClovaRequestDto.ClovaRequest; +import com.be.bloom.dto.ClovaRequestDto.ClovaRequestMessage; +import com.be.bloom.mapper.TestMapper; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/com/be/poten/utils/JsonUtils.java b/src/main/java/com/be/bloom/utils/JsonUtils.java similarity index 98% rename from src/main/java/com/be/poten/utils/JsonUtils.java rename to src/main/java/com/be/bloom/utils/JsonUtils.java index 06c952f..e98c424 100644 --- a/src/main/java/com/be/poten/utils/JsonUtils.java +++ b/src/main/java/com/be/bloom/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.be.poten.utils; +package com.be.bloom.utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/src/main/java/com/be/poten/utils/SignitureUtils.java b/src/main/java/com/be/bloom/utils/SignitureUtils.java similarity index 97% rename from src/main/java/com/be/poten/utils/SignitureUtils.java rename to src/main/java/com/be/bloom/utils/SignitureUtils.java index 00c66b7..1fa1730 100644 --- a/src/main/java/com/be/poten/utils/SignitureUtils.java +++ b/src/main/java/com/be/bloom/utils/SignitureUtils.java @@ -1,4 +1,4 @@ -package com.be.poten.utils; +package com.be.bloom.utils; import org.apache.tomcat.util.codec.binary.Base64; diff --git a/src/main/java/com/be/poten/utils/StringUtils.java b/src/main/java/com/be/bloom/utils/StringUtils.java similarity index 91% rename from src/main/java/com/be/poten/utils/StringUtils.java rename to src/main/java/com/be/bloom/utils/StringUtils.java index 94ca758..8a781d1 100644 --- a/src/main/java/com/be/poten/utils/StringUtils.java +++ b/src/main/java/com/be/bloom/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.be.poten.utils; +package com.be.bloom.utils; public final class StringUtils { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 80cf1d5..aaa808c 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -26,5 +26,5 @@ spring: # Mybatis mybatis: - type-aliases-package: com.be.poten.domain + type-aliases-package: com.be.bloom.domain mapper-locations: mapper/*.xml \ No newline at end of file diff --git a/src/main/resources/application-prd.yml b/src/main/resources/application-prd.yml index 97b92b0..16ce448 100644 --- a/src/main/resources/application-prd.yml +++ b/src/main/resources/application-prd.yml @@ -26,5 +26,5 @@ spring: # Mybatis mybatis: - type-aliases-package: com.be.poten.domain + type-aliases-package: com.be.bloom.domain mapper-locations: mapper/*.xml \ No newline at end of file diff --git a/src/main/resources/mapper/MessageMapper.xml b/src/main/resources/mapper/MessageMapper.xml index 8cffb7a..3b955b9 100644 --- a/src/main/resources/mapper/MessageMapper.xml +++ b/src/main/resources/mapper/MessageMapper.xml @@ -1,13 +1,13 @@ - + - + insert into message (user_id, param_data, param_clova_data, result_data, result_row_data, is_renew) values (null, #{paramData}, #{paramClovaData}, #{resultData}, #{resultRowData}, #{isRenew}); - select message_id as messageId, reg_date as regDate, if(is_update = 'Y', result_update_data, result_data) as resultData @@ -15,7 +15,7 @@ where message_id = #{messageId}; - + update message set is_update = #{isUpdate}, result_update_data = #{resultUpdateData} diff --git a/src/main/resources/mapper/TestMapper.xml b/src/main/resources/mapper/TestMapper.xml index 5c7c11b..3da83a7 100644 --- a/src/main/resources/mapper/TestMapper.xml +++ b/src/main/resources/mapper/TestMapper.xml @@ -1,6 +1,6 @@ - +