Merge pull request #21 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0

* commit '4777f44fb372da892dc1451de2cdce2c9f805094':
  REPORT-7707 【10.0集群一轮】工具栏上的图标都没了 顺便改几个bug

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());
         }
     }
 

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");
     }