Merge branch 'master' of https://github.com/yuhuangbin/spring-cloud-alibaba

README.md

@@ -71,7 +71,7 @@ These artifacts are available from Maven Central and Spring Release repository v
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>2.2.0.RELEASE</version>
+                <version>2.2.1.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

pom.xml

@@ -349,6 +349,31 @@
                     <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${flatten-maven-plugin.version}</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -406,32 +431,6 @@
                             </execution>
                         </executions>
                     </plugin>
-
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>flatten-maven-plugin</artifactId>
-                        <version>${flatten-maven-plugin.version}</version>
-                        <configuration>
-                            <updatePomFile>true</updatePomFile>
-                            <flattenMode>resolveCiFriendliesOnly</flattenMode>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>flatten</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>flatten</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>flatten.clean</id>
-                                <phase>clean</phase>
-                                <goals>
-                                    <goal>clean</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
 

spring-cloud-alibaba-dependencies/pom.xml

@@ -21,7 +21,7 @@
         <revision>2.2.1.RELEASE</revision>
         <sentinel.version>1.7.1</sentinel.version>
         <oss.version>3.1.0</oss.version>
-        <seata.version>1.1.0</seata.version>
+        <seata.version>1.2.0</seata.version>
         <nacos.client.version>1.2.1</nacos.client.version>
         <nacos.config.version>0.8.0</nacos.config.version>
         <spring.context.support.version>1.0.6</spring.context.support.version>

spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme-zh.md

@@ -175,7 +175,7 @@ AccessKey|spring.cloud.nacos.config.access-key||
 SecretKey|spring.cloud.nacos.config.secret-key||
 相对路径|spring.cloud.nacos.config.context-path||服务端 API 的相对路径
 接入点|spring.cloud.nacos.config.endpoint|UTF-8|地域的某个服务的入口域名，通过此域名可以动态地拿到服务端地址
-是否开启监听和自动刷新|spring.cloud.nacos.config.refresh.enabled|true|
+是否开启监听和自动刷新|spring.cloud.nacos.config.refresh-enabled|true|
 
 
 

spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java

@@ -76,12 +76,17 @@ public class DubboServiceRegistrationNonWebApplicationAutoConfiguration {
 
 	@Around("execution(* org.springframework.cloud.client.serviceregistry.Registration.getPort())")
 	public Object getPort(ProceedingJoinPoint pjp) throws Throwable {
+		/**
+		 * move setServerPort from onApplicationStarted() to here for this issue :
+		 * https://github.com/alibaba/spring-cloud-alibaba/issues/1383
+		 * @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
+		 */
+		setServerPort();
 		return serverPort != null ? serverPort : pjp.proceed();
 	}
 
 	@EventListener(ApplicationStartedEvent.class)
 	public void onApplicationStarted() {
-		setServerPort();
 		register();
 	}
 
@@ -98,10 +103,12 @@ public class DubboServiceRegistrationNonWebApplicationAutoConfiguration {
 	 * protocol is present.
 	 */
 	private void setServerPort() {
+		if (serverPort == null) {
+			synchronized (DubboServiceRegistrationNonWebApplicationAutoConfiguration.class) {
 				if (serverPort == null) {
 					for (List<URL> urls : repository.getAllExportedUrls().values()) {
-				urls.stream()
+						urls.stream().filter(
-						.filter(url -> REST_PROTOCOL.equalsIgnoreCase(url.getProtocol()))
+								url -> REST_PROTOCOL.equalsIgnoreCase(url.getProtocol()))
 								.findFirst().ifPresent(url -> {
 									serverPort = url.getPort();
 								});
@@ -115,6 +122,8 @@ public class DubboServiceRegistrationNonWebApplicationAutoConfiguration {
 					}
 				}
 			}
+		}
+	}
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnBean(name = ZOOKEEPER_AUTO_SERVICE_AUTO_CONFIGURATION_CLASS_NAME)
@@ -126,6 +135,7 @@ public class DubboServiceRegistrationNonWebApplicationAutoConfiguration {
 		@EventListener(ServiceInstancePreRegisteredEvent.class)
 		public void onServiceInstancePreRegistered(
 				ServiceInstancePreRegisteredEvent event) {
+			setServerPort();
 			registration.setPort(serverPort);
 		}