From 2d6a2493ae66b60b9408b0268824816db1fb9750 Mon Sep 17 00:00:00 2001
From: neil <459208047@qq.com>
Date: Wed, 23 Aug 2017 15:39:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-3457=20=E6=9C=89=E5=87=A0=E4=B8=AA?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=B2=A1=E6=88=AA=E5=8F=96=E5=88=B0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java
index 26ae4d61fd..30356efe8f 100644
--- a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java
+++ b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java
@@ -78,7 +78,8 @@ public class ErrorInfoLogAppender extends AppenderSkeleton {
 
     private String readLogID(String log) {
         String errorCode = Inter.getLocText("FR-Engine_ErrorCode-Prefix");
-        String[] matchs = log.split(errorCode + ".*?:");
+        // 报错信息国际化不规范, 有些是中文分号, 有些是英文
+        String[] matchs = log.split(errorCode + ".*?[:,：]");
         if (matchs.length <= 1) {
             return StringUtils.EMPTY;
         }

From 345cb24b7fbb24b4469b0e155715f94549a2df2a Mon Sep 17 00:00:00 2001
From: neil <459208047@qq.com>
Date: Wed, 23 Aug 2017 15:49:24 +0800
Subject: [PATCH 2/2] build failed

---
 .../src/com/fr/design/file/HistoryTemplateListPane.java          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/file/HistoryTemplateListPane.java b/designer_base/src/com/fr/design/file/HistoryTemplateListPane.java
index 50eb2a46f3..ab1b30babe 100644
--- a/designer_base/src/com/fr/design/file/HistoryTemplateListPane.java
+++ b/designer_base/src/com/fr/design/file/HistoryTemplateListPane.java
@@ -233,7 +233,6 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C
         getCurrentEditingTemplate().repaint();
     }
 
-    @Override
     public void downLoadSources() {
         DownLoadOnLineSourcesHelper pane = new DownLoadOnLineSourcesHelper();
         pane.addMapJSONSiteInfo();