Browse Source

Pull request #9108: REPORT-72831 设计器环境检测-设计器正常的,但是抛出异常了

Merge in DESIGN/design from ~HARRISON/design:feature/x to feature/x

* commit '16eea506d74a530781979852aff0ce699f124014':
  REPORT-72831 设计器环境检测-设计器正常的,但是抛出异常了 遗漏一部分,合一下
feature/x
Harrison 3 years ago
parent
commit
d9a28468d7
  1. 8
      designer-base/src/main/java/com/fr/env/detect/impl/JarInconsistentDetector.java

8
designer-base/src/main/java/com/fr/env/detect/impl/JarInconsistentDetector.java vendored

@ -54,7 +54,6 @@ public class JarInconsistentDetector extends AbstractExceptionDetector {
if (WorkContext.getCurrent().isLocal()) { if (WorkContext.getCurrent().isLocal()) {
return detectLocal(); return detectLocal();
} else { } else {
return detectLocalAndRemote(); return detectLocalAndRemote();
} }
@ -75,13 +74,14 @@ public class JarInconsistentDetector extends AbstractExceptionDetector {
Map<String, String> remoteMap = groupBy(remoteInfos); Map<String, String> remoteMap = groupBy(remoteInfos);
MapDifference<String, String> difference = Maps.difference(localMap, remoteMap); MapDifference<String, String> difference = Maps.difference(localMap, remoteMap);
Map<String, String> diffInCommon = difference.entriesInCommon(); // 获取本地远程不一样的部分
Map<String, MapDifference.ValueDifference<String>> diffs = difference.entriesDiffering();
if (diffInCommon.isEmpty()) { if (diffs.isEmpty()) {
return DetectorResult.normal(type()); return DetectorResult.normal(type());
} }
Set<String> inConsistentJars = diffInCommon.keySet(); Set<String> inConsistentJars = diffs.keySet();
String message = StringUtils.join(inConsistentJars, SEPARATOR); String message = StringUtils.join(inConsistentJars, SEPARATOR);
Message.Simple tipsMessage = new Message.Simple(Toolkit.i18nText("Fine_Design_Basic_Detect_Server") + Toolkit.i18nText(type().getTipsLocale()) + message); Message.Simple tipsMessage = new Message.Simple(Toolkit.i18nText("Fine_Design_Basic_Detect_Server") + Toolkit.i18nText(type().getTipsLocale()) + message);

Loading…
Cancel
Save