From fdab3f9d81e5e0d3a89977605ea660122dc063de Mon Sep 17 00:00:00 2001 From: hades Date: Wed, 4 Mar 2020 18:46:30 +0800 Subject: [PATCH 1/3] REPORT-27510 && REPORT-27462 --- .../src/main/java/com/fr/start/DesignerLauncher.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java b/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java index fa1cd969f..8be938717 100644 --- a/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java +++ b/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java @@ -3,6 +3,7 @@ package com.fr.start; import com.fr.process.FineProcess; import com.fr.process.engine.FineJavaProcessFactory; import com.fr.process.engine.core.FineProcessContext; +import com.fr.stable.StableUtils; /** * @author hades @@ -32,6 +33,7 @@ public class DesignerLauncher { inheritJvmSettings(). jvmSettings(DesignerJavaRuntime.getInstance().getJvmOptions()). arguments(args). + directory(StableUtils.getInstallHome()). startProcess(DesignerProcessType.INSTANCE); DesignerSuperListener.getInstance().start(); } From 122fec07dce4e66d1befeac1c04f48c67ced12f9 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 5 Mar 2020 09:45:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E8=B0=83=E6=95=B4=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/start/DesignerLauncher.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java b/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java index 8be938717..0777d699f 100644 --- a/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java +++ b/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java @@ -5,6 +5,8 @@ import com.fr.process.engine.FineJavaProcessFactory; import com.fr.process.engine.core.FineProcessContext; import com.fr.stable.StableUtils; +import java.io.File; + /** * @author hades * @version 10.0 @@ -12,6 +14,9 @@ import com.fr.stable.StableUtils; */ public class DesignerLauncher { + private static final String BIN_HOME = ".".equals(StableUtils.getInstallHome()) ? + "." : StableUtils.getInstallHome() + File.separator + "bin"; + private static final DesignerLauncher INSTANCE = new DesignerLauncher(); private String[] args; @@ -33,7 +38,7 @@ public class DesignerLauncher { inheritJvmSettings(). jvmSettings(DesignerJavaRuntime.getInstance().getJvmOptions()). arguments(args). - directory(StableUtils.getInstallHome()). + directory(BIN_HOME). startProcess(DesignerProcessType.INSTANCE); DesignerSuperListener.getInstance().start(); } From bec9f421edb454ad286ea1596464ccb3cbfe069b Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 5 Mar 2020 09:57:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/start/DesignerLauncher.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java b/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java index 0777d699f..d0633ac6a 100644 --- a/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java +++ b/designer-realize/src/main/java/com/fr/start/DesignerLauncher.java @@ -14,8 +14,9 @@ import java.io.File; */ public class DesignerLauncher { - private static final String BIN_HOME = ".".equals(StableUtils.getInstallHome()) ? - "." : StableUtils.getInstallHome() + File.separator + "bin"; + 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(); @@ -25,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() { return INSTANCE; }