diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 28cce6e1d..bdf8accf9 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -38,9 +38,6 @@ class AttachmentsController < ApplicationController tip_exception(403, "你没有权限访问") if request.host.present? && !request.referer.to_s.include?(request.host.to_s.gsub("www.","")) normal_status(-1, "参数缺失") if params[:download_url].blank? url = base_url.starts_with?("https:") ? params[:download_url].to_s.gsub("http:", "https:") : params[:download_url].to_s - md5_file = Digest::MD5.hexdigest(params[:download_url]) - FileUtils.mkdir_p("#{Rails.root}#{EduSetting.get("attachment_folder")}gitea/") unless Dir.exists?("#{Rails.root}#{EduSetting.get("attachment_folder")}gitea/") - tmp_path = "#{Rails.root}#{EduSetting.get("attachment_folder")}gitea/#{Time.now.strftime('%Y%m%d')}-#{md5_file}" if url.starts_with?(base_url) && !url.starts_with?("#{base_url}/repo") domain = GiteaService.gitea_config[:domain] api_url = GiteaService.gitea_config[:base_url] @@ -49,18 +46,15 @@ class AttachmentsController < ApplicationController url.gsub!(url.split("/")[-1], '') # Rails.logger.info("url===#{url}") Rails.logger.info(filepath) - ref = ref.blank? ? "" : URI.escape(ref.split('ref=')[1]) - request_url = [domain, api_url, URI.encode(url), URI.escape(filepath), "?ref=#{ref}&access_token=#{User.where(admin: true).take&.gitea_token}"].join + request_url = [domain, api_url, URI.encode(url), URI.escape(filepath), "?ref=#{URI.escape(ref.split('ref=')[1])}&access_token=#{User.where(admin: true).take&.gitea_token}"].join Rails.logger.info("request_url===#{request_url}") - File.delete(tmp_path) if File.exist?(tmp_path) # 删除之前的文件 - Util.download_file(request_url, tmp_path) + response = Faraday.get(request_url) filename = filepath else - File.delete(tmp_path) if File.exist?(tmp_path) # 删除之前的文件 - Util.download_file(URI.encode(url), tmp_path) + response = Faraday.get(URI.encode(url)) filename = params[:download_url].to_s.split("/").pop() end - send_file(tmp_path, filename: filename, type: "application/octet-stream", disposition: 'attachment') + send_data(response.body.force_encoding("UTF-8"), filename: filename, type: "application/octet-stream", disposition: 'attachment') end def create