From 5735c343c5ee630cb67242f5fd2a4d3be583cbaf Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Fri, 7 Aug 2020 11:49:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?REPORT-36200=20=E3=80=90name63/user63?= =?UTF-8?q?=E3=80=91=E5=9C=A8=E6=8E=A7=E4=BB=B6=E5=8F=B3=E4=B8=8B=E6=96=B9?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=A4=8D=E5=88=B6=EF=BC=8C=E5=B9=B6=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E4=B8=8D=E6=96=AD=E5=90=91=E5=8F=B3=E4=B8=8B=E5=A4=8D?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/FormSelectionUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java b/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java index b3b07efd7..193a63235 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java @@ -115,7 +115,6 @@ public class FormSelectionUtils { FineLoggerFactory.getLogger().error(e.getMessage(), e); } } - rebuildSelection(designer); designer.getEditListenerTable().fireCreatorModified( designer.getSelectionModel().getSelection().getSelectedCreator(), DesignerEvent.CREATOR_PASTED); From b29ee8d713b292073ddb84d7a85d43e02dd5b150 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Mon, 10 Aug 2020 10:49:09 +0800 Subject: [PATCH 2/6] =?UTF-8?q?REPORT-36778=20=E3=80=90=E9=85=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=91=E7=89=88=E6=9C=AC=E5=8F=B7=E8=A7=84?= =?UTF-8?q?=E8=8C=83FR=E9=80=82=E9=85=8D=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/help/AboutPane.java | 5 +++-- .../update/push/DesignerPushUpdateDialog.java | 2 +- .../update/push/DesignerUpdateInfo.java | 22 +++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index 57e01f1ac..b1f4bad07 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -55,8 +55,9 @@ public class AboutPane extends JPanel { JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); centerPane.add(contentPane, BorderLayout.NORTH); + contentPane.add(new BoxCenterAligmentPane(getBuildTitle())); BoxCenterAlignmentCopyablePane buildCopyPane = new BoxCenterAlignmentCopyablePane( - getBuildTitle(), + StringUtils.EMPTY, getVersionBuildNO(), new String[]{ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO"), @@ -204,7 +205,7 @@ public class AboutPane extends JPanel { private String getBuildTitle() { return append(ProductConstants.APP_NAME, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_Version"), - StringUtils.BLANK, ProductConstants.RELEASE_VERSION, BUILD_PREFIX); + StringUtils.BLANK, ProductConstants.VERSION, BUILD_PREFIX); } private JPanel getEmailActionPane(final String desc, final String mailTo) { diff --git a/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java index d35b1dd54..e37877a4b 100644 --- a/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java +++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java @@ -79,7 +79,7 @@ class DesignerPushUpdateDialog extends UIDialog { private Model createModel(DesignerUpdateInfo updateInfo) { Model model = new Model(); - model.setVersion(updateInfo.getLatestVersion()); + model.setVersion(updateInfo.getLatestFullVersion()); model.setContent(updateInfo.getPushContent()); model.setMoreInfoUrl(updateInfo.getMoreInfoUrl()); model.setBackgroundUrl(updateInfo.getBackgroundUrl()); diff --git a/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java index 5d5e02a47..fda62cab2 100644 --- a/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java +++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java @@ -1,7 +1,10 @@ package com.fr.design.update.push; +import com.fr.general.CloudCenter; import com.fr.general.ComparatorUtils; +import com.fr.general.http.HttpToolbox; import com.fr.json.JSONObject; +import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import java.security.InvalidParameterException; @@ -58,6 +61,25 @@ class DesignerUpdateInfo { return latestVersion; } + String getLatestFullVersion() { + try { + String url = CloudCenter.getInstance().acquireUrlByKind("jar10.newupdate"); + if (StringUtils.isBlank(url)) { + return StringUtils.EMPTY; + } + String res = HttpToolbox.get(url); + if (StringUtils.isBlank(res)) { + return StringUtils.EMPTY; + } + String version = new JSONObject(res).optString("version"); + String build = new JSONObject(res).optString("build"); + return version + "-" + build; + } catch (Throwable e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } + return StringUtils.EMPTY; + } + String getLastIgnoredVersion() { return lastIgnoredVersion; } From 0bb07f8d88fe968c7ec7bf4bfa67ed420f143e6d Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Mon, 10 Aug 2020 10:51:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?REPORT-36778=20=E3=80=90=E9=85=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=91=E7=89=88=E6=9C=AC=E5=8F=B7=E8=A7=84?= =?UTF-8?q?=E8=8C=83FR=E9=80=82=E9=85=8D=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/mainframe/FormSelectionUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java b/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java index 193a63235..b3b07efd7 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java @@ -115,6 +115,7 @@ public class FormSelectionUtils { FineLoggerFactory.getLogger().error(e.getMessage(), e); } } + rebuildSelection(designer); designer.getEditListenerTable().fireCreatorModified( designer.getSelectionModel().getSelection().getSelectedCreator(), DesignerEvent.CREATOR_PASTED); From 768699195bd2a73059fb1029316889255bc28907 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Mon, 10 Aug 2020 10:56:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?REPORT-36778=20=E3=80=90=E9=85=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=91=E7=89=88=E6=9C=AC=E5=8F=B7=E8=A7=84?= =?UTF-8?q?=E8=8C=83FR=E9=80=82=E9=85=8D=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/update/push/DesignerUpdateInfo.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java index fda62cab2..cf8226829 100644 --- a/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java +++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java @@ -17,6 +17,8 @@ class DesignerUpdateInfo { private static final String KEY_CONTENT = "content"; private static final String KEY_BACKGROUND_URL = "background"; private static final String KEY_MORE_INFO_URL = "more"; + private static final String SPLIT_CHAR = "-"; + private final String currentVersion; // 当前版本 private final String latestVersion; // 最新版本 @@ -73,7 +75,7 @@ class DesignerUpdateInfo { } String version = new JSONObject(res).optString("version"); String build = new JSONObject(res).optString("build"); - return version + "-" + build; + return version + SPLIT_CHAR + build; } catch (Throwable e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } From 6c36a0e1c9d849514410c6d0682409197ce1d827 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Mon, 10 Aug 2020 11:20:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?REPORT-36778=20=E3=80=90=E9=85=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=91=E7=89=88=E6=9C=AC=E5=8F=B7=E8=A7=84?= =?UTF-8?q?=E8=8C=83FR=E9=80=82=E9=85=8D=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/update/push/DesignerUpdateInfo.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java index cf8226829..56e28c5fe 100644 --- a/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java +++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java @@ -3,6 +3,8 @@ package com.fr.design.update.push; import com.fr.general.CloudCenter; import com.fr.general.ComparatorUtils; import com.fr.general.http.HttpToolbox; +import com.fr.json.JSON; +import com.fr.json.JSONFactory; import com.fr.json.JSONObject; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -73,8 +75,9 @@ class DesignerUpdateInfo { if (StringUtils.isBlank(res)) { return StringUtils.EMPTY; } - String version = new JSONObject(res).optString("version"); - String build = new JSONObject(res).optString("build"); + JSONObject jsonObject = JSONFactory.createJSON(JSON.OBJECT, res); + String version = jsonObject.getString("version"); + String build = jsonObject.getString("build"); return version + SPLIT_CHAR + build; } catch (Throwable e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); From 81c21c6ee7ba9bc7cf1c5db96e4b06668ba3f50c Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Mon, 10 Aug 2020 13:52:44 +0800 Subject: [PATCH 6/6] =?UTF-8?q?REPORT-36778=20=E3=80=90=E9=85=8D=E5=90=88?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=91=E7=89=88=E6=9C=AC=E5=8F=B7=E8=A7=84?= =?UTF-8?q?=E8=8C=83FR=E9=80=82=E9=85=8D=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/update/push/DesignerUpdateInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java index 56e28c5fe..a136f279b 100644 --- a/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java +++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java @@ -67,7 +67,7 @@ class DesignerUpdateInfo { String getLatestFullVersion() { try { - String url = CloudCenter.getInstance().acquireUrlByKind("jar10.newupdate"); + String url = CloudCenter.getInstance().acquireUrlByKind("jar10.new.update"); if (StringUtils.isBlank(url)) { return StringUtils.EMPTY; }