|
|
@ -44,6 +44,7 @@ public class DesignerJavaRuntime extends AbstractJavaRuntime { |
|
|
|
private static final String DOCK_NAME_OPTIONS = "-Xdock:name=" + FineDesigner.class.getSimpleName(); |
|
|
|
private static final String DOCK_NAME_OPTIONS = "-Xdock:name=" + FineDesigner.class.getSimpleName(); |
|
|
|
private static final String WIN_VM_OPTIONS_PATH = StableUtils.pathJoin(BIN_HOME, "designer.vmoptions"); |
|
|
|
private static final String WIN_VM_OPTIONS_PATH = StableUtils.pathJoin(BIN_HOME, "designer.vmoptions"); |
|
|
|
private static final String[] DEBUG_OPTIONS = new String[]{"-Dfile.encoding=UTF-8", "-Xmx2048m"}; |
|
|
|
private static final String[] DEBUG_OPTIONS = new String[]{"-Dfile.encoding=UTF-8", "-Xmx2048m"}; |
|
|
|
|
|
|
|
private static final String WIN_SERVER_PATH = "../server/lib"; |
|
|
|
|
|
|
|
|
|
|
|
static { |
|
|
|
static { |
|
|
|
try { |
|
|
|
try { |
|
|
@ -110,7 +111,7 @@ public class DesignerJavaRuntime extends AbstractJavaRuntime { |
|
|
|
if (isInstallVersion()) { |
|
|
|
if (isInstallVersion()) { |
|
|
|
String[] options = super.getJvmOptions(); |
|
|
|
String[] options = super.getJvmOptions(); |
|
|
|
// win下环境变量 存在错误的设置会导致问题 直接读vmoptions
|
|
|
|
// win下环境变量 存在错误的设置会导致问题 直接读vmoptions
|
|
|
|
if (SupportOSImpl.VM_OPTIONS_ADAPTER.support()) { |
|
|
|
if (SupportOSImpl.VM_OPTIONS_ADAPTER.support() && !getClassPath().contains(WIN_SERVER_PATH)) { |
|
|
|
List<String> optionList = new ArrayList<>(); |
|
|
|
List<String> optionList = new ArrayList<>(); |
|
|
|
try (BufferedReader reader = new BufferedReader(new FileReader(new File(WIN_VM_OPTIONS_PATH)))) { |
|
|
|
try (BufferedReader reader = new BufferedReader(new FileReader(new File(WIN_VM_OPTIONS_PATH)))) { |
|
|
|
String option = null; |
|
|
|
String option = null; |
|
|
|