微调配置注解的位置，将@EnableFeignClients挪到FeignConfig。因为将@EnableFeignClients放在@…

…SpringBootApplication上会导致使用@WebMvcTest的测试失败

spring-projects/spring-boot#7270

gulimall-auth-server/src/main/java/com/atguigu/gulimall/authServer/GulimallAuthServerApplication.java

@@ -6,8 +6,6 @@
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-@EnableFeignClients
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackageClasses = {GulimallAuthServerApplication.class, GulimallCommonModule.class})
 public class GulimallAuthServerApplication {
 

gulimall-cart/src/main/java/com/atguigu/gulimall/cart/GulimallCartApplication.java

@@ -8,8 +8,6 @@
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 
-@EnableFeignClients
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackageClasses = {GulimallCartApplication.class, GulimallCommonModule.class},exclude = DataSourceAutoConfiguration.class)
 public class GulimallCartApplication {
 

gulimall-common/src/main/java/com/atguigu/common/config/FeignConfig.java

@@ -0,0 +1,8 @@
+package com.atguigu.common.config;
+
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Configuration;
+@EnableFeignClients
+@Configuration
+public class FeignConfig {
+}

gulimall-common/src/main/java/com/atguigu/common/config/NacosConfig.java

@@ -0,0 +1,9 @@
+package com.atguigu.common.config;
+
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.Configuration;
+
+@EnableDiscoveryClient
+@Configuration
+public class NacosConfig {
+}

gulimall-common/src/main/java/com/atguigu/common/config/RestClientConfig.java

@@ -0,0 +1,13 @@
+package com.atguigu.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestClientConfig {
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+}

gulimall-common/src/testFixtures/java/com/atguigu/common/ResponseBodyMatchers.java

@@ -0,0 +1,22 @@
+package com.atguigu.common;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.assertj.core.api.Assertions;
+import org.springframework.test.web.servlet.ResultMatcher;
+
+public class ResponseBodyMatchers {
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    public <T> ResultMatcher containsObjectAsJson(
+        Object expectedObject, Class<T> targetClass) {
+        return mvcResult -> {
+            String json = mvcResult.getResponse().getContentAsString();
+            T actualObject = objectMapper.readValue(json, targetClass);
+            Assertions.assertThat(actualObject).isEqualToComparingFieldByField(expectedObject);
+        };
+    }
+
+    public static ResponseBodyMatchers responseBody() {
+        return new ResponseBodyMatchers();
+    }
+}

gulimall-common/src/testFixtures/java/com/atguigu/common/Rmatcher.java

@@ -0,0 +1,24 @@
+package com.atguigu.common;
+
+import com.atguigu.common.utils.R;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.assertj.core.api.Assertions;
+import org.springframework.test.web.servlet.ResultMatcher;
+
+public class Rmatcher {
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    public <T> ResultMatcher hasKeyValue(String key, T val, Class<T> valClass) {
+        return mvcResult -> {
+            String json = mvcResult.getResponse().getContentAsString();
+            R r = objectMapper.readValue(json, R.class);
+            Assertions.assertThat(r.get(key)).isInstanceOf(valClass);
+            Assertions.assertThat(r.get(key)).isEqualToComparingFieldByField(val);
+        };
+    }
+
+
+    public static Rmatcher Rm() {
+        return new Rmatcher();
+    }
+}

gulimall-common/src/testFixtures/java/com/atguigu/common/WebMvcTestConfig.java

@@ -0,0 +1,8 @@
+package com.atguigu.common;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class WebMvcTestConfig {
+
+}

gulimall-coupon/src/main/java/com/atguigu/gulimall/coupon/GulimallCouponApplication.java

@@ -52,7 +52,6 @@
  *
  *
  */
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackageClasses = {GulimallCouponApplication.class, GulimallCommonModule.class})
 public class GulimallCouponApplication {
 

gulimall-gateway/src/main/java/com/atguigu/gulimall/gateway/GulimallGatewayApplication.java

@@ -19,7 +19,6 @@
  * 2、编写网关配置文件
  */
 
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackageClasses = {GulimallGatewayApplication.class, GulimallCommonModule.class},exclude = {DataSourceAutoConfiguration.class})
 public class GulimallGatewayApplication {
 

gulimall-member/src/main/java/com/atguigu/gulimall/member/GulimallMemberApplication.java

@@ -14,9 +14,6 @@
  *   1、声明接口的每一个方法都是调用哪个远程服务的那个请求
  * 3）、开启远程调用功能
  */
-@EnableRedisHttpSession
-@EnableFeignClients(basePackages = "com.atguigu.gulimall.member.feign")
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackageClasses = {GulimallMemberApplication.class, GulimallCommonModule.class})
 public class GulimallMemberApplication {
 

gulimall-order/src/main/java/com/atguigu/gulimall/order/GulimallOrderApplication.java

@@ -10,8 +10,6 @@
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
 @EnableAspectJAutoProxy(exposeProxy = true)
-@EnableFeignClients
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackageClasses = {GulimallOrderApplication.class, GulimallCommonModule.class})
 public class GulimallOrderApplication {
 

gulimall-product/src/main/java/com/atguigu/gulimall/product/GulimallProductApplication.java

@@ -57,8 +57,6 @@
  *  1）、编写异常处理类，使用@ControllerAdvice。
  *  2）、使用@ExceptionHandler标注方法可以处理的异常。
  */
-@EnableFeignClients(basePackages = "com.atguigu.gulimall.product.feign")
-@EnableDiscoveryClient
 @MapperScan("com.atguigu.gulimall.product.dao")
 @SpringBootApplication(scanBasePackageClasses = {GulimallProductApplication.class, GulimallCommonModule.class})
 public class GulimallProductApplication {

gulimall-search/src/main/java/com/atguigu/gulimall/search/GulimallSearchApplication.java

@@ -8,8 +8,6 @@
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 
-@EnableFeignClients(basePackages = "com.atguigu.gulimall.search.feign")
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackageClasses = {GulimallSearchApplication.class, GulimallCommonModule.class}, exclude = DataSourceAutoConfiguration.class)
 public class GulimallSearchApplication {
 

gulimall-seckill/src/main/java/com/atguigu/gulimall/seckill/GulimallSeckillApplication.java

@@ -8,8 +8,6 @@
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 
-@EnableFeignClients
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackageClasses = {GulimallSeckillApplication.class, GulimallCommonModule.class},exclude = DataSourceAutoConfiguration.class)
 public class GulimallSeckillApplication {
 

gulimall-third-party/src/main/java/com/atguigu/gulimall/thirdparty/GulimallThirdPartyApplication.java

@@ -7,7 +7,6 @@
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.ComponentScan;
 
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackageClasses = {GulimallThirdPartyApplication.class, GulimallCommonModule.class})
 public class GulimallThirdPartyApplication {
 

gulimall-ware/src/main/java/com/atguigu/gulimall/ware/GulimallWareApplication.java

@@ -8,8 +8,6 @@
 
 
 
-@EnableFeignClients
-@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackageClasses = {GulimallWareApplication.class, GulimallCommonModule.class})
 public class GulimallWareApplication {