Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/helpers/application_helper.rb

@@ -258,7 +258,7 @@ module ApplicationHelper
   end
 
   def download_url attachment
-    attachment_path(attachment).gsub("/api","")
+    attachment_path(attachment)
   end
 
   # 耗时：天、小时、分、秒

app/views/files/histories.json.jbuilder

@@ -1,3 +1,9 @@
 
-json.partial! 'attachments/attachment_small', attachment: @file
+# json.partial! 'attachments/attachment_small', attachment: @file
+json.id @file.id
+json.title @file.title
+json.filesize number_to_human_size(@file.filesize)
+json.url download_url(@file).gsub("/api","")
+json.created_on @file.created_on
+json.is_pdf @file.is_pdf?
 json.partial! "attachment_histories/list", attachment_histories: @attachment_histories