From a8356767abb6ad8d8ac0a234246f30ef419671ad Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Wed, 18 Jul 2018 16:25:12 +0800
Subject: [PATCH] REPORT-9619

---
 .../com/fr/start/module/DesignerStartup.java  | 20 +++++++++++++------
 .../module/DesignerWorkspaceProvider.java     | 19 ++++++------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
index 5f9ec707c..9d684a821 100644
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
@@ -1,14 +1,16 @@
 package com.fr.start.module;
 
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.event.Event;
 import com.fr.event.Listener;
+import com.fr.general.ComparatorUtils;
 import com.fr.module.Activator;
 import com.fr.record.analyzer.EnableMetrics;
 import com.fr.record.analyzer.Metrics;
 import com.fr.start.Designer;
-import com.fr.start.EnvSwitcher;
+import com.fr.start.ServerStarter;
 import com.fr.start.SplashContext;
 import com.fr.startup.activators.BasicActivator;
 import com.fr.workspace.Workspace;
@@ -32,13 +34,19 @@ public class DesignerStartup extends Activator {
         final String[] args = getModule().upFindSingleton(StartupArgs.class).get();
         final Designer designer = new Designer(args);
 
-        EnvSwitcher switcher = new EnvSwitcher();
-        //设置好环境即可，具体跟环境有关的模块会自动调用
-        switcher.switch2LastEnv();
-        getRoot().setSingleton(EnvSwitcher.class, switcher);
+        startSub(DesignerWorkspaceProvider.class);
         //启动env
         startSub(EnvBasedModule.class);
-        startSub(DesignerWorkspaceProvider.class);
+
+        if (args != null) {
+            for (String arg : args) {
+                if (ComparatorUtils.equals(arg, "demo")) {
+                    DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
+                    ServerStarter.browserDemoURL();
+                    break;
+                }
+            }
+        }
         ExecutorService service = Executors.newSingleThreadExecutor();
         registerEnvListener();
         service.submit(new Runnable() {
diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
index cab3868fb..bd8159c6d 100644
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java
@@ -1,10 +1,9 @@
 package com.fr.start.module;
 
 import com.fr.design.DesignerEnvManager;
-import com.fr.general.ComparatorUtils;
+
 import com.fr.module.Activator;
 import com.fr.start.EnvSwitcher;
-import com.fr.start.ServerStarter;
 
 /**
  * Created by juhaoyu on 2018/1/8.
@@ -16,17 +15,11 @@ public class DesignerWorkspaceProvider extends Activator {
     public void start() {
         //检查环境
         DesignerEnvManager.checkNameEnvMap();
-        
-        String[] args = getModule().upFindSingleton(StartupArgs.class).get();
-        if (args != null) {
-            for (String arg : args) {
-                if (ComparatorUtils.equals(arg, "demo")) {
-                    DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
-                    ServerStarter.browserDemoURL();
-                    break;
-                }
-            }
-        }
+
+        EnvSwitcher switcher = new EnvSwitcher();
+        //设置好环境即可，具体跟环境有关的模块会自动调用
+        switcher.switch2LastEnv();
+        getRoot().setSingleton(EnvSwitcher.class, switcher);
     }