From f79198c2d714d26dc527c4b41efa02047427cd96 Mon Sep 17 00:00:00 2001
From: "Hugh.C" <Hugh.C@fanruan.com>
Date: Tue, 18 Feb 2020 15:15:38 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-26672=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E5=92=8C=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=83=BD=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E7=9A=84lic=E9=83=BD=E6=B2=A1=E6=9C=89=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E5=8A=9F=E8=83=BD=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=98=E6=98=AF=E5=8F=AF=E4=BB=A5=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/env/RemoteDesignerWorkspaceInfo.java    | 11 +++++++++--
 .../src/main/java/com/fr/env/RemoteEnvPane.java       |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java b/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java
index ffc80cb089..0ac5ea139d 100644
--- a/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java
+++ b/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java
@@ -1,11 +1,13 @@
 package com.fr.design.env;
 
+import com.fr.log.FineLoggerFactory;
 import com.fr.security.SecurityToolbox;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
 
 public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
 
@@ -89,8 +91,13 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
 
 
     @Override
-    public boolean checkValid(){
-
+    public boolean checkValid() {
+        try {
+            new FunctionalHttpRequest(this.connection).validateVT();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            return false;
+        }
         return true;
     }
 }
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 56a805dde6..4871bb769c 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
+++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
@@ -17,6 +17,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.scrollruler.ModLineBorder;
+import com.fr.license.exception.RegistEditionException;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.third.guava.base.Strings;
@@ -564,6 +565,9 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                     return TestConnectionResult.parse(WorkContext.getConnector().testConnection(connection), connection);
                 } catch (WorkspaceAuthException ignored) {
                     return AUTH_FAILED;
+                } catch (RegistEditionException e) {
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    throw e;
                 }
             }