From e4b212625e21556d30511bbaa9e33df137d80edb Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 28 Feb 2018 19:29:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-7003=20=E4=BB=8E=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E4=B8=AD=E6=89=93=E5=BC=80=E5=86=B3=E7=AD=96=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=EF=BC=8C=E8=A6=81=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=96=B0?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/server/PlatformManagerAction.java | 4 ++-- designer_base/src/com/fr/design/utils/DesignUtils.java | 3 ++- designer_base/src/com/fr/start/StartServer.java | 7 +++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java b/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java index f8f1cd655e..f13a638033 100644 --- a/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java +++ b/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java @@ -24,8 +24,8 @@ public class PlatformManagerAction extends UpdateAction { */ public void actionPerformed(ActionEvent evt) { DesignUtils.visitEnvServerByParameters( - new String[] {ParameterConsts.OP}, - new String[] {"fr_platform"} + new String[] {}, + new String[] {} ); } diff --git a/designer_base/src/com/fr/design/utils/DesignUtils.java b/designer_base/src/com/fr/design/utils/DesignUtils.java index 9dc0399d51..427ebeb0e2 100644 --- a/designer_base/src/com/fr/design/utils/DesignUtils.java +++ b/designer_base/src/com/fr/design/utils/DesignUtils.java @@ -4,6 +4,7 @@ import com.fr.base.*; import com.fr.base.remote.RemoteDeziConstants; import com.fr.dav.DavXMLUtils; import com.fr.dav.LocalEnv; +import com.fr.decision.base.query.FineServletConfig; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.DesignerEnvProcessor; @@ -318,7 +319,7 @@ public class DesignUtils { } else { try { String web = GeneralContext.getCurrentAppNameOfEnv(); - String url = "http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ConfigManager.getProviderInstance().getServletMapping() + String url = "http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + FineServletConfig.getInstance().getServletName() + postfixOfUri; StartServer.browserURLWithLocalEnv(url); } catch (Throwable e) { diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index 78026f5048..479429d329 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -2,6 +2,7 @@ package com.fr.start; import com.fr.base.ConfigManager; import com.fr.base.FRContext; +import com.fr.decision.base.query.FineServletConfig; import com.fr.design.DesignModelAdapter; import com.fr.design.DesignerEnvManager; import com.fr.design.data.datapane.TableDataTreePane; @@ -54,8 +55,7 @@ public class StartServer { } if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用 String web = GeneralContext.getCurrentAppNameOfEnv(); - browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ConfigManager.getProviderInstance().getServletMapping() - + "?op=fs"); + browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + FineServletConfig.getInstance().getServletName()); return; } DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); @@ -100,8 +100,7 @@ public class StartServer { } finally { //先访问Demo, 后访问报表, 不需要重置服务器. NEED_LOAD_ENV = false; - browser("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + ProjectConstants.WEBAPP_NAME + "/" + ConfigManager.getProviderInstance().getServletMapping() - + "?op=fs"); + browser("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + ProjectConstants.WEBAPP_NAME + "/" + FineServletConfig.getInstance().getServletName()); } } From 4b07983e75c27ee6804479a104d01dcd5ad44c61 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 28 Feb 2018 20:35:05 +0800 Subject: [PATCH 2/2] pmd --- .../fr/design/actions/server/PlatformManagerAction.java | 5 +---- designer_base/src/com/fr/design/utils/DesignUtils.java | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java b/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java index f13a638033..a766e35315 100644 --- a/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java +++ b/designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java @@ -23,10 +23,7 @@ public class PlatformManagerAction extends UpdateAction { * @param evt 事件 */ public void actionPerformed(ActionEvent evt) { - DesignUtils.visitEnvServerByParameters( - new String[] {}, - new String[] {} - ); + DesignUtils.visitEnvServer(); } public static final MenuKeySet PLATEFORM_MANAGER = new MenuKeySet() { diff --git a/designer_base/src/com/fr/design/utils/DesignUtils.java b/designer_base/src/com/fr/design/utils/DesignUtils.java index 427ebeb0e2..56b806c995 100644 --- a/designer_base/src/com/fr/design/utils/DesignUtils.java +++ b/designer_base/src/com/fr/design/utils/DesignUtils.java @@ -282,6 +282,13 @@ public class DesignUtils { || ComparatorUtils.equals(defaultLocale, Locale.KOREA); } + /** + * 访问服务器环境-空参数 + */ + public static void visitEnvServer() { + visitEnvServerByParameters(new String[] {}, new String[] {}); + } + /** * 访问服务器环境 *