Fix: contribution branch 반영

This commit is contained in:
yongfire38
2024-05-27 17:44:12 +09:00
parent 8c1401b6c0
commit f082637aac
47 changed files with 905 additions and 11905 deletions

View File

@@ -1,14 +1,14 @@
plugins {
id 'org.springframework.boot' version '2.7.0'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'org.springframework.boot' version '2.7.12'
id 'io.spring.dependency-management' version '1.1.0'
// querydsl
id 'com.ewerk.gradle.plugins.querydsl' version '1.0.10'
id 'java'
id "org.sonarqube" version "2.7"
id 'org.sonarqube' version '3.5.0.2730'
}
group 'org.egovframe.cloud'
version '4.1.0'
version '4.2.0'
sourceCompatibility = '1.8'
repositories {
@@ -30,13 +30,13 @@ configurations {
}
ext {
set('springCloudVersion', "2021.0.3")
set('log4j2.version', "2.17.2") // log4j 보안 패치
set('springCloudVersion', '2021.0.7')
set('log4j2.version', '2.20.0') // log4j 보안 패치
}
dependencies {
// EgovAbstractServiceImpl
implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.1.0') {
implementation('org.egovframe.rte:org.egovframe.rte.fdl.cmmn:4.2.0') {
exclude group: 'org.egovframe.rte', module: 'org.egovframe.rte.fdl.logging'
}
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
@@ -44,7 +44,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation' // LocalValidatorFactoryBean
implementation 'io.jsonwebtoken:jjwt:0.9.1'
implementation 'javassist:javassist:3.12.1.GA'
implementation 'org.javassist:javassist:3.29.2-GA'
// querydsl
implementation 'com.querydsl:querydsl-jpa:5.0.0'
@@ -55,8 +55,8 @@ dependencies {
//openapi docs
implementation group: 'io.springfox', name: 'springfox-swagger2', version: '2.9.2'
implementation group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.9.2'
implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.6.9'
implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.6.9'
implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.7.0'
implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.7.0'
//reactive
implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc'

Binary file not shown.

View File

@@ -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

View File

@@ -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);