jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
疯狂的狮子li
2021-06-21 19:41:11 +08:00
parent d507111008 9c55b83dea
commit f585992c6f
6 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FeignConfig.java
View File

@ -1,7 +1,6 @@
package com.ruoyi.framework.config;
import feign.*;
import feign.hystrix.HystrixFeign;
import okhttp3.ConnectionPool;
import okhttp3.OkHttpClient;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@ -35,11 +34,6 @@ public class FeignConfig {
.build();
}
@Bean
public Feign.Builder feignBuilder() {
return HystrixFeign.builder();
}
@Bean
public Contract feignContract() {
return new SpringMvcContract();
@ -60,4 +54,4 @@ public class FeignConfig {
return new Retryer.Default();
}
}
}

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
View File

@ -50,7 +50,7 @@ public class ResourcesConfig implements WebMvcConfigurer
CorsConfiguration config = new CorsConfiguration();
config.setAllowCredentials(true);
// 设置访问源地址
config.addAllowedOrigin("*");
config.addAllowedOriginPattern("*");
// 设置访问源请求头
config.addAllowedHeader("*");
// 设置访问源请求方法