From c2df4ef92a194bdbd2cad92aa8c2b17260024b91 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 19 Aug 2019 14:59:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/message/js/MessagSub.js       |  7 +++++++
 .../user/usersInfo/video/AliyunUploaderManager.js      | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index ab814aab8..196c460a5 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -470,6 +470,13 @@ class MessagSub extends Component{
 				}
 				case "Discuss":
 					return window.open(`/shixuns/${item.identifier}/shixun_discuss`);
+			case "Video":
+				if(item.tiding_type==="Apply"){
+					return window.open(`/managements/video_applies`);
+				}else if(item.tiding_type==="System"){
+					return window.open(`/users/${item.trigger_user.login}/videos`);
+				}
+				return '';
 			default :
 				return 	window.open("/")
 		}
diff --git a/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js b/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js
index 2e2ba71f8..9ac0f1a08 100644
--- a/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js
+++ b/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js
@@ -7,6 +7,7 @@ let _path = isDev() ? 'public' : 'build'
 let _testHost =  '' ;  // 'http://192.168.2.63:3001/api' ; // '' ; 
 let login = 'innov'
 
+// https://help.aliyun.com/document_detail/52204.html?spm=5176.2020520165.120.d52204.19a47029YWhro7#%E4%B8%8A%E4%BC%A0%E5%9C%B0%E5%9D%80%E5%92%8C%E5%87%AD%E8%AF%81%E6%96%B9%E5%BC%8F(%E6%8E%A8%E8%8D%90%E4%BD%BF%E7%94%A8)
 let uploader;
 let $ = window.$
 function loadLib(callback) {
@@ -63,7 +64,7 @@ function doCreateUploader (options) {
 
             if (!uploadInfo.videoId) {
                 
-                var createUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
+                var createUrl = `${_testHost}/users/${login}/video_auths.json`
                 axios.post(createUrl, {
                     title: fileName,
                     file_name: fileName
@@ -89,7 +90,7 @@ function doCreateUploader (options) {
                 console.log("onUploadStarted:" + uploadInfo.file.name + ", endpoint:" + uploadInfo.endpoint + ", bucket:" + uploadInfo.bucket + ", object:" + uploadInfo.object)
             } else {
                 // 如果videoId有值，根据videoId刷新上传凭证
-                var refreshUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
+                var refreshUrl = `${_testHost}/users/${login}/video_auths.json`
                 
                 axios.put(refreshUrl, {
                     video_id: uploadInfo.videoId,
@@ -104,7 +105,8 @@ function doCreateUploader (options) {
                     var uploadAuth = data.UploadAuth
                     var uploadAddress = data.UploadAddress
                     var videoId = data.VideoId
-                    uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
+                    uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress)
+                    // , videoId
 
                     options.addFileSuccess && options.addFileSuccess(uploadInfo)
                 }).catch((error) => {
@@ -147,7 +149,7 @@ function doCreateUploader (options) {
             // 需要根据 uploadInfo.videoId 调用刷新视频上传凭证接口(https://help.aliyun.com/document_detail/55408.html)重新获取 UploadAuth
             // 然后调用 resumeUploadWithAuth 方法, 这里是测试接口, 所以我直接获取了 UploadAuth
             $('#status').text('文件上传超时!')
-            var refreshUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
+            var refreshUrl = `${_testHost}/users/${login}/video_auths.json`
             
 
             axios.put(refreshUrl, {