From 430d184c69c32fbfe65ae2f4de7c59f073246b75 Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 22 Jun 2018 16:17:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-8962=2010.0=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=95=86=E5=9F=8E=E6=9B=B4=E6=96=B0=E4=B8=8B=E8=BD=BD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=80=82=E9=85=8D=E5=92=8C=E8=84=9A=E6=9C=AC=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0(=E4=BF=AE=E6=94=B9url=E7=94=9F=E6=88=90=E6=96=B9?= =?UTF-8?q?=E5=BC=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/com/fr/design/extra/PluginUtils.java | 4 +++- designer-base/src/com/fr/design/extra/WebViewDlgHelper.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/designer-base/src/com/fr/design/extra/PluginUtils.java b/designer-base/src/com/fr/design/extra/PluginUtils.java index 124ef323f..a804ed820 100644 --- a/designer-base/src/com/fr/design/extra/PluginUtils.java +++ b/designer-base/src/com/fr/design/extra/PluginUtils.java @@ -15,6 +15,7 @@ import com.fr.plugin.error.PluginErrorCode; import com.fr.plugin.manage.PluginManager; import com.fr.plugin.view.PluginView; import com.fr.stable.EncodeConstants; +import com.fr.stable.ProductConstants; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import java.io.File; @@ -35,6 +36,7 @@ import java.util.Map; public class PluginUtils { private static final String ERROR_CODE_I18N_PREFIX = "FR-Plugin_Error_"; + public static final String FR_VERSION = "fr_version"; public static PluginMarker createPluginMarker(String pluginInfo) { @@ -109,7 +111,7 @@ public class PluginUtils { private static String getDownloadPath(String id) throws Exception { HashMap map = new HashMap(); map.put("id", id); - HttpClient httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind("shop.plugin.scripts_10")); + HttpClient httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind("shop.script.download")+ "?" + FR_VERSION + "=" + ProductConstants.VERSION); httpClient.asGet(); String resText = httpClient.getResponseText(); JSONObject resultJSONObject = new JSONObject(resText); diff --git a/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java b/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java index 18afa06bb..dfca29ea8 100644 --- a/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java +++ b/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java @@ -296,7 +296,7 @@ public class WebViewDlgHelper { new SwingWorker() { @Override protected Void doInBackground() throws Exception { - HttpClient httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind("shop.plugin.cv_10") + "&version=" + PluginStoreConstants.getInstance().getProps("VERSION")); + HttpClient httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind("shop.plugin.update") + "?" + PluginUtils.FR_VERSION + "=" + ProductConstants.VERSION + "&version=" + PluginStoreConstants.getInstance().getProps("VERSION")); httpClient.asGet(); if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) { String text = httpClient.getResponseText(); From 6c71ebed2b059e8295c0c26a69a48aa614a8419d Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 22 Jun 2018 16:50:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/com/fr/design/extra/PluginWebBridge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/com/fr/design/extra/PluginWebBridge.java b/designer-base/src/com/fr/design/extra/PluginWebBridge.java index 767a3ea2c..931f5d68a 100644 --- a/designer-base/src/com/fr/design/extra/PluginWebBridge.java +++ b/designer-base/src/com/fr/design/extra/PluginWebBridge.java @@ -559,7 +559,7 @@ public class PluginWebBridge { uiLabel.setText(Inter.getLocText("FR-Base_UnSignIn")); } - public void updatePluginStore(final JSObject callback){ + public void getPackInfo(final JSObject callback){ JSCallback jsCallback = new JSCallback(webEngine, callback); jsCallback.execute(StringUtils.EMPTY); }