From 9c8cd304339ae3aedf9f97399c0df47c31bada1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=2EYing-=E5=BA=94=E5=BF=97=E6=B5=A9?= Date: Wed, 24 May 2023 14:30:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-96107=208.0=E5=92=8C11.0.2=E8=83=BD?= =?UTF-8?q?=E5=8F=8C=E5=BC=80=EF=BC=8C8.0=E5=92=8C11.0.14=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E5=8F=8C=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/DesignerEnvManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 199834fb7..73db5f13d 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -2309,6 +2309,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada writeUUID(writer); writeActiveStatus(writer); writeHttpsParas(writer); + writeDesignerPort(writer); writeAlphaFineAttr(writer); writeEnvDetectorConfig(writer); writeStartupConfig(writer); @@ -2316,7 +2317,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada writeOpenDebug(writer); writeDesignerPushUpdateAttr(writer); writeVcsAttr(writer); - writeDesignerPort(writer); writeSnapChatConfig(writer); writeComponentReuseNotificationInfo(writer); writeDesignerLoginAttr(writer); From 69dbfa1da6ef97a6a7547030178bff463904450f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=2EYing-=E5=BA=94=E5=BF=97=E6=B5=A9?= Date: Wed, 24 May 2023 18:16:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-96107=208.0=E5=92=8C11.0.2=E8=83=BD?= =?UTF-8?q?=E5=8F=8C=E5=BC=80=EF=BC=8C8.0=E5=92=8C11.0.14=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E5=8F=8C=E5=BC=80--=E6=96=B9=E6=A1=88=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/DesignerEnvManager.java | 2 +- .../java/com/fr/design/utils/DesignUtils.java | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 73db5f13d..199834fb7 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -2309,7 +2309,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada writeUUID(writer); writeActiveStatus(writer); writeHttpsParas(writer); - writeDesignerPort(writer); writeAlphaFineAttr(writer); writeEnvDetectorConfig(writer); writeStartupConfig(writer); @@ -2317,6 +2316,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter, AsyncXmlReada writeOpenDebug(writer); writeDesignerPushUpdateAttr(writer); writeVcsAttr(writer); + writeDesignerPort(writer); writeSnapChatConfig(writer); writeComponentReuseNotificationInfo(writer); writeDesignerLoginAttr(writer); diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java index 4779f9191..752aa653f 100644 --- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java @@ -66,7 +66,8 @@ import java.util.concurrent.TimeoutException; * Some util method of Designer */ public class DesignUtils { - private static int port = DesignerPort.getInstance().getMessagePort(); + + private static Integer port; private static boolean started = false; @@ -80,6 +81,13 @@ public class DesignUtils { } public synchronized static int getPort() { + if (port == null) { + if (ComparatorUtils.equals("true", System.getProperty("debug"))) { + setPort(DesignerPort.getInstance().getDebugMessagePort()); + } else { + setPort(DesignerPort.getInstance().getMessagePort()); + } + } return port; } @@ -93,7 +101,6 @@ public class DesignUtils { return started; } - /** * 判断设计器端口是否被其他程序占用 * 尝试去通信，无回应就是其他程序占用端口，否则需要继续判断是否为设计器进程未关闭 @@ -103,7 +110,7 @@ public class DesignUtils { public static boolean isPortOccupied() { ExecutorService executor = null; Future future = null; - try (Socket socket = new Socket("localhost", port); + try (Socket socket = new Socket("localhost", getPort()); BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8)); PrintWriter writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8)))) { writer.println("check"); @@ -167,7 +174,7 @@ public class DesignUtils { if (lines == null || lines.length == 0) { return; } - try (Socket socket = new Socket("localhost", port)) { + try (Socket socket = new Socket("localhost", getPort())) { clientSend(lines, socket); } catch (Exception ignore) { @@ -190,7 +197,7 @@ public class DesignUtils { try { serverSocket = new ServerSocket(startPort); } catch (IOException e1) { - FineLoggerFactory.getLogger().error("Cannot create server socket on " + port); + FineLoggerFactory.getLogger().error("Cannot create server socket on " + getPort()); } while (true) { try { @@ -250,7 +257,7 @@ public class DesignUtils { reader.close(); socket.close(); } else { - FineLoggerFactory.getLogger().error("Cannot create server socket on " + port); + FineLoggerFactory.getLogger().error("Cannot create server socket on " + getPort()); break; } } catch (IOException ignored) { From 2f557b6b024bc1fb957eb68e27d372b4338b9861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=2EYing-=E5=BA=94=E5=BF=97=E6=B5=A9?= Date: Wed, 24 May 2023 18:19:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-96107=208.0=E5=92=8C11.0.2=E8=83=BD?= =?UTF-8?q?=E5=8F=8C=E5=BC=80=EF=BC=8C8.0=E5=92=8C11.0.14=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E5=8F=8C=E5=BC=80--=E9=AD=94=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/utils/DesignUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java index 752aa653f..b91ca4d8e 100644 --- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java @@ -69,7 +69,9 @@ public class DesignUtils { private static Integer port; + private static final String TURE = "true"; + private static final String DEBUG = "debug"; private static boolean started = false; @@ -82,7 +84,7 @@ public class DesignUtils { public synchronized static int getPort() { if (port == null) { - if (ComparatorUtils.equals("true", System.getProperty("debug"))) { + if (ComparatorUtils.equals(TURE, System.getProperty(DEBUG))) { setPort(DesignerPort.getInstance().getDebugMessagePort()); } else { setPort(DesignerPort.getInstance().getMessagePort()); From 7a9d957377cc91ee1bddff058f8381f0d4e2aec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=2EYing-=E5=BA=94=E5=BF=97=E6=B5=A9?= Date: Thu, 25 May 2023 11:26:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-96107=208.0=E5=92=8C11.0.2=E8=83=BD?= =?UTF-8?q?=E5=8F=8C=E5=BC=80=EF=BC=8C8.0=E5=92=8C11.0.14=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E5=8F=8C=E5=BC=80--=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/utils/DesignUtils.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java index b91ca4d8e..bfba512a2 100644 --- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java @@ -69,9 +69,6 @@ public class DesignUtils { private static Integer port; - private static final String TURE = "true"; - - private static final String DEBUG = "debug"; private static boolean started = false; @@ -84,11 +81,7 @@ public class DesignUtils { public synchronized static int getPort() { if (port == null) { - if (ComparatorUtils.equals(TURE, System.getProperty(DEBUG))) { - setPort(DesignerPort.getInstance().getDebugMessagePort()); - } else { - setPort(DesignerPort.getInstance().getMessagePort()); - } + setPort(DesignerPort.getInstance().getMessagePort()); } return port; } @@ -230,7 +223,7 @@ public class DesignUtils { @Override public void run() { DesignerStartupContext context = DesignerStartupContext.getInstance(); - + // 如果在启动页展示中 if (DesignerStartupUtil.openTemplateIfOnWaiting(f)) { return; @@ -240,7 +233,7 @@ public class DesignUtils { // 之前就有这样的问题 return; } - + // 打开模板 DesignerContext.getDesignerFrame().openTemplate(new FileFILE(f)); } @@ -493,6 +486,7 @@ public class DesignUtils { /** * 获取设计器可用字体 + * * @return */ public static String[] getAvailableFontFamilyNames4Report() {