Merge branch 'master' of D:\播智教育\2020\benyi with conflicts.

ruoyi-ui/src/utils/zipdownload.js

@@ -2,59 +2,57 @@ import axios from 'axios'
 import { getToken } from '@/utils/auth'
 
 const mimeMap = {
-  xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-  zip: 'application/zip'
+    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    zip: 'application/zip'
 }
 
 const baseUrl = process.env.VUE_APP_BASE_API
 export function downLoadZip(str, filename) {
-  var url = baseUrl + str
-  axios({
-    method: 'get',
-    url: url,
-    responseType: 'blob',
-    headers: { 'Authorization': 'Bearer ' + getToken() }
-  }).then(res => {
-    resolveBlob(res, mimeMap.zip)
-  })
+    var url = baseUrl + str
+    axios({
+        method: 'get',
+        url: url,
+        responseType: 'blob',
+        headers: { 'Authorization': 'Bearer ' + getToken() }
+    }).then(res => {
+        resolveBlob(res, mimeMap.zip)
+    })
 }
 export function downLoadVideoUrl(str) {
-  var url = baseUrl + str
-  axios({
-    method: 'get',
-    url: url,
-    responseType: 'arraybuffer',
-    headers: { 'Authorization': 'Bearer ' + getToken() },
-  }).then(res => {
-    // console.log(res);
-    return res.data
-  })
+    var url = baseUrl + str
+    return axios({
+        method: 'get',
+        url: url,
+        responseType: 'blob',
+        headers: { 'Authorization': 'Bearer ' + getToken() },
+    })
 }
 
 export function downLoadUrl(str, item) {
-  var url = baseUrl + str
-  axios({
-    method: 'get',
-    url: url,
-    responseType: 'blob',
-    headers: { 'Authorization': 'Bearer ' + getToken() },
-  }).then(res => {
-    // console.log(res);
-    downloadFileFun(res.data, item)
-  })
+    var url = baseUrl + str
+    axios({
+        method: 'get',
+        url: url,
+        responseType: 'blob',
+        headers: { 'Authorization': 'Bearer ' + getToken() },
+    }).then(res => {
+        // console.log(res);
+        // downloadFileFun(res.data, item)
+        res.send();
+    })
 }
 
 export function downloadFileFun(data, item) {
-  if (!data) {
-    return
-  }
-  let url = window.URL.createObjectURL(new Blob([data]))
-  let link = document.createElement('a')
-  link.style.display = 'none'
-  link.href = url
-  link.setAttribute('download', item.name)
-  document.body.appendChild(link)
-  link.click()
+    if (!data) {
+        return
+    }
+    let url = window.URL.createObjectURL(new Blob([data]))
+    let link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', item.name)
+    document.body.appendChild(link)
+    link.click()
 }
 
 /**
@@ -63,17 +61,17 @@ export function downloadFileFun(data, item) {
  * @param {String} mimeType MIME类型
  */
 export function resolveBlob(res, mimeType) {
-  const aLink = document.createElement('a')
-  var blob = new Blob([res.data], { type: mimeType })
-  // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
-  var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
-  var contentDisposition = decodeURI(res.headers['content-disposition'])
-  var result = patt.exec(contentDisposition)
-  var fileName = result[1]
-  fileName = fileName.replace(/\"/g, '')
-  aLink.href = URL.createObjectURL(blob)
-  aLink.setAttribute('download', fileName) // 设置下载文件名称
-  document.body.appendChild(aLink)
-  aLink.click()
-  document.body.appendChild(aLink)
+    const aLink = document.createElement('a')
+    var blob = new Blob([res.data], { type: mimeType })
+        // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
+    var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+    var contentDisposition = decodeURI(res.headers['content-disposition'])
+    var result = patt.exec(contentDisposition)
+    var fileName = result[1]
+    fileName = fileName.replace(/\"/g, '')
+    aLink.href = URL.createObjectURL(blob)
+    aLink.setAttribute('download', fileName) // 设置下载文件名称
+    document.body.appendChild(aLink)
+    aLink.click()
+    document.body.appendChild(aLink)
 }

ruoyi-ui/src/views/benyi_train/video_study/index.vue

@@ -171,11 +171,17 @@ export default {
       return data;
     },
     /** 查询培训列表 */
-    getList() {
+   async getList() {
       this.loading = true;
+        let videobuffer="";
+        await downLoadVideoUrl("/profile/video/lg4y3idmDCEme_eu6FzAAoOdcyS2.mp4").then((res)=>{
+          videobuffer=res;
+          console.log(videobuffer);
+        })
       listVideo(this.queryParams).then((response) => {
         this.videoList = response.rows;
         this.playerOptions = response.rows.map((ele) => {
+          console.log(ele.videourl);
           return {
             autoplay: false,
             muted: true,
@@ -186,8 +192,8 @@ export default {
               {
                 type: ele.filetype,
                 // mp4
-                src: ele.videourl
-                // src: downLoadVideoUrl(ele.videourl),
+                // src: ele.videourl
+                src: videobuffer.request.response,
               },
             ],
             notSupportedMessage: "此视频暂无法播放，请稍后再试",