4.2.x <- contribution

2024-07-12 15:41:03 +09:00
parent f1478b722e
commit b7a255d112
54 changed files with 1241 additions and 11741 deletions
--- a/backend/apigateway/build.gradle
+++ b/backend/apigateway/build.gradle
@@ -27,8 +27,9 @@ dependencies {
    implementation 'org.springframework.cloud:spring-cloud-starter-config'    // config
    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // config
    implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'        // logstash logback
-	implementation 'io.jsonwebtoken:jjwt:0.9.1'
+    implementation 'io.jsonwebtoken:jjwt:0.9.1'
    implementation 'javax.xml.bind:jaxb-api:2.3.1'

    implementation 'org.springdoc:springdoc-openapi-webflux-ui:1.7.0'
--- a/backend/apigateway/src/main/resources/logback-spring.xml
+++ b/backend/apigateway/src/main/resources/logback-spring.xml
@@ -46,4 +46,4 @@
        </root>
    </springProfile>

-</Configuration>
+</Configuration>
--- a/backend/board-service/build.gradle
+++ b/backend/board-service/build.gradle
@@ -44,9 +44,13 @@ dependencies {
    implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
    implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
    implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
+    implementation 'org.apache.tomcat:tomcat-annotations-api:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.73'
    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'        // logstash logback
    implementation 'mysql:mysql-connector-java:8.0.33'
-	implementation 'io.jsonwebtoken:jjwt:0.9.1'
+    implementation 'io.jsonwebtoken:jjwt:0.9.1'
    // querydsl
    implementation 'com.querydsl:querydsl-jpa:5.0.0'
    annotationProcessor 'com.querydsl:querydsl-apt:5.0.0'
--- a/backend/board-service/src/main/resources/logback-spring.xml
+++ b/backend/board-service/src/main/resources/logback-spring.xml
@@ -46,4 +46,4 @@
        </root>
    </springProfile>

-</Configuration>
+</Configuration>
--- a/backend/config/build.gradle
+++ b/backend/config/build.gradle
@@ -23,6 +23,10 @@ dependencies {
    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
    implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
    implementation 'org.springframework.boot:spring-boot-starter-actuator'    // bus
+    implementation 'org.apache.tomcat:tomcat-annotations-api:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.73'
    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'        // logstash logback
    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
--- a/backend/config/src/main/resources/application.yml
+++ b/backend/config/src/main/resources/application.yml
@@ -10,9 +10,8 @@ spring:
    config:
      server:
        native:
-          search-locations: file:./config
-#          search-locations: ${search.location:file:///${user.home}/workspace.edu/egovframe-msa-edu/config} # Windows
-#          search-locations: file://${user.home}/workspace.edu/egovframe-msa-edu/config # MacOS
+          search-locations: ${search.location:file:///${user.home}/workspace.edu/egovframe-msa-edu/config} # Windows
+#           search-locations: file://${user.home}/workspace.edu/egovframe-msa-edu/config # MacOS
  rabbitmq:
    host: ${rabbitmq.hostname:localhost}
    port: 5672
--- a/backend/config/src/main/resources/logback-spring.xml
+++ b/backend/config/src/main/resources/logback-spring.xml
@@ -46,4 +46,4 @@
        </root>
    </springProfile>

-</Configuration>
+</Configuration>
--- a/backend/discovery/build.gradle
+++ b/backend/discovery/build.gradle
@@ -20,6 +20,10 @@ ext {
 dependencies {
    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-server'
    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.apache.tomcat:tomcat-annotations-api:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.73'
    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }

--- 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
--- a/backend/module-common/gradle/wrapper/gradle-wrapper.jar
+++ b/backend/module-common/gradle/wrapper/gradle-wrapper.jar
--- a/backend/module-common/gradle/wrapper/gradle-wrapper.properties
+++ 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
--- 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);
--- a/backend/portal-service/build.gradle
+++ b/backend/portal-service/build.gradle
@@ -46,6 +46,10 @@ dependencies {
    implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
    implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j'
+    implementation 'org.apache.tomcat:tomcat-annotations-api:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.73'
    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'        // logstash logback
    implementation 'commons-io:commons-io:2.13.0'
    implementation 'commons-net:commons-net:3.9.0' // FTPClient
@@ -62,7 +66,7 @@ dependencies {

    // openapi docs
    implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.7.0'
-    annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"

    // lombok
    implementation 'org.projectlombok:lombok'
--- a/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/service/attachment/AttachmentService.java
+++ b/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/service/attachment/AttachmentService.java
@@ -150,7 +150,12 @@ public class AttachmentService extends AbstractService {
     */
    @Transactional(readOnly = true)
    public AttachmentImageResponseDto loadImage(String imagename) {
-        return storageUtils.loadImage(imagename.replaceAll(EDITOR_FILE_SEPARATOR, FILE_SEPARATOR));
+    	if(FILE_SEPARATOR.equals("\\")) {//윈도우기반 자바시스템일 때 하이픈 character to be escaped is missing 에러방지
+    		imagename = imagename.replaceAll(EDITOR_FILE_SEPARATOR, "\\\\"); //getFileSystem().getPath에서 디스크의 경로를 사용할 때 
+    	} else { //리눅스 또는 맥 기반 자바시스템 경로일 때(아래)
+    		imagename = imagename.replaceAll(EDITOR_FILE_SEPARATOR, FILE_SEPARATOR);
+    	}
+        return storageUtils.loadImage(imagename);
    }

    /**
--- a/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/utils/FileStorageUtils.java
+++ b/backend/portal-service/src/main/java/org/egovframe/cloud/portalservice/utils/FileStorageUtils.java
@@ -51,10 +51,16 @@ public class FileStorageUtils implements StorageUtils {
    private final Path fileStorageLocation;
    private final Environment environment;
    private final MessageUtil messageUtil;
-
+    private static final String FILE_SEPARATOR = File.separator;
+    
    public FileStorageUtils(Environment environment, MessageUtil messageUtil) {
        this.environment = environment;
-        this.fileStorageLocation = Paths.get(environment.getProperty("file.directory")).toAbsolutePath().normalize();
+        String envFileDir = "";
+        envFileDir = environment.getProperty("file.directory");
+        if(FILE_SEPARATOR.equals("\\")) {//윈도우기반 자바시스템일 때 경로 에러방지
+        	envFileDir = envFileDir.replaceAll("/", "\\\\");
+        }
+        this.fileStorageLocation = Paths.get(envFileDir).toAbsolutePath().normalize();
        this.messageUtil = messageUtil;
    }

@@ -185,8 +191,9 @@ public class FileStorageUtils implements StorageUtils {

            Path path = getStorePath(basePath);
            Path target = path.resolve(filename);
-            Files.copy(file.getInputStream(), target, StandardCopyOption.REPLACE_EXISTING);
-
+            InputStream inputStream = file.getInputStream();
+            Files.copy(inputStream, target, StandardCopyOption.REPLACE_EXISTING);
+            inputStream.close(); //윈도우 시스템에서도 업로드 시 Temp폴더의 delete file 에러방지코드 추가
            return filename;
        } catch (IOException ex) {
            log.error("Could not stored file", ex);
--- a/backend/portal-service/src/main/resources/logback-spring.xml
+++ b/backend/portal-service/src/main/resources/logback-spring.xml
@@ -46,4 +46,4 @@
        </root>
    </springProfile>

-</Configuration>
+</Configuration>
--- a/backend/reserve-check-service/build.gradle
+++ b/backend/reserve-check-service/build.gradle
@@ -40,6 +40,7 @@ dependencies {
    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // config
    implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
    implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
    implementation 'com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:3.2.11'

    implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
@@ -50,7 +51,7 @@ dependencies {
    implementation 'org.springframework.cloud:spring-cloud-stream'
    implementation 'org.springframework.cloud:spring-cloud-stream-binder-rabbit'

-	implementation 'io.jsonwebtoken:jjwt:0.9.1'
+    implementation 'io.jsonwebtoken:jjwt:0.9.1'

    implementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
    implementation 'mysql:mysql-connector-java:8.0.33'
--- a/backend/reserve-check-service/src/main/resources/logback-spring.xml
+++ b/backend/reserve-check-service/src/main/resources/logback-spring.xml
@@ -46,4 +46,4 @@
        </root>
    </springProfile>

-</Configuration>
+</Configuration>
--- a/backend/reserve-item-service/build.gradle
+++ b/backend/reserve-item-service/build.gradle
@@ -40,9 +40,10 @@ dependencies {
    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // config
    implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
    implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
    implementation 'com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:3.2.11'

-	implementation 'io.jsonwebtoken:jjwt:0.9.1'
+    implementation 'io.jsonwebtoken:jjwt:0.9.1'

    implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
    implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
@@ -71,7 +72,7 @@ dependencies {
    testImplementation 'io.projectreactor:reactor-test'
    testImplementation 'org.springframework.security:spring-security-test'

-	implementation 'org.webjars:webjars-locator-core:0.53'
+    implementation 'org.webjars:webjars-locator-core:0.53'
 }

 test {
@@ -83,3 +84,4 @@ dependencyManagement {
        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
    }
 }
+
--- a/backend/reserve-item-service/src/main/resources/logback-spring.xml
+++ b/backend/reserve-item-service/src/main/resources/logback-spring.xml
@@ -46,4 +46,4 @@
        </root>
    </springProfile>

-</Configuration>
+</Configuration>
--- a/backend/reserve-request-service/build.gradle
+++ b/backend/reserve-request-service/build.gradle
@@ -40,6 +40,7 @@ dependencies {
    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // config
    implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
    implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
    implementation 'com.playtika.reactivefeign:feign-reactor-spring-cloud-starter:3.2.11'

    implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
@@ -51,7 +52,8 @@ dependencies {
    implementation 'org.springframework.cloud:spring-cloud-stream-binder-rabbit'
    implementation 'org.springframework.boot:spring-boot-starter-amqp'

-	implementation 'io.jsonwebtoken:jjwt:0.9.1'
+
+    implementation 'io.jsonwebtoken:jjwt:0.9.1'

    implementation 'dev.miku:r2dbc-mysql:0.8.2.RELEASE'
    implementation 'mysql:mysql-connector-java:8.0.33'
@@ -73,7 +75,7 @@ dependencies {
    testImplementation 'org.springframework.security:spring-security-test'
    testImplementation 'org.springframework.amqp:spring-rabbit-test'

-	implementation 'org.webjars:webjars-locator-core:0.53'
+    implementation 'org.webjars:webjars-locator-core:0.53'
 }

 test {
--- a/backend/reserve-request-service/src/main/resources/logback-spring.xml
+++ b/backend/reserve-request-service/src/main/resources/logback-spring.xml
@@ -46,4 +46,4 @@
        </root>
    </springProfile>

-</Configuration>
+</Configuration>
--- a/backend/user-service/build.gradle
+++ b/backend/user-service/build.gradle
@@ -46,14 +46,16 @@ dependencies {
    implementation 'org.springframework.cloud:spring-cloud-starter-bus-amqp'  // bus
    implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
    implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.2'        // logstash logback
+    implementation 'org.apache.tomcat:tomcat-annotations-api:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-core:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-el:9.0.73'
+    implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.73'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'        // logstash logback
    implementation 'mysql:mysql-connector-java:8.0.33'
 	implementation 'io.jsonwebtoken:jjwt:0.9.1'
-
    // querydsl
    implementation 'com.querydsl:querydsl-jpa:5.0.0'
    annotationProcessor 'com.querydsl:querydsl-apt:5.0.0'
-
    // cache
    implementation 'org.springframework.boot:spring-boot-starter-cache'
    implementation 'org.ehcache:ehcache'
@@ -63,7 +65,7 @@ dependencies {

    // openapi docs
    implementation 'org.springdoc:springdoc-openapi-webmvc-core:1.7.0'
-    annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"

    // lombok
    implementation 'org.projectlombok:lombok'
--- a/backend/user-service/src/main/java/org/egovframe/cloud/userservice/config/SecurityConfig.java
+++ b/backend/user-service/src/main/java/org/egovframe/cloud/userservice/config/SecurityConfig.java
@@ -2,12 +2,13 @@ package org.egovframe.cloud.userservice.config;

 import lombok.RequiredArgsConstructor;
 import org.egovframe.cloud.userservice.service.user.UserService;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;

 import static org.egovframe.cloud.common.config.GlobalConstant.SECURITY_PERMITALL_ANTPATTERNS;

@@ -31,57 +32,50 @@ import static org.egovframe.cloud.common.config.GlobalConstant.SECURITY_PERMITAL
 */
@RequiredArgsConstructor
@EnableWebSecurity // Spring Security 설정들을 활성화시켜 준다
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
+public class SecurityConfig {

    private final TokenProvider tokenProvider;
    private final UserService userService;
-    private final BCryptPasswordEncoder bCryptPasswordEncoder;
-
+    
+    @Bean
+	AuthenticationManager authenticationManager(AuthenticationConfiguration authConfiguration) throws Exception {
+		return authConfiguration.getAuthenticationManager();
+	}
+    
    /**
     * 스프링 시큐리티 설정
     *
     * @param http
     * @throws Exception
     */
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-                .csrf().disable()
-                .headers().frameOptions().disable()
-            .and()
-                .sessionManagement()
-                .sessionCreationPolicy(SessionCreationPolicy.STATELESS) // 토큰 사용하기 때문에 세션은 비활성화
-            .and()
-                .authorizeRequests()
-                .antMatchers(SECURITY_PERMITALL_ANTPATTERNS).permitAll()
-                .anyRequest().access("@authorizationService.isAuthorization(request, authentication)") // 호출 시 권한 인가 데이터 확인
-            .and()
-                .addFilter(getAuthenticationFilter())
-                .logout()
-                .logoutSuccessUrl("/");
-    }
-
-    /**
-     * 로그인 인증정보를 받아 토큰을 발급할 수 있도록 필터를 등록해준다.
-     *
-     * @return
-     * @throws Exception
-     */
-    private AuthenticationFilter getAuthenticationFilter() throws Exception {
-        return new AuthenticationFilter(authenticationManager(), tokenProvider, userService);
-    }
-
-    /**
-     * 인증 관련 - 로그인 처리
-     * DB 에서 조회하여 일치하는지 체크한다.
-     *
-     * @param auth
-     * @throws Exception
-     */
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        // userService.loadUserByUsername 메소드
-        auth.userDetailsService(userService).passwordEncoder(bCryptPasswordEncoder);
-    }
+    @Bean
+	public SecurityFilterChain configure(HttpSecurity http) throws Exception {
+		
+		AuthenticationManager authenticationManager = authenticationManager(http.getSharedObject(AuthenticationConfiguration.class));
+		
+		/**
+	     * 로그인 인증정보를 받아 토큰을 발급할 수 있도록 필터를 등록해준다.
+	     *
+	     * @return
+	     * @throws Exception
+	     */
+		AuthenticationFilter authenticationFilter = new AuthenticationFilter(authenticationManager, tokenProvider, userService);
+		
+		http
+        .csrf().disable().headers().frameOptions().disable()
+        .and()
+            .sessionManagement()
+            .sessionCreationPolicy(SessionCreationPolicy.STATELESS) // 토큰 사용하기 때문에 세션은 비활성화
+        .and()
+            .authorizeRequests()
+            .antMatchers(SECURITY_PERMITALL_ANTPATTERNS).permitAll()
+            .anyRequest().access("@authorizationService.isAuthorization(request, authentication)") // 호출 시 권한 인가 데이터 확인
+        .and()
+            .addFilter(authenticationFilter)
+            .logout()
+            .logoutSuccessUrl("/");
+		
+		return http.build();
+	}

 }
--- a/backend/user-service/src/main/resources/logback-spring.xml
+++ b/backend/user-service/src/main/resources/logback-spring.xml
@@ -46,4 +46,4 @@
        </root>
    </springProfile>

-</Configuration>
+</Configuration>