From 4872caf558c2114e59371900fb99894a1d5e0324 Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Tue, 8 Mar 2022 16:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=20JIRA=20=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../env/LocalDesignerWorkspaceInfo.java       | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java b/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
index 4a488cb2d..ec8d997c3 100644
--- a/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
+++ b/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java
@@ -1,9 +1,14 @@
 package com.fr.design.env;
 
+import com.fr.general.ComparatorUtils;
+import com.fr.stable.CoreConstants;
+import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
+import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import com.fr.workspace.engine.exception.MainVersionNotMatchException;
 
 import java.io.File;
 import java.util.Properties;
@@ -94,18 +99,18 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
     @Override
     public boolean checkValid(){
         File file = new File(this.path);
-        ////判断不是文件夹/路径不在WEB-INF下/代码启动三种情况
-        //if(!file.isDirectory() || !ComparatorUtils.equals(file.getName(), "WEB-INF") || this.path.startsWith(".")) {
-        //    return false;
-        //}
-        //
-        //File engineLib = new File(StableUtils.pathJoin(this.path, ProjectConstants.LIB_NAME, REPORT_ENGINE_JAR));
-        //// 非安装版本允许自由切换
-        //boolean notExistLib = !CoreConstants.DOT.equals(StableUtils.getInstallHome())
-        //        && !engineLib.exists();
-        //if (notExistLib) {
-        //    throw new MainVersionNotMatchException();
-        //}
+        //判断不是文件夹/路径不在WEB-INF下/代码启动三种情况
+        if(!file.isDirectory() || !ComparatorUtils.equals(file.getName(), "WEB-INF") || this.path.startsWith(".")) {
+            return false;
+        }
+
+        File engineLib = new File(StableUtils.pathJoin(this.path, ProjectConstants.LIB_NAME, REPORT_ENGINE_JAR));
+        // 非安装版本允许自由切换
+        boolean notExistLib = !CoreConstants.DOT.equals(StableUtils.getInstallHome())
+                && !engineLib.exists();
+        if (notExistLib) {
+            throw new MainVersionNotMatchException();
+        }
 
         return true;
     }