Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/zips_controller.rb

@@ -10,7 +10,9 @@ class ZipsController < ApplicationController
     service = BatchExportShixunReportService.new(@homework, @all_student_works)
 
     filename = filename_for_content_disposition(service.filename)
-    send_file service.zip, filename: filename, type: 'application/zip'
+    Rails.logger.info("################___________file_name________________###########{filename}")
+    Rails.logger.info("################___________service.filename________________###########{service.filename}")
+    send_file service.zip, filename: filename.encode(Encoding.default_external, 'gb2312'), type: 'application/zip'
   rescue BatchExportShixunReportService::Error => ex
     normal_status(-1, ex.message)
   end