From de5ee5ee9e9f7387c9bac97cfd2057f40a12af36 Mon Sep 17 00:00:00 2001
From: "alex.sung" <alex.sung@fanruan.com>
Date: Wed, 13 Mar 2019 15:12:38 +0800
Subject: [PATCH] =?UTF-8?q?http://www.finedevelop.com:2016/browse/REPORT-1?=
 =?UTF-8?q?5128=20lastTime=E5=88=B7=E6=96=B0=E5=90=8E=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=8A=9F=E8=83=BD=E7=82=B9=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=8A=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/InformationCollector.java       | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 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 37f86172ea..abc39fd83e 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
@@ -184,12 +184,6 @@ public class InformationCollector implements XMLReadable, XMLWriter {
 	}
 
 	private void sendUserInfo(){
-		long currentTime = new Date().getTime();
-		long lastTime = getLastTimeMillis();
-
-		if (currentTime - lastTime <= DELTA) {
-			return;
-		}
 		JSONObject content = getJSONContentAsByte();
 		String url = CloudCenter.getInstance().acquireUrlByKind("user.info.v10");
 		boolean success = false;
@@ -207,13 +201,7 @@ public class InformationCollector implements XMLReadable, XMLWriter {
 		}
 	}
 
-    private void sendFunctionsInfo(){
-		Date current = new Date();
-		long lastTime = getLastTimeMillis();
-		long currentTime = current.getTime();
-        if (currentTime - lastTime <= DELTA) {
-            return;
-        }
+    private void sendFunctionsInfo(long currentTime, long lastTime){
 		FineLoggerFactory.getLogger().info("Start sent function records to the cloud center...");
 		queryAndSendOnePageFunctionContent(currentTime, lastTime, 0);
         long page =  (totalCount/PAGE_SIZE) + 1;
@@ -363,8 +351,14 @@ public class InformationCollector implements XMLReadable, XMLWriter {
 				} catch (InterruptedException e) {
 					FRContext.getLogger().error(e.getMessage(), e);
 				}
-                sendUserInfo();
-				sendFunctionsInfo();
+
+				long currentTime = new Date().getTime();
+				long lastTime = getLastTimeMillis();
+				if (currentTime - lastTime > DELTA) {
+					sendUserInfo();
+					sendFunctionsInfo(currentTime, lastTime);
+				}
+
 				TemplateInfoCollector.getInstance().sendTemplateInfo();
 				ErrorInfoUploader.getInstance().sendErrorInfo();
 			}