From c634283978f20b165cf57e6a347a88671165c074 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Mon, 16 Oct 2017 11:12:25 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4829=20=E4=BF=AE=E5=A4=8D=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BD=8D=E7=BD=AE=E6=B2=A1=E6=9C=89=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/extra/WebViewDlgHelper.java | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java
index cef4c2d964..c394e75197 100644
--- a/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java
+++ b/designer_base/src/com/fr/design/extra/WebViewDlgHelper.java
@@ -6,6 +6,7 @@ import com.fr.design.dialog.UIDialog;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.general.SiteCenter;
@@ -13,6 +14,7 @@ import com.fr.general.http.HttpClient;
 import com.fr.json.JSONObject;
 import com.fr.plugin.PluginStoreConstants;
 import com.fr.plugin.PluginVerifyException;
+import com.fr.stable.EnvChangedListener;
 import com.fr.stable.StableUtils;
 
 import javax.swing.*;
@@ -35,6 +37,15 @@ public class WebViewDlgHelper {
     private static String installHome = FRContext.getCurrentEnv().getWebReportPath();
     private static final int BYTES_NUM = 1024;
 
+    static {
+        GeneralContext.addEnvChangedListener(new EnvChangedListener() {
+            @Override
+            public void envChanged() {
+                installHome = FRContext.getCurrentEnv().getWebReportPath();
+            }
+        });
+    }
+
     public static void createPluginDialog() {
         if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
             String relativePath = "/scripts/plugin.html";
@@ -74,9 +85,8 @@ public class WebViewDlgHelper {
 
     /**
      * 检查script文件夹中的plugin.html文件
-     *
      */
-    public static void checkAndCopyMainFile(String indexPath, String mainJsPath){
+    public static void checkAndCopyMainFile(String indexPath, String mainJsPath) {
         File file = new File(indexPath);
         if (!file.exists()) {
             copyMainFile(indexPath, mainJsPath);
@@ -85,9 +95,8 @@ public class WebViewDlgHelper {
 
     /**
      * 將script文件夹中的plugin.html文件复制到webreport下
-     *
      */
-    public static void copyMainFile(String indexPath, String mainJsPath){
+    public static void copyMainFile(String indexPath, String mainJsPath) {
         try {
             File mainJsFile = new File(mainJsPath);
             int byteread = 0;
@@ -193,7 +202,7 @@ public class WebViewDlgHelper {
                     if (get()) {
                         String relativePath = "/scripts/plugin.html";
                         IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome);
-                        copyMainFile(StableUtils.pathJoin(installHome, "plugin.html"),  StableUtils.pathJoin(installHome, relativePath));
+                        copyMainFile(StableUtils.pathJoin(installHome, "plugin.html"), StableUtils.pathJoin(installHome, relativePath));
                         // TODO: 2017/4/17 删除之前存放在安装目录下的script
                         PluginStoreConstants.refreshProps();    // 下载完刷新一下版本号等
                         JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Shop_Installed"), Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE);