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

lib/tasks/public_course.rake

@@ -69,6 +69,7 @@ namespace :public_course do
     when 1
       # 讨论区
       created_on = random_time start_time, end_time
+      puts created_on
       messages = Message.where(board_id: course.boards)
       messages.each do |message|
         message.update_columns(created_on: created_on, updated_on: created_on)

public/react/src/modules/user/usersInfo/video/VideoUploadList.js

@@ -61,7 +61,14 @@ function VideoUploadList (props) {
             // alert("请先选择需要上传的文件!")
             return
         }
-        if (file.type && file.type.indexOf('ogm') != -1) {
+        // avi、flv、f4v、m4v、mov、mp4、rmvb、swf、webm
+        if (file.name 
+            && file.name.indexOf('.avi') == -1 && file.name.indexOf('.flv') == -1 
+            && file.name.indexOf('.f4v') == -1 && file.name.indexOf('.m4v') == -1 
+            && file.name.indexOf('.mov') == -1 && file.name.indexOf('.mp4') == -1 
+            && file.name.indexOf('.rmvb') == -1 && file.name.indexOf('.swf') == -1 
+            && file.name.indexOf('.webm') == -1 
+        ) {
             showNotification(`不支持的视频格式`)
             return;
         }