From a2b246c1dc16dd8f256f38293710ff6eb67921fb Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 15 Apr 2019 14:04:45 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-14865=20=E6=9B=B4=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8E=A8=E9=80=81=3D>=E8=B0=83=E6=95=B4=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../push/DesignerPushUpdateManager.java | 13 ++++++++++--- .../onlineupdate/push/DesignerUpdateInfo.java | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateManager.java b/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateManager.java index e24faacf6..c31b61336 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateManager.java +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateManager.java @@ -5,12 +5,14 @@ import com.fr.design.mainframe.DesignerFrame; import com.fr.general.CloudCenter; import com.fr.general.GeneralContext; import com.fr.general.GeneralUtils; -import com.fr.general.http.HttpClient; +import com.fr.general.http.HttpToolbox; import com.fr.json.JSONObject; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import com.fr.workspace.WorkContext; +import java.io.IOException; + /** * Created by plough on 2019/4/8. */ @@ -40,8 +42,13 @@ public class DesignerPushUpdateManager { } private String getFullLatestVersion() { - HttpClient hc = new HttpClient(CloudCenter.getInstance().acquireUrlByKind("jar10.update")); - return new JSONObject(hc.getResponseText()).optString("buildNO"); + try { + String res = HttpToolbox.get(CloudCenter.getInstance().acquireUrlByKind("jar10.update")); + return new JSONObject(res).optString("buildNO"); + } catch (IOException e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } + return StringUtils.EMPTY; } private String getVersionByFullNO(String fullNO) { diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerUpdateInfo.java b/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerUpdateInfo.java index 8301d193e..6d7bd93a3 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerUpdateInfo.java +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerUpdateInfo.java @@ -58,7 +58,7 @@ class DesignerUpdateInfo { return latestVersion; } - public String getLastIgnoredVersion() { + String getLastIgnoredVersion() { return lastIgnoredVersion; }