From 135b0d7ad96f71e0d76a4605c07d4c6afe2a0bee Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Mon, 6 Dec 2021 20:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20CorsConfig=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE,=20=E4=BD=BF=E7=94=A8=20Spring=20=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=20@CrossOrigin.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hippo4j/starter/config/CorsConfig.java | 31 ------------------- .../DynamicThreadPoolAutoConfiguration.java | 2 +- .../controller/PoolRunStateController.java | 4 ++- 3 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/CorsConfig.java diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/CorsConfig.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/CorsConfig.java deleted file mode 100644 index 2102da2e..00000000 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/CorsConfig.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.hippo4j.starter.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; - -/** - * Cors config. - * - * @author chen.ma - * @date 2021/11/12 21:46 - */ -public class CorsConfig { - - private CorsConfiguration buildConfig() { - CorsConfiguration corsConfiguration = new CorsConfiguration(); - corsConfiguration.addAllowedOrigin("*"); - corsConfiguration.addAllowedHeader("*"); - corsConfiguration.addAllowedMethod("GET"); - return corsConfiguration; - } - - @Bean - public CorsFilter corsFilter() { - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**", buildConfig()); - return new CorsFilter(source); - } - -} diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java index 79b2c938..9e8a4169 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/config/DynamicThreadPoolAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.core.env.ConfigurableEnvironment; @AllArgsConstructor @ConditionalOnBean(MarkerConfiguration.Marker.class) @EnableConfigurationProperties(BootstrapProperties.class) -@ImportAutoConfiguration({HttpClientConfig.class, DiscoveryConfig.class, MessageAlarmConfig.class, UtilAutoConfiguration.class, CorsConfig.class}) +@ImportAutoConfiguration({HttpClientConfig.class, DiscoveryConfig.class, MessageAlarmConfig.class, UtilAutoConfiguration.class}) public class DynamicThreadPoolAutoConfiguration { private final BootstrapProperties properties; diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/PoolRunStateController.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/PoolRunStateController.java index 4a13f4b1..fc2465be 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/PoolRunStateController.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/controller/PoolRunStateController.java @@ -1,9 +1,10 @@ package cn.hippo4j.starter.controller; -import cn.hippo4j.starter.handler.ThreadPoolRunStateHandler; import cn.hippo4j.common.model.PoolRunStateInfo; import cn.hippo4j.common.web.base.Result; import cn.hippo4j.common.web.base.Results; +import cn.hippo4j.starter.handler.ThreadPoolRunStateHandler; +import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; @@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; * @author chen.ma * @date 2021/7/7 21:34 */ +@CrossOrigin @RestController public class PoolRunStateController {