Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
#	spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListener.java

@@ -1,20 +1,20 @@
 package org.springframework.cloud.alicloud.context.nacos;
 
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
 import org.springframework.cloud.alicloud.context.listener.AbstractOnceApplicationListener;
 
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
-
 /**
  * @author pbting
  */
-public class NacosParameterInitListener
+public class NacosConfigParameterInitListener
 		extends AbstractOnceApplicationListener<ApplicationEnvironmentPreparedEvent> {
 	private static final Logger log = LoggerFactory
-			.getLogger(NacosParameterInitListener.class);
+			.getLogger(NacosConfigParameterInitListener.class);
 
 	@Override
 	protected String conditionalOnClass() {
@@ -30,12 +30,15 @@ public class NacosParameterInitListener
 		EdasChangeOrderConfiguration edasChangeOrderConfiguration = EdasChangeOrderConfigurationFactory
 				.getEdasChangeOrderConfiguration();
 
+		if (log.isDebugEnabled()) {
+			log.debug("Initialize Nacos Config Parameter ,is managed {}.",
+					edasChangeOrderConfiguration.isEdasManaged());
+		}
+
 		if (!edasChangeOrderConfiguration.isEdasManaged()) {
 			return;
 		}
 
-		log.info("Initialize Nacos Parameter from edas change order,is edas managed {}.",
-				edasChangeOrderConfiguration.isEdasManaged());
 		System.getProperties().setProperty("spring.cloud.nacos.config.server-mode",
 				"EDAS");
 		// initialize nacos configuration

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cloud.alicloud.context.nacos;
+
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
+import org.springframework.cloud.alicloud.context.listener.AbstractOnceApplicationListener;
+
+import java.util.Properties;
+
+/**
+ * @author pbting
+ * @date 2019-02-14 11:12 AM
+ */
+public class NacosDiscoveryParameterInitListener
+		extends AbstractOnceApplicationListener<ApplicationEnvironmentPreparedEvent> {
+	private static final Logger log = LoggerFactory
+			.getLogger(NacosDiscoveryParameterInitListener.class);
+
+	@Override
+	protected String conditionalOnClass() {
+		return "org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration";
+	}
+
+	@Override
+	protected void handleEvent(ApplicationEnvironmentPreparedEvent event) {
+		EdasChangeOrderConfiguration edasChangeOrderConfiguration = EdasChangeOrderConfigurationFactory
+				.getEdasChangeOrderConfiguration();
+
+		if (log.isDebugEnabled()) {
+			log.debug("Initialize Nacos Discovery Parameter ,is managed {}.",
+					edasChangeOrderConfiguration.isEdasManaged());
+		}
+
+		if (!edasChangeOrderConfiguration.isEdasManaged()) {
+			return;
+		}
+		// initialize nacos configuration
+		Properties properties = System.getProperties();
+
+		// step 1: set some properties for spring cloud alibaba nacos discovery
+		properties.setProperty("spring.cloud.nacos.discovery.server-addr", "");
+		properties.setProperty("spring.cloud.nacos.discovery.endpoint",
+				edasChangeOrderConfiguration.getAddressServerDomain());
+		properties.setProperty("spring.cloud.nacos.discovery.namespace",
+				edasChangeOrderConfiguration.getTenantId());
+		properties.setProperty("spring.cloud.nacos.discovery.access-key",
+				edasChangeOrderConfiguration.getDauthAccessKey());
+		properties.setProperty("spring.cloud.nacos.discovery.secret-key",
+				edasChangeOrderConfiguration.getDauthSecretKey());
+
+		// step 2: set these properties for nacos client
+		properties.setProperty("webContext", "/vipserver");
+		properties.setProperty("serverPort", "80");
+	}
+}

spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories

@@ -10,5 +10,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springframework.cloud.alicloud.context.sms.SmsContextAutoConfiguration
 org.springframework.context.ApplicationListener=\
   org.springframework.cloud.alicloud.context.ans.AnsContextApplicationListener,\
-  org.springframework.cloud.alicloud.context.nacos.NacosParameterInitListener,\
+  org.springframework.cloud.alicloud.context.nacos.NacosConfigParameterInitListener,\
+  org.springframework.cloud.alicloud.context.nacos.NacosDiscoveryParameterInitListener,\
   org.springframework.cloud.alicloud.context.sentinel.SentinelAliCloudListener

spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java

@@ -16,7 +16,8 @@
 
 package org.springframework.cloud.alicloud.context.nacos;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -24,15 +25,14 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
 import org.springframework.cloud.alicloud.utils.ChangeOrderUtils;
 
-import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
-import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 /**
  * @author xiaolongzuo
  */
 @PrepareForTest({ EdasChangeOrderConfigurationFactory.class,
-		NacosParameterInitListener.class, AliCloudAnsInitializer.class })
-public class NacosParameterInitListenerTests extends BaseAliCloudSpringApplication {
+		NacosConfigParameterInitListener.class, AliCloudAnsInitializer.class })
+public class NacosConfigParameterInitListenerTests extends BaseAliCloudSpringApplication {
 
 	@BeforeClass
 	public static void setUp() {

spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.alicloud.context.nacos;
+
+import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
+import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
+import org.springframework.cloud.alicloud.utils.ChangeOrderUtils;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+/**
+ * @author xiaolongzuo
+ */
+@PrepareForTest({EdasChangeOrderConfigurationFactory.class,
+        NacosConfigParameterInitListener.class, AliCloudAnsInitializer.class})
+public class NacosDiscoveryParameterInitListenerTests extends BaseAliCloudSpringApplication {
+
+    @BeforeClass
+    public static void setUp() {
+        ChangeOrderUtils.mockChangeOrder();
+        System.getProperties().setProperty("webContext", "/vipserver");
+        System.getProperties().setProperty("serverPort", "80");
+    }
+
+    @Test
+    public void testNacosParameterInitListener() {
+        assertThat(System.getProperty("spring.cloud.nacos.config.server-addr"))
+                .isEqualTo("");
+        assertThat(System.getProperty("spring.cloud.nacos.config.endpoint"))
+                .isEqualTo("testDomain");
+        assertThat(System.getProperty("spring.cloud.nacos.config.namespace"))
+                .isEqualTo("testTenantId");
+        assertThat(System.getProperty("spring.cloud.nacos.config.access-key"))
+                .isEqualTo("testAK");
+        assertThat(System.getProperty("spring.cloud.nacos.config.secret-key"))
+                .isEqualTo("testSK");
+        assertThat(System.getProperties().getProperty("webContext")).isEqualTo("/vipserver");
+        assertThat(System.getProperties().getProperty("serverPort")).isEqualTo("80");
+    }
+}