From ab51a98c129dbacd72b4fb9886dafaf453cdbb4e Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Fri, 29 Jun 2018 15:39:58 +0800
Subject: [PATCH] REPORT-9284 REPORT-9159

---
 .../mainframe/loghandler/DesignerLogHandler.java     |  4 +++-
 designer-realize/src/com/fr/start/Designer.java      | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
index ef5325215..b4829a988 100644
--- a/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
+++ b/designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
@@ -6,6 +6,7 @@ import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.FRLogLevel;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
 import com.fr.general.LogRecordTime;
@@ -119,7 +120,8 @@ public class DesignerLogHandler {
             @Override
             public void actionPerformed(ActionEvent e) {
                 JPopupMenu jPopupMenu = new JPopupMenu();
-                int logLevelInt = Log4jConfig.getInstance().getRootLevel().toInt();
+                //这里把log4j的日志级别也转成java级别,可以进行比对
+                int logLevelInt = FRLogLevel.convertLog4jToJava(Log4jConfig.getInstance().getRootLevel()).intValue();
                 if (logLevelInt <= INFO_INT) {
                     jPopupMenu.add(showInfo);
                     jPopupMenu.add(showError);
diff --git a/designer-realize/src/com/fr/start/Designer.java b/designer-realize/src/com/fr/start/Designer.java
index fad29deb3..b0d0742ea 100644
--- a/designer-realize/src/com/fr/start/Designer.java
+++ b/designer-realize/src/com/fr/start/Designer.java
@@ -115,6 +115,18 @@ public class Designer extends BaseDesigner {
         //传递启动参数
         designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args));
         designerRoot.start();
+
+        //加入从产品演示启动
+        if (args != null) {
+            for (String arg : args) {
+                if (ComparatorUtils.equals(arg, "demo")) {
+                    DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
+                    ServerStarter.browserDemoURL();
+                    break;
+                }
+            }
+        }
+
         if (WorkContext.getCurrent().isLocal()) {
             //初始化一下serverTray
             ServerTray.init();