fix: Cross domain configuration

Author: lu-yg

app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java

@@ -13,36 +13,40 @@
 package com.tinyengine.it.config.filter;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Configuration
 public  class WebConfig implements WebMvcConfigurer {
     @Value("${cors.allowed-origins}")
     private String allowedOrigins;
 
-    @Value("${cors.allowed-methods}")
-    private String allowedMethods;
-
-    @Value("${cors.allowed-headers}")
-    private String allowedHeaders;
-
-    @Value("${cors.exposed-headers}")
-    private String exposedHeaders;
-
-    @Value("${cors.allow-credentials}")
-    private boolean allowCredentials;
-
-
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        // 配置 CORS
-        registry.addMapping("/**")  // 允许所有路径
-                .allowedOrigins(allowedOrigins)  // 允许特定来源的前端地址
-                .allowedMethods(allowedMethods.split(","))  // 允许的 HTTP 方法
-                .allowedHeaders(allowedHeaders.split(","))  // 允许的请求头
-                .exposedHeaders(exposedHeaders.split(","))  // 暴露给前端的响应头
-                .allowCredentials(allowCredentials);  // 允许携带凭证
-    }
-}
+    @Bean
+    public CorsFilter corsFilter()
+    {
+        // 跨域配置地址
+        List<String> crosDomainList = Arrays.asList(allowedOrigins.split(","));
+
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        // 1、允许来源
+        corsConfiguration.setAllowedOriginPatterns(crosDomainList);
+        // 2、允许任何请求头
+        corsConfiguration.addAllowedHeader(CorsConfiguration.ALL);
+        // 3、允许任何方法
+        corsConfiguration.addAllowedMethod(CorsConfiguration.ALL);
+        // 4、允许凭证
+        corsConfiguration.setAllowCredentials(true);
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", corsConfiguration);
+         return new CorsFilter(source);
+         }
+
+}

app/src/main/resources/application-dev.yml

@@ -60,10 +60,5 @@ logging:
     name: /logs
 
 cors:
-  allowed-origins: "http://127.0.0.1:8090"
-  allowed-methods: "GET,POST,PUT,DELETE,OPTIONS"
-  allowed-headers: "Accept,Referer,User-Agent,x-lowcode-mode,x-lowcode-org,Content-Type,Authorization"
-  exposed-headers: "Authorization"
-  allow-credentials: true
-
+  allowed-origins: "*"
 

base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java

@@ -17,7 +17,6 @@
 import com.tinyengine.it.common.exception.ServiceException;
 import com.tinyengine.it.common.log.SystemControllerLog;
 import com.tinyengine.it.mapper.BlockGroupMapper;
-import com.tinyengine.it.model.dto.BlockGroupDto;
 import com.tinyengine.it.model.entity.BlockGroup;
 import com.tinyengine.it.service.material.BlockGroupService;
 

base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java

@@ -17,11 +17,9 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.tinyengine.it.common.enums.Enums;
 import com.tinyengine.it.common.exception.ServiceException;
 import com.tinyengine.it.config.AiChatConfig;
 import com.tinyengine.it.model.dto.AiParam;
-import com.tinyengine.it.model.dto.OpenAiBodyDto;
 
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;

base/src/main/java/com/tinyengine/it/service/app/impl/AiChatServiceImpl.java

@@ -20,7 +20,6 @@
 import com.tinyengine.it.gateway.ai.AiChatClient;
 import com.tinyengine.it.model.dto.AiMessages;
 import com.tinyengine.it.model.dto.AiParam;
-import com.tinyengine.it.model.dto.OpenAiBodyDto;
 import com.tinyengine.it.service.app.AiChatService;
 
 import lombok.extern.slf4j.Slf4j;

base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java

@@ -52,6 +52,7 @@ public class BlockGroupServiceImpl implements BlockGroupService {
     private BlockGroupBlockMapper blockGroupBlockMapper;
 
     private static final String DEFAULT_USER_ID = "1";
+
     /**
      * 查询表t_block_group所有数据
      *

base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java

@@ -95,6 +95,7 @@ public class BlockServiceImpl implements BlockService {
 
     private static final int DEFAULT_PLATFORM_ID = 1;
     private static final String DEFAULT_USER_ID = "1";
+
     /**
      * 查询表t_block所有数据
      *

base/src/test/java/com/tinyengine/it/controller/AiChatControllerTest.java

@@ -15,7 +15,6 @@
 import static org.mockito.Mockito.when;
 
 import com.tinyengine.it.common.base.Result;
-import com.tinyengine.it.model.dto.AiMessages;
 import com.tinyengine.it.model.dto.AiParam;
 import com.tinyengine.it.service.app.AiChatService;
 
@@ -26,7 +25,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 

base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java

@@ -29,7 +29,6 @@
 import org.mockito.MockitoAnnotations;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 /**

base/src/test/java/com/tinyengine/it/service/app/impl/AiChatServiceImplTest.java

@@ -19,7 +19,6 @@
 import com.tinyengine.it.gateway.ai.AiChatClient;
 import com.tinyengine.it.model.dto.AiMessages;
 import com.tinyengine.it.model.dto.AiParam;
-import com.tinyengine.it.model.dto.OpenAiBodyDto;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;