Update Deploy Backend

Author: yunomix2834

ai-service/src/main/java/com/codecampus/ai/constant/config/SecurityConfigConstant.java

@@ -24,7 +24,7 @@ public class SecurityConfigConstant {
   // FRONTEND ENDPOINT
   public static final String FRONTEND_ENDPOINT = "http://192.168.1.30:4200";
   public static final String FRONTEND_ENDPOINT2 = "http://localhost:4200";
-  public static final String FRONTEND_ENDPOINT3 = "http://127.0.0.1:5500";
+  public static final String FRONTEND_ENDPOINT3 = "http://72.60.41.133:4200";
 
   // METHOD ALLOWED
   public static String GET_METHOD = "GET";

chat-service/src/main/java/com/codecampus/chat/constant/config/SecurityConfigConstant.java

@@ -23,7 +23,7 @@ public class SecurityConfigConstant {
   // FRONTEND ENDPOINT
   public static final String FRONTEND_ENDPOINT = "http://192.168.1.30:4200";
   public static final String FRONTEND_ENDPOINT2 = "http://localhost:4200";
-  public static final String FRONTEND_ENDPOINT3 = "http://127.0.0.1:5500";
+  public static final String FRONTEND_ENDPOINT3 = "http://72.60.41.133:4200";
 
   // METHOD ALLOWED
   public static String GET_METHOD = "GET";

coding-service/src/main/java/com/codecampus/coding/constant/config/SecurityConfigConstant.java

@@ -23,7 +23,7 @@ public class SecurityConfigConstant {
   // FRONTEND ENDPOINT
   public static final String FRONTEND_ENDPOINT = "http://192.168.1.30:4200";
   public static final String FRONTEND_ENDPOINT2 = "http://localhost:4200";
-  public static final String FRONTEND_ENDPOINT3 = "http://127.0.0.1:5500";
+  public static final String FRONTEND_ENDPOINT3 = "http://72.60.41.133:4200";
 
   // METHOD ALLOWED
   public static String GET_METHOD = "GET";

docker-compose.prod-services.yml

@@ -205,6 +205,7 @@ services:
     environment:
       - SPRING_PROFILES_ACTIVE=docker
       - APP_API_PREFIX=/api/v1
+      - CORS_ALLOWED_ORIGINS=http://72.60.41.133:4200
     ports: [ "8888:8888" ]
     depends_on:
       - identity-service

gateway-service/src/main/java/com/codecampus/gateway/configuration/client/CorsProperties.java

@@ -0,0 +1,16 @@
+package com.codecampus.gateway.configuration.client;
+
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "app.cors")
+public class CorsProperties {
+
+  private List<String> allowedOrigins = List.of();
+}

gateway-service/src/main/java/com/codecampus/gateway/configuration/client/WebClientConfiguration.java

@@ -85,10 +85,10 @@ WebClient webClient(IdentityServiceProperties props) {
    * @return một đối tượng CorsWebFilter áp dụng cấu hình CORS cho mọi đường dẫn
    */
   @Bean
-  CorsWebFilter corsWebFilter() {
+  CorsWebFilter corsWebFilter(CorsProperties corsProperties) {
     CorsConfiguration corsConfiguration = new CorsConfiguration();
     corsConfiguration.setAllowCredentials(true);
-    corsConfiguration.setAllowedOrigins(List.of("http://72.60.41.133:4200"));
+    corsConfiguration.setAllowedOrigins(corsProperties.getAllowedOrigins());
     corsConfiguration.setAllowedHeaders(List.of("*"));
     corsConfiguration.setAllowedMethods(List.of("*"));
 

gateway-service/src/main/resources/application-docker.yml

@@ -2,7 +2,9 @@ server:
   port: 8888
 
 app:
-  api-prefix: /api/v1
+  api-prefix: ${APP_API_PREFIX}
+  cors:
+    allowed-origins: ${CORS_ALLOWED_ORIGINS}
 
 management:
   endpoints:
@@ -16,6 +18,14 @@ management:
 spring:
   cloud:
     gateway:
+      #      globalcors:
+      #        add-to-simple-url-handler-mapping: true
+      #        corsConfigurations:
+      #          '[/**]':
+      #            allowedOrigins: ${CORS_ALLOWED_ORIGINS}
+      #            allowedHeaders: "*"
+      #            allowedMethods: "*"
+      #            allowCredentials: true
       routes:
         - id: identity_service
           uri: http://identity-service:8080

gateway-service/src/main/resources/application.yml

@@ -12,6 +12,8 @@ server:
 #    trust-store-password: changeit
 app:
   api-prefix: /api/v1
+  cors:
+    allowed-origins: http://localhost:4200
 
 spring:
   application:
@@ -34,6 +36,14 @@ spring:
       #          key-store-password: changeit
       #          trusted-x509-certificates:
       #            - classpath:ssl/ca.crt
+      #      globalcors:
+      #        add-to-simple-url-handler-mapping: true
+      #        corsConfigurations:
+      #          '[/**]':
+      #            allowedOrigins: http://localhost:4200
+      #            allowedHeaders: "*"
+      #            allowedMethods: "*"
+      #            allowCredentials: true
       routes:
         - id: identity_service
           #          uri: https://localhost:8080

identity-service/src/main/java/com/codecampus/identity/constant/config/SecurityConfigConstant.java

@@ -15,7 +15,7 @@ public class SecurityConfigConstant {
   // FRONTEND ENDPOINT (CORS)
   public static final String FRONTEND_ENDPOINT = "http://192.168.1.30:4200";
   public static final String FRONTEND_ENDPOINT2 = "http://localhost:4200";
-  public static final String FRONTEND_ENDPOINT3 = "http://127.0.0.1:5500";
+  public static final String FRONTEND_ENDPOINT3 = "http://72.60.41.133:4200";
 
   // PATTERN REQUEST
   public static final String URL_PATTERN_ALL = "/**";

notification-service/src/main/java/com/codecampus/notification/constant/config/SecurityConfigConstant.java

@@ -23,7 +23,7 @@ public class SecurityConfigConstant {
   // FRONTEND ENDPOINT
   public static final String FRONTEND_ENDPOINT = "http://192.168.1.30:4200";
   public static final String FRONTEND_ENDPOINT2 = "http://localhost:4200";
-  public static final String FRONTEND_ENDPOINT3 = "http://127.0.0.1:5500";
+  public static final String FRONTEND_ENDPOINT3 = "http://72.60.41.133:4200";
 
   // METHOD ALLOWED
   public static String GET_METHOD = "GET";