From 123b0ce7e144e9952abf6aac425c657f9fafc70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 7 Dec 2021 22:02:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-62804=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E7=9A=84=E9=93=BE=E6=8E=A5=E6=94=B9?= =?UTF-8?q?=E5=8A=A8(=E7=A4=BE=E5=8C=BAurl=E6=94=B9=E5=8A=A8=E9=9C=80?= =?UTF-8?q?=E6=B1=82)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/community/BugAction.java | 2 +- .../design/actions/community/NeedAction.java | 2 +- .../actions/community/StudyPlanAction.java | 17 +++++++++++++++++ .../mainframe/toolbar/ToolBarMenuDock.java | 2 ++ .../com/fr/design/images/bbs/studyPlan.png | Bin 0 -> 1129 bytes .../fr/design/images/bbs/studyPlan_normal.svg | 1 + .../com/fr/start/preload/ImagePreLoader.java | 1 + 7 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java create mode 100644 designer-base/src/main/resources/com/fr/design/images/bbs/studyPlan.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/bbs/studyPlan_normal.svg diff --git a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java index a162571002..bb2de54ba2 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java @@ -17,7 +17,7 @@ public class BugAction extends AbstractDesignerSSO { @Override public String getJumpUrl() { - return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "http://bbs.fanruan.com/forum-156-1.html"); + return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "https://service.fanruan.com/PF/FR/feedback"); } public static final MenuKeySet BUG = new MenuKeySet() { diff --git a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java index c8b2ccdae1..4a9b80a9b9 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java @@ -18,7 +18,7 @@ public class NeedAction extends AbstractDesignerSSO { @Override public String getJumpUrl() { - return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "http://bbs.fanruan.com/forum-56-1.html"); + return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "https://service.fanruan.com/PF/FR/feedback"); } public static final MenuKeySet NEED = new MenuKeySet() { diff --git a/designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java b/designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java new file mode 100644 index 0000000000..d0dcc4195d --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java @@ -0,0 +1,17 @@ +package com.fr.design.actions.community; + +import com.fr.design.i18n.Toolkit; +import com.fr.design.login.AbstractDesignerSSO; +import com.fr.general.CloudCenter; + +public class StudyPlanAction extends AbstractDesignerSSO { + public StudyPlanAction() { + this.setName(Toolkit.i18nText("Fine-Design_Study_Plan")); + this.setSmallIcon("/com/fr/design/images/bbs/studyPlan"); + } + + @Override + public String getJumpUrl() { + return CloudCenter.getInstance().acquireUrlByKind("bbs.studyPlan", "https://edu.fanruan.com/studypath/finereport"); + } +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index cfc4483c95..5043e8307b 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -17,6 +17,7 @@ import com.fr.design.actions.community.FacebookFansAction; import com.fr.design.actions.community.NeedAction; import com.fr.design.actions.community.QuestionAction; import com.fr.design.actions.community.SignAction; +import com.fr.design.actions.community.StudyPlanAction; import com.fr.design.actions.community.TechSolutionAction; import com.fr.design.actions.community.TechSupportAction; import com.fr.design.actions.community.TemplateStoreAction; @@ -597,6 +598,7 @@ public abstract class ToolBarMenuDock { shortCuts.add(new TutorialAction()); } }, SupportLocaleImpl.TUTORIAL_COMMUNITY); + shortCuts.add(new StudyPlanAction()); shortCuts.add(new QuestionAction()); shortCuts.add(new TechSolutionAction()); diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/studyPlan.png b/designer-base/src/main/resources/com/fr/design/images/bbs/studyPlan.png new file mode 100644 index 0000000000000000000000000000000000000000..1a27244653e92d08f20967f7b423605328f3cea3 GIT binary patch literal 1129 zcmb`_KS-NF7{~ETjhb2_#){TB=-^N*D1uTaAt9v(N-CmA9IP(R1sytwgPV(pINE}U z|3IY$r5!@RE`p#Gp(@(OMZrZx92}Iy?=N^EDam9X_`G-TbN3$aJ$K_Bp||cLZ;>&^ z9c&MD(w2y;fM@k}Vu0r9$M*1$F{Q)ehz(YMGR9dI4EVZQJ&qFRfpaut3#%wc)^L%H;wNge%y>?29$LI2%ea{!xe5J+ z2hWf#W=KZtfUSX-gjR0E8P<`HLnso^{->d1)7%e;s6dK7==3xp4nI!u6$j8lVccL3 zszVbtY!P4b@(T(rFp6zdKF}W)LklQ&@Jb!09)wzZDN5;UkIQK}x@HPL)FJMW{MIh; zm&9w05H&c)2yD3N=x*51{m?h5&=#(sqtdn(Z~`qPx(iWgOm$OTx{(n}ye+0>G*KrZ zDq0H^YIkA(Ub$qH@zn8rL9RQHoS6Qw_rT^}(3wR8=Ade;V5+$ELU$q+|1Mw$d~|wH g2kkqCZ_vGnl \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java b/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java index 138e7df2bb..24d23565c0 100644 --- a/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java +++ b/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java @@ -175,6 +175,7 @@ public class ImagePreLoader { "/com/fr/design/images/bbs/center_normal.svg", "/com/fr/design/images/bbs/sign_normal.svg", "/com/fr/design/images/bbs/facebook_normal.svg", + "/com/fr/design/images/bbs/studyPlan_normal.svg", "/com/fr/design/images/update/update_new_normal.svg", "com/fr/design/images/signature.png", "com/fr/design/images/m_file/switch.png", From e691b1a8ac5e9733ca4bc2a8b9521f9aade23507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com> Date: Tue, 7 Dec 2021 22:07:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-62804=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E7=9A=84=E9=93=BE=E6=8E=A5=E6=94=B9?= =?UTF-8?q?=E5=8A=A8(=E7=A4=BE=E5=8C=BAurl=E6=94=B9=E5=8A=A8=E9=9C=80?= =?UTF-8?q?=E6=B1=82)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/community/BugAction.java | 2 +- .../design/actions/community/NeedAction.java | 2 +- .../actions/community/StudyPlanAction.java | 17 +++++++++++++++++ .../mainframe/toolbar/ToolBarMenuDock.java | 2 ++ .../com/fr/design/images/bbs/studyPlan.png | Bin 0 -> 1129 bytes .../fr/design/images/bbs/studyPlan_normal.svg | 1 + .../com/fr/start/preload/ImagePreLoader.java | 1 + 7 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java create mode 100644 designer-base/src/main/resources/com/fr/design/images/bbs/studyPlan.png create mode 100644 designer-base/src/main/resources/com/fr/design/images/bbs/studyPlan_normal.svg diff --git a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java index a162571002..bb2de54ba2 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java @@ -17,7 +17,7 @@ public class BugAction extends AbstractDesignerSSO { @Override public String getJumpUrl() { - return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "http://bbs.fanruan.com/forum-156-1.html"); + return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "https://service.fanruan.com/PF/FR/feedback"); } public static final MenuKeySet BUG = new MenuKeySet() { diff --git a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java index c8b2ccdae1..4a9b80a9b9 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java @@ -18,7 +18,7 @@ public class NeedAction extends AbstractDesignerSSO { @Override public String getJumpUrl() { - return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "http://bbs.fanruan.com/forum-56-1.html"); + return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "https://service.fanruan.com/PF/FR/feedback"); } public static final MenuKeySet NEED = new MenuKeySet() { diff --git a/designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java b/designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java new file mode 100644 index 0000000000..39cc62caa5 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java @@ -0,0 +1,17 @@ +package com.fr.design.actions.community; + +import com.fr.design.i18n.Toolkit; +import com.fr.design.login.AbstractDesignerSSO; +import com.fr.general.CloudCenter; + +public class StudyPlanAction extends AbstractDesignerSSO { + public StudyPlanAction() { + this.setName(Toolkit.i18nText("Fine-Design_Study_Plan")); + this.setSmallIcon("/com/fr/design/images/bbs/studyPlan"); + } + + @Override + public String getJumpUrl() { + return CloudCenter.getInstance().acquireUrlByKind("bbs.studyPlan", "https://edu.fanruan.com/studypath/finereport"); + } +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index c4ad83ca7a..ba9aadcc5e 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -17,6 +17,7 @@ import com.fr.design.actions.community.FacebookFansAction; import com.fr.design.actions.community.NeedAction; import com.fr.design.actions.community.QuestionAction; import com.fr.design.actions.community.SignAction; +import com.fr.design.actions.community.StudyPlanAction; import com.fr.design.actions.community.TechSolutionAction; import com.fr.design.actions.community.TechSupportAction; import com.fr.design.actions.community.TemplateStoreAction; @@ -601,6 +602,7 @@ public abstract class ToolBarMenuDock { shortCuts.add(new TutorialAction()); } }, SupportLocaleImpl.TUTORIAL_COMMUNITY); + shortCuts.add(new StudyPlanAction()); shortCuts.add(new QuestionAction()); shortCuts.add(new TechSolutionAction()); diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/studyPlan.png b/designer-base/src/main/resources/com/fr/design/images/bbs/studyPlan.png new file mode 100644 index 0000000000000000000000000000000000000000..1a27244653e92d08f20967f7b423605328f3cea3 GIT binary patch literal 1129 zcmb`_KS-NF7{~ETjhb2_#){TB=-^N*D1uTaAt9v(N-CmA9IP(R1sytwgPV(pINE}U z|3IY$r5!@RE`p#Gp(@(OMZrZx92}Iy?=N^EDam9X_`G-TbN3$aJ$K_Bp||cLZ;>&^ z9c&MD(w2y;fM@k}Vu0r9$M*1$F{Q)ehz(YMGR9dI4EVZQJ&qFRfpaut3#%wc)^L%H;wNge%y>?29$LI2%ea{!xe5J+ z2hWf#W=KZtfUSX-gjR0E8P<`HLnso^{->d1)7%e;s6dK7==3xp4nI!u6$j8lVccL3 zszVbtY!P4b@(T(rFp6zdKF}W)LklQ&@Jb!09)wzZDN5;UkIQK}x@HPL)FJMW{MIh; zm&9w05H&c)2yD3N=x*51{m?h5&=#(sqtdn(Z~`qPx(iWgOm$OTx{(n}ye+0>G*KrZ zDq0H^YIkA(Ub$qH@zn8rL9RQHoS6Qw_rT^}(3wR8=Ade;V5+$ELU$q+|1Mw$d~|wH g2kkqCZ_vGnl \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java b/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java index 138e7df2bb..24d23565c0 100644 --- a/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java +++ b/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java @@ -175,6 +175,7 @@ public class ImagePreLoader { "/com/fr/design/images/bbs/center_normal.svg", "/com/fr/design/images/bbs/sign_normal.svg", "/com/fr/design/images/bbs/facebook_normal.svg", + "/com/fr/design/images/bbs/studyPlan_normal.svg", "/com/fr/design/images/update/update_new_normal.svg", "com/fr/design/images/signature.png", "com/fr/design/images/m_file/switch.png",