Browse Source

Merge pull request #1544 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0

* commit '57115393825ba779904ec9f52c7a8f84da3ff3f5':
  REPORT-29003 错误报告问题
final/10.0
Kara 5 years ago
parent
commit
5245903fcc
  1. 4
      designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java
  2. 4
      designer-realize/src/main/java/com/fr/start/DesignerSuperListener.java

4
designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java vendored

@ -23,6 +23,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
/** /**
* 根据配置生成运行环境 * 根据配置生成运行环境
@ -55,7 +56,7 @@ public class DesignerWorkspaceGenerator {
WorkspaceClient client = null; WorkspaceClient client = null;
try { try {
client = future.get(WAIT_FREQ, TimeUnit.SECONDS); client = future.get(WAIT_FREQ, TimeUnit.SECONDS);
} catch (Exception e) { } catch (TimeoutException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
RemoteHandler.handle(config); RemoteHandler.handle(config);
} }
@ -92,7 +93,6 @@ public class DesignerWorkspaceGenerator {
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} }
} else {
} }
} }
} }

4
designer-realize/src/main/java/com/fr/start/DesignerSuperListener.java

@ -81,6 +81,9 @@ public class DesignerSuperListener {
if (ComparatorUtils.equals(ReportState.ACTIVE.getValue(), msg)) { if (ComparatorUtils.equals(ReportState.ACTIVE.getValue(), msg)) {
startFrameListener(); startFrameListener();
} }
if (ComparatorUtils.equals(DesignerProcessType.INSTANCE.obtain(), msg)) {
frameReport();
}
} }
} }
}); });
@ -90,6 +93,7 @@ public class DesignerSuperListener {
onceFuture = service.schedule(new Runnable() { onceFuture = service.schedule(new Runnable() {
@Override @Override
public void run() { public void run() {
cancel = true;
ProcessEventPipe pipe = process.getPipe(); ProcessEventPipe pipe = process.getPipe();
pipe.fire(FineProcessEngineEvent.READY); pipe.fire(FineProcessEngineEvent.READY);
if (StringUtils.isNotEmpty(pipe.info())) { if (StringUtils.isNotEmpty(pipe.info())) {

Loading…
Cancel
Save