From 4777f44fb372da892dc1451de2cdce2c9f805094 Mon Sep 17 00:00:00 2001 From: ju Date: Tue, 17 Apr 2018 14:47:25 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-7707=20=E3=80=9010.0=E9=9B=86=E7=BE=A4?= =?UTF-8?q?=E4=B8=80=E8=BD=AE=E3=80=91=E5=B7=A5=E5=85=B7=E6=A0=8F=E4=B8=8A?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E6=A0=87=E9=83=BD=E6=B2=A1=E4=BA=86=20?= =?UTF-8?q?=E9=A1=BA=E4=BE=BF=E6=94=B9=E5=87=A0=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/start/StartServer.java | 4 ++-- .../src/com/fr/van/chart/map/server/ChartMapEditorAction.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index af86fc4096..c2e31353db 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -55,7 +55,7 @@ public class StartServer { } if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用 String web = GeneralContext.getCurrentAppNameOfEnv(); - browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ServerConfig.getInstance().getServletName()); + browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ServerConfig.getInstance().getDecisionServletName()); return; } DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); @@ -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() + "/" + ProjectConstants.WEBAPP_NAME + "/" + ServerConfig.getInstance().getDecisionServletName()); } } diff --git a/designer_chart/src/com/fr/van/chart/map/server/ChartMapEditorAction.java b/designer_chart/src/com/fr/van/chart/map/server/ChartMapEditorAction.java index 10ccfdb6b9..9c8096cde0 100644 --- a/designer_chart/src/com/fr/van/chart/map/server/ChartMapEditorAction.java +++ b/designer_chart/src/com/fr/van/chart/map/server/ChartMapEditorAction.java @@ -25,7 +25,7 @@ public class ChartMapEditorAction extends UpdateAction { public void actionPerformed(ActionEvent evt) { int port = DesignerEnvManager.getEnvManager().getJettyServerPort(); String web = GeneralContext.getCurrentAppNameOfEnv(); - String serverlet = ServerConfig.getInstance().getServletMapping(); + String serverlet = ServerConfig.getInstance().getReportServletName(); Env env = FRContext.getCurrentEnv(); StartServer.browserURLWithLocalEnv(env.isLocalEnv() ? String.format("http://localhost:%d/%s/%s?op=map", port, web, serverlet) : env.getPath() + "?op=map"); }