Merge remote-tracking branch 'origin/9.0' into 9.0

designer_base/src/com/fr/design/extra/PluginOperateUtils.java

@@ -34,11 +34,13 @@ public class PluginOperateUtils {
     public static void installPluginOnline(final PluginMarker pluginMarker, JSCallback jsCallback) {
         //下载插件
         if (!BBSPluginLogin.getInstance().hasLogin()) {
-            LoginCheckContext.fireLoginCheckListener();
+            UserLoginContext.fireLoginContextListener();
         }
         if (BBSPluginLogin.getInstance().hasLogin()) {
             PluginTask pluginTask = PluginTask.installTask(pluginMarker);
             PluginControllerHelper.installOnline(pluginMarker, new InstallOnlineCallback(pluginTask, jsCallback));
+        }else{
+            jsCallback.execute("success");
         }
     }
 

designer_base/src/com/fr/design/extra/WebViewDlgHelper.java

@@ -33,7 +33,7 @@ public class WebViewDlgHelper {
     private static final String SHOP_SCRIPTS = "shop_scripts";
     private static final int VERSION_8 = 8;
     // 调试时，使用installHome = ClassLoader.getSystemResource("").getPath()代替下面
-    private static String installHome = StableUtils.getInstallHome();
+    private static String installHome = FRContext.getCurrentEnv().getWebReportPath();
     private static final int BYTES_NUM = 1024;
 
     public static void createPluginDialog() {