You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by xi...@apache.org on 2022/06/08 07:40:08 UTC
[incubator-shenyu] branch master updated: [type:fix] fix spring cloud dubbo example (#3491)
This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new fe531c1d8 [type:fix] fix spring cloud dubbo example (#3491)
fe531c1d8 is described below
commit fe531c1d8d73cb075e67b013b9cd48e289926200
Author: moremind <he...@hotmail.com>
AuthorDate: Wed Jun 8 15:40:03 2022 +0800
[type:fix] fix spring cloud dubbo example (#3491)
* [type:fix-bug] fix-spring-cloud-dubbo-example
* [type:fix-bug] fix-spring-cloud-dubbo-example,just support zookeeper.
* [type:fix-bug] fix-spring-cloud-dubbo-example,just support zookeeper.
* [type:fix-bug] fix-spring-cloud-dubbo-example,just support zookeeper.
---
.../annotation/impl/DubboClassMultiParamServiceImpl.java | 4 ++--
.../service/annotation/impl/DubboClassTestServiceImpl.java | 4 ++--
.../service/annotation/impl/DubboMultiParamServiceImpl.java | 4 ++--
.../dubbo/service/annotation/impl/DubboTestServiceImpl.java | 4 ++--
.../pom.xml | 11 ++++++++++-
.../spring/cloud/dubbo/service/annotation/Application.java | 4 ++++
.../src/main/resources/application.yml | 1 +
7 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboClassMultiParamServiceImpl.java b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboClassMultiParamServiceImpl.java
index ba43a3061..45b035290 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboClassMultiParamServiceImpl.java
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboClassMultiParamServiceImpl.java
@@ -17,7 +17,7 @@
package org.apache.shenyu.examples.apache.dubbo.service.annotation.impl;
-import org.apache.dubbo.config.annotation.Service;
+import org.apache.dubbo.config.annotation.DubboService;
import org.apache.shenyu.client.dubbo.common.annotation.ShenyuDubboClient;
import org.apache.shenyu.examples.dubbo.api.entity.ComplexBeanTest;
import org.apache.shenyu.examples.dubbo.api.entity.DubboTest;
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
* The type Dubbo multi param service.
*/
@ShenyuDubboClient(path = "/demo")
-@Service
+@DubboService
public class DubboClassMultiParamServiceImpl implements DubboClassMultiParamService {
@Override
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboClassTestServiceImpl.java b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboClassTestServiceImpl.java
index a738d52ec..2a6078783 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboClassTestServiceImpl.java
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboClassTestServiceImpl.java
@@ -16,7 +16,7 @@
package org.apache.shenyu.examples.apache.dubbo.service.annotation.impl;
-import org.apache.dubbo.config.annotation.Service;
+import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.shenyu.client.dubbo.common.annotation.ShenyuDubboClient;
import org.apache.shenyu.common.utils.GsonUtils;
@@ -33,7 +33,7 @@ import java.util.Random;
* The type Dubbo service.
*/
@ShenyuDubboClient(path = "/demo/**", desc = "class init")
-@Service
+@DubboService
public class DubboClassTestServiceImpl implements DubboClassTestService {
private static final Logger LOGGER = LoggerFactory.getLogger(DubboClassTestServiceImpl.class);
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboMultiParamServiceImpl.java b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboMultiParamServiceImpl.java
index 8c4fe9e87..ecd606489 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboMultiParamServiceImpl.java
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboMultiParamServiceImpl.java
@@ -17,7 +17,7 @@
package org.apache.shenyu.examples.apache.dubbo.service.annotation.impl;
-import org.apache.dubbo.config.annotation.Service;
+import org.apache.dubbo.config.annotation.DubboService;
import org.apache.shenyu.client.dubbo.common.annotation.ShenyuDubboClient;
import org.apache.shenyu.examples.dubbo.api.entity.ComplexBeanTest;
import org.apache.shenyu.examples.dubbo.api.entity.DubboTest;
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
/**
* The type Dubbo multi param service.
*/
-@Service
+@DubboService
public class DubboMultiParamServiceImpl implements DubboMultiParamService {
@Override
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboTestServiceImpl.java b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboTestServiceImpl.java
index 2f4e6eb46..8691e95b3 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboTestServiceImpl.java
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/apache/dubbo/service/annotation/impl/DubboTestServiceImpl.java
@@ -16,7 +16,7 @@
package org.apache.shenyu.examples.apache.dubbo.service.annotation.impl;
-import org.apache.dubbo.config.annotation.Service;
+import org.apache.dubbo.config.annotation.DubboService;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.shenyu.client.dubbo.common.annotation.ShenyuDubboClient;
import org.apache.shenyu.common.utils.GsonUtils;
@@ -32,7 +32,7 @@ import java.util.Random;
/**
* The type Dubbo service.
*/
-@Service
+@DubboService
public class DubboTestServiceImpl implements DubboTestService {
private static final Logger LOGGER = LoggerFactory.getLogger(DubboTestServiceImpl.class);
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/pom.xml b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/pom.xml
index 6367f5c81..31a3408f7 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/pom.xml
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/pom.xml
@@ -30,6 +30,8 @@
<properties>
<spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
+ <spring-common.version>3.1.2</spring-common.version>
+ <spring-cloud-ribbon.version>2.2.10.RELEASE</spring-cloud-ribbon.version>
</properties>
<dependencyManagement>
@@ -58,7 +60,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
- <version>2.2.10.RELEASE</version>
+ <version>${spring-cloud-ribbon.version}</version>
<exclusions>
<exclusion>
<artifactId>spring-cloud-context</artifactId>
@@ -93,6 +95,13 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ <version>${spring-common.version}</version>
+ </dependency>
+
</dependencies>
<build>
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/spring/cloud/dubbo/service/annotation/Application.java b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/spring/cloud/dubbo/service/annotation/Application.java
index ebfb8c181..63bf76281 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/spring/cloud/dubbo/service/annotation/Application.java
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/src/main/java/org/apache/shenyu/examples/spring/cloud/dubbo/service/annotation/Application.java
@@ -17,13 +17,17 @@
package org.apache.shenyu.examples.spring.cloud.dubbo.service.annotation;
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
/**
* Application.
*/
@SpringBootApplication
+@EnableDubbo
+@EnableDiscoveryClient
public class Application {
/**
diff --git a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/src/main/resources/application.yml b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/src/main/resources/application.yml
index fd046c15a..9dd58cc67 100644
--- a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/src/main/resources/application.yml
+++ b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-spring-cloud-alibaba-dubbo-service-annotation/src/main/resources/application.yml
@@ -21,6 +21,7 @@ server:
spring:
main:
allow-bean-definition-overriding: true
+ allow-circular-references: true
application:
name: test-spring-cloud-alibaba-dubbo-service