From 730db06984892bfca452378b9a3aaaaa44409655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=97=E5=B0=91?= <314226532@qq.com>
Date: Thu, 10 Jan 2019 22:13:50 +0800
Subject: [PATCH] code optimization

---
 spring-cloud-alibaba-examples/sms-example/pom.xml              | 2 --
 .../alicloud/ans/migrate/MigrateEndpointAutoConfiguration.java | 3 ++-
 .../alicloud/ans/migrate/MigrateRefreshEventListener.java      | 2 +-
 .../alicloud/ans/registry/AnsAutoServiceRegistration.java      | 2 +-
 .../alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java    | 3 ++-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-alibaba-examples/sms-example/pom.xml b/spring-cloud-alibaba-examples/sms-example/pom.xml
index dce6083e..ea076b02 100644
--- a/spring-cloud-alibaba-examples/sms-example/pom.xml
+++ b/spring-cloud-alibaba-examples/sms-example/pom.xml
@@ -10,10 +10,8 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>alibaba.com</groupId>
     <artifactId>sms-example</artifactId>
     <packaging>jar</packaging>
-
     <name>sms-example</name>
     <description>Demo project for Spring Boot</description>
 
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpointAutoConfiguration.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpointAutoConfiguration.java
index 169d00a0..3f3b1e72 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpointAutoConfiguration.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpointAutoConfiguration.java
@@ -1,5 +1,6 @@
 package org.springframework.cloud.alicloud.ans.migrate;
 
+import org.springframework.boot.actuate.endpoint.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
@@ -9,7 +10,7 @@ import org.springframework.context.annotation.Conditional;
  * @author pbting
  */
 @ConditionalOnWebApplication
-@ConditionalOnClass(name = "org.springframework.boot.actuate.endpoint.AbstractEndpoint")
+@ConditionalOnClass(value = Endpoint.class)
 @Conditional(MigrateOnConditionClass.class)
 public class MigrateEndpointAutoConfiguration {
 
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java
index 6012c714..f5144972 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java
@@ -26,7 +26,7 @@ public class MigrateRefreshEventListener implements ApplicationListener<RefreshE
 
 	private final static int CHECK_INTERVAL = 1;
 
-	private final static String MIGRATE_SWITCH = "sca.migrate.ans.switch";
+	private final static String MIGRATE_SWITCH = "spring.cloud.alicloud.migarte.ans.switch";
 
 	private volatile String lastScaMigrateAnsSwitchValue = "true";
 
diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java
index ded9e15e..5ea2258c 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java
@@ -62,7 +62,7 @@ public class AnsAutoServiceRegistration
 
 	@Override
 	protected AnsRegistration getManagementRegistration() {
-		return registration;
+		return null;
 	}
 
 	@Override
diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java b/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java
index 48cb05c9..326c5812 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java
+++ b/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java
@@ -15,12 +15,13 @@
  */
 package org.springframework.cloud.alicloud.sms.endpoint;
 
+import org.springframework.boot.actuate.endpoint.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 
 @ConditionalOnWebApplication
-@ConditionalOnClass(name = "org.springframework.boot.actuate.endpoint.AbstractEndpoint")
+@ConditionalOnClass(value = Endpoint.class)
 public class SmsEndpointAutoConfiguration {
 
 	@Bean