From 7db1c448d073dcd3900a7dc4d272688fa5a2df36 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Wed, 10 Oct 2018 19:40:33 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-11794=2010.0=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E8=B7=AF=E5=BE=84=E5=AD=98=E5=9C=A8=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=BC=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=8F=92=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2=E8=B5=84=E6=BA=90=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/extra/PluginWebPane.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java
index 3e2cafdfea..627d16855e 100644
--- a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java
@@ -4,6 +4,7 @@ import com.fr.base.TemplateUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.EncodeConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import javafx.application.Platform;
@@ -32,6 +33,9 @@ import java.util.Map;
 public class PluginWebPane extends JFXPanel {
     private static final String RESOURCE_URL = "resourceURL";
     private static final String LANGUAGE = "language";
+    private static final String URL_PLUS = "+";
+    private static final String URL_SPACING = "%20";
+    private static final String URL_PREFIX = "file:///";
     private WebEngine webEngine;
 
     public PluginWebPane(final String installHome, final String mainJs) {
@@ -75,8 +79,9 @@ public class PluginWebPane extends JFXPanel {
         StringBuffer sb = new StringBuffer();
         String line;
         Map<String, Object> map4Tpl = new HashMap<String, Object>();
-
-        map4Tpl.put(RESOURCE_URL, "file:///" + URLEncoder.encode(installHome, "UTF-8"));
+        //URL中关于空格的编码与空格所在位置相关：空格被编码成+的情况只能在查询字符串部分出现，而被编码成%20则可以出现在路径和查询字符串中
+        //URLEncoder会将空格转成+,这边需要+转成%20
+        map4Tpl.put(RESOURCE_URL, URL_PREFIX + URLEncoder.encode(installHome, EncodeConstants.ENCODING_UTF_8).replace(URL_PLUS, URL_SPACING));
         map4Tpl.put(LANGUAGE, GeneralContext.getLocale().toString());
         while ((line = read.readLine()) != null) {
             if (sb.length() > 0) {