Browse Source

Merge pull request #1471 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'bec9f421edb454ad286ea1596464ccb3cbfe069b':
  fix 调整
  fix 调整下
  REPORT-27510 && REPORT-27462
feature/big-screen
Hades 5 years ago
parent
commit
7758855f95
  1. 13
      designer-realize/src/main/java/com/fr/start/DesignerLauncher.java

13
designer-realize/src/main/java/com/fr/start/DesignerLauncher.java

@ -3,6 +3,9 @@ package com.fr.start;
import com.fr.process.FineProcess; import com.fr.process.FineProcess;
import com.fr.process.engine.FineJavaProcessFactory; import com.fr.process.engine.FineJavaProcessFactory;
import com.fr.process.engine.core.FineProcessContext; import com.fr.process.engine.core.FineProcessContext;
import com.fr.stable.StableUtils;
import java.io.File;
/** /**
* @author hades * @author hades
@ -11,6 +14,10 @@ import com.fr.process.engine.core.FineProcessContext;
*/ */
public class DesignerLauncher { public class DesignerLauncher {
private static final String BIN = "bin";
private static final String DOT =".";
private static final String BIN_HOME = generateBinHome();
private static final DesignerLauncher INSTANCE = new DesignerLauncher(); private static final DesignerLauncher INSTANCE = new DesignerLauncher();
private String[] args; private String[] args;
@ -19,6 +26,11 @@ public class DesignerLauncher {
} }
private static String generateBinHome() {
return DOT.equals(StableUtils.getInstallHome()) ?
DOT : StableUtils.getInstallHome() + File.separator + BIN;
}
public static DesignerLauncher getInstance() { public static DesignerLauncher getInstance() {
return INSTANCE; return INSTANCE;
} }
@ -32,6 +44,7 @@ public class DesignerLauncher {
inheritJvmSettings(). inheritJvmSettings().
jvmSettings(DesignerJavaRuntime.getInstance().getJvmOptions()). jvmSettings(DesignerJavaRuntime.getInstance().getJvmOptions()).
arguments(args). arguments(args).
directory(BIN_HOME).
startProcess(DesignerProcessType.INSTANCE); startProcess(DesignerProcessType.INSTANCE);
DesignerSuperListener.getInstance().start(); DesignerSuperListener.getInstance().start();
} }

Loading…
Cancel
Save