diff --git a/README.md b/README.md index 71cb7b5..4f620d8 100644 --- a/README.md +++ b/README.md @@ -43,4 +43,19 @@ spring: | log4jdbc.auto.load.popular.drivers | 자주 사용되는 드라이버를 자동으로 로드할지 여부를 지정합니다. 이 코드에서는 true로 설정되어 있습니다. | | log4jdbc.trim.sql.enabled | SQL 문의 앞뒤 공백을 자동으로 제거할지 여부를 지정합니다. 이 코드에서는 true로 설정되어 있습니다. | | log4jdbc.trim.sql.extrablanklines | SQL 문의 공백 라인을 제거할지 여부를 지정합니다. 이 코드에서는 false로 설정되어 있습니다. | -| log4jdbc.suppress.generated.keys.exception | SQL 문에서 생성된 키 예외를 억제할지 여부를 지정합니다. 이 코드에서는 false로 설정되어 있습니다. \ No newline at end of file +| log4jdbc.suppress.generated.keys.exception | SQL 문에서 생성된 키 예외를 억제할지 여부를 지정합니다. 이 코드에서는 false로 설정되어 있습니다. + + +## spring rest doc + +### URL + +- uri : `/docs/index.html` +- local : http://localhost:8080/docs/index.html + +## spring swagger + +### URL + +- uri : `/swagger-ui/index.html` +- local : http://localhost:8080/swagger-ui/index.html \ No newline at end of file diff --git a/app/kac-app/build.gradle b/app/kac-app/build.gradle index 83b36f6..cc98764 100644 --- a/app/kac-app/build.gradle +++ b/app/kac-app/build.gradle @@ -37,8 +37,8 @@ dependencies { implementation project(":common-core") implementation project(":common-util") - implementation project(":common-security") - implementation project(":web-api-com") + implementation project(":web-security") + implementation project(":web-api-common") } ext { diff --git a/build.gradle b/build.gradle index 51830cf..4b8f7dd 100644 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,8 @@ subprojects { subProjectDir.eachDir {dir-> def projectName = ":${it}-${dir.name}" project(projectName){ - + bootJar.enabled(true) + jar.enabled(false) } } } diff --git a/web/api-com/build.gradle b/web/api-common/build.gradle similarity index 100% rename from web/api-com/build.gradle rename to web/api-common/build.gradle diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java similarity index 100% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java similarity index 100% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java similarity index 100% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java similarity index 90% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java index 4664261..a6bce97 100644 --- a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java +++ b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java @@ -6,7 +6,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.ArrayList; import java.util.List; @Data @@ -18,7 +17,7 @@ public class CodeGroupRS { private String siteCd; private String groupCdNm; private String rm; - private List codeList = new ArrayList<>(); + private List codeList; // ComCdGroupBas을 받아서 CodeGroupRS로 변환 public static CodeGroupRS toRS(ComCdGroupBas comCdGroupBas) { diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java similarity index 100% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java similarity index 91% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java index b779be0..5511917 100644 --- a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java +++ b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java @@ -6,7 +6,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.ArrayList; import java.util.List; @Data @@ -20,7 +19,7 @@ public class CodeRS { private String upperCd; private Integer sortOrdr; private String addInfoValue; - private List children = new ArrayList<>(); + private List children; public static CodeRS toRS(ComCdBas comCdBas) { return CodeRS.builder() diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java similarity index 100% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java similarity index 100% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java similarity index 100% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeAllRQ.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeAllRQ.java similarity index 100% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeAllRQ.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeAllRQ.java diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeRQ.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeRQ.java similarity index 100% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeRQ.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeRQ.java diff --git a/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java b/web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java similarity index 100% rename from web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java rename to web/api-common/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java diff --git a/common/security/build.gradle b/web/security/build.gradle similarity index 100% rename from common/security/build.gradle rename to web/security/build.gradle diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/SecurityConfig.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/SecurityConfig.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/SecurityConfig.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/SecurityConfig.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAccessDeniedHandler.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAccessDeniedHandler.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAccessDeniedHandler.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAccessDeniedHandler.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationEntryPoint.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationEntryPoint.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationEntryPoint.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationEntryPoint.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationException.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationException.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationException.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationException.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationExceptionHandler.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationExceptionHandler.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationExceptionHandler.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/exception/BaseAuthenticationExceptionHandler.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/filter/JwtCheckFilter.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/filter/JwtCheckFilter.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/filter/JwtCheckFilter.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/filter/JwtCheckFilter.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/filter/JwtLoginFilter.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/filter/JwtLoginFilter.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/filter/JwtLoginFilter.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/filter/JwtLoginFilter.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/message/AuthErrorMessageSourceConfig.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/message/AuthErrorMessageSourceConfig.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/message/AuthErrorMessageSourceConfig.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/message/AuthErrorMessageSourceConfig.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/model/AuthErrorRS.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/model/AuthErrorRS.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/model/AuthErrorRS.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/model/AuthErrorRS.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/model/BaseAuthErrorCode.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/model/BaseAuthErrorCode.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/model/BaseAuthErrorCode.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/model/BaseAuthErrorCode.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/model/BaseUserDetails.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/model/BaseUserDetails.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/model/BaseUserDetails.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/model/BaseUserDetails.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/model/UserLoginForm.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/model/UserLoginForm.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/model/UserLoginForm.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/model/UserLoginForm.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/service/BaseUserDetailsService.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/service/BaseUserDetailsService.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/service/BaseUserDetailsService.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/service/BaseUserDetailsService.java diff --git a/common/security/src/main/java/kr/co/palnet/kac/config/security/util/JwtUtil.java b/web/security/src/main/java/kr/co/palnet/kac/config/security/util/JwtUtil.java similarity index 100% rename from common/security/src/main/java/kr/co/palnet/kac/config/security/util/JwtUtil.java rename to web/security/src/main/java/kr/co/palnet/kac/config/security/util/JwtUtil.java diff --git a/common/security/src/main/java/lombok.config b/web/security/src/main/java/lombok.config similarity index 100% rename from common/security/src/main/java/lombok.config rename to web/security/src/main/java/lombok.config diff --git a/common/security/src/main/resources/messages/errors/auth_error.properties b/web/security/src/main/resources/messages/errors/auth_error.properties similarity index 100% rename from common/security/src/main/resources/messages/errors/auth_error.properties rename to web/security/src/main/resources/messages/errors/auth_error.properties diff --git a/common/security/src/main/resources/messages/errors/auth_error_en.properties b/web/security/src/main/resources/messages/errors/auth_error_en.properties similarity index 100% rename from common/security/src/main/resources/messages/errors/auth_error_en.properties rename to web/security/src/main/resources/messages/errors/auth_error_en.properties