From 8f6f1a1ba622e03bf6ab0e4db3225a3f65afb509 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Thu, 19 Oct 2017 16:56:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-3976=20=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=89=88=E6=9C=AC=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/extra/PluginUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/extra/PluginUtils.java b/designer_base/src/com/fr/design/extra/PluginUtils.java
index 7ef3eaaad6..f4403c7fc0 100644
--- a/designer_base/src/com/fr/design/extra/PluginUtils.java
+++ b/designer_base/src/com/fr/design/extra/PluginUtils.java
@@ -195,7 +195,7 @@ public class PluginUtils {
         JSONArray resultJSONArray =  JSONArray.create();
         for(int i = 0; i < oriJSONArray.length(); i++){
             JSONObject jo = oriJSONArray.getJSONObject(i);
-            String envVersion = jo.optString("env-version");
+            String envVersion = jo.optString("envversion");
             if(isCompatibleCurrentEnv(envVersion)){
                 resultJSONArray.put(jo);
             }

From e420eeac47e4012a725d357bb82fe3e5b8f69a94 Mon Sep 17 00:00:00 2001
From: daniel <daniel@finereport.com>
Date: Thu, 19 Oct 2017 22:02:37 +0800
Subject: [PATCH 2/2] PFC-1053

---
 build.9.0.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.9.0.gradle b/build.9.0.gradle
index 43b7bcf260..b315658137 100644
--- a/build.9.0.gradle
+++ b/build.9.0.gradle
@@ -15,7 +15,7 @@ task appletJar<<{
 			fileset(dir:"${basicDir}/report/build/classes/main")		
 			fileset(dir:"${basicDir}/platform/build/classes/main")		
 		}
-		unjar(src:"${libDir}/3rd.jar",dest:"./tmp")
+		unjar(src:"${libDir}/fr-third-9.0.jar",dest:"./tmp")
 		unjar(src:"${libDir}/servlet-api.jar",dest:"./tmp")
 		jar(jarfile:"build/libs/fr-applet-9.0.jar"){
 			fileset(dir:"build/classes"){