diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 9ae909dbc..abc3e4856 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1027,7 +1027,10 @@ class CoursesController < ApplicationController
           tip_exception(403,"无权限操作")
         elsif @all_members.size == 0
           normal_status(-1,"课堂暂时没有学生")
+        elsif params[:export].present? && params[:export]
+            normal_status(0,"正在下载中")
         else
+          set_export_cookies
           member_to_xlsx(@course, @all_members, @c_homeworks, @c_exercises, @c_tasks)
           filename_ = "#{current_user.real_name}_#{@course.name}_全部成绩_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
           render xlsx: "#{format_sheet_name filename_.strip}",template: "courses/export_member_scores_excel.xlsx.axlsx",
diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 915a4e22c..6f121db5f 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -1261,6 +1261,7 @@ class ExercisesController < ApplicationController
           else
             respond_to do |format|
               format.xlsx{
+                set_export_cookies
                 get_export_users(@exercise,@course,@export_ex_users)
                 exercise_export_name_ =
                     "#{current_user.real_name}_#{@course.name}_#{@exercise.exercise_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
@@ -1286,6 +1287,7 @@ class ExercisesController < ApplicationController
     if params[:export].present? && params[:export]
       normal_status(0,"正在下载中")
     else
+      set_export_cookies
       render pdf: 'exercise_export/blank_exercise', filename: filename_, stylesheets: stylesheets
     end
   end
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index b2de6dcad..b3b062c1a 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -116,10 +116,11 @@ class GamesController < ApplicationController
       @qrcode_str = Base64.encode64( qr.to_img.resize(400,400).to_s )
 
     else
-      @type = "image"
       #conv = Iconv.new("GBK", "utf-8")
       @game_challenge = @game.challenge
       type = @game_challenge.show_type
+      @type = shixun_show_type type
+
       workspace_path = @game.try(:picture_path)
       @answer_path = "#{Rails.root}/#{workspace_path}/#{@game_challenge.expect_picture_path}"
       @user_path = "#{Rails.root}/#{workspace_path}/#{@game_challenge.picture_path}"
diff --git a/app/controllers/graduation_tasks_controller.rb b/app/controllers/graduation_tasks_controller.rb
index aeb5c409d..0885eeae2 100644
--- a/app/controllers/graduation_tasks_controller.rb
+++ b/app/controllers/graduation_tasks_controller.rb
@@ -132,6 +132,8 @@ class GraduationTasksController < ApplicationController
           tip_exception(403, "无权限操作")
         elsif complete_works == 0
           normal_status(-1,"暂无用户提交")
+        elsif params[:export].present? && params[:export]
+          normal_status(0,"正在下载中")
         else
           respond_to do |format|
             format.xlsx{
@@ -148,12 +150,17 @@ class GraduationTasksController < ApplicationController
           zip_works = @work_excel.where("work_status > 0")
           status = checkfileSize(zip_works)
           if status == 0
-            respond_to do |format|
-              format.zip{
-                zipfile = zip_homework_common @task, zip_works
-                file = decode64(zipfile[0][:base64file])
-                send_file "#{OUTPUT_FOLDER}/#{file}", filename: filename_for_content_disposition(file), type: 'application/zip'
-              }
+            if params[:export].present? && params[:export]
+            normal_status(0,"正在下载中")
+            else
+              respond_to do |format|
+                format.zip{
+                  set_export_cookies
+                  zipfile = zip_homework_common @task, zip_works
+                  file = decode64(zipfile[0][:base64file])
+                  send_file "#{OUTPUT_FOLDER}/#{file}", filename: filename_for_content_disposition(file), type: 'application/zip'
+                }
+              end
             end
           else
             normal_status(status,status == -2 ? "500M" : "无附件可下载")
diff --git a/app/controllers/graduation_topics_controller.rb b/app/controllers/graduation_topics_controller.rb
index 96816c2a6..bd93401f3 100644
--- a/app/controllers/graduation_topics_controller.rb
+++ b/app/controllers/graduation_topics_controller.rb
@@ -271,7 +271,12 @@ class GraduationTopicsController < ApplicationController
       students = course.students.joins(user: :user_extension).order("user_extensions.student_id")
       graduation_topic_to_xlsx(students,course)
       topic_export_name_ = "#{current_user.real_name}_#{course.name}_毕设选题_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
-      render xlsx: "#{topic_export_name_.strip}",template: "graduation_topics/export.xlsx.axlsx",locals: {table_columns:@topic_head_cells,topic_users:@topic_body_cells}
+      if params[:export].present? && params[:export]
+        normal_status(0,"正在下载中")
+      else
+        set_export_cookies
+        render xlsx: "#{topic_export_name_.strip}",template: "graduation_topics/export.xlsx.axlsx",locals: {table_columns:@topic_head_cells,topic_users:@topic_body_cells}
+      end
     rescue Exception => e
       uid_logger(e.message)
       missing_template
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index fa47fd7f6..1d6b15969 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -24,7 +24,7 @@ class MyshixunsController < ApplicationController
       ActiveRecord::Base.transaction do
         begin
           @shixun = Shixun.select(:id, :identifier).find(@myshixun.shixun_id)
-          @myshixun.destroy
+          @myshixun.destroy!
 
           StudentWork.where(:myshixun_id => @myshixun.id).update_all(:myshixun_id => 0, :work_status => 0)
 
diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index 87435f743..7d978d722 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -945,9 +945,12 @@ class PollsController < ApplicationController
             tip_exception(403,"无权限操作")
           elsif (@poll.polls_status == 1) || (@poll_export_questions.size == 0) || (@poll_commit_ids.size == 0)
             normal_status(-1,"暂无用户提交")
+          elsif params[:export].present? && params[:export]
+            normal_status(0,"正在下载中")
           else
             respond_to do |format|
               format.xlsx{
+                set_export_cookies
                 polls_export_name_ = "#{current_user.real_name}_#{@course.name}_#{@poll.polls_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
                 polls_user_commit = poll_commit_result(@poll,@poll_export_questions,@poll_users,@poll_commit_ids)
                 render xlsx: "#{polls_export_name_.strip}",template: "polls/commit_result.xlsx.axlsx",locals: {polls_user_commit:polls_user_commit}
diff --git a/app/controllers/zips_controller.rb b/app/controllers/zips_controller.rb
index b1f7804a9..3ed1eb8b3 100644
--- a/app/controllers/zips_controller.rb
+++ b/app/controllers/zips_controller.rb
@@ -27,6 +27,7 @@ class ZipsController < ApplicationController
     if params[:export].present? && params[:export]
       normal_status(0,"正在下载中")
     else
+      set_export_cookies
       send_file exercises.ex_zip, filename: file_name_, type: 'application/zip'
     end
   rescue Exception => e
diff --git a/app/helpers/games_helper.rb b/app/helpers/games_helper.rb
index aff05904f..5a9871673 100644
--- a/app/helpers/games_helper.rb
+++ b/app/helpers/games_helper.rb
@@ -6,7 +6,7 @@ module GamesHelper
   end
 
   # 获取目录下所有文件，返回一个文件名的数组 type是查看文件的类型image表示图片
-  # type [[1, "图片"], [2, "apk/exe"], [3, "txt"], [4, "html"]]
+  # type [[1, "图片"], [2, "apk/exe"], [3, "txt"], [4, "html"], [5, "mp3"], [6, "mp4"]]
   def get_dir_filename(path, type, game_id)
     answer_picture = []
     return answer_picture unless File.directory?(path)
@@ -39,6 +39,12 @@ module GamesHelper
         end
         f.close
         @type = 'txt'
+      elsif extension == 'mp3' && type == 5
+        answer_picture << file
+        @type = 'mp3'
+      elsif extension == 'mp4' && type == 6
+        answer_picture << file
+        @type = 'mp4'
       end
     end
 
@@ -51,4 +57,21 @@ module GamesHelper
           "编译失败，请在测试结果中查看具体的错误信息" : test_set.try(:actual_output)
     end
   end
+
+  def shixun_show_type type
+    case type.to_i
+    when 1
+      "image"
+    when 2
+      "apk/exe"
+    when 3
+      "txt"
+    when 4
+      "html"
+    when 5
+      "mp3"
+    when 6
+      "mp4"
+    end
+  end
 end
diff --git a/app/models/challenge.rb b/app/models/challenge.rb
index 0bea54eb4..8e4d2ae42 100644
--- a/app/models/challenge.rb
+++ b/app/models/challenge.rb
@@ -1,5 +1,6 @@
 class Challenge < ApplicationRecord
   # difficulty: 关卡难度: 1.简单 2.中等 3.困难
+  # show_type: 效果展示：-1.无效果 1.图片 2.apk/exe 3.txt 4.html 5.mp3 6.mp4
   default_scope { order("challenges.position asc") }
 
   belongs_to :shixun, :touch => true, counter_cache: true
diff --git a/app/views/games/picture_display.json.jbuilder b/app/views/games/picture_display.json.jbuilder
index 541c478a9..b43efa57e 100644
--- a/app/views/games/picture_display.json.jbuilder
+++ b/app/views/games/picture_display.json.jbuilder
@@ -24,5 +24,30 @@ elsif @type == "txt"
   json.contents @contents.html_safe
 elsif @type =="qrcode"
   json.qrcode_str @qrcode_str
+elsif @type == "mp3" || @type == "mp4"
+  if @type == "mp4"
+    json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}]
+    json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}]
+    json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}]
+  else
+    json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}]
+    json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
+    json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
+  end
 
+  # json.orignal_file do
+  #   json.array! @orignal_picture do |file|
+  #     json.file_url attachment_show_users_path(:file_name => file, :path => @original_path)
+  #   end
+  # end
+  # json.user_file do
+  #   json.array! @user_picture do |file|
+  #     json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i)
+  #   end
+  # end
+  # json.answer_file do
+  #   json.array! @answer_picture do |file|
+  #     json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path)
+  #   end
+  # end
 end
\ No newline at end of file