From d3db2cb26c67f6b47d7759ac2e0fd5d23544df78 Mon Sep 17 00:00:00 2001
From: "John.Ying" <John.Ying@fanruan.com>
Date: Tue, 11 Oct 2022 17:17:43 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-81270=20=E8=BF=9C=E7=A8=8B=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=A4=84=E7=90=86?=
 =?UTF-8?q?IPV6=E6=A0=BC=E5=BC=8F=E7=9A=84url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/env/RemoteEnvPane.java   |  5 ++-
 .../java/com/fr/env/RemoteWorkspaceURL.java   | 32 ++++++++-----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
index 83b5e7b95..63854dc71 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
+++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
@@ -75,7 +75,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
     private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK"));
     private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel"));
     private UILabel uiLabel = new UILabel();
-    private String IPV6_JUDGE_SYMBOL = "[";
+    private static final String IPV6_JUDGE_SYMBOL = "[";
 
     /**
      * 是否启用 https 勾选框
@@ -210,6 +210,9 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
         private void actionURLInputChange() {
             remoteWorkspaceURL = new RemoteWorkspaceURL(remoteEnvURLInput.getText());
+            if (remoteWorkspaceURL.getURL().contains(IPV6_JUDGE_SYMBOL)) {
+                remoteWorkspaceURL.refreshIPV6Format();
+            }
             fillIndividualField();
 
             httpsCheckbox.setSelected(remoteWorkspaceURL.getHttps());
diff --git a/designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java b/designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java
index b37bc4d05..15e1674b1 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java
+++ b/designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java
@@ -1,9 +1,15 @@
 package com.fr.env;
 
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.AssistUtils;
 import com.fr.stable.FCloneable;
 import com.fr.stable.StringUtils;
 
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
 /**
  * @author yaohwu
  */
@@ -135,24 +141,13 @@ public class RemoteWorkspaceURL implements FCloneable {
      */
     public void refreshIPV6Format() {
         String url = this.url;
-        // 第三次出现"/"的地方
-        int webIndex = url.indexOf("/", url.indexOf("://") + 3);
-        int hostIndex = url.indexOf("[");
-        int portIndex = url.indexOf("]");
-        isContainsRelatedIndex(webIndex, hostIndex, portIndex);
-        this.host = url.substring(hostIndex, portIndex + 1);
-        this.port = url.substring(portIndex + 2, webIndex);
-    }
-
-    /**
-     *
-     * @param webIndex web指针
-     * @param hostIndex 主机指针
-     * @param portIndex 端口指针
-     * @return 三个指针是否都存在
-     */
-    public boolean isContainsRelatedIndex(int webIndex, int hostIndex, int portIndex) {
-        return webIndex != -1 && hostIndex != -1 && portIndex != -1;
+        try {
+            URI uri = new URI(url);
+            this.host = uri.getHost();
+            this.port = String.valueOf(uri.getPort());
+        } catch (URISyntaxException e) {
+            FineLoggerFactory.getLogger().info("error request url");
+        }
     }
 
     public void setHttps(boolean https) {
@@ -255,4 +250,5 @@ public class RemoteWorkspaceURL implements FCloneable {
             }
         }
     }
+
 }
\ No newline at end of file