From 31ad012bee2a482a798756b72e6692ff5b7bac4c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 11 Nov 2014 14:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=E6=88=90=E5=8A=9F=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8E=E9=9D=A2=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/zipdown_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb
index 10c42cd6c..efa171d52 100644
--- a/app/controllers/zipdown_controller.rb
+++ b/app/controllers/zipdown_controller.rb
@@ -72,7 +72,7 @@ class ZipdownController < ApplicationController
     homeattach.attachments.each do |attach|
       homeworks_attach_path << attach.diskfile#.to_s.slice((length+1)..-1)
     end
-    zipping("#{homeattach.user.name}_#{homeattach.user.user_extensions.student_id}.zip", homeworks_attach_path, OUTPUT_FOLDER, true)
+    zipping("#{Time.now.to_i.to_s}_#{homeattach.user.name}_#{homeattach.user.user_extensions.student_id}.zip", homeworks_attach_path, OUTPUT_FOLDER, true)
   end
 
 
@@ -81,7 +81,7 @@ class ZipdownController < ApplicationController
     ic = Iconv.new('GBK//IGNORE', 'UTF-8//IGNORE')
     input_filename = files_paths
 
-    rename_zipfile = zip_name_refer ||= "homework.zip"
+    rename_zipfile = zip_name_refer ||= "#{Time.now.to_i.to_s}.zip"
     zipfile_name = "#{output_path}/#{rename_zipfile}"
 
     Dir.mkdir(File.dirname(zipfile_name)) unless File.exist?(File.dirname(zipfile_name))