Skip to content

Commit 94c29dd

Browse files
authored
fix: Cross domain configuration (#192)
* fix: update page history bug * fix: format code and fix style issue * fix: modify page histiry entity * feat: add code submission rules * fix: modify app schema for test * fix: modify t_i18n_entry u_idx_i18n_entity * fix: modify t_i18n_entry u_idx_i18n_entity * fix: modify block update api * fix: Modify code format * fix: Modify code format * fix: Modify code format * fix: modify block group api * fix: modify block group mapper * fix: modify workflows * fix: Update checkstyle.yml * fix: modify workflows * fix: Modify block create and update api * fix: Modify code format * fix: Modify code format * fix: Modify block group * fix: Modify block group * fix: Modify block group * fix: Modify block group api * fix: Modify block group api * fix: Modify block group api * feat: add code check * feat: add code check * feat: add code check * fix: Fix code check * fix: Cross domain configuration
1 parent a95eae3 commit 94c29dd

File tree

10 files changed

+32
-39
lines changed

10 files changed

+32
-39
lines changed

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

+29-25
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,40 @@
1313
package com.tinyengine.it.config.filter;
1414

1515
import org.springframework.beans.factory.annotation.Value;
16+
import org.springframework.context.annotation.Bean;
1617
import org.springframework.context.annotation.Configuration;
17-
import org.springframework.web.servlet.config.annotation.CorsRegistry;
18+
import org.springframework.web.cors.CorsConfiguration;
19+
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
20+
import org.springframework.web.filter.CorsFilter;
1821
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
1922

23+
import java.util.Arrays;
24+
import java.util.List;
25+
2026
@Configuration
2127
public class WebConfig implements WebMvcConfigurer {
2228
@Value("${cors.allowed-origins}")
2329
private String allowedOrigins;
2430

25-
@Value("${cors.allowed-methods}")
26-
private String allowedMethods;
27-
28-
@Value("${cors.allowed-headers}")
29-
private String allowedHeaders;
30-
31-
@Value("${cors.exposed-headers}")
32-
private String exposedHeaders;
33-
34-
@Value("${cors.allow-credentials}")
35-
private boolean allowCredentials;
36-
37-
38-
@Override
39-
public void addCorsMappings(CorsRegistry registry) {
40-
// 配置 CORS
41-
registry.addMapping("/**") // 允许所有路径
42-
.allowedOrigins(allowedOrigins) // 允许特定来源的前端地址
43-
.allowedMethods(allowedMethods.split(",")) // 允许的 HTTP 方法
44-
.allowedHeaders(allowedHeaders.split(",")) // 允许的请求头
45-
.exposedHeaders(exposedHeaders.split(",")) // 暴露给前端的响应头
46-
.allowCredentials(allowCredentials); // 允许携带凭证
47-
}
48-
}
31+
@Bean
32+
public CorsFilter corsFilter()
33+
{
34+
// 跨域配置地址
35+
List<String> crosDomainList = Arrays.asList(allowedOrigins.split(","));
36+
37+
CorsConfiguration corsConfiguration = new CorsConfiguration();
38+
// 1、允许来源
39+
corsConfiguration.setAllowedOriginPatterns(crosDomainList);
40+
// 2、允许任何请求头
41+
corsConfiguration.addAllowedHeader(CorsConfiguration.ALL);
42+
// 3、允许任何方法
43+
corsConfiguration.addAllowedMethod(CorsConfiguration.ALL);
44+
// 4、允许凭证
45+
corsConfiguration.setAllowCredentials(true);
46+
47+
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
48+
source.registerCorsConfiguration("/**", corsConfiguration);
49+
return new CorsFilter(source);
50+
}
51+
52+
}

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

+1-6
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,5 @@ logging:
6060
name: /logs
6161

6262
cors:
63-
allowed-origins: "http://127.0.0.1:8090"
64-
allowed-methods: "GET,POST,PUT,DELETE,OPTIONS"
65-
allowed-headers: "Accept,Referer,User-Agent,x-lowcode-mode,x-lowcode-org,Content-Type,Authorization"
66-
exposed-headers: "Authorization"
67-
allow-credentials: true
68-
63+
allowed-origins: "*"
6964

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

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.tinyengine.it.common.exception.ServiceException;
1818
import com.tinyengine.it.common.log.SystemControllerLog;
1919
import com.tinyengine.it.mapper.BlockGroupMapper;
20-
import com.tinyengine.it.model.dto.BlockGroupDto;
2120
import com.tinyengine.it.model.entity.BlockGroup;
2221
import com.tinyengine.it.service.material.BlockGroupService;
2322

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

-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
import com.fasterxml.jackson.core.JsonProcessingException;
1818
import com.fasterxml.jackson.core.type.TypeReference;
1919
import com.fasterxml.jackson.databind.ObjectMapper;
20-
import com.tinyengine.it.common.enums.Enums;
2120
import com.tinyengine.it.common.exception.ServiceException;
2221
import com.tinyengine.it.config.AiChatConfig;
2322
import com.tinyengine.it.model.dto.AiParam;
24-
import com.tinyengine.it.model.dto.OpenAiBodyDto;
2523

2624
import lombok.extern.slf4j.Slf4j;
2725
import reactor.core.publisher.Mono;

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

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.tinyengine.it.gateway.ai.AiChatClient;
2121
import com.tinyengine.it.model.dto.AiMessages;
2222
import com.tinyengine.it.model.dto.AiParam;
23-
import com.tinyengine.it.model.dto.OpenAiBodyDto;
2423
import com.tinyengine.it.service.app.AiChatService;
2524

2625
import lombok.extern.slf4j.Slf4j;

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

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public class BlockGroupServiceImpl implements BlockGroupService {
5252
private BlockGroupBlockMapper blockGroupBlockMapper;
5353

5454
private static final String DEFAULT_USER_ID = "1";
55+
5556
/**
5657
* 查询表t_block_group所有数据
5758
*

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

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public class BlockServiceImpl implements BlockService {
9595

9696
private static final int DEFAULT_PLATFORM_ID = 1;
9797
private static final String DEFAULT_USER_ID = "1";
98+
9899
/**
99100
* 查询表t_block所有数据
100101
*

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

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import static org.mockito.Mockito.when;
1616

1717
import com.tinyengine.it.common.base.Result;
18-
import com.tinyengine.it.model.dto.AiMessages;
1918
import com.tinyengine.it.model.dto.AiParam;
2019
import com.tinyengine.it.service.app.AiChatService;
2120

@@ -26,7 +25,6 @@
2625
import org.mockito.Mock;
2726
import org.mockito.MockitoAnnotations;
2827

29-
import java.util.ArrayList;
3028
import java.util.HashMap;
3129
import java.util.Map;
3230

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

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.mockito.MockitoAnnotations;
3030

3131
import java.util.Arrays;
32-
import java.util.Collections;
3332
import java.util.List;
3433

3534
/**

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

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.tinyengine.it.gateway.ai.AiChatClient;
2020
import com.tinyengine.it.model.dto.AiMessages;
2121
import com.tinyengine.it.model.dto.AiParam;
22-
import com.tinyengine.it.model.dto.OpenAiBodyDto;
2322

2423
import org.junit.jupiter.api.Assertions;
2524
import org.junit.jupiter.api.BeforeEach;

0 commit comments

Comments
 (0)