From 5aa527e37e6ace165e5c9d6070ddbfa77a2d199c Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Fri, 18 Aug 2017 11:07:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Env=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8C=BA=E9=97=B4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/extra/PluginHelper.java          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java
index cab0a6dbd..e79231a3a 100644
--- a/designer_base/src/com/fr/design/extra/PluginHelper.java
+++ b/designer_base/src/com/fr/design/extra/PluginHelper.java
@@ -15,6 +15,8 @@ import com.fr.plugin.PluginConfigManager;
 import com.fr.plugin.PluginLoader;
 import com.fr.plugin.PluginManagerHelper;
 import com.fr.plugin.PluginUtils;
+import com.fr.plugin.basic.Version;
+import com.fr.plugin.basic.VersionIntervalFactory;
 import com.fr.plugin.dependence.PluginDependence;
 import com.fr.plugin.dependence.PluginDependenceException;
 import com.fr.plugin.dependence.PluginDependenceUnit;
@@ -274,7 +276,7 @@ public class PluginHelper {
             FRLogger.getLogger().error(jarExpiredInfo);
             throw new com.fr.plugin.PluginVerifyException(jarExpiredInfo);
         }
-        if (isHigherEnvVersion(plugin.getEnvVersion())) {
+        if (!isSupportCurrentEnv(plugin.getEnvVersion())) {
             String envVersionNotSupport = Inter.getLocText(new String[]{"FR-Designer-Plugin_Env_Expired", ",", "FR-Designer-Plugin_Install_Failed"});
             FRLogger.getLogger().error(envVersionNotSupport);
             throw new com.fr.plugin.PluginVerifyException(envVersionNotSupport);
@@ -291,9 +293,9 @@ public class PluginHelper {
         }
     }
     
-    private static boolean isHigherEnvVersion(String envVersion) {
-        //高于8.0
-        return PluginUtils.compareVersion(envVersion, ProductConstants.MAIN_VERSION) > 0;
+    private static boolean isSupportCurrentEnv(String envVersion) {
+        //包含8.0
+        return !VersionIntervalFactory.create(envVersion).contain(Version.currentEnvVersion());
     }
     
     /**