Temporary commit

spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudBootstrap.java

@@ -29,8 +29,16 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.alibaba.dubbo.service.EchoService;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -39,18 +47,37 @@ import java.util.List;
  */
 @EnableDiscoveryClient
 @EnableAutoConfiguration
+@EnableFeignClients
+@EnableScheduling
+@RestController
 public class DubboSpringCloudBootstrap {
 
     @Reference(version = "1.0.0")
     private EchoService echoService;
 
-    @Reference(version = "1.0.0")
-    private EchoService echoServiceForRest;
+    @Autowired
+    @Lazy
+    private FeignEchoService feignEchoService;
+
+    @GetMapping(value = "/call/echo")
+    public String echo(@RequestParam("message") String message) {
+        return feignEchoService.echo(message);
+    }
+
+    @FeignClient("spring-cloud-alibaba-dubbo")
+    public interface FeignEchoService {
+
+        @GetMapping(value = "/echo")
+        String echo(@RequestParam("message") String message);
+    }
 
     @Bean
     public ApplicationRunner applicationRunner() {
         return arguments -> {
+            // Dubbo Service call
             System.out.println(echoService.echo("mercyblitz"));
+            // Spring Cloud Open Feign REST Call
+            System.out.println(feignEchoService.echo("mercyblitz"));
         };
     }
 

spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/service/DefaultEchoService.java

@@ -43,13 +43,14 @@ import javax.ws.rs.QueryParam;
 public class DefaultEchoService implements EchoService {
 
     @Override
-    @GetMapping(value = "/echo",
-            consumes = MediaType.APPLICATION_JSON_VALUE,
-            produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @GetMapping(value = "/echo"
+//            consumes = MediaType.APPLICATION_JSON_VALUE,
+//            produces = MediaType.APPLICATION_JSON_UTF8_VALUE
+    )
     @Path("/echo")
     @GET
-    @Consumes("application/json")
-    @Produces("application/json;charset=UTF-8")
+//    @Consumes("application/json")
+//    @Produces("application/json;charset=UTF-8")
     public String echo(@RequestParam @QueryParam("message") String message) {
         return RpcContext.getContext().getUrl() + " [echo] : " + message;
     }

spring-cloud-alibaba-dubbo/src/test/resources/application.yaml

@@ -10,4 +10,4 @@ dubbo:
       port: 9090
       server: netty
   registry:
-    address: spring-cloud://dummy
+    address: spring-cloud://nacos

spring-cloud-alibaba-dubbo/src/test/resources/bootstrap.yaml

@@ -5,7 +5,6 @@ spring:
     nacos:
       discovery:
         server-addr: 127.0.0.1:8848
-        port: 12345
 eureka:
   client:
     enabled: false