From 94ec7b21ba23250203288a5b3f44a97e4a9ea809 Mon Sep 17 00:00:00 2001 From: Anner Date: Tue, 19 Nov 2024 11:15:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-141134=20fix:=20=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E5=90=AF=E5=8A=A8=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/utils/DesignUtils.java | 9 ++++----- .../src/main/java/com/fr/start/ServerStarter.java | 3 +++ 2 files changed, 7 insertions(+), 5 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 cc7f68ee39..e324b4ba89 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 @@ -1,8 +1,8 @@ package com.fr.design.utils; +import com.fanruan.workplace.http.HttpConstants; import com.fine.theme.light.ui.laf.FineLightLaf; import com.formdev.flatlaf.extras.FlatUIDefaultsInspector; -import com.fanruan.workplace.http.HttpConstants; import com.fr.base.FeedBackInfo; import com.fr.base.ServerConfig; import com.fr.base.Utils; @@ -37,9 +37,8 @@ import com.fr.value.NotNullLazyValue; import com.fr.workspace.WorkContext; import org.jetbrains.annotations.NotNull; -import javax.swing.SwingUtilities; -import java.awt.Desktop; -import java.awt.Font; +import javax.swing.*; +import java.awt.*; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -380,7 +379,7 @@ public class DesignUtils { * 访问服务器环境-空参数 */ public static void visitEnvServer() { - visitEnvServerByParameters(StringUtils.EMPTY, new String[]{}, new String[]{}); + visitEnvServerByParameters(ServerStarter.DEFAULT_SERVER_BASE_ROUTE, new String[]{}, new String[]{}); } /** diff --git a/designer-base/src/main/java/com/fr/start/ServerStarter.java b/designer-base/src/main/java/com/fr/start/ServerStarter.java index e3bd6d6b75..9c2bfa2620 100644 --- a/designer-base/src/main/java/com/fr/start/ServerStarter.java +++ b/designer-base/src/main/java/com/fr/start/ServerStarter.java @@ -15,6 +15,9 @@ import java.util.concurrent.Executors; public class ServerStarter { + // FBP 下默认进入管理系统 + public static final String DEFAULT_SERVER_BASE_ROUTE = "#/management"; + /** * 预览Demo * 找默认工作目录，不应该按照名字去找，而应该按照安装路径，因为默认工作目录的名字可能会改变。 From e4cc1d0618f3b1f80974532ae8fc97f3e2c254ae Mon Sep 17 00:00:00 2001 From: Anner Date: Tue, 19 Nov 2024 11:18:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-141134=20fix:=20=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E5=90=AF=E5=8A=A8=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/utils/DesignUtils.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 e324b4ba89..4d270d87a7 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 @@ -37,8 +37,9 @@ import com.fr.value.NotNullLazyValue; import com.fr.workspace.WorkContext; import org.jetbrains.annotations.NotNull; -import javax.swing.*; -import java.awt.*; +import javax.swing.SwingUtilities; +import java.awt.Desktop; +import java.awt.Font; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -376,7 +377,7 @@ public class DesignUtils { } /** - * 访问服务器环境-空参数 + * 默认情况下访问服务器环境 */ public static void visitEnvServer() { visitEnvServerByParameters(ServerStarter.DEFAULT_SERVER_BASE_ROUTE, new String[]{}, new String[]{});