From 7fcbbb79225a390f6196fd34e466eb074b0a0319 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 13 May 2022 13:53:25 +0800
Subject: [PATCH] fix: remove project tasks_count

---
 app/controllers/traces/projects_controller.rb | 6 +++---
 app/services/trace/pdf_report_service.rb      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/traces/projects_controller.rb b/app/controllers/traces/projects_controller.rb
index bd9eb8661..a1847d808 100644
--- a/app/controllers/traces/projects_controller.rb
+++ b/app/controllers/traces/projects_controller.rb
@@ -7,13 +7,13 @@ class Traces::ProjectsController < Traces::BaseController
 
   def tasks 
     branch_name = params[:branch_name]
-    return render_error("无可用检测次数") if @project&.trace_tasks_count >= 5
+    # return render_error("无可用检测次数") if @project&.trace_tasks_count >= 5
     return render_error("分支名不能为空！") if branch_name.blank?
     @all_branches = Gitea::Repository::Branches::ListNameService.call(@project&.owner, @project.identifier)
     return render_error("请输入正确的分支名！") unless @all_branches["branch_name"].include?(branch_name) 
     code, data, error = Trace::CheckService.call(current_user.trace_token, @project, "1", branch_name)
     if code == 200 
-      @project.increment!(:trace_tasks_count, 1)
+      # @project.increment!(:trace_tasks_count, 1)
       render_ok
     else 
       render_error("检测失败 Error:#{error}")
@@ -43,7 +43,7 @@ class Traces::ProjectsController < Traces::BaseController
     return render_error("project_id错误") if params[:project_id].blank?
     code, data, error = Trace::ReloadCheckService.call(current_user.trace_token, params[:project_id])
     if code == 200 
-      @project.increment!(:trace_tasks_count, 1)
+      # @project.increment!(:trace_tasks_count, 1)
       render_ok 
     else 
       render_error("重新检测失败 Error:#{error}")
diff --git a/app/services/trace/pdf_report_service.rb b/app/services/trace/pdf_report_service.rb
index 244698641..aa7312739 100644
--- a/app/services/trace/pdf_report_service.rb
+++ b/app/services/trace/pdf_report_service.rb
@@ -12,11 +12,11 @@ class Trace::PdfReportService < Trace::ClientService
   end
 
   def call 
-    content = URI.open("#{domain}#{base_url}#{url}?task_id#{task_id}", "Authorization" => token)
+    content = open("#{domain}#{base_url}#{url}?task_id=#{task_id}", "Authorization" => token)
     if content.is_a?(Tempfile)
       check_file_path
-      IO.copy_stream(content, "#{save_path}/#{task_id}.zip")
-      return {code: 200, download_url: "/trace_task_results/#{task_id}.zip"}
+      IO.copy_stream(content, "#{save_path}/#{task_id}.pdf")
+      return {code: 200, download_url: "/trace_task_results/#{task_id}.pdf"}
     else 
       return {code: 404}
     end