From 9d239159e90b131b4a6a50888ff4ad6569730a03 Mon Sep 17 00:00:00 2001
From: PanLi320 <854954082@qq.com>
Date: Fri, 9 Dec 2016 15:37:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-1147=20=E8=84=9A=E6=9C=AC=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

最初是为了解决，插件更新和安装下会出现plugin的数组读取两遍的问题，所以在哪个地方加个强制的判断，当时的解决方案是可为两个，还有一个是在脚本
中加入sort处理。后来vito那边找到出现问题的核心点，在于pane部分加载两次，导致脚本数组加载两次，那这边的就去掉这边的判断，因为会导致脚
本更新问题。
---
 designer_base/src/com/fr/design/extra/PluginHelper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java
index ecaa34ea00..30f5e2a530 100644
--- a/designer_base/src/com/fr/design/extra/PluginHelper.java
+++ b/designer_base/src/com/fr/design/extra/PluginHelper.java
@@ -48,9 +48,11 @@ public class PluginHelper {
      * @param p  下载百分比处理
      */
     public static void downloadPluginFile(String id, String username, String password, Process<Double> p) throws Exception {
+        /*
         if (!PluginHelper.invalidUser(id, username, password)) {
             return;
         }
+        */
         HttpClient httpClient = new HttpClient(getDownloadPath(id, username, password));
         if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
             int totalSize = httpClient.getContentLength();
@@ -353,4 +355,4 @@ public class PluginHelper {
     }
 
     private static final int TIME_OUT = 5000;
-}
\ No newline at end of file
+}

From 38a3b913430d64358c9e55e5cded3132debaee5c Mon Sep 17 00:00:00 2001
From: PanLi320 <854954082@qq.com>
Date: Mon, 12 Dec 2016 09:25:52 +0800
Subject: [PATCH 2/2] 1

1
---
 designer_base/src/com/fr/design/extra/PluginHelper.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java
index 30f5e2a530..02f3680328 100644
--- a/designer_base/src/com/fr/design/extra/PluginHelper.java
+++ b/designer_base/src/com/fr/design/extra/PluginHelper.java
@@ -48,11 +48,6 @@ public class PluginHelper {
      * @param p  下载百分比处理
      */
     public static void downloadPluginFile(String id, String username, String password, Process<Double> p) throws Exception {
-        /*
-        if (!PluginHelper.invalidUser(id, username, password)) {
-            return;
-        }
-        */
         HttpClient httpClient = new HttpClient(getDownloadPath(id, username, password));
         if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
             int totalSize = httpClient.getContentLength();