From 8ad59994a6b46c8c0a31e82cd1e8e065b4bde8c8 Mon Sep 17 00:00:00 2001
From: ju <ju@finereport.com>
Date: Wed, 13 Jun 2018 17:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=201=E3=80=81?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E4=BF=9D=E5=AD=98=E6=A8=A1=E6=9D=BF=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=202=E3=80=81=E5=85=B6=E4=BB=96=E5=B0=8Ffix=203?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E8=BF=9C=E7=A8=8B=E6=9D=83=E9=99=90=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E7=9A=84=E6=94=B9=E5=8A=A8=E8=BE=83=E5=A4=A7=EF=BC=8C?=
 =?UTF-8?q?=E6=88=91=E4=B9=A0=E6=83=AF=E5=85=88=E5=86=99=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E6=83=B3=E6=B8=85=E6=A5=9A=E4=B9=8B=E5=90=8E=E5=86=8D?=
 =?UTF-8?q?=E5=86=99=E5=AE=9E=E7=8E=B0=E4=BA=86=EF=BC=8C=E6=89=80=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=88=E5=86=99=E4=BA=86=E4=B8=80=E5=A5=97=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer-base/src/com/fr/design/mainframe/JTemplate.java | 8 ++++----
 designer-base/src/com/fr/env/RemoteEnv.java              | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/com/fr/design/mainframe/JTemplate.java b/designer-base/src/com/fr/design/mainframe/JTemplate.java
index f31fc7491..62ed475db 100644
--- a/designer-base/src/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/com/fr/design/mainframe/JTemplate.java
@@ -60,6 +60,7 @@ import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.undo.UndoManager;
 import java.awt.*;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -654,10 +655,9 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             return false;
         }
         try {
-            if (!this.getTarget().export(editingFILE.asOutputStream())) {
-                return false;
-            }
-
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            this.getTarget().export(out);
+            FRContext.getCurrentEnv().getFileOperator().write(out.toByteArray(), editingFILE.getPath());
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);
             JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);
diff --git a/designer-base/src/com/fr/env/RemoteEnv.java b/designer-base/src/com/fr/env/RemoteEnv.java
index d2f178aea..6517efce1 100644
--- a/designer-base/src/com/fr/env/RemoteEnv.java
+++ b/designer-base/src/com/fr/env/RemoteEnv.java
@@ -577,7 +577,8 @@ public class RemoteEnv extends AbstractEnv<RemoteEnvConfig> implements DesignAut
      */
     @Override
     public String getWebReportPath() {
-        return getPath().substring(0, getPath().lastIndexOf("/"));
+    
+        return StableUtils.pathJoin(getPath(), getAppName());
     }
 
     public String[] getProcedureColumns(StoreProcedure storeProcedure, Map parameterMap) throws Exception {