Browse Source

Pull request #9915: REPORT-79345 【冒烟】切换远程,日志刷报错write failed

Merge in DESIGN/design from ~LANLAN/design:release/11.0 to release/11.0

* commit '4c05a9f48b1b9682072c463c616f759a66d6235a':
  REPORT-79345 【冒烟】切换远程,日志刷报错write failed
newui
Lanlan 2 years ago
parent
commit
fa93558161
  1. 10
      designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

10
designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@ -174,7 +174,7 @@ public class DesignerActivator extends Activator implements Prepare {
@Override @Override
public void start() { public void start() {
List<LocaleMarker> markers = findMutable(InterMutableKey.Path); List<LocaleMarker> markers = findMutable(InterMutableKey.Path);
for (LocaleMarker marker : markers) { for (LocaleMarker marker : markers) {
@ -209,8 +209,10 @@ public class DesignerActivator extends Activator implements Prepare {
CompletableFuture<Void> resourcePrepare = CompletableFuture.runAsync(() -> { CompletableFuture<Void> resourcePrepare = CompletableFuture.runAsync(() -> {
pushUpdateTask.run(); pushUpdateTask.run();
PluginResourceLoader.INSTANCE.checkOldShopFile(); if (WorkContext.getCurrent().isLocal()) {
UpmResourceLoader.INSTANCE.checkOldShopFile(); PluginResourceLoader.INSTANCE.checkOldShopFile();
UpmResourceLoader.INSTANCE.checkOldShopFile();
}
}, DesignerStartupPool.common()); }, DesignerStartupPool.common());
CompletableFuture CompletableFuture
@ -554,7 +556,7 @@ public class DesignerActivator extends Activator implements Prepare {
} }
private void startBBSLoginAuthServer() { private void startBBSLoginAuthServer() {
OptimizeUtil.open(() -> { OptimizeUtil.open(() -> {
// 设计器启动后启动 // 设计器启动后启动
EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() { EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {

Loading…
Cancel
Save