diff --git a/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java b/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java index 1aafc500..09e4203e 100644 --- a/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java +++ b/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 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); + } + +} \ No newline at end of file diff --git a/app/src/main/resources/application-dev.yml b/app/src/main/resources/application-dev.yml index e2e1c842..f276145d 100644 --- a/app/src/main/resources/application-dev.yml +++ b/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: "*" diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java b/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java index a8cc3ad9..32fd1c6f 100644 --- a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java +++ b/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; diff --git a/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java b/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java index 9a3c956f..9d34320c 100644 --- a/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java +++ b/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; diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/AiChatServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/AiChatServiceImpl.java index 6d06c6fb..3e6a628d 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/AiChatServiceImpl.java +++ b/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; diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java index 6b9683cd..d3ef6c45 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java +++ b/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所有数据 * diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java index b8841974..8fe27152 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java +++ b/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所有数据 * diff --git a/base/src/test/java/com/tinyengine/it/controller/AiChatControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/AiChatControllerTest.java index 3db4aac8..165aba00 100644 --- a/base/src/test/java/com/tinyengine/it/controller/AiChatControllerTest.java +++ b/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; diff --git a/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java index 6deaa51b..535be04f 100644 --- a/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java +++ b/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; /** diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/AiChatServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/AiChatServiceImplTest.java index f4dd2621..43ea47cd 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/AiChatServiceImplTest.java +++ b/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;