Browse Source

Merge pull request #1107 in BA/design from ~NEIL/design:release/9.0 to release/9.0

* commit '345cb24b7fbb24b4469b0e155715f94549a2df2a':
  build failed
  REPORT-3457 有几个报错没截取到日志.
master
superman 7 years ago
parent
commit
fd60f66799
  1. 3
      designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java
  2. 1
      designer_base/src/com/fr/design/file/HistoryTemplateListPane.java

3
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;
}

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

Loading…
Cancel
Save