From b46d0075aa3f47301a50e8b36d2c8433782eb028 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 23 Jul 2020 09:41:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/utils/HttpClientManager.java | 18 +++---------------
 .../deploy/docker-compose-dev.yml              |  2 +-
 .../epmet-third/epmet-third-server/pom.xml     |  2 +-
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
index 880dec240e..69a3f68157 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java
@@ -66,9 +66,9 @@ public class HttpClientManager {
 			.setConnectTimeout(connectionTimeout)
 			.build();//设置请求和传输超时时间
 
-	public static HttpClientManager getInstance() {
-		return SingleClass.instance;
-	}
+//	public static HttpClientManager getInstance() {
+//		return SingleClass.instance;
+//	}
 
 	private static class SingleClass {
 		private final static HttpClientManager instance = new HttpClientManager();
@@ -309,18 +309,6 @@ public class HttpClientManager {
 		return new Result<Byte[]>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 	}
 
-	public static void main(String[] args) {
-		String url = "http://localhost:8107/epmetscan/api/textSyncScan";
-		TextTaskDTO p = new TextTaskDTO();
-		p.setDataId("1");
-		p.setContent("neirong1");
-		List<TextTaskDTO> list = new ArrayList<>();
-		list.add(p);
-		TextScanParamDTO param = new TextScanParamDTO();
- 		param.setTasks(list);
-		Result<String> result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(param));
-		System.out.println(JSON.toJSONString(result));
-	}
 }
 
 
diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
index de278b5785..9d6ee7c695 100644
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.48
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.49
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index 2efc3df332..d32deba4f6 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.48</version>
+    <version>0.0.49</version>
 
     <parent>
         <groupId>com.epmet</groupId>