Merge pull request #19 from capgoing/feature/swagger-cors

🐛 Fix : cors setting

Author: hyeonda02

.github/workflows/CI.yml

@@ -44,5 +44,7 @@ jobs:
         env:
           SPRING_DATA_MONGODB_URI: "mongodb://test:testPW@localhost:27017/testdb"
           FASTAPI_BASE_URL: ${{ secrets.FASTAPI_BASE_URL }}
+          SERVER_BASE_URL: ${{ secrets.SERVER_BASE_URL }}
+
         run: |
           ./gradlew build test

.github/workflows/CICD.yml

@@ -9,6 +9,7 @@ on:
 env:
   DOCKERHUB_REPOSITORY: ${{ secrets.DOCKER_REPOSITORY }}
   FASTAPI_BASE_URL: ${{ secrets.FASTAPI_BASE_URL }}
+  SERVER_BASE_URL: ${{ secrets.SERVER_BASE_URL }}
 
 jobs:
   CI:
@@ -48,6 +49,7 @@ jobs:
         env:
           SPRING_DATA_MONGODB_URI: "mongodb://test:testPW@localhost:27017/testdb"
           FASTAPI_BASE_URL: ${{ secrets.FASTAPI_BASE_URL }}
+          SERVER_BASE_URL: ${{ secrets.SERVER_BASE_URL }}
         run: |
           ./gradlew build test
 
@@ -100,6 +102,7 @@ jobs:
           USERNAME: ${{ secrets.DOCKER_USERNAME }}
           IMAGE_TAG: ${{ steps.slug.outputs.sha7 }}
           FASTAPI_BASE_URL: ${{ secrets.FASTAPI_BASE_URL }}
+          SERVER_BASE_URL: ${{ secrets.SERVER_BASE_URL }}
 
         run: |
           docker build -t $USERNAME/$DOCKERHUB_REPOSITORY:$IMAGE_TAG -t $USERNAME/$DOCKERHUB_REPOSITORY:latest .
@@ -128,6 +131,7 @@ jobs:
             export DOCKER_IMAGE="${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:latest"
             export DOCKER_COMPOSE_PATH="${{ secrets.DOCKER_COMPOSE_PATH }}"
             export FASTAPI_BASE_URL="${{ secrets.FASTAPI_BASE_URL }}"
+            export SERVER_BASE_URL="${{ secrets.SERVER_BASE_URL }}"
             
             cd /home/ubuntu/scripts
             ./rolling-update.sh

src/main/java/com/going/server/domain/word/dto/WordResponseDto.java

@@ -8,7 +8,7 @@
 @AllArgsConstructor
 @Builder
 public class WordResponseDto {
-    private Integer clusterId; // 클러스터 ID 추가
+    private Integer clusterId;
     private String word;
     private String result_img;
 }

src/main/java/com/going/server/global/config/SwaggerConfig.java

@@ -3,21 +3,30 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.servers.Server;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.filter.ForwardedHeaderFilter;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 public class SwaggerConfig {
+    @Value("${server.base-url}")
+    private String springServerUrl;
+
+    @Value("${fastapi.base-url}")
+    private String fastapiServerUrl;
 
     @Bean
     public OpenAPI customOpenAPI() {
         return new OpenAPI()
                 .info(new Info()
                         .title("Test SpringBoot API")
                         .description("<h3>CapGoing API</h3>")
-                        .version("1.0.0")); // FastAPI 서버 추가
+                        .version("1.0.0"))
+            .addServersItem(new Server().url(springServerUrl).description("Spring Boot Server"))
+            .addServersItem(new Server().url(fastapiServerUrl).description("FastAPI Server"));
     }
 
     @Bean
@@ -26,11 +35,17 @@ public WebMvcConfigurer corsConfigurer() {
             @Override
             public void addCorsMappings(CorsRegistry registry) {
                 registry.addMapping("/**")
-                        .allowedOrigins("http://localhost:5173/","http://localhost:5173","https://www.capgoing.shop", "https://capgoing.shop")
+                        .allowedOrigins("http://localhost:5173/","http://localhost:5173","https://www.capgoing.shop",
+                            "https://capgoing.shop",
+                            "https://api.capgoing.shop")
                         .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")
                         .allowedHeaders("*")
                         .allowCredentials(false);
             }
         };
     }
+    @Bean
+    public ForwardedHeaderFilter forwardedHeaderFilter() {
+        return new ForwardedHeaderFilter();
+    }
 }

src/main/resources/application-prod.properties

@@ -1 +1,2 @@
-fastapi.base-url=${FASTAPI_BASE_URL}
+fastapi.base-url=${FASTAPI_BASE_URL}
+server.base-url=${SERVER_BASE_URL}