From 906961c8b5815c71eed70a37ddb7d7f43c4fe18c Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 24 Aug 2018 16:03:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JRA=E4=BB=BB=E5=8A=A1=20=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=86=85=E7=BD=AE=E5=9C=A8release=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 7abe673a0c..4f7920d1e9 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -474,9 +474,9 @@ public abstract class ToolBarMenuDock { shortCuts.add(new TutorialAction()); } //远程不使用更新升级 - if(WorkContext.getCurrent().isLocal()) { - shortCuts.add(new SoftwareUpdateAction()); - } +// if(WorkContext.getCurrent().isLocal()) { +// shortCuts.add(new SoftwareUpdateAction()); +// } if (AlphaFineConfigManager.isALPHALicAvailable()) { shortCuts.add(new AlphaFineAction()); } From 338137ced4f268807ba53c16823266ef9bbe1a55 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 24 Aug 2018 17:31:54 +0800 Subject: [PATCH 2/2] REPORT-10847 --- .../fr/design/mainframe/loghandler/DesignerLogHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index a2bd7018b8..877a322cb8 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -38,6 +38,7 @@ public class DesignerLogHandler { protected static final int INFO_INT = Level.INFO.toInt(); protected static final int ERROR_INT = Level.ERROR.toInt(); protected static final int WARN_INT = Level.WARN.toInt(); + protected static final int DEBUG_INT = Level.DEBUG.toInt(); private static final int GAP_X = -150; private static final int INFO_GAP_Y = -60; private static final int ERRO_GAP_Y = -40; @@ -209,12 +210,15 @@ public class DesignerLogHandler { public void printStackTrace(String message, Level level, Date date) { int intLevel = level.toInt(); + int logLevel = Log4jConfig.getInstance().getRootLevel().toInt(); if (intLevel == INFO_INT && showInfo.isSelected()) { printMessage(message, intLevel, date); } else if (intLevel == ERROR_INT && showError.isSelected()) { printMessage(message, intLevel, date); } else if (intLevel == WARN_INT && showServer.isSelected()) { printMessage(message, intLevel, date); + } else if (intLevel == DEBUG_INT && logLevel == DEBUG_INT){ + printMessage(message, intLevel, date); } }