From 055eaf65b19ce827efba9adde3f021e192380906 Mon Sep 17 00:00:00 2001
From: "523163881@qq.com" <523163881@qq.com>
Date: Fri, 9 Oct 2020 22:48:48 +0800
Subject: [PATCH] optimize the dependencies,update package name

---
 druid-admin/pom.xml                           | 37 ++-----------------
 .../admin/service/MonitorStatService.java     | 20 +++++-----
 2 files changed, 14 insertions(+), 43 deletions(-)

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 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
-		<!--各个注册中心依赖-->
+        <!--各个注册中心依赖-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-consul-core</artifactId>
-        </dependency>        
-        <dependency>
-            <groupId>com.ecwid.consul</groupId>
-            <artifactId>consul-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.netflix.eureka</groupId>
-            <artifactId>eureka-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.netflix.eureka</groupId>
-            <artifactId>eureka-client</artifactId>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun.jersey</groupId>
-                    <artifactId>jersey-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jersey</groupId>
-                    <artifactId>jersey-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jersey.contribs</groupId>
-                    <artifactId>jersey-apache-client4</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-nacos-discovery</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
             <version>2.1.1.RELEASE</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-netflix-eureka-client</artifactId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
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;