From e128c6dfea992c79adc7c086dfb48c499825f9fe Mon Sep 17 00:00:00 2001 From: gongdewei Date: Tue, 27 Oct 2020 16:35:46 +0800 Subject: [PATCH 1/8] Improve reading scan base package property --- ...DubboRelaxedBinding2AutoConfiguration.java | 41 ------------------- ...oRelaxedBinding2AutoConfigurationTest.java | 27 ++++-------- .../autoconfigure/DubboAutoConfiguration.java | 15 ++----- .../DubboRelaxedBindingAutoConfiguration.java | 27 ------------ .../dubbo/spring/boot/util/DubboUtils.java | 20 +++++++++ ...boAutoConfigurationOnSingleConfigTest.java | 2 +- 6 files changed, 32 insertions(+), 100 deletions(-) diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java index 0b858f81c..35a92d439 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java @@ -21,26 +21,11 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.source.ConfigurationPropertySources; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; -import org.springframework.core.env.AbstractEnvironment; -import org.springframework.core.env.ConfigurableEnvironment; -import org.springframework.core.env.Environment; -import org.springframework.core.env.MapPropertySource; -import org.springframework.core.env.MutablePropertySources; -import org.springframework.core.env.PropertyResolver; -import java.util.Map; -import java.util.Set; - -import static com.alibaba.spring.util.PropertySourcesUtils.getSubProperties; -import static java.util.Collections.emptySet; -import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_BEAN_NAME; -import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_NAME; import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_PREFIX; -import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SCAN_PREFIX; import static org.apache.dubbo.spring.boot.util.DubboUtils.RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME; import static org.springframework.beans.factory.config.ConfigurableBeanFactory.SCOPE_PROTOTYPE; @@ -56,32 +41,6 @@ @AutoConfigureBefore(DubboRelaxedBindingAutoConfiguration.class) public class DubboRelaxedBinding2AutoConfiguration { - public PropertyResolver dubboScanBasePackagesPropertyResolver(ConfigurableEnvironment environment) { - ConfigurableEnvironment propertyResolver = new AbstractEnvironment() { - @Override - protected void customizePropertySources(MutablePropertySources propertySources) { - Map dubboScanProperties = getSubProperties(environment.getPropertySources(), DUBBO_SCAN_PREFIX); - propertySources.addLast(new MapPropertySource("dubboScanProperties", dubboScanProperties)); - } - }; - ConfigurationPropertySources.attach(propertyResolver); - return propertyResolver; - } - - /** - * The bean is used to scan the packages of Dubbo Service classes - * - * @param environment {@link Environment} instance - * @return non-null {@link Set} - * @since 2.7.8 - */ - @ConditionalOnMissingBean(name = BASE_PACKAGES_BEAN_NAME) - @Bean(name = BASE_PACKAGES_BEAN_NAME) - public Set dubboBasePackages(ConfigurableEnvironment environment) { - PropertyResolver propertyResolver = dubboScanBasePackagesPropertyResolver(environment); - return propertyResolver.getProperty(BASE_PACKAGES_PROPERTY_NAME, Set.class, emptySet()); - } - @ConditionalOnMissingBean(name = RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME, value = ConfigurationBeanBinder.class) @Bean(RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME) @Scope(scopeName = SCOPE_PROTOTYPE) diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java index aaa74c773..d1ed840fa 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java @@ -17,9 +17,10 @@ package org.apache.dubbo.spring.boot.autoconfigure; import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; -import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceClassPostProcessor; +import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor; import com.alibaba.spring.context.config.ConfigurationBeanBinder; +import org.apache.dubbo.spring.boot.util.DubboUtils; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.ObjectProvider; @@ -34,9 +35,7 @@ import org.springframework.util.ClassUtils; import java.util.Map; -import java.util.Set; -import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_BEAN_NAME; import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME; import static org.apache.dubbo.spring.boot.util.DubboUtils.RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME; import static org.junit.Assert.assertEquals; @@ -54,16 +53,12 @@ @PropertySource(value = "classpath:/dubbo.properties") public class DubboRelaxedBinding2AutoConfigurationTest { - @Autowired - @Qualifier(BASE_PACKAGES_BEAN_NAME) - private Set packagesToScan; - @Autowired @Qualifier(RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME) private ConfigurationBeanBinder dubboConfigBinder; @Autowired - private ObjectProvider serviceClassPostProcessor; + private ObjectProvider serviceAnnotationBeanPostProcessor; @Autowired private ObjectProvider referenceAnnotationBeanPostProcessor; @@ -71,26 +66,18 @@ public class DubboRelaxedBinding2AutoConfigurationTest { @Autowired private Environment environment; - @Autowired - private Map environments; - @Test public void testBeans() { + assertEquals(1, DubboUtils.getScanBasePackage(environment).size()); + assertTrue(ClassUtils.isAssignableValue(BinderDubboConfigBinder.class, dubboConfigBinder)); - assertNotNull(serviceClassPostProcessor); - assertNotNull(serviceClassPostProcessor.getIfAvailable()); + assertNotNull(serviceAnnotationBeanPostProcessor); + assertNotNull(serviceAnnotationBeanPostProcessor.getIfAvailable()); assertNotNull(referenceAnnotationBeanPostProcessor); assertNotNull(referenceAnnotationBeanPostProcessor.getIfAvailable()); - assertNotNull(environment); - assertNotNull(environments); - - - assertEquals(1, environments.size()); - - assertTrue(environments.containsValue(environment)); } } \ No newline at end of file diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java index 360bbfc80..16c070b98 100644 --- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java +++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java @@ -23,14 +23,12 @@ import org.apache.dubbo.config.spring.context.DubboBootstrapApplicationListener; import org.apache.dubbo.config.spring.context.DubboLifecycleComponentApplicationListener; import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig; - +import org.apache.dubbo.spring.boot.util.DubboUtils; import org.springframework.beans.BeansException; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; @@ -38,10 +36,8 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; -import java.util.Set; - -import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_BEAN_NAME; import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_NAME; import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_PREFIX; import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SCAN_PREFIX; @@ -65,15 +61,12 @@ public class DubboAutoConfiguration implements ApplicationContextAware, BeanDefi /** * Creates {@link ServiceClassPostProcessor} Bean * - * @param packagesToScan the packages to scan * @return {@link ServiceClassPostProcessor} */ @ConditionalOnProperty(prefix = DUBBO_SCAN_PREFIX, name = BASE_PACKAGES_PROPERTY_NAME) - @ConditionalOnBean(name = BASE_PACKAGES_BEAN_NAME) @Bean - public ServiceClassPostProcessor serviceClassPostProcessor(@Qualifier(BASE_PACKAGES_BEAN_NAME) - Set packagesToScan) { - return new ServiceClassPostProcessor(packagesToScan); + public ServiceClassPostProcessor serviceClassPostProcessor(Environment environment) { + return new ServiceClassPostProcessor(DubboUtils.getScanBasePackage(environment)); } @Override diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBindingAutoConfiguration.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBindingAutoConfiguration.java index fdd320936..5fccf3394 100644 --- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBindingAutoConfiguration.java +++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBindingAutoConfiguration.java @@ -20,20 +20,11 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; -import org.springframework.core.env.Environment; -import org.springframework.core.env.PropertyResolver; -import java.util.Set; - -import static java.util.Collections.emptySet; -import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_BEAN_NAME; -import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_NAME; import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_PREFIX; -import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SCAN_PREFIX; import static org.apache.dubbo.spring.boot.util.DubboUtils.RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME; import static org.springframework.beans.factory.config.ConfigurableBeanFactory.SCOPE_PROTOTYPE; @@ -45,24 +36,6 @@ @Configuration public class DubboRelaxedBindingAutoConfiguration { - public PropertyResolver dubboScanBasePackagesPropertyResolver(Environment environment) { - return new RelaxedPropertyResolver(environment, DUBBO_SCAN_PREFIX); - } - - /** - * The bean is used to scan the packages of Dubbo Service classes - * - * @param environment {@link Environment} instance - * @return non-null {@link Set} - * @since 2.7.8 - */ - @ConditionalOnMissingBean(name = BASE_PACKAGES_BEAN_NAME) - @Bean(name = BASE_PACKAGES_BEAN_NAME) - public Set dubboBasePackages(Environment environment) { - PropertyResolver propertyResolver = dubboScanBasePackagesPropertyResolver(environment); - return propertyResolver.getProperty(BASE_PACKAGES_PROPERTY_NAME, Set.class, emptySet()); - } - @ConditionalOnMissingBean(name = RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME, value = ConfigurationBeanBinder.class) @Bean(RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME) @Scope(scopeName = SCOPE_PROTOTYPE) diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java index 4e6505cfa..b0bcf02f9 100644 --- a/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java +++ b/dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java @@ -22,8 +22,10 @@ import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig; import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder; +import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.boot.context.ContextIdApplicationContextInitializer; import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.Environment; import org.springframework.core.env.PropertyResolver; import java.util.Collections; @@ -32,6 +34,8 @@ import java.util.SortedMap; import java.util.TreeMap; +import static java.util.Collections.emptySet; + /** * The utilities class for Dubbo * @@ -212,4 +216,20 @@ public static SortedMap filterDubboProperties(ConfigurableEnviro return Collections.unmodifiableSortedMap(dubboProperties); } + public static Set getScanBasePackage(Environment environment) { + // spring-boot 2.x Environment support relaxed properties + String name = DUBBO_SCAN_PREFIX + BASE_PACKAGES_PROPERTY_NAME; + Set packagesToScan = environment.getProperty(name, Set.class, emptySet()); + + //read relaxed properties compatible with spring-boot 1.x + if (packagesToScan == null || packagesToScan.isEmpty()) { + try { + RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(environment, DUBBO_SCAN_PREFIX); + packagesToScan = propertyResolver.getProperty(BASE_PACKAGES_PROPERTY_NAME, Set.class, emptySet()); + } catch (NoClassDefFoundError ex) { + //ignore + } + } + return packagesToScan; + } } diff --git a/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java index 26fb6bd50..0ed37df44 100644 --- a/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java +++ b/dubbo-spring-boot-compatible/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java @@ -46,7 +46,7 @@ @RunWith(SpringRunner.class) @TestPropertySource( properties = { - "dubbo.application.name = dubbo-demo-application", + "dubbo.application.NAME = dubbo-demo-application", "dubbo.module.name = dubbo-demo-module", "dubbo.registry.address = zookeeper://192.168.99.100:32770", "dubbo.protocol.name=dubbo", From 2ca371e2819981cb85f3c52f4d05f940054b15bd Mon Sep 17 00:00:00 2001 From: gongdewei Date: Thu, 29 Oct 2020 11:44:38 +0800 Subject: [PATCH 2/8] fix testcase --- .../DubboRelaxedBinding2AutoConfigurationTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java index d1ed840fa..1b8cf0e35 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java @@ -17,9 +17,9 @@ package org.apache.dubbo.spring.boot.autoconfigure; import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; -import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor; import com.alibaba.spring.context.config.ConfigurationBeanBinder; +import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceClassPostProcessor; import org.apache.dubbo.spring.boot.util.DubboUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,13 +30,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.PropertySource; import org.springframework.core.env.Environment; -import org.springframework.core.env.PropertyResolver; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ClassUtils; -import java.util.Map; - -import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME; import static org.apache.dubbo.spring.boot.util.DubboUtils.RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -58,7 +54,7 @@ public class DubboRelaxedBinding2AutoConfigurationTest { private ConfigurationBeanBinder dubboConfigBinder; @Autowired - private ObjectProvider serviceAnnotationBeanPostProcessor; + private ObjectProvider serviceClassPostProcessor; @Autowired private ObjectProvider referenceAnnotationBeanPostProcessor; @@ -73,8 +69,8 @@ public void testBeans() { assertTrue(ClassUtils.isAssignableValue(BinderDubboConfigBinder.class, dubboConfigBinder)); - assertNotNull(serviceAnnotationBeanPostProcessor); - assertNotNull(serviceAnnotationBeanPostProcessor.getIfAvailable()); + assertNotNull(serviceClassPostProcessor); + assertNotNull(serviceClassPostProcessor.getIfAvailable()); assertNotNull(referenceAnnotationBeanPostProcessor); assertNotNull(referenceAnnotationBeanPostProcessor.getIfAvailable()); From 5b35e74ff5f688ff6bee24865ac961379bf9b511 Mon Sep 17 00:00:00 2001 From: JackyKyoto <51149572+JackyKyoto@users.noreply.github.com> Date: Mon, 14 Dec 2020 17:55:50 +0800 Subject: [PATCH 3/8] Fix wrong sample code : (#761) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @Service ====> @DubboService @Reference ====> @DubboReference Co-authored-by: 李大成 --- README_CN.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README_CN.md b/README_CN.md index 8d7b3ebc5..53a4d87cb 100644 --- a/README_CN.md +++ b/README_CN.md @@ -141,7 +141,7 @@ public interface DemoService { 1. 实现 `DemoService` 接口 ```java - @Service(version = "1.0.0") + @DubboService(version = "1.0.0") public class DefaultDemoService implements DemoService { /** @@ -197,7 +197,7 @@ public interface DemoService { ### 实现 Dubbo 服务消费方 -1. 通过 `@Reference` 注入 `DemoService` : +1. 通过 `@DubboReference` 注入 `DemoService` : ```java @EnableAutoConfiguration @@ -205,7 +205,7 @@ public interface DemoService { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Reference(version = "1.0.0", url = "dubbo://127.0.0.1:12345") + @DubboReference(version = "1.0.0", url = "dubbo://127.0.0.1:12345") private DemoService demoService; public static void main(String[] args) { From a11cf3e3405dda745b186c58a960b28bfa886f4e Mon Sep 17 00:00:00 2001 From: lxl910128 <287876871@qq.com> Date: Mon, 14 Dec 2020 18:11:15 +0800 Subject: [PATCH 4/8] fix README_CN change Registry Zookeeper Samples and Registry Nacos Samples error (#760) --- README_CN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_CN.md b/README_CN.md index 53a4d87cb..4db54ce9d 100644 --- a/README_CN.md +++ b/README_CN.md @@ -288,8 +288,8 @@ Dubbo Spring Boot 示例工程包括: - [自动装配](dubbo-spring-boot-samples/auto-configure-samples) - [外部化配置](dubbo-spring-boot-samples/externalized-configuration-samples) -- [Zookeeper 注册中心](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples) -- [Nacos 注册中心](dubbo-spring-boot-samples/dubbo-registry-nacos-samples) +- [Zookeeper 注册中心](https://github.com/apache/dubbo-spring-boot-project/tree/master/dubbo-spring-boot-samples/registry-samples/zookeeper-samples) +- [Nacos 注册中心](https://github.com/apache/dubbo-spring-boot-project/tree/master/dubbo-spring-boot-samples/registry-samples/nacos-samples) From 18635349e168d3c43b1b74a8f699196e9715012a Mon Sep 17 00:00:00 2001 From: JustDoNow Date: Mon, 14 Dec 2020 18:38:54 +0800 Subject: [PATCH 5/8] Update README_CN.md (#762) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改版本号，2.7.7->2.7.8 --- README_CN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_CN.md b/README_CN.md index 4db54ce9d..e1e42cc34 100644 --- a/README_CN.md +++ b/README_CN.md @@ -22,7 +22,7 @@ ```xml 2.3.0.RELEASE - 2.7.7 + 2.7.8 @@ -72,7 +72,7 @@ org.apache.dubbo dubbo-spring-boot-starter - 2.7.7 + 2.7.8 From 94a95bb5dacde989d928e20453a359da77c11fa6 Mon Sep 17 00:00:00 2001 From: wuudongdong <74701398+wuudongdong@users.noreply.github.com> Date: Mon, 14 Dec 2020 18:41:46 +0800 Subject: [PATCH 6/8] Update README.md (#764) update Registry Zookeeper Samples and Registry Nacos Samples URL --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0cd325468..d85bf0829 100644 --- a/README.md +++ b/README.md @@ -263,8 +263,8 @@ The samples project of Dubbo Spring Boot that includes: - [Auto-Configuaration Samples](dubbo-spring-boot-samples/auto-configure-samples) - [Externalized Configuration Samples](dubbo-spring-boot-samples/externalized-configuration-samples) -- [Registry Zookeeper Samples](dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples) -- [Registry Nacos Samples](dubbo-spring-boot-samples/dubbo-registry-nacos-samples) +- [Registry Zookeeper Samples](https://github.com/apache/dubbo-spring-boot-project/tree/master/dubbo-spring-boot-samples/registry-samples/zookeeper-samples) +- [Registry Nacos Samples](https://github.com/apache/dubbo-spring-boot-project/tree/master/dubbo-spring-boot-samples/registry-samples/nacos-samples) From 2d53ca2b3d8472a93a52a5fe3766d72c4867db1b Mon Sep 17 00:00:00 2001 From: DaisyLJQ <37607839+DaisyLJQ@users.noreply.github.com> Date: Mon, 14 Dec 2020 18:45:34 +0800 Subject: [PATCH 7/8] Update README.md (#763) Update the version of the project to 2.7.8 . --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d85bf0829..2ebdf45d4 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi ```xml 2.3.0.RELEASE - 2.7.7 + 2.7.8 @@ -50,7 +50,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi org.apache.dubbo dubbo-spring-boot-starter - 2.7.7 + 2.7.8 ``` From ff58629200cf0a7a7c789d27a5c1759fed22b8f4 Mon Sep 17 00:00:00 2001 From: sharpzhango <1404405160@qq.com> Date: Mon, 14 Dec 2020 23:00:02 +0800 Subject: [PATCH 8/8] Update README.md (#765) Wrong annotation ====> Correct annotation @service ====> @DubboService @reference ====> @DubboReference --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2ebdf45d4..022bc3d41 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ public interface DemoService { 1. Service Provider implements `DemoService` ```java - @Service(version = "1.0.0") + @DubboService(version = "1.0.0") public class DefaultDemoService implements DemoService { /** @@ -176,7 +176,7 @@ public interface DemoService { private final Logger logger = LoggerFactory.getLogger(getClass()); - @Reference(version = "1.0.0", url = "dubbo://127.0.0.1:12345") + @DubboReference(version = "1.0.0", url = "dubbo://127.0.0.1:12345") private DemoService demoService; public static void main(String[] args) {