From 54b470d6e8128444d404637744fbadb0e703e69a Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Thu, 16 Nov 2017 12:35:51 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5097=209.0,=E5=88=87=E6=8D=A2=E5=88=B0?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=85=B6=E4=BB=96=E7=9B=AE=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B8=AE=E5=8A=A9-=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=BC=94=E7=A4=BA=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E7=9B=AE=E5=BD=95=E7=9A=84=E6=8F=90=E7=A4=BA=20?=
 =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=88=E4=B8=8D=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/start/StartServer.java         | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java
index e7512380c..17e3c58d7 100644
--- a/designer_base/src/com/fr/start/StartServer.java
+++ b/designer_base/src/com/fr/start/StartServer.java
@@ -58,7 +58,26 @@ public class StartServer {
                     + "?op=fs");
             return;
         }
-        initDemoServerAndBrowser();
+        DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
+        if (!envManager.isCurrentEnvDefault()) {
+            InformationPane inf = new InformationPane(envManager.getDefaultEnvName());
+            inf.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+                @Override
+                public void doOk() {
+                    try {
+                        SignIn.signIn(DesignerEnvManager.getEnvManager().getDefaultEnv());
+                        TemplateTreePane.getInstance().refreshDockingView();
+                        TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
+                    } catch (Exception e) {
+                        FRContext.getLogger().errorWithServerLevel(e.getMessage());
+                    }
+                    initDemoServerAndBrowser();
+                }
+
+            }).setVisible(true);
+        } else {
+            initDemoServerAndBrowser();
+        }
     }
 
     private static void initDemoServerAndBrowser() {