Commit cdff68bc authored by luyuan's avatar luyuan

update

parent 10109bb5
...@@ -30,6 +30,7 @@ import java.util.Map; ...@@ -30,6 +30,7 @@ import java.util.Map;
*/ */
@RestController @RestController
@RequestMapping(path = "/cmd") @RequestMapping(path = "/cmd")
//@CrossOrigin
public class CmdApi extends BaseController { public class CmdApi extends BaseController {
private final static Logger logger = LoggerFactory.getLogger(CmdApi.class); private final static Logger logger = LoggerFactory.getLogger(CmdApi.class);
......
...@@ -50,9 +50,9 @@ public class CustomMVCConfiguration extends WebMvcConfigurerAdapter { ...@@ -50,9 +50,9 @@ public class CustomMVCConfiguration extends WebMvcConfigurerAdapter {
} }
private static final String ORIGINS[] = new String[] { "GET", "POST", "PUT", "DELETE" }; // private static final String ORIGINS[] = new String[] { "GET", "POST", "PUT", "DELETE" };
@Override // @Override
public void addCorsMappings(CorsRegistry registry) { // public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**").allowedOrigins("*").allowedMethods("*").allowedHeaders("*"); // registry.addMapping("/**").allowedOrigins("*").allowedMethods("*").allowedHeaders("*");
} // }
} }
...@@ -126,26 +126,26 @@ public class ServiceConfiguration { ...@@ -126,26 +126,26 @@ public class ServiceConfiguration {
} }
@Bean // @Bean
public FilterRegistrationBean corsFilter() { // public FilterRegistrationBean corsFilter() {
// 创建 CorsConfiguration 对象后添加配置 // // 创建 CorsConfiguration 对象后添加配置
CorsConfiguration corsConfiguration = new CorsConfiguration(); // CorsConfiguration corsConfiguration = new CorsConfiguration();
corsConfiguration.setAllowCredentials(true); // corsConfiguration.setAllowCredentials(true);
// 设置放行哪些原始域 // // 设置放行哪些原始域
corsConfiguration.addAllowedOrigin("*"); //// corsConfiguration.addAllowedOrigin("*");
// 放行哪些原始请求头部信息 // // 放行哪些原始请求头部信息
corsConfiguration.addAllowedHeader("*"); // corsConfiguration.addAllowedHeader("*");
// 放行哪些请求方法 // // 放行哪些请求方法
corsConfiguration.addAllowedMethod("*"); // corsConfiguration.addAllowedMethod("*");
//
// 添加映射路径 // // 添加映射路径
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); // UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", corsConfiguration); // source.registerCorsConfiguration("/**", corsConfiguration);
CorsFilter corsFilter = new CorsFilter(source); // CorsFilter corsFilter = new CorsFilter(source);
//
FilterRegistrationBean<CorsFilter> registrationBean = new FilterRegistrationBean<>(); // FilterRegistrationBean<CorsFilter> registrationBean = new FilterRegistrationBean<>();
registrationBean.setFilter(corsFilter); // registrationBean.setFilter(corsFilter);
registrationBean.setOrder(Ordered.HIGHEST_PRECEDENCE); // registrationBean.setOrder(Ordered.HIGHEST_PRECEDENCE);
return registrationBean; // return registrationBean;
} // }
} }
...@@ -48,6 +48,7 @@ import java.util.Map; ...@@ -48,6 +48,7 @@ import java.util.Map;
*/ */
@RestController @RestController
@RequestMapping(path = "/app") @RequestMapping(path = "/app")
@CrossOrigin
public class AppController extends BaseController { public class AppController extends BaseController {
private final static Logger logger = LoggerFactory.getLogger(AppController.class); private final static Logger logger = LoggerFactory.getLogger(AppController.class);
......
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