整合Actuator和Swagger

discovery-console/pom.xml

@@ -31,6 +31,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
         </dependency>

discovery-console/src/main/java/com/nepxion/discovery/console/configuration/ConsoleAutoConfiguration.java

@@ -9,12 +9,16 @@ package com.nepxion.discovery.console.configuration;
  * @version 1.0
  */
 
-import org.springframework.context.annotation.ComponentScan;
+import org.springframework.boot.actuate.endpoint.Endpoint;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
+import com.nepxion.discovery.console.endpoint.ConsoleEndpoint;
+
 @Configuration
-@ComponentScan(basePackages = { "com.nepxion.discovery.console.controller" })
+// @ComponentScan(basePackages = { "com.nepxion.discovery.console.endpoint" })
 @Import(SwaggerConfiguration.class)
 public class ConsoleAutoConfiguration {
     static {
@@ -30,4 +34,12 @@ public class ConsoleAutoConfiguration {
         System.out.println("Nepxion Discovery - Console  v3.3.11");
         System.out.println("");
     }
+
+    @ConditionalOnClass(Endpoint.class)
+    protected static class ConsoleEndpointConfiguration {
+        @Bean
+        public ConsoleEndpoint consoleEndpoint() {
+            return new ConsoleEndpoint();
+        }
+    }
 }
\ No newline at end of file

discovery-console/src/main/java/com/nepxion/discovery/console/controller/ConsoleController.java → discovery-console/src/main/java/com/nepxion/discovery/console/endpoint/ConsoleEndpoint.java

-package com.nepxion.discovery.console.controller;
+package com.nepxion.discovery.console.endpoint;
 
 /**
  * <p>Title: Nepxion Discovery</p>
@@ -16,27 +16,37 @@ import io.swagger.annotations.ApiParam;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.endpoint.Endpoint;
+import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.jmx.export.annotation.ManagedOperation;
+import org.springframework.jmx.export.annotation.ManagedResource;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @Api(tags = { "控制台接口" })
-public class ConsoleController {
+@ManagedResource(description = "Console Endpoint")
+public class ConsoleEndpoint implements MvcEndpoint {
     @Autowired
     private DiscoveryClient discoveryClient;
 
-    @RequestMapping(path = "/services", method = RequestMethod.GET)
+    @RequestMapping(path = "/console/services", method = RequestMethod.GET)
     @ApiOperation(value = "获取服务注册中心所有服务列表", notes = "", response = List.class, httpMethod = "GET")
+    @ResponseBody
+    @ManagedOperation
     public List<String> services() {
         return getServices();
     }
 
-    @RequestMapping(path = "/instances/{serviceId}", method = RequestMethod.GET)
+    @RequestMapping(path = "/console/instances/{serviceId}", method = RequestMethod.GET)
     @ApiOperation(value = "获取服务注册中心服务的实例列表", notes = "", response = List.class, httpMethod = "GET")
+    @ResponseBody
+    @ManagedOperation
     public List<ServiceInstance> instances(@PathVariable(value = "serviceId") @ApiParam(value = "服务名", required = true) String serviceId) {
         return getInstanceList(serviceId);
     }
@@ -48,4 +58,19 @@ public class ConsoleController {
     public List<ServiceInstance> getInstanceList(String serviceId) {
         return discoveryClient.getInstances(serviceId);
     }
+
+    @Override
+    public String getPath() {
+        return "/";
+    }
+
+    @Override
+    public boolean isSensitive() {
+        return true;
+    }
+
+    @Override
+    public Class<? extends Endpoint<?>> getEndpointType() {
+        return null;
+    }
 }
\ No newline at end of file

discovery-springcloud-example-console/src/main/resources/application.properties

@@ -20,8 +20,12 @@ spring.cloud.zookeeper.discovery.preferIpAddress=true
 ribbon.ReadTimeout=60000
 ribbon.ConnectTimeout=60000
 
+# Admin config
+management.port=3333
+management.security.enabled=false
+
 # Swagger config
-swagger.service.base.package=com.nepxion.discovery.console.controller
+swagger.service.base.package=com.nepxion.discovery.console.endpoint
 swagger.service.description=Console Restful APIs
 swagger.service.version=1.0.0
 swagger.service.license=Apache License 2.0