Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoEurekaController.java

@@ -1,12 +1,8 @@
 package cn.estsh.i3plus.core.apiservice.controller;
 
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import com.netflix.appinfo.ApplicationInfoManager;
 import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.discovery.DiscoveryClient;
-import com.netflix.discovery.DiscoveryManager;
 import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.Applications;
@@ -15,10 +11,10 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Description :
@@ -30,6 +26,7 @@ import java.util.List;
 @RestController
 @Api(description="微服功能demo")
 @RequestMapping("/demo-eureka-service")
+@ConditionalOnExpression("'${eureka.client.enabled}' == 'true'")
 public class DemoEurekaController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DemoEurekaController.class);