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

app/controllers/accounts_controller.rb

@@ -33,7 +33,7 @@ class AccountsController < ApplicationController
       uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
       # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
       # todo 上线前请删除万能验证码"513231"
-      if code != "513231"
+      unless code == "513231" && request.host == "47.96.87.25"
         return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
         return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
       end

app/controllers/exercises_controller.rb

@@ -1566,15 +1566,22 @@ class ExercisesController < ApplicationController
 
   def check_user_id_start_answer #判断用户在开始答题时，是否有用户id传入,如果为老师，则id必需，否则为当前用户的id
     user_login = params[:login]
-    # exercise_current_user_id = params[:user_id]
     if user_login.blank? && @user_course_identity < Course::STUDENT  #id不存在，且当前为老师/管理员等
       normal_status(-1,"请输入学生登陆名！")
     else
-      @ex_answerer = User.find_by(login: user_login) #回答者
+      if @user_course_identity < Course::STUDENT || @exercise.score_open
+        @ex_answerer = user_login.blank? ? current_user : User.find_by(login: user_login)
+      else
+        @ex_answerer = current_user
+      end
+
       if @ex_answerer.blank?
         normal_status(404,"答题用户不存在")
+      elsif @user_course_identity > Course::STUDENT && !@exercise.is_public
+        normal_status(403,"非公开试卷")
       else
-        @exercise_current_user_id = @ex_answerer.id || current_user.id
+        # @exercise_current_user_id = @ex_answerer.id || current_user.id
+        @exercise_current_user_id = @ex_answerer.id
       end
     end
   end

app/libs/aliyun_vod/service/video_upload.rb

@@ -16,6 +16,15 @@ module AliyunVod::Service::VideoUpload
 
     result = request(:post, params)
 
+    if result['Code'].present?
+      message =
+        case result['Code']
+        when 'InvalidFileName.Extension' then '不支持的文件格式'
+        when 'IllegalCharacters' then '文件名称包含非法字符'
+        end
+      raise AliyunVod::Error, message if message.present?
+    end
+
     raise AliyunVod::Error, '获取上传凭证失败' if result['UploadAddress'].blank?
 
     result

app/services/videos/create_auth_service.rb

@@ -35,7 +35,7 @@ class Videos::CreateAuthService < ApplicationService
 
   def upload_video_result
     AliyunVod::Service.create_upload_video(title, filename, params)
-  rescue AliyunVod::Error => _
+  rescue AliyunVod::Error => ex
-    raise Error, '获取视频上传凭证失败'
+    raise Error, ex.message || '获取视频上传凭证失败'
   end
 end

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -39,7 +39,12 @@ class Fileslistitem extends Component{
 
 						if(result.data.attachment_histories.length===0){
 							if(result.data.is_pdf===true){
-								axios.get(result.data.url).then((result)=>{
+								//预览pdf
+								axios({
+									method:'get',
+								  url:result.data.url,
+									responseType: 'arraybuffer',
+								}).then((result)=>{
 										var binaryData = [];
 										binaryData.push(result.data);
 										 this.url =window.URL.createObjectURL(new Blob(binaryData, {type:"application/pdf"}));

public/react/src/modules/courses/coursesPublic/Showoldfiles.js

@@ -43,7 +43,11 @@ class Showoldfiles extends Component{
 	}
 
 	showfiless=(url)=>{
-			axios.get(url).then((result)=>{
+		axios({
+			method:'get',
+			url:url,
+			responseType: 'arraybuffer',
+		}).then((result)=>{
 			var binaryData = [];
 			binaryData.push(result.data);
 			this.url =window.URL.createObjectURL(new Blob(binaryData, {type:"application/pdf"}));

public/react/src/modules/paths/PathDetail/DetailCards.js

@@ -226,10 +226,11 @@ class DetailCards extends Component{
 					startshixunCombattype:true,
 				})
 			} else {
-				window.location.href = "/tasks/" + response.data.game_identifier;
+				// window.location.href = "/tasks/" + response.data.game_identifier;
 				// window.location.href = path
 				// let path="/tasks/"+response.data.game_identifier;
 				// this.props.history.push(path);
+				window.open("/tasks/" + response.data.game_identifier);
 			}
 		}).catch((error) => {