From 00fc83235f8b4360140c1695379730438defbb85 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 12 May 2022 17:11:16 +0800
Subject: [PATCH] download file use redirect

---
 app/controllers/traces/projects_controller.rb         | 11 ++++++-----
 .../message_template/project_setting_changed.rb       |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/controllers/traces/projects_controller.rb b/app/controllers/traces/projects_controller.rb
index 191f04e83..1bf5515dd 100644
--- a/app/controllers/traces/projects_controller.rb
+++ b/app/controllers/traces/projects_controller.rb
@@ -57,11 +57,12 @@ class Traces::ProjectsController < Traces::BaseController
   def task_pdf 
     return render_error("task_id错误") if params[:task_id].blank?
     code, data, error = Trace::PdfReportService.call(current_user.trace_token, params[:task_id])
-    if code == 200 
-      render_ok 
-    else
-      render_error("下载报告失败 Error:#{error}")
-    end
+    domain = Trace.trace_config[:domain]
+    base_url = Trace.trace_config[:base_url]
+    url = "/user/pdfreport?task_id=#{params[:task_id]}"
+    file_path = [domain, api_url, url].join
+    request.headers["Authorization"] = current_user.trace_token
+    redirect_to file_path
   rescue Exception => exception 
     puts exception.message
     normal_status(-1, exception.message)
diff --git a/app/models/message_template/project_setting_changed.rb b/app/models/message_template/project_setting_changed.rb
index 0920dfe7a..ab597122a 100644
--- a/app/models/message_template/project_setting_changed.rb
+++ b/app/models/message_template/project_setting_changed.rb
@@ -141,6 +141,7 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
       navbar.gsub!('devops', '工作流')
       navbar.gsub!('versions', '里程碑')
       navbar.gsub!('resources', '资源库')
+      navbar.gsub!('services', '服务')
       if change_count > 1
         content.sub!('{ifnavbar}', '<br/>') 
       else
@@ -290,6 +291,7 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
         navbar.gsub!('devops', '工作流')
         navbar.gsub!('versions', '里程碑')
         navbar.gsub!('resources', '资源库')
+        navbar.gsub!('services', '服务')
         if change_count > 1
           content.sub!('{ifnavbar}', '<br/>') 
         else