From 79e7040b683f5e21c962b4ef32f5880d18d48014 Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Sat, 5 Feb 2022 16:41:52 +0800
Subject: [PATCH] =?UTF-8?q?[collector]http=E5=85=AC=E5=85=B1=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF,=E5=85=AC=E5=85=B1=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => collect}/common/CollectorProperties.java      |  2 +-
 .../collector/collect/database/JdbcCommonCollect.java  | 10 +++++-----
 .../usthe/collector/collect/http/HttpCollectImpl.java  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename collector/src/main/java/com/usthe/collector/{ => collect}/common/CollectorProperties.java (87%)

diff --git a/collector/src/main/java/com/usthe/collector/common/CollectorProperties.java b/collector/src/main/java/com/usthe/collector/collect/common/CollectorProperties.java
similarity index 87%
rename from collector/src/main/java/com/usthe/collector/common/CollectorProperties.java
rename to collector/src/main/java/com/usthe/collector/collect/common/CollectorProperties.java
index 9b3cb1d..c56044a 100644
--- a/collector/src/main/java/com/usthe/collector/common/CollectorProperties.java
+++ b/collector/src/main/java/com/usthe/collector/collect/common/CollectorProperties.java
@@ -1,4 +1,4 @@
-package com.usthe.collector.common;
+package com.usthe.collector.collect.common;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
diff --git a/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java b/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java
index 25908fd..9441d49 100644
--- a/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java
+++ b/collector/src/main/java/com/usthe/collector/collect/database/JdbcCommonCollect.java
@@ -1,9 +1,9 @@
 package com.usthe.collector.collect.database;
 
 import com.usthe.collector.collect.AbstractCollect;
-import com.usthe.collector.common.cache.CacheIdentifier;
-import com.usthe.collector.common.cache.CommonCache;
-import com.usthe.collector.common.cache.support.CommonJdbcConnect;
+import com.usthe.collector.collect.common.cache.CacheIdentifier;
+import com.usthe.collector.collect.common.cache.CommonCache;
+import com.usthe.collector.collect.common.cache.JdbcConnect;
 import com.usthe.collector.util.CollectorConstants;
 import com.usthe.common.entity.job.Metrics;
 import com.usthe.common.entity.job.protocol.JdbcProtocol;
@@ -88,7 +88,7 @@ public class JdbcCommonCollect extends AbstractCollect {
         Optional<Object> cacheOption = CommonCache.getInstance().getCache(identifier, true);
         Statement statement = null;
         if (cacheOption.isPresent()) {
-            CommonJdbcConnect jdbcConnect = (CommonJdbcConnect) cacheOption.get();
+            JdbcConnect jdbcConnect = (JdbcConnect) cacheOption.get();
             try {
                 statement = jdbcConnect.getConnection().createStatement();
                 // 设置查询超时时间10秒
@@ -119,7 +119,7 @@ public class JdbcCommonCollect extends AbstractCollect {
         statement.setQueryTimeout(10);
         // 设置查询最大行数1000行
         statement.setMaxRows(1000);
-        CommonJdbcConnect jdbcConnect = new CommonJdbcConnect(connection);
+        JdbcConnect jdbcConnect = new JdbcConnect(connection);
         CommonCache.getInstance().addCache(identifier, jdbcConnect, 10000L);
         return statement;
     }
diff --git a/collector/src/main/java/com/usthe/collector/collect/http/HttpCollectImpl.java b/collector/src/main/java/com/usthe/collector/collect/http/HttpCollectImpl.java
index 8d40f6b..5983f55 100644
--- a/collector/src/main/java/com/usthe/collector/collect/http/HttpCollectImpl.java
+++ b/collector/src/main/java/com/usthe/collector/collect/http/HttpCollectImpl.java
@@ -5,7 +5,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.usthe.collector.collect.AbstractCollect;
-import com.usthe.collector.common.http.HttpClientPool;
+import com.usthe.collector.collect.common.http.CommonHttpClient;
 import com.usthe.collector.dispatch.DispatchConstants;
 import com.usthe.collector.util.CollectorConstants;
 import com.usthe.collector.util.JsonPathParser;
@@ -67,7 +67,7 @@ public class HttpCollectImpl extends AbstractCollect {
         HttpContext httpContext = createHttpContext(metrics.getHttp());
         HttpUriRequest request = createHttpRequest(metrics.getHttp());
         try {
-            CloseableHttpResponse response = HttpClientPool.getHttpClient()
+            CloseableHttpResponse response = CommonHttpClient.getHttpClient()
                     .execute(request, httpContext);
             int statusCode = response.getStatusLine().getStatusCode();
             log.debug("http response status: {}", statusCode);