Skip to content

D
data-server
Commit 9258ced6 authored by liqin's avatar liqin 💬
Browse files
Options

bug fixed

parent baf65df7
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 83 deletions
wisenergy-common/src/main/java/cn/wisenergy/common/config/cors/CORSFilter.java
View file @ 9258ced6
//package cn.wisenergy.common.config.cors;
//
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.web.cors.CorsConfiguration;
//import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
//import org.springframework.web.filter.CorsFilter;
//
///**
// * 跨域过滤器设置
// *
// * @author wyy
// * @date 2019-09-04 14:31
// */
//@Configuration
//public class CORSFilter {
//
// /**
// * 前置跨域设置【过滤器方式先于拦截器生效】
// *
// * @return
// */
// @Bean
// public CorsFilter corsFilter() {
// CorsConfiguration config = new CorsConfiguration();
// config.addAllowedOrigin("*");
// config.setAllowCredentials(true);
// config.addAllowedMethod("*");
// config.addAllowedHeader("*");
// UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
// configSource.registerCorsConfiguration("/**", config);
// return new CorsFilter(configSource);
// }
//
//}
package cn.wisenergy.common.config.cors;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
/**
* 跨域过滤器设置
*
* @author wyy
* @date 2019-09-04 14:31
*/
@Configuration
public class CORSFilter {
/**
* 前置跨域设置【过滤器方式先于拦截器生效】
*
* @return
*/
@Bean
public CorsFilter corsFilter() {
CorsConfiguration config = new CorsConfiguration();
config.addAllowedOrigin("*");
config.setAllowCredentials(true);
config.addAllowedMethod("*");
config.addAllowedHeader("*");
UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
configSource.registerCorsConfiguration("/**", config);
return new CorsFilter(configSource);
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/GlobalCorsConfig.java
View file @ 9258ced6
package cn.wisenergy.web.config;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import java.util.Arrays;
@Configuration
public class GlobalCorsConfig {
@Value("${cors.url.list:#{null}}")
private String corsUrlList;
@Bean
public CorsFilter corsFilter() {
//1.添加CORS配置信息
CorsConfiguration config = new CorsConfiguration();
//2) 允许通过的域,不要写*，否则cookie就无法使用了
if (corsUrlList != null && corsUrlList.length() > 1) {
config.setAllowedOrigins(Arrays.asList(StringUtils.split(corsUrlList, ",")));
config.setAllowCredentials(true);
} else {
config.setAllowCredentials(false);
config.addAllowedOrigin("*");
}
//3) 允许的请求方式
config.addAllowedMethod("OPTIONS");
config.addAllowedMethod("GET");
config.addAllowedMethod("POST");
config.addAllowedMethod("PUT");
config.addAllowedMethod("DELETE");
// 4）允许的头信息
config.addAllowedHeader("*");
//2.添加映射路径，我们拦截一切请求
UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
configSource.registerCorsConfiguration("/**", config);
//3.返回新的CorsFilter.
return new CorsFilter(configSource);
}
}
//package cn.wisenergy.web.config;
//
//import org.apache.commons.lang3.StringUtils;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.web.cors.CorsConfiguration;
//import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
//import org.springframework.web.filter.CorsFilter;
//
//import java.util.Arrays;
//
//@Configuration
//public class GlobalCorsConfig {
//
// @Value("${cors.url.list:#{null}}")
// private String corsUrlList;
//
// @Bean
// public CorsFilter corsFilter() {
// //1.添加CORS配置信息
// CorsConfiguration config = new CorsConfiguration();
// //2) 允许通过的域,不要写*，否则cookie就无法使用了
// if (corsUrlList != null && corsUrlList.length() > 1) {
// config.setAllowedOrigins(Arrays.asList(StringUtils.split(corsUrlList, ",")));
// config.setAllowCredentials(true);
// } else {
// config.setAllowCredentials(false);
// config.addAllowedOrigin("*");
// }
//
// //3) 允许的请求方式
// config.addAllowedMethod("OPTIONS");
// config.addAllowedMethod("GET");
// config.addAllowedMethod("POST");
// config.addAllowedMethod("PUT");
// config.addAllowedMethod("DELETE");
//
// // 4）允许的头信息
// config.addAllowedHeader("*");
// //2.添加映射路径，我们拦截一切请求
// UrlBasedCorsConfigurationSource configSource = new UrlBasedCorsConfigurationSource();
// configSource.registerCorsConfiguration("/**", config);
// //3.返回新的CorsFilter.
// return new CorsFilter(configSource);
// }
//
//}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/MvcConfiguration.java
View file @ 9258ced6
......@@ -45,6 +45,22 @@ public class MvcConfiguration extends WebMvcConfigurationSupport {
@Value("${uploadFile.location}")
private String location;
/**
* 后置跨域支持【当出现跨域请求,此处会放在拦截器最后执行，CORS失效】
*
* @param registry
*/
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
.allowedOriginPatterns("*")
.allowedHeaders("*")
.allowedMethods("*")
.allowCredentials(true)
.maxAge(3600);
}
/**
* 配置消息转换器：Ali开源的fastJson
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment