diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/app/config/MessageSourceConfig.java b/app/kac-app/src/main/java/kr/co/palnet/kac/app/config/MessageSourceConfig.java new file mode 100644 index 0000000..4d2f3ec --- /dev/null +++ b/app/kac-app/src/main/java/kr/co/palnet/kac/app/config/MessageSourceConfig.java @@ -0,0 +1,31 @@ +package kr.co.palnet.kac.app.config; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.MessageSource; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.context.support.MessageSourceAccessor; +import org.springframework.context.support.ReloadableResourceBundleMessageSource; + +@Slf4j +@Configuration +public class MessageSourceConfig { + + @Bean(name = "errorMessageSource") + public MessageSource getErrorMessageSource() { + log.debug("===>> error message source local : {} ", LocaleContextHolder.getLocale()); + ReloadableResourceBundleMessageSource errorMessageSource = new ReloadableResourceBundleMessageSource(); + errorMessageSource.setBasenames("classpath:messages/errors/error"); + errorMessageSource.setDefaultEncoding("UTF-8"); + errorMessageSource.setCacheSeconds(300); + return errorMessageSource; + } + + @Bean(name = "errorMessageSourceAccessor") + public MessageSourceAccessor errorMessageSourceAccessor(@Qualifier("errorMessageSource") MessageSource errorMessageSource) { + log.debug("===>> error message source accessor local : {} ", LocaleContextHolder.getLocale()); + return new MessageSourceAccessor(errorMessageSource); + } +} diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/app/ping/controller/PingController.java b/app/kac-app/src/main/java/kr/co/palnet/kac/app/ping/controller/PingController.java index fdff5ec..913a29f 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/app/ping/controller/PingController.java +++ b/app/kac-app/src/main/java/kr/co/palnet/kac/app/ping/controller/PingController.java @@ -1,13 +1,9 @@ package kr.co.palnet.kac.app.ping.controller; -import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Locale; - @Slf4j @RestController public class PingController { @@ -17,10 +13,4 @@ public class PingController { return "pong"; } - @GetMapping("/test") - public String test() { - Locale locale = LocaleContextHolder.getLocale(); - log.info(locale.toString()); - return locale.toString(); - } } diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/app/ping/controller/QueryRepository.java b/app/kac-app/src/main/java/kr/co/palnet/kac/app/ping/controller/QueryRepository.java deleted file mode 100644 index 02d0aab..0000000 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/app/ping/controller/QueryRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package kr.co.palnet.kac.app.ping.controller; - -import com.querydsl.jpa.impl.JPAQueryFactory; -import kr.co.palnet.kac.data.com.model.QComArcrftBas; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Repository; - -@Slf4j -@RequiredArgsConstructor -@Repository -public class QueryRepository { - private final JPAQueryFactory query; - - public void test() { - QComArcrftBas bas = QComArcrftBas.comArcrftBas; - query.select(bas).from(bas).fetch(); - } -} diff --git a/app/kac-app/src/main/java/lombok.config b/app/kac-app/src/main/java/lombok.config new file mode 100644 index 0000000..eb6db90 --- /dev/null +++ b/app/kac-app/src/main/java/lombok.config @@ -0,0 +1 @@ +lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Qualifier \ No newline at end of file diff --git a/app/kac-app/src/main/resources/application.yml b/app/kac-app/src/main/resources/application.yml index d72bf35..ce2a2e1 100644 --- a/app/kac-app/src/main/resources/application.yml +++ b/app/kac-app/src/main/resources/application.yml @@ -14,9 +14,8 @@ spring: logging: level: - com: - zaxxer: - hikari: INFO + kr.co.palnet: DEBUG + com.com.zaxxer.hikari: INFO jdbc: audit: OFF resultset: OFF @@ -24,10 +23,6 @@ logging: sqlonly: OFF #SQL만 로그로 남긴다. sqltiming: INFO #SQL과 소요시간을 표기한다. connection : OFF # 커넥션 확인가능 - org: - hibernate: - SQL: DEBUG - type: - descriptor: - sql: - BasicBinder: TRACE \ No newline at end of file + org.hibernate: + SQL: DEBUG + type.descriptor.sql.BasicBinder: TRACE \ No newline at end of file diff --git a/app/kac-app/src/main/resources/messages/errors/error.properties b/app/kac-app/src/main/resources/messages/errors/error.properties new file mode 100644 index 0000000..c435a74 --- /dev/null +++ b/app/kac-app/src/main/resources/messages/errors/error.properties @@ -0,0 +1,5 @@ +TEST001=\uD14C\uC2A4\uD2B8001 +TEST002=\uD14C\uC2A4\uD2B8002 +TEST003=\uD14C\uC2A4\uD2B8003 +TEST004=\uD14C\uC2A4\uD2B8004 +TEST005=\uD14C\uC2A4\uD2B8005 \ No newline at end of file diff --git a/app/kac-app/src/main/resources/messages/errors/error_en.properties b/app/kac-app/src/main/resources/messages/errors/error_en.properties new file mode 100644 index 0000000..26aa42e --- /dev/null +++ b/app/kac-app/src/main/resources/messages/errors/error_en.properties @@ -0,0 +1,5 @@ +TEST001=TEST001 +TEST002=TEST002 +TEST003=TEST003 +TEST004=TEST004 +TEST005=TEST005 \ No newline at end of file diff --git a/common/core/src/main/java/kr/co/palnet/kac/core/exception/model/BaseErrorModel.java b/common/core/src/main/java/kr/co/palnet/kac/core/exception/model/BaseErrorModel.java index 2ff17fd..8ec41a4 100644 --- a/common/core/src/main/java/kr/co/palnet/kac/core/exception/model/BaseErrorModel.java +++ b/common/core/src/main/java/kr/co/palnet/kac/core/exception/model/BaseErrorModel.java @@ -15,8 +15,6 @@ public class BaseErrorModel { private String message; -// private String code; -// -// private String desc; + private String code; } diff --git a/data/com/build.gradle b/data/com/build.gradle index 764f250..d19a085 100644 --- a/data/com/build.gradle +++ b/data/com/build.gradle @@ -3,7 +3,6 @@ dependencies { implementation "$boot:spring-boot-starter-data-jpa" -// compileOnly "com.querydsl:querydsl-jpa:5.0.0:jakarta" implementation "com.querydsl:querydsl-jpa:5.0.0:jakarta" annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" annotationProcessor "jakarta.annotation:jakarta.annotation-api"