chore: merge conflict 해결

softeerbootcamp4th · Aug 23, 2024 · 45f788f · 45f788f
2 parents ed54b32 + 75027ef
commit 45f788f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/main/java/com/softeer/podoarrival/PodoArrivalApplication.java b/src/main/java/com/softeer/podoarrival/PodoArrivalApplication.java
@@ -30,10 +30,27 @@ public WebMvcConfigurer corsConfigurer() {
             @Override
             public void addCorsMappings(CorsRegistry registry) {
                 registry.addMapping("/**")
-                        .allowedOrigins("http://localhost:8000", "https://www.hyundaiseltos.site")  // 허용할 도메인
+                        .allowedOrigins("http://localhost:8000", "https://www.hyundaiseltos.site", "https://d3u0wfxb13l271.cloudfront.net")  // 허용할 도메인
                         .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")  // 허용할 HTTP 메소드
                         .allowedHeaders("*"); // 허용할 헤더
             }
         };
     }
+
+//    @Bean
+//    public ServletWebServerFactory servletContainer() {
+//        // Enable SSL Trafic
+//        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory() {
+//            @Override
+//            protected void postProcessContext(Context context) {
+//                SecurityConstraint securityConstraint = new SecurityConstraint();
+//                securityConstraint.setUserConstraint("CONFIDENTIAL");
+//                SecurityCollection collection = new SecurityCollection();
+//                collection.addPattern("/*");
+//                securityConstraint.addCollection(collection);
+//                context.addConstraint(securityConstraint);
+//            }
+//        };
+//        return tomcat;
+//    }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -6,6 +6,12 @@ server:
       max: 200 # 작업 스레드
 #    accept-count: 500000 # 요청 대기 큐 크기
 #    connection-timeout: 600000 # 연결 타임아웃 (밀리초)
+#  ssl:
+#    enabled: true
+#    key-store: ../arrival-server.p12
+#    key-store-password: teampodo
+#    key-store-type: PKCS12
+#    key-alias: softeerbootcamp4th
 
 spring:
   application: