Merge branch 'feature/20210830_礼品卡支付_wuping' into qa

order-application-service/src/main/java/cn/freemud/OrderApplication.java

@@ -14,6 +14,7 @@ package cn.freemud;
 
 import cn.freemud.core.db.DataSourcesConfig;
 import com.alibaba.fastjson.parser.ParserConfig;
+import com.freemud.application.sdk.api.couponcenter.config.CouponRestTemplateConfig;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import feign.RequestInterceptor;
 import org.apache.commons.lang.StringUtils;
@@ -29,12 +30,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.context.annotation.*;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -43,14 +39,14 @@ import tk.mybatis.spring.annotation.MapperScan;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
-
 @ServletComponentScan
 @ImportAutoConfiguration(classes = {DataSourcesConfig.class})
 @EnableSwagger2
 @EnableCircuitBreaker
 @SpringBootApplication(exclude = RedisAutoConfiguration.class) @EnableDiscoveryClient
 @EnableAspectJAutoProxy
-@ComponentScan({"cn.freemud", "com.freemud"})
+@ComponentScan(value = {"cn.freemud", "com.freemud"},excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE,
+        classes ={ CouponRestTemplateConfig.RestTemplateConfig.class})})
 @MapperScan({"cn.freemud.*.dao","com.freemud.sdk.api.assortment.orderdistributor.mapper","com.freemud.api.assortment.datamanager.manager",
                 "com.freemud.api.assortment.datamanager.queue.dao","com.freemud.api.assortment.datamanager.rbac.dao","com.freemud.api.assortment.datamanager.queue.entity"})
 @EnableFeignClients({"cn.freemud.service.thirdparty",