diff --git a/druid-admin/pom.xml b/druid-admin/pom.xml index 3f0ee0988d..a2a1c1ec6e 100644 --- a/druid-admin/pom.xml +++ b/druid-admin/pom.xml @@ -49,48 +49,19 @@ org.springframework.boot spring-boot-starter-undertow - + org.springframework.cloud - spring-cloud-consul-core - - - com.ecwid.consul - consul-api - - - com.netflix.eureka - eureka-core - true - - - com.netflix.eureka - eureka-client - true - - - com.sun.jersey - jersey-client - - - com.sun.jersey - jersey-core - - - com.sun.jersey.contribs - jersey-apache-client4 - - + spring-cloud-starter-consul-discovery com.alibaba.cloud - spring-cloud-alibaba-nacos-discovery + spring-cloud-starter-alibaba-nacos-discovery 2.1.1.RELEASE - org.springframework.cloud - spring-cloud-netflix-eureka-client + spring-cloud-starter-netflix-eureka-client com.alibaba diff --git a/druid-admin/src/main/java/com/alibaba/druid/admin/service/MonitorStatService.java b/druid-admin/src/main/java/com/alibaba/druid/admin/service/MonitorStatService.java index 93b8d60756..ddff85506b 100644 --- a/druid-admin/src/main/java/com/alibaba/druid/admin/service/MonitorStatService.java +++ b/druid-admin/src/main/java/com/alibaba/druid/admin/service/MonitorStatService.java @@ -1,5 +1,14 @@ -package com.linchtech.druid.admin.service; +package com.alibaba.druid.admin.service; +import com.alibaba.druid.admin.config.MonitorProperties; +import com.alibaba.druid.admin.model.ServiceNode; +import com.alibaba.druid.admin.model.dto.ConnectionResult; +import com.alibaba.druid.admin.model.dto.DataSourceResult; +import com.alibaba.druid.admin.model.dto.SqlDetailResult; +import com.alibaba.druid.admin.model.dto.SqlListResult; +import com.alibaba.druid.admin.model.dto.WallResult; +import com.alibaba.druid.admin.model.dto.WebResult; +import com.alibaba.druid.admin.util.HttpUtil; import com.alibaba.druid.stat.DruidStatServiceMBean; import com.alibaba.druid.support.http.stat.WebAppStatManager; import com.alibaba.druid.support.json.JSONUtils; @@ -9,15 +18,6 @@ import com.alibaba.druid.util.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.linchtech.druid.admin.config.MonitorProperties; -import com.linchtech.druid.admin.model.ServiceNode; -import com.linchtech.druid.admin.model.dto.ConnectionResult; -import com.linchtech.druid.admin.model.dto.DataSourceResult; -import com.linchtech.druid.admin.model.dto.SqlDetailResult; -import com.linchtech.druid.admin.model.dto.SqlListResult; -import com.linchtech.druid.admin.model.dto.WallResult; -import com.linchtech.druid.admin.model.dto.WebResult; -import com.linchtech.druid.admin.util.HttpUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.client.ServiceInstance;