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

app/controllers/users/video_auths_controller.rb

@@ -10,9 +10,7 @@ class Users::VideoAuthsController < Users::BaseController
 
   def update
     video = observed_user.videos.find_by(uuid: params[:video_id])
-    if video.blank?
-      video = observed_user.videos.create!(uuid: params[:video_id], title: params[:title], cover_url: params[:cover_url])
-    end
+    return render_error('该视频凭证不存在') if video.blank?
 
     result = AliyunVod::Service.refresh_upload_video(video.uuid)
     render_ok(data: result)

app/libs/aliyun_vod/service/base.rb

@@ -10,7 +10,15 @@ module AliyunVod::Service::Base
 
     Rails.logger.info("[AliyunVod] response => status: #{response.status}, result: #{result}")
 
-    raise AliyunVod::Error, result['Code'] if response.status != 200
+    if response.status != 200
+      message =
+        case result['Code']
+        when 'InvalidFileName.Extension' then '不支持的文件格式'
+        when 'IllegalCharacters' then '文件名称包含非法字符'
+        else raise AliyunVod::Error, result['Message']
+        end
+      raise AliyunVod::Error, message if message.present?
+    end
 
     result
   rescue => ex

app/libs/aliyun_vod/service/video_upload.rb

@@ -16,15 +16,6 @@ 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

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -360,6 +360,10 @@ export function TPMIndexHOC(WrappedComponent) {
 				link.dispatchEvent(evt);
 				document.body.removeChild(link);
 			}
+
+			DownloadOpenPdf=(type,url)=>{
+				type===true?window.open(url):window.location.href=url;
+			}
 	  	render() {
           let{Headertop,Footerdown, isRender, AccountProfiletype}=this.state;
           const common = {
@@ -383,6 +387,7 @@ export function TPMIndexHOC(WrappedComponent) {
             
 						ShowOnlinePdf:(url)=>this.ShowOnlinePdf(url),
 						DownloadFileA:(title,url)=>this.DownloadFileA(title,url),
+						DownloadOpenPdf:(type,url)=>this.DownloadOpenPdf(type,url)
           }
 		    return (
 		    	<div>