From d950b4e8bfd647ef5843191ca302d1d5561f90dc Mon Sep 17 00:00:00 2001
From: ju <ju@finereport.com>
Date: Thu, 17 May 2018 15:20:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=8D=A2?=
 =?UTF-8?q?=E4=BA=86=E4=B8=AA1.7=E7=9A=84jdk=EF=BC=8C=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer-base/src/com/fr/env/RemoteEnvURL.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-base/src/com/fr/env/RemoteEnvURL.java b/designer-base/src/com/fr/env/RemoteEnvURL.java
index 33a3a9ebc..bc948f972 100644
--- a/designer-base/src/com/fr/env/RemoteEnvURL.java
+++ b/designer-base/src/com/fr/env/RemoteEnvURL.java
@@ -205,7 +205,7 @@ public class RemoteEnvURL implements FCloneable {
             return cloned;
         } catch (CloneNotSupportedException e) {
             // this shouldn't happen, since we are Cloneable
-            throw new InternalError(e);
+            throw new InternalError(e.getMessage());
         }
     }
 

From c0abf24a5c61a38fd7aaf3ead0f3d71560049464 Mon Sep 17 00:00:00 2001
From: richie <jihua.me@gmail.com>
Date: Mon, 21 May 2018 11:24:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E4=BB=8E?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=89=93=E5=BC=80=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=BC=94=E7=A4=BA=EF=BC=8C=E8=83=BD=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E5=86=B3=E7=AD=96=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer-base/src/com/fr/start/StartServer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/com/fr/start/StartServer.java b/designer-base/src/com/fr/start/StartServer.java
index ecf8e9e04..27ba970c3 100644
--- a/designer-base/src/com/fr/start/StartServer.java
+++ b/designer-base/src/com/fr/start/StartServer.java
@@ -50,7 +50,7 @@ public class StartServer {
      */
     public static void browserDemoURL() {
         if (FRContext.getCurrentEnv() instanceof RemoteEnv) {
-            browser(FRContext.getCurrentEnv().getPath() + "?op=fs");
+            browser(FRContext.getCurrentEnv().getPath());
             return;
         }
         if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用
@@ -102,7 +102,7 @@ public class StartServer {
         } finally {
             //先访问Demo, 后访问报表, 不需要重置服务器.
             NEED_LOAD_ENV = false;
-            browser("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + ProjectConstants.WEBAPP_NAME + "/" + ServerConfig.getInstance().getServletName());
+            browser("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + GeneralContext.getCurrentAppNameOfEnv() + "/" + ServerConfig.getInstance().getServletName());
         }
     }
 

From 3b47392ac9345e9cf0a5e4f2eb39d127d026bbb5 Mon Sep 17 00:00:00 2001
From: CL <824983662@qq.com>
Date: Mon, 21 May 2018 11:36:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?DBEnv=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/bbs/UserInfoPane.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/com/fr/design/mainframe/bbs/UserInfoPane.java b/designer-realize/src/com/fr/design/mainframe/bbs/UserInfoPane.java
index fe6e61615..3fae72f92 100644
--- a/designer-realize/src/com/fr/design/mainframe/bbs/UserInfoPane.java
+++ b/designer-realize/src/com/fr/design/mainframe/bbs/UserInfoPane.java
@@ -4,7 +4,7 @@
 package com.fr.design.mainframe.bbs;
 
 import com.fr.base.FRContext;
-import com.fr.config.DBEnv;
+import com.fr.config.BaseDBEnv;
 import com.fr.config.MarketConfig;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.constants.UIConstants;
@@ -77,7 +77,7 @@ public class UserInfoPane extends BasicPane {
         GeneralContext.addEnvChangedListener(new EnvChangedListener() {
             @Override
             public void envChanged() {
-                if (DBEnv.isDBEnvAvailable()) {
+                if (BaseDBEnv.isDBEnvAvailable()) {
                     String username = MarketConfig.getInstance().getBbsUsername();
                     if (StringUtils.isEmpty(username)) {
                         markUnSignIn();