From 1ff55110dc3af9154fd7f5d3b94b4e46a26ed5ff Mon Sep 17 00:00:00 2001
From: ju <ju@finereport.com>
Date: Mon, 6 Aug 2018 01:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88demo=E6=9C=89=E9=97=AE=E9=A2=98=20=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=92=8C=E9=A2=84=E8=A7=88demo=E5=88=86?=
 =?UTF-8?q?=E5=BC=80=EF=BC=8C=E9=A2=84=E8=A7=88demo=E4=B8=8D=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E7=AC=AC=E4=BA=8C=E6=AC=A1=E5=88=87=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/start/module/DesignerStartup.java  | 14 +++--------
 .../module/DesignerWorkspaceProvider.java     | 24 +++++++------------
 .../java/com/fr/start/module/StartupArgs.java | 17 +++++++++++++
 3 files changed, 29 insertions(+), 26 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 c131573b8..aac6112ee 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
@@ -4,7 +4,6 @@ package com.fr.start.module;
 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;
@@ -61,16 +60,9 @@ public class DesignerStartup extends Activator {
     }
     
     private void browserDemo() {
-        
-        final String[] args = getModule().upFindSingleton(StartupArgs.class).get();
-        
-        if (args != null) {
-            for (String arg : args) {
-                if (ComparatorUtils.equals(arg, "demo")) {
-                    ServerStarter.browserDemoURL();
-                    break;
-                }
-            }
+    
+        if (getModule().leftFindSingleton(StartupArgs.class) != null && getModule().leftFindSingleton(StartupArgs.class).isDemo()) {
+            ServerStarter.browserDemoURL();
         }
     }
     
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 8397a21c7..bfcb4fefe 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
@@ -13,21 +13,14 @@ import com.fr.workspace.Workspace;
  * 设计器启动时的环境相关模块activator
  */
 public class DesignerWorkspaceProvider extends Activator {
-
+    
     @Override
     public void start() {
         //检查环境
         DesignerEnvManager.checkNameEnvMap();
-    
-        final String[] args = getModule().upFindSingleton(StartupArgs.class).get();
-    
-        if (args != null) {
-            for (String arg : args) {
-                if (ComparatorUtils.equals(arg, "demo")) {
-                    DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
-                    break;
-                }
-            }
+        
+        if (getModule().leftFindSingleton(StartupArgs.class) != null && getModule().leftFindSingleton(StartupArgs.class).isDemo()) {
+            DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
         } else {
             try {
                 String current = DesignerEnvManager.getEnvManager().getCurEnvName();
@@ -42,11 +35,12 @@ public class DesignerWorkspaceProvider extends Activator {
             }
         }
     }
-
-
+    
+    
     @Override
     public void stop() {
+    
     }
-
-
+    
+    
 }
diff --git a/designer-realize/src/main/java/com/fr/start/module/StartupArgs.java b/designer-realize/src/main/java/com/fr/start/module/StartupArgs.java
index b957e8d65..678147f54 100644
--- a/designer-realize/src/main/java/com/fr/start/module/StartupArgs.java
+++ b/designer-realize/src/main/java/com/fr/start/module/StartupArgs.java
@@ -1,5 +1,7 @@
 package com.fr.start.module;
 
+import com.fr.general.ComparatorUtils;
+
 /**
  * Created by juhaoyu on 2018/1/8.
  * 封装启动参数
@@ -17,5 +19,20 @@ public class StartupArgs {
         
         return args;
     }
+    
+    /**
+     * 是否是产品演示
+     */
+    public boolean isDemo() {
+        
+        if (args != null) {
+            for (String arg : args) {
+                if (ComparatorUtils.equals(arg, "demo")) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }