From 394d5bddb1122e4cdf382ac76eab57fe2bf049be Mon Sep 17 00:00:00 2001
From: "alex.sung" <alex.sung@fanruan.com>
Date: Wed, 31 Oct 2018 11:46:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?content=E9=9C=80=E8=A6=81=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/InformationCollector.java       | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java b/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
index 00eda062d..650762069 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
@@ -58,6 +58,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -227,11 +228,7 @@ public class InformationCollector implements XMLReadable, XMLWriter {
     private void sendFunctionsInfo(){
         long currentTime = new Date().getTime();
         ArrayList<Map<String, Object>> content = null;
-        try {
-            content = getFunctionsContentAsByte(currentTime);
-        } catch (JSONException e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
+        content = getFunctionsContentAsByte(currentTime);
         boolean success = false;
         String url = CloudCenter.getInstance().acquireUrlByKind(TABLE_FUNCTION_RECORD);
         if(content.size() > 0){
@@ -246,19 +243,12 @@ public class InformationCollector implements XMLReadable, XMLWriter {
     }
 
     private boolean sendFunctionRecord(String url, Map<String,Object> record) {
-        HashMap<String, String> para = new HashMap<>();
-        para.put("token", SiteCenterToken.generateToken());
-        para.put("content",  new JSONObject(record).toString());
-        String res = null;
-        try {
-            res = HttpToolbox.get(url, para);
-        } catch (IOException e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
         boolean success = false;
         try {
+            String recordUrl = url+"?token=" + SiteCenterToken.generateToken() + "&content="+URLEncoder.encode(new JSONObject(record).toString(), EncodeConstants.ENCODING_UTF_8);
+            String res = HttpToolbox.get(recordUrl);
             success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
-        } catch (JSONException e) {
+        } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return success;
@@ -424,14 +414,13 @@ public class InformationCollector implements XMLReadable, XMLWriter {
         });
 	}
 
-	public static ArrayList getFunctionsContentAsByte(long currentTime) throws JSONException{
+	public static ArrayList getFunctionsContentAsByte(long currentTime){
         ArrayList<Map<String,Object>> records = new ArrayList<Map<String,Object>>();
         QueryCondition condition = QueryFactory.create().addRestriction(
                 RestrictionFactory.lte(COLUMN_TIME, currentTime)
         );
         try {
             DataList<FocusPoint> focusPoints = MetricRegistry.getMetric().find(FocusPoint.class,condition);
-            focusPoints.getList();
             DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
             String bbsUserName = MarketConfig.getInstance().getBbsUsername();
             String uuid = envManager.getUUID();

From ca58fc5a81c2529790c68405daf7740b2761d70b Mon Sep 17 00:00:00 2001
From: "alex.sung" <alex.sung@fanruan.com>
Date: Thu, 1 Nov 2018 16:33:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8F=E5=A4=A7?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=A1=88=EF=BC=8C=E5=8F=91=E9=80=81zip?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=B0=E4=BA=91=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/InformationCollector.java   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java b/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
index 650762069..003a482b7 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java
@@ -240,6 +240,22 @@ public class InformationCollector implements XMLReadable, XMLWriter {
                 deleteFunctionRecords(currentTime);
             }
         }
+//      //先将发送压缩文件这段代码注释，之后提任务
+		//大数据量下发送压缩zip数据不容易丢失
+//		try {
+//			ObjectMapper objectMapper = new ObjectMapper();
+//			String contentStr = objectMapper.writeValueAsString(content);
+//			InputStream inputStream = new ByteArrayInputStream(contentStr.getBytes("UTF-8"));
+//			String recordUrl = url+"?token=" + SiteCenterToken.generateToken() + "&content="+ IOUtils.inputStream2Bytes(IOUtils.toZipIn(inputStream));
+//
+//			String res = HttpToolbox.get(recordUrl);
+//			success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
+//		} catch (Exception e) {
+//			FineLoggerFactory.getLogger().error(e.getMessage(), e);
+//		}
+//		if (success) {
+//			deleteFunctionRecords(currentTime);
+//		}
     }
 
     private boolean sendFunctionRecord(String url, Map<String,Object> record) {