Merge pull request #1680 in BA/design from ~MOMEAK/design:feature/10.0 to feature/10.0

* commit '4b07983e75c27ee6804479a104d01dcd5ad44c61':
  pmd
  REPORT-7003 从设计器中打开决策平台，要跳转到新平台

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(
+		DesignUtils.visitEnvServer();
-				new String[] {ParameterConsts.OP}, 
-				new String[] {"fr_platform"}
-		);
 	}
 
 	public static final MenuKeySet PLATEFORM_MANAGER = new MenuKeySet() {

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;
@@ -281,6 +282,13 @@ public class DesignUtils {
                 || ComparatorUtils.equals(defaultLocale, Locale.KOREA);
     }
 
+    /**
+     * 访问服务器环境-空参数
+     */
+    public static void visitEnvServer() {
+        visitEnvServerByParameters(new String[] {}, new String[] {});
+    }
+
     /**
      * 访问服务器环境
      *
@@ -318,7 +326,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) {

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()
+            browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + FineServletConfig.getInstance().getServletName());
-                    + "?op=fs");
             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()
+            browser("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + ProjectConstants.WEBAPP_NAME + "/" + FineServletConfig.getInstance().getServletName());
-                    + "?op=fs");
         }
     }