From 6169293529d5bc05dd1a172018f8ef335d5b677b Mon Sep 17 00:00:00 2001
From: "Link.Zhao" <Link.Zhao@fanruan.com>
Date: Mon, 22 Aug 2022 17:21:57 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-78647=20=E3=80=90=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8C=96=E4=BA=8C=E6=9C=9F=E3=80=91=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=9B=AE=E5=89=8D=E7=82=B9=E5=87=BB=E7=AB=8B?=
 =?UTF-8?q?=E5=8D=B3=E4=BD=BF=E7=94=A8=E6=9C=AA=E4=B8=8B=E8=BD=BD=201?=
 =?UTF-8?q?=E3=80=81=E6=9B=B4=E6=8D=A2url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/alphafine/action/StartUseAction.java | 11 ++++-------
 .../search/helper/FineMarketClientHelper.java      | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/action/StartUseAction.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/action/StartUseAction.java
index d8ddfe27be..0afd89308f 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/action/StartUseAction.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/action/StartUseAction.java
@@ -2,7 +2,7 @@ package com.fr.design.mainframe.alphafine.action;
 
 import com.fr.design.mainframe.alphafine.model.TemplateResourceDetail;
 import com.fr.design.mainframe.alphafine.search.helper.FineMarketClientHelper;
-import com.fr.design.utils.BrowseUtils;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -11,6 +11,8 @@ import java.awt.event.ActionListener;
  * alphaFine - 模板资源 - 二级界面 - 开始使用按钮的绑定事件
  *
  * 点击后跳转至帆软市场下载对应模板资源
+ *
+ * TODO:可以参考mini组件商城的下载@ComponentsPackageInstallation#install
  * */
 public class StartUseAction implements ActionListener {
 
@@ -22,11 +24,6 @@ public class StartUseAction implements ActionListener {
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        String url = FineMarketClientHelper.getInstance().getResourceDownloadUrl(resourceDetail.getRoot());
-        if (url == null) {
-            // 如果获取失败，跳转到所有模板页面
-            url = FineMarketClientHelper.getInstance().getFineMarketTemplateUrl();
-        }
-        BrowseUtils.browser(url);
+        FineMarketClientHelper.getInstance().openBrowserAndDownload(resourceDetail.getRoot());
     }
 }
\ No newline at end of file
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/helper/FineMarketClientHelper.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/helper/FineMarketClientHelper.java
index 2354712b5f..81a165ca06 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/helper/FineMarketClientHelper.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/helper/FineMarketClientHelper.java
@@ -53,11 +53,21 @@ public class FineMarketClientHelper {
 
     }
 
+    public void openBrowserAndDownload(TemplateResource templateResource) {
+        String url = LOGIN_FINE_CLUB_AND_REDIRECT_SHOP;
+        if (TemplateResource.Type.SCENARIO_SOLUTION.equals(templateResource.getType())) {
+            url += getPackageDownloadUrl(templateResource.getId());
+        } else {
+            url += getFileDownLoadUrl(templateResource.getId());
+        }
+        BrowseUtils.browser(url);
+    }
+
     /**
-     * 打开浏览器，打包并下载模板资源包，可能会很慢
+     * 暂时没有package的下载接口，需要用户在浏览器点击下载
      * */
     private String getPackageDownloadUrl(String id) {
-        return FINE_MARKET_TEMPLATE_INFO + PACKAGE_DOWNLOAD + id;
+        return getTemplateUrlById(id);
     }
 
     /**