|
3 | 3 | import cn.springcloud.gray.decision.DefaultGrayDecisionFactoryKeeper;
|
4 | 4 | import cn.springcloud.gray.decision.GrayDecisionFactoryKeeper;
|
5 | 5 | import cn.springcloud.gray.decision.factory.*;
|
6 |
| -import org.apache.commons.collections.CollectionUtils; |
7 | 6 | import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
8 | 7 | import org.springframework.context.annotation.Bean;
|
9 | 8 | import org.springframework.context.annotation.Configuration;
|
10 |
| -import org.springframework.core.convert.ConversionService; |
11 | 9 | import org.springframework.core.convert.support.DefaultConversionService;
|
12 | 10 | import org.springframework.validation.Validator;
|
13 | 11 |
|
@@ -41,13 +39,22 @@ public TraceIpGrayDecisionFactory traceIpGrayDecisionFactory() {
|
41 | 39 | }
|
42 | 40 | }
|
43 | 41 |
|
| 42 | + |
| 43 | + /** |
| 44 | + * 不可引入spring mvc中的ConversionService, 否则会导致feign 加载时,找不到ServletContext, 从而出现异常:No ServletContext set |
| 45 | + * |
| 46 | + * @param validator 校验器 |
| 47 | + * @param decisionFactories 灰度决策工厂类列表 |
| 48 | + * @return 灰度决策工厂管理器 |
| 49 | + */ |
44 | 50 | @Bean
|
45 | 51 | @ConditionalOnMissingBean
|
46 | 52 | public GrayDecisionFactoryKeeper grayDecisionFactoryKeeper(
|
47 |
| - List<ConversionService> conversionServices, Validator validator, List<GrayDecisionFactory> decisionFactories) { |
48 |
| - if (CollectionUtils.isNotEmpty(conversionServices)) { |
49 |
| - return new DefaultGrayDecisionFactoryKeeper(conversionServices.get(0), validator, decisionFactories); |
50 |
| - } |
| 53 | + /*List<ConversionService> conversionServices, */ |
| 54 | + Validator validator, List<GrayDecisionFactory> decisionFactories) { |
| 55 | +// if (CollectionUtils.isNotEmpty(conversionServices)) { |
| 56 | +// return new DefaultGrayDecisionFactoryKeeper(conversionServices.get(0), validator, decisionFactories); |
| 57 | +// } |
51 | 58 | return new DefaultGrayDecisionFactoryKeeper(DefaultConversionService.getSharedInstance(), validator, decisionFactories);
|
52 | 59 |
|
53 | 60 | }
|
|
0 commit comments