Merge pull request #81 from xiaolongzuo/master

Fix configuration specification

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmProperties.java

@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.alicloud.context.acm;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import com.alibaba.cloud.context.AliCloudServerMode;
@@ -31,8 +30,7 @@ import com.alibaba.cloud.context.acm.AcmConfiguration;
 @ConfigurationProperties(prefix = "spring.cloud.alicloud.acm")
 public class AcmProperties implements AcmConfiguration {
 
-	@Value("${spring.cloud.alicloud.acm.server-mode:LOCAL}")
+	private AliCloudServerMode serverMode = AliCloudServerMode.LOCAL;
-	private AliCloudServerMode serverMode;
 
 	private String serverList = "127.0.0.1";
 
@@ -49,7 +47,7 @@ public class AcmProperties implements AcmConfiguration {
 	private int timeout = 3000;
 
 	/**
-	 * the AliYun endpoint2 for ACM
+	 * the AliYun endpoint for ACM
 	 */
 	private String endpoint;
 

spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsProperties.java

@@ -44,20 +44,17 @@ public class AnsProperties implements AnsConfiguration {
 	/**
 	 * 服务端模式，默认为LOCAL
 	 */
-	@Value("${spring.cloud.alicloud.ans.server-mode:LOCAL}")
+	private AliCloudServerMode serverMode = AliCloudServerMode.LOCAL;
-	private AliCloudServerMode serverMode;
 
 	/**
 	 * 服务端列表
 	 */
-	@Value("${spring.cloud.alicloud.ans.server-list:127.0.0.1}")
+	private String serverList = "127.0.0.1";
-	private String serverList;
 
 	/**
 	 * 服务端列表
 	 */
-	@Value("${spring.cloud.alicloud.ans.server-port:8080}")
+	private String serverPort = "8080";
-	private String serverPort;
 
 	/**
 	 * 注册的服务名，默认从 spring.cloud.alicloud.ans.doms 中获取，当没有配置时，使用 spring.application.name

spring-cloud-alicloud-context/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,31 +1,13 @@
 {
   "properties": [
     {
-      "name": "spring.cloud.alicloud.ans.server.mode",
+      "name": "spring.cloud.alicloud.ans.client-domains",
-      "type": "java.lang.String",
-      "defaultValue": "LOCAL",
-      "description": "Server mode."
-    },
-    {
-      "name": "spring.cloud.alicloud.ans.server.list",
-      "type": "java.lang.String",
-      "defaultValue": "127.0.0.1",
-      "description": "ANS server list."
-    },
-    {
-      "name": "spring.cloud.alicloud.ans.server.port",
-      "type": "java.lang.Integer",
-      "defaultValue": "80",
-      "description": "ANS server port."
-    },
-    {
-      "name": "spring.cloud.alicloud.ans.client.domains",
       "type": "java.lang.String",
       "defaultValue": "",
       "description": "Service name list, default value is ${spring.application.name}."
     },
     {
-      "name": "spring.cloud.alicloud.ans.client.env",
+      "name": "spring.cloud.alicloud.ans.env",
       "type": "java.lang.String",
       "defaultValue": "DEFAULT",
       "description": "The env for ans, default value is DEFAULT."