diff --git a/.gitignore b/.gitignore index 9d7daf0..ed62eae 100644 --- a/.gitignore +++ b/.gitignore @@ -56,8 +56,10 @@ HELP.md **/out/ # production -**/build +!**/build/ +**/build/* **/dist +!backend/module-common/build/libs/ # misc **.DS_Store diff --git a/backend/board-service/build.gradle b/backend/board-service/build.gradle index 9684ff0..3b9319d 100644 --- a/backend/board-service/build.gradle +++ b/backend/board-service/build.gradle @@ -28,8 +28,8 @@ ext { } dependencies { -// implementation files('../../module-common/build/libs/module-common-0.1.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 - implementation 'org.egovframe.cloud:module-common:0.1' + implementation files('../module-common/build/libs/module-common-4.1.0-plain.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 +// implementation 'org.egovframe.cloud:module-common:0.1' implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') { exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging' } diff --git a/backend/module-common/build/libs/module-common-4.1.0-plain.jar b/backend/module-common/build/libs/module-common-4.1.0-plain.jar new file mode 100644 index 0000000..eaf52d7 Binary files /dev/null and b/backend/module-common/build/libs/module-common-4.1.0-plain.jar differ diff --git a/backend/module-common/gradle/wrapper/gradle-wrapper.jar b/backend/module-common/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/backend/module-common/gradle/wrapper/gradle-wrapper.jar differ diff --git a/backend/module-common/gradle/wrapper/gradle-wrapper.properties b/backend/module-common/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b1159fc --- /dev/null +++ b/backend/module-common/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/backend/module-common/src/main/java/org/egovframe/cloud/common/config/MessageSourceConfig.java b/backend/module-common/src/main/java/org/egovframe/cloud/common/config/MessageSourceConfig.java index fef988f..fafee11 100644 --- a/backend/module-common/src/main/java/org/egovframe/cloud/common/config/MessageSourceConfig.java +++ b/backend/module-common/src/main/java/org/egovframe/cloud/common/config/MessageSourceConfig.java @@ -8,6 +8,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.util.StringUtils; +import java.io.File; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.nio.file.Paths; @@ -41,6 +42,7 @@ public class MessageSourceConfig { @Value("${spring.profiles.active:default}") private String profile; + private static final String FILE_SEPARATOR = File.separator; @Bean public MessageSource messageSource() { ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource(); @@ -48,6 +50,9 @@ public class MessageSourceConfig { if ("default".equals(profile)) { Path fileStorageLocation = Paths.get(messagesDirectory).toAbsolutePath().normalize(); String dbMessages = StringUtils.cleanPath("file://" + fileStorageLocation + MESSAGES); + if(FILE_SEPARATOR.equals("\\")) {//윈도우기반 자바시스템일 때 Could not parse properties file 에러방지 + dbMessages = StringUtils.cleanPath("file:///" + fileStorageLocation + MESSAGES); + } messageSource.setBasenames(dbMessages); } else { messageSource.setBasenames(messagesDirectory + MESSAGES); diff --git a/backend/portal-service/build.gradle b/backend/portal-service/build.gradle index 102c5b2..6c9e2da 100644 --- a/backend/portal-service/build.gradle +++ b/backend/portal-service/build.gradle @@ -28,8 +28,8 @@ ext { } dependencies { -// implementation files('../../module-common/build/libs/module-common-0.1.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 - implementation 'org.egovframe.cloud:module-common:0.1' + implementation files('../module-common/build/libs/module-common-4.1.0-plain.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 +// implementation 'org.egovframe.cloud:module-common:0.1' implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') { exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging' } diff --git a/backend/reserve-check-service/build.gradle b/backend/reserve-check-service/build.gradle index fbd9e90..6290f13 100644 --- a/backend/reserve-check-service/build.gradle +++ b/backend/reserve-check-service/build.gradle @@ -25,8 +25,8 @@ ext { } dependencies { -// implementation files('../../module-common/build/libs/module-common-0.1.jar') // @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 - implementation 'org.egovframe.cloud:module-common:0.1' + implementation files('../module-common/build/libs/module-common-4.1.0-plain.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 +// implementation 'org.egovframe.cloud:module-common:0.1' implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') { exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging' } diff --git a/backend/reserve-item-service/build.gradle b/backend/reserve-item-service/build.gradle index e622d66..85ec0f3 100644 --- a/backend/reserve-item-service/build.gradle +++ b/backend/reserve-item-service/build.gradle @@ -25,8 +25,8 @@ ext { } dependencies { -// implementation files('../../module-common/build/libs/module-common-0.1.jar') // @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 - implementation 'org.egovframe.cloud:module-common:0.1' + implementation files('../module-common/build/libs/module-common-4.1.0-plain.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 +// implementation 'org.egovframe.cloud:module-common:0.1' implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') { exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging' } diff --git a/backend/reserve-request-service/build.gradle b/backend/reserve-request-service/build.gradle index 96fa12c..6f9e313 100644 --- a/backend/reserve-request-service/build.gradle +++ b/backend/reserve-request-service/build.gradle @@ -26,8 +26,8 @@ ext { dependencies { -// implementation files('../../module-common/build/libs/module-common-0.1.jar') // @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 - implementation 'org.egovframe.cloud:module-common:0.1' + implementation files('../module-common/build/libs/module-common-4.1.0-plain.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 +// implementation 'org.egovframe.cloud:module-common:0.1' implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') { exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging' } diff --git a/backend/user-service/build.gradle b/backend/user-service/build.gradle index c91c8fb..25cfceb 100644 --- a/backend/user-service/build.gradle +++ b/backend/user-service/build.gradle @@ -28,8 +28,8 @@ ext { } dependencies { -// implementation files('../../module-common/build/libs/module-common-0.1.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 - implementation 'org.egovframe.cloud:module-common:0.1' + implementation files('../module-common/build/libs/module-common-4.1.0-plain.jar') // 공통 모듈, @ComponentScan(basePackages={"org.egovframe.cloud"}) 추가해야 적용된다 +// implementation 'org.egovframe.cloud:module-common:0.1' implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') { exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging' }