Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into feature/10.0

designer-base/src/com/fr/start/StartServer.java

@@ -23,8 +23,11 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.start.server.TomcatHost;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import java.awt.*;
+import javax.swing.JOptionPane;
+import java.awt.BorderLayout;
+import java.awt.Desktop;
+import java.awt.Font;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -121,9 +124,9 @@ public class StartServer {
                     tomcatHost.addAndStartLocalEnvHomeWebApp();
 
                 }
-            }
+                if (!tomcatHost.isStarted()) {
-            if (!tomcatHost.isStarted()) {
+                    tomcatHost.start();
-                tomcatHost.start();
+                }
             }
         } catch (InterruptedException e) {
             FineLoggerFactory.getLogger().error(e.getMessage());

designer-realize/src/com/fr/start/Designer.java

@@ -3,6 +3,7 @@ package com.fr.start;
 import com.fr.base.BaseUtils;
 import com.fr.base.Env;
 import com.fr.base.FRContext;
+import com.fr.dav.LocalEnv;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.file.WebPreviewUtils;
@@ -89,8 +90,10 @@ public class Designer extends BaseDesigner {
         //传递启动参数
         designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args));
         designerRoot.start();
-        // 预启动一下
+        if (FRContext.getCurrentEnv() instanceof LocalEnv) {
-        StartServer.start();
+            // 预启动一下
+            StartServer.start();
+        }
     }
 
     public Designer(String[] args) {