Skip to content

Commit 7859555

Browse files
authored
Merge pull request #147 from prgrms-web-devcourse-final-project/develop
bug[deploy]: url 변경
2 parents 062e73f + 34f6b38 commit 7859555

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

backend/src/main/java/com/ai/lawyer/global/security/SecurityConfig.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,13 @@ public PasswordEncoder passwordEncoder() {
6464
@Bean
6565
public CorsConfigurationSource corsConfigurationSource() {
6666
CorsConfiguration configuration = new CorsConfiguration();
67-
configuration.setAllowedOrigins(List.of("http://localhost:3000, https://www.trybalaw.com, https://api.trybalaw.com"));
67+
configuration.setAllowedOrigins(List.of(
68+
"http://localhost:3000",
69+
"https://www.trybalaw.com",
70+
"https://api.trybalaw.com",
71+
"https://balaw.vercel.app"));
6872
configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
69-
configuration.setAllowedHeaders(List.of("*"));
73+
configuration.setAllowedHeaders(List.of("Authorization","Content-Type","Accept","X-Requested-With"));
7074
configuration.setAllowCredentials(true);
7175

7276
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();

backend/src/main/java/com/ai/lawyer/global/springDoc/SpringDocConfig.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@
44
import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
55
import io.swagger.v3.oas.annotations.info.Info;
66
import io.swagger.v3.oas.annotations.security.SecurityScheme;
7+
import io.swagger.v3.oas.models.OpenAPI;
78
import io.swagger.v3.oas.models.Operation;
89
import io.swagger.v3.oas.models.PathItem;
10+
import io.swagger.v3.oas.models.servers.Server;
911
import org.springdoc.core.customizers.OpenApiCustomizer;
1012
import org.springdoc.core.models.GroupedOpenApi;
1113
import org.springframework.context.annotation.Bean;
1214
import org.springframework.context.annotation.Configuration;
1315

1416
import java.util.Comparator;
1517
import java.util.LinkedHashMap;
18+
import java.util.List;
1619
import java.util.Map;
1720
import java.util.regex.Matcher;
1821
import java.util.regex.Pattern;
@@ -100,4 +103,12 @@ private OpenApiCustomizer orderBySummaryNumber() {
100103
.packagesToScan("com.ai.lawyer.domain.chatbot.controller")
101104
.build();
102105
}
106+
107+
@Bean
108+
public OpenAPI customOpenAPI() {
109+
return new OpenAPI()
110+
.servers(List.of(
111+
new Server().url("/api").description("Relative (proxy-friendly)")
112+
));
113+
}
103114
}

backend/src/main/resources/application.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
server:
2+
forward-headers-strategy: framework
13
spring:
24
autoconfigure:
35
exclude:

0 commit comments

Comments
 (0)