From 380d744c2f8e1cd1bc6c0b63028c508b8be8e6f8 Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 11 Jun 2018 17:41:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-8665=2010.0=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=BF=9D=E5=AD=98=E4=B8=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/server/ConnectionListAction.java | 4 +++- .../com/fr/design/actions/server/GlobalTableDataAction.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java index e14b22b6d..3b7881c3d 100644 --- a/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java @@ -68,7 +68,9 @@ public class ConnectionListAction extends UpdateAction { } protected void renameConnection(String oldName, String newName) { - datasourceManager.renameConnection(oldName, newName); + if(datasourceManager.getConnection(oldName) != null){ + datasourceManager.renameConnection(oldName, newName); + } } }; final BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null); diff --git a/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java index b723b9928..946fa61f5 100644 --- a/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java @@ -78,7 +78,9 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS Configurations.update(new Worker() { @Override public void run() { - tableDataConfig.renameTableData(oldName, newName); + if(tableDataConfig.getTableData(oldName) != null){ + tableDataConfig.renameTableData(oldName, newName); + } } @Override From 9a3ccfef6f538f019d23f32e04fb72639b5c5eca Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 11 Jun 2018 18:44:51 +0800 Subject: [PATCH 2/3] REVERT --- .../com/fr/design/actions/server/ConnectionListAction.java | 4 +--- .../com/fr/design/actions/server/GlobalTableDataAction.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java index 3b7881c3d..e14b22b6d 100644 --- a/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer-base/src/com/fr/design/actions/server/ConnectionListAction.java @@ -68,9 +68,7 @@ public class ConnectionListAction extends UpdateAction { } protected void renameConnection(String oldName, String newName) { - if(datasourceManager.getConnection(oldName) != null){ - datasourceManager.renameConnection(oldName, newName); - } + datasourceManager.renameConnection(oldName, newName); } }; final BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null); diff --git a/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java index 946fa61f5..b723b9928 100644 --- a/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java @@ -78,9 +78,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS Configurations.update(new Worker() { @Override public void run() { - if(tableDataConfig.getTableData(oldName) != null){ - tableDataConfig.renameTableData(oldName, newName); - } + tableDataConfig.renameTableData(oldName, newName); } @Override From 8a750fccde2232c8b54946a24fbf6c57ef30943b Mon Sep 17 00:00:00 2001 From: kerry Date: Tue, 12 Jun 2018 11:49:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-8676=20=E6=8F=92=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=8610.0=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginUtils.java | 36 +++---------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/designer-base/src/com/fr/design/extra/PluginUtils.java b/designer-base/src/com/fr/design/extra/PluginUtils.java index 883db4289..2c684fad0 100644 --- a/designer-base/src/com/fr/design/extra/PluginUtils.java +++ b/designer-base/src/com/fr/design/extra/PluginUtils.java @@ -1,6 +1,5 @@ package com.fr.design.extra; -import com.fr.base.FRContext; import com.fr.base.TemplateUtils; import com.fr.general.Inter; import com.fr.general.SiteCenter; @@ -18,7 +17,6 @@ import com.fr.plugin.view.PluginView; import com.fr.stable.EncodeConstants; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -202,7 +200,7 @@ public class PluginUtils { resultJSONArray.put(jo); } } - return PluginUtils.transferLocalPluginToJson(resultJSONArray); + return resultJSONArray; } private static boolean isCompatibleCurrentEnv(String envVersion){ @@ -223,48 +221,24 @@ public class PluginUtils { jo.put("changeNotes", pluginContext.getChangeNotes()); jo.put("vendor", pluginContext.getVendor()); jo.put("price", pluginContext.getPrice()); - jo.put("jarTime", pluginContext.getRequiredJarTime()); + jo.put("requiredJarTime", pluginContext.getRequiredJarTime()); jo.put("active", pluginContext.isActive()); jo.put("hidden", pluginContext.isHidden()); jo.put("free", pluginContext.isFree()); - jo.put("licDamage", pluginContext.isLicDamaged()); + jo.put("licDamaged", pluginContext.isLicDamaged()); jo.put("available", pluginContext.isAvailable()); - jo.put("leftTime", String.valueOf(pluginContext.getLeftDays())); + jo.put("leftDays", String.valueOf(pluginContext.getLeftDays())); jo.put("trial", pluginContext.isOnTrial()); jo.put("deadline", getDeadline(pluginContext)); jo.put("registerFailed", pluginContext.isRegisterFailed()); ja.put(jo); } }catch (Exception e){ - FRContext.getLogger().error(e.getMessage(), e); + FineLoggerFactory.getLogger().error(e.getMessage(), e); } return ja; } - public static JSONArray transferLocalPluginToJson(JSONArray resultArr) throws Exception{ - JSONArray ja = JSONArray.create(); - for(int i = 0; i < resultArr.length(); i++){ - JSONObject jo = JSONObject.create(); - JSONObject pluginJsonObject = resultArr.getJSONObject(i); - jo.put("categoryId", pluginJsonObject.getString("cid")); - jo.put("description", pluginJsonObject.optString("description")); - jo.put("downloadTimes", Integer.parseInt(pluginJsonObject.getString("downloadTimes"))); - jo.put("envVersion", pluginJsonObject.getString("envversion")); - jo.put("id", Integer.parseInt(pluginJsonObject.getString("id"))); - jo.put("jarTime", pluginJsonObject.getString("jartime")); - jo.put("link", pluginJsonObject.getString("link")); - jo.put("name", pluginJsonObject.getString("name")); - jo.put("pic", pluginJsonObject.getString("pic")); - jo.put("pluginId", pluginJsonObject.getString("pluginid")); - jo.put("price", Integer.parseInt(pluginJsonObject.getString("price"))); - jo.put("sellerId", Integer.parseInt(pluginJsonObject.getString("sellerId"))); - jo.put("uploadTime", pluginJsonObject.getString("uploadTime")); - jo.put("vendor", pluginJsonObject.getString("vendor")); - jo.put("version", pluginJsonObject.getString("version")); - ja.put(jo); - } - return ja; - } private static String getDeadline(PluginContext plugin) {