From c5095c1989f216d0ecd1b679b94e7a1628a8a715 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 27 Dec 2024 17:25:23 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-145453=20=E3=80=90fr-fbp=E3=80=91ssh?= =?UTF-8?q?=E5=92=8Cssl=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E8=8E=B7=E5=8F=96=E5=AF=86=E9=92=A5=E7=AD=89?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=EF=BC=8C=E8=B7=AF=E5=BE=84=E6=B7=B1?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E9=80=89=E6=8B=A9=E5=90=8E=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/datapane/connect/SslPane.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java index 8fc59ba7a0..20fbcf1fd4 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java @@ -6,6 +6,7 @@ import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.security.ssl.Ssl; import com.fr.data.security.ssl.SslException; import com.fr.data.security.ssl.SslType; +import com.fr.data.security.ssl.SslUtils; import com.fr.data.security.ssl.impl.NormalSsl; import com.fr.design.constants.LayoutConstants; import com.fr.design.data.datapane.connect.SshPane.KeyFileUITextField; @@ -19,6 +20,7 @@ import com.fr.file.FILE; import com.fr.file.FILEChooserPane; import com.fr.file.filter.ChooseFileFilter; import com.fr.stable.StringUtils; +import com.fr.stable.project.ProjectConstants; import javax.swing.JPanel; import javax.swing.SwingConstants; @@ -47,6 +49,7 @@ public class SslPane extends BasicPane { private final UIButton fileChooserButtonClientKey = new UIButton(); private final UICheckBox verifyCa = new UICheckBox(i18nText("Fine-Design_Basic_Ssl_Verify_Ca")); private final JPanel sslSettingPane; + private static final String TRIM = SslUtils.CERTIFICATES + ProjectConstants.FORWARD_SLASH; public SslPane() { initDotButtons(); @@ -151,7 +154,11 @@ public class SslPane extends BasicPane { if (file == null) { textField.setText(StringUtils.EMPTY); } else { - textField.setText(file.getPath()); + String path = file.getPath(); + if (path.startsWith(TRIM)) { + path = path.substring(TRIM.length()); + } + textField.setText(path); } } fileChooser.removeAllFilter();