From e832e8f77153af2880bb79c7a289eba95108acca Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 21 Apr 2016 16:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8sitecenter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginManagerPane.java | 7 ++++--- designer_base/src/com/fr/design/extra/PluginWebBridge.java | 3 ++- designer_base/src/com/fr/design/extra/PluginWebPane.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginManagerPane.java b/designer_base/src/com/fr/design/extra/PluginManagerPane.java index 43e9585c3..26374d881 100644 --- a/designer_base/src/com/fr/design/extra/PluginManagerPane.java +++ b/designer_base/src/com/fr/design/extra/PluginManagerPane.java @@ -5,6 +5,7 @@ import com.fr.design.DesignerEnvManager; import com.fr.design.RestartHelper; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.frpane.UITabbedPane; +import com.fr.general.GeneralUtils; import com.fr.general.IOUtils; import com.fr.general.Inter; import com.fr.stable.StableUtils; @@ -34,10 +35,10 @@ public class PluginManagerPane extends BasicPane { String installHome; if (StableUtils.isDebug()) { URL url = ClassLoader.getSystemResource(""); - installHome = url.getPath() + "scripts"; + installHome = url.getPath(); } else { - installHome = StableUtils.getInstallHome() + File.separator + "scripts"; - File file = new File(installHome); + installHome = StableUtils.getInstallHome(); + File file = new File(StableUtils.pathJoin(installHome, "scripts")); if (!file.exists()) { int rv = JOptionPane.showConfirmDialog( null, diff --git a/designer_base/src/com/fr/design/extra/PluginWebBridge.java b/designer_base/src/com/fr/design/extra/PluginWebBridge.java index 947e8bd3a..69f65075f 100644 --- a/designer_base/src/com/fr/design/extra/PluginWebBridge.java +++ b/designer_base/src/com/fr/design/extra/PluginWebBridge.java @@ -6,6 +6,7 @@ import com.fr.design.dialog.UIDialog; import com.fr.design.extra.exe.*; import com.fr.general.FRLogger; import com.fr.general.Inter; +import com.fr.general.SiteCenter; import com.fr.plugin.Plugin; import com.fr.plugin.PluginLoader; import com.fr.stable.ArrayUtils; @@ -33,7 +34,7 @@ public class PluginWebBridge { private UIDialog uiDialog; - public static final String PLUGIN_SHOP = "http://192.168.101.20/ShopServer?pg=plist";//http://shop.finereport.com/ShopServer?pg=plist(plugin.list) + public static final String PLUGIN_SHOP = SiteCenter.getInstance().acquireUrlByKind("plugin.plist"); public static PluginWebBridge getHelper() { if (helper != null) { diff --git a/designer_base/src/com/fr/design/extra/PluginWebPane.java b/designer_base/src/com/fr/design/extra/PluginWebPane.java index 76e4ef5e8..0f2bd0760 100644 --- a/designer_base/src/com/fr/design/extra/PluginWebPane.java +++ b/designer_base/src/com/fr/design/extra/PluginWebPane.java @@ -29,7 +29,7 @@ public class PluginWebPane extends JFXPanel { PluginWebPane.this.setScene(scene); WebView webView = new WebView(); webEngine = webView.getEngine(); - webEngine.load("file:///" + installHome + "/store/web/index.html"); + webEngine.load("file:///" + installHome + "/scripts/store/web/index.html"); webEngine.setOnAlert(new EventHandler>() { @Override public void handle(WebEvent event) {