From 8b9b06e4e8d60a501db36de1d1e1b3de1924f11c Mon Sep 17 00:00:00 2001 From: xiaolongzuo <150349407@qq.com> Date: Tue, 30 Oct 2018 20:51:40 +0800 Subject: [PATCH] Fix configuration specification. --- .../cloud/alicloud/context/acm/AcmProperties.java | 6 ++---- .../cloud/alicloud/context/ans/AnsProperties.java | 9 +++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmProperties.java b/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmProperties.java index 18b037a39..2a1993e90 100644 --- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmProperties.java +++ b/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; + private AliCloudServerMode serverMode = AliCloudServerMode.LOCAL; 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; diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsProperties.java b/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsProperties.java index 2889ae796..2852ff573 100644 --- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsProperties.java +++ b/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; + private AliCloudServerMode serverMode = AliCloudServerMode.LOCAL; /** * 服务端列表 */ - @Value("${spring.cloud.alicloud.ans.server-list:127.0.0.1}") - private String serverList; + private String serverList = "127.0.0.1"; /** * 服务端列表 */ - @Value("${spring.cloud.alicloud.ans.server-port:8080}") - private String serverPort; + private String serverPort = "8080"; /** * 注册的服务名,默认从 spring.cloud.alicloud.ans.doms 中获取,当没有配置时,使用 spring.application.name