From 5b6cd5afe43f18e422fec85b0e6a6df1cf3d15c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 6 Feb 2020 19:38:45 +0800
Subject: [PATCH 01/34] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/Resource/Fileslistitem.js | 23 +++++++++++--------
 .../src/modules/courses/Resource/index.js     |  7 +++---
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 348303116..f9d0ee7d8 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -60,7 +60,7 @@ class Fileslistitem extends Component{
 				if(list.content_type==="video/mp4"){
 					this.setState({
 						videoModalObj:true,
-						file_url:getmyUrl(list.url+'?file_name='+list.title),
+						file_url:"https://"+document.domain+list.url+'?file_name='+list.title,
 					})
 					return
 				}else{
@@ -92,7 +92,7 @@ class Fileslistitem extends Component{
 						if(list.content_type==="video/mp4"){
 							this.setState({
 								videoModalObj:true,
-								file_url:getmyUrl(list.url+'?file_name='+list.title),
+								file_url:"https://"+document.domain+list.url+'?file_name='+list.title,
 							})
 							return
 						}else{
@@ -128,7 +128,7 @@ class Fileslistitem extends Component{
 	Clicktobroadcastthevideo=(bool,url)=>{
 			this.setState({
 									videoModalObj:bool,
-									file_url:getmyUrl(url),
+									file_url:"https://"+document.domain+url,
 		})
 	}
 
@@ -216,7 +216,10 @@ class Fileslistitem extends Component{
 			discussMessage,index
 		} = this.props;
 		console.log("Fileslistitem");
-		console.log(file_url);
+		console.log( document.domain);
+		console.log(this.props.imhost);
+		console.log( window.location.href);
+
 		return(
 			<div className="graduateTopicList boardsList">
 				{
@@ -232,12 +235,12 @@ class Fileslistitem extends Component{
 								src={file_url} controls="true" controlslist="nodownload">
 								您的浏览器不支持 video 标签。
 							</video>
-							{/*<div className="df copyLine">*/}
-							{/*	<Input value={file_url}*/}
-							{/*				 className="dark"*/}
-							{/*	></Input>*/}
-							{/*	<ActionBtn className="copybtn" data-clipboard-text={file_url} onClick={() =>this.copyurls()}>复制视频地址</ActionBtn>*/}
-							{/*</div>*/}
+							<div className="df copyLine">
+								<Input value={file_url}
+											 className="dark"
+								></Input>
+								<ActionBtn className="copybtn" data-clipboard-text={file_url} onClick={() =>this.copyurls()}>复制视频地址</ActionBtn>
+							</div>
 						</HeadlessModal>
 
 						:""
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 501176882..d177502e9 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -1,6 +1,6 @@
 import React,{ Component } from "react";
 import { Input, Checkbox, Table, Tooltip, Pagination,Spin } from "antd";
-import { WordsBtn,on, off, trigger } from 'educoder';
+import { WordsBtn,on, off, trigger ,getUrl} from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 import Sendtofilesmodal from "../coursesPublic/SendToFilesModal";
@@ -15,7 +15,7 @@ import _ from 'lodash'
 import './style.css';
 import '../css/members.css';
 import moment from 'moment';
-
+let imhost=getUrl();
 class Fileslists extends Component{
   constructor(props){
     super(props);
@@ -997,6 +997,7 @@ class Fileslists extends Component{
                             <Fileslistitem
                                 {...this.props}
 																{...this.state}
+																imhost={imhost}
                                 discussMessage={item}
                                 isAdmin={this.props.isAdmin()}
                                 isStudent={this.props.isStudent()}
@@ -1062,4 +1063,4 @@ export default Fileslists;
 	{/*<div className="edu-tab-con-box clearfix edu-txt-center">*/}
 		{/*<img className="edu-nodata-img mb20"  src="/images/educoder/nodata.png" />*/}
 		{/*<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>*/}
-{/*</div>*/}
\ No newline at end of file
+{/*</div>*/}

From b2065247dac9be306fc8b92a2ba69045af3c6bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 6 Feb 2020 19:39:51 +0800
Subject: [PATCH 02/34] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Resource/Fileslistitem.js | 5 +----
 public/react/src/modules/courses/Resource/index.js         | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index f9d0ee7d8..332938dd3 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -215,10 +215,7 @@ class Fileslistitem extends Component{
 		const { checkBox,
 			discussMessage,index
 		} = this.props;
-		console.log("Fileslistitem");
-		console.log( document.domain);
-		console.log(this.props.imhost);
-		console.log( window.location.href);
+
 
 		return(
 			<div className="graduateTopicList boardsList">
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index d177502e9..8187cd5af 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -15,7 +15,6 @@ import _ from 'lodash'
 import './style.css';
 import '../css/members.css';
 import moment from 'moment';
-let imhost=getUrl();
 class Fileslists extends Component{
   constructor(props){
     super(props);
@@ -997,7 +996,6 @@ class Fileslists extends Component{
                             <Fileslistitem
                                 {...this.props}
 																{...this.state}
-																imhost={imhost}
                                 discussMessage={item}
                                 isAdmin={this.props.isAdmin()}
                                 isStudent={this.props.isStudent()}

From 1b88a2b086514e3ba63f9a0fa611b27eb543d32c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 6 Feb 2020 21:05:12 +0800
Subject: [PATCH 03/34] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/Resource/Fileslistitem.js     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 332938dd3..3ac293de2 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -126,9 +126,9 @@ class Fileslistitem extends Component{
 	}
 
 	Clicktobroadcastthevideo=(bool,url)=>{
-			this.setState({
-									videoModalObj:bool,
-									file_url:"https://"+document.domain+url,
+		this.setState({
+			videoModalObj:bool,
+			file_url:"https://"+document.domain+url,
 		})
 	}
 
@@ -215,7 +215,10 @@ class Fileslistitem extends Component{
 		const { checkBox,
 			discussMessage,index
 		} = this.props;
-
+		console.log("Fileslistitem");
+		console.log( document.domain);
+		console.log(this.props.imhost);
+		console.log( window.location.href);
 
 		return(
 			<div className="graduateTopicList boardsList">

From be852d200be6138778466bbc93bca31bba7b0fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 6 Feb 2020 21:07:47 +0800
Subject: [PATCH 04/34] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/Resource/Fileslistitem.js   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 3ac293de2..fe0574f56 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -215,10 +215,10 @@ class Fileslistitem extends Component{
 		const { checkBox,
 			discussMessage,index
 		} = this.props;
-		console.log("Fileslistitem");
-		console.log( document.domain);
-		console.log(this.props.imhost);
-		console.log( window.location.href);
+		// console.log("Fileslistitem");
+		// console.log( document.domain);
+		// console.log(this.props.imhost);
+		// console.log( window.location.href);
 
 		return(
 			<div className="graduateTopicList boardsList">

From 39313bd726656a9f6950a450e66b5d54b7e03533 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 21:24:45 +0800
Subject: [PATCH 05/34] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index e0dd71467..0bfe9f124 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -17,9 +17,12 @@ class AttachmentsController < ApplicationController
       redirect_to @file.cloud_url and return
     end
 
-    pdf_attachment = params[:disposition] || "attachment"
-    if pdf_attachment == "inline"
+    type_attachment = params[:disposition] || "attachment"
+    if type_attachment == "inline"
       send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
+    elsif type_attachment == "MP4"
+      response.header["Accept-Ranges"] = "bytes"
+      send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: @file.content_type.presence || 'application/octet-stream'
     else
       send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end

From ad0e3cb128d23f567ac524402b35bf2cb739acce Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 21:37:29 +0800
Subject: [PATCH 06/34] 1

---
 app/controllers/attachments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 0bfe9f124..eb962ad2e 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -22,7 +22,7 @@ class AttachmentsController < ApplicationController
       send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
     elsif type_attachment == "MP4"
       response.header["Accept-Ranges"] = "bytes"
-      send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: @file.content_type.presence || 'application/octet-stream'
+      send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: @file.content_type.presence || 'application/octet-stream', status: 206
     else
       send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end

From e7de4550cf202b4a9659bcd34d70674d8ed545ae Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 21:41:26 +0800
Subject: [PATCH 07/34] 1

---
 app/controllers/attachments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index eb962ad2e..107932cd8 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -22,7 +22,7 @@ class AttachmentsController < ApplicationController
       send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
     elsif type_attachment == "MP4"
       response.header["Accept-Ranges"] = "bytes"
-      send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: @file.content_type.presence || 'application/octet-stream', status: 206
+      send_file absolute_path(local_path(@file)),filename: @file.title,type: @file.content_type.presence || 'application/octet-stream', status: 206
     else
       send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end

From f2cd502b2f10def116749114e2accc62b8b8026e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 21:48:18 +0800
Subject: [PATCH 08/34] 1

---
 app/controllers/attachments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 107932cd8..a3352aaca 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -22,7 +22,7 @@ class AttachmentsController < ApplicationController
       send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
     elsif type_attachment == "MP4"
       response.header["Accept-Ranges"] = "bytes"
-      send_file absolute_path(local_path(@file)),filename: @file.title,type: @file.content_type.presence || 'application/octet-stream', status: 206
+      send_file absolute_path(local_path(@file)),filename: @file.title,type: @file.content_type.presence || 'application/octet-stream'
     else
       send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end

From 1e834e18aae81d6de26b1f65b882ccbeb3ced755 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 21:55:57 +0800
Subject: [PATCH 09/34] 1

---
 app/controllers/attachments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index a3352aaca..184d63120 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -22,7 +22,7 @@ class AttachmentsController < ApplicationController
       send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
     elsif type_attachment == "MP4"
       response.header["Accept-Ranges"] = "bytes"
-      send_file absolute_path(local_path(@file)),filename: @file.title,type: @file.content_type.presence || 'application/octet-stream'
+      send_file absolute_path(local_path(@file)),filename: @file.title,type: @file.content_type.presence || 'application/octet-stream', x_sendfile: true
     else
       send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end

From 5ed217d5b5814f6185951e265e49aaff76355f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 6 Feb 2020 22:22:24 +0800
Subject: [PATCH 10/34] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/Resource/Fileslistitem.js | 24 +++++++++++--------
 .../courses/coursesPublic/Showoldfiles.js     |  5 +++-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index fe0574f56..27d8f471b 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import { WordsBtn,ActionBtn,getmyUrl } from 'educoder';
+import { WordsBtn,ActionBtn,getmyUrl,getUrl } from 'educoder';
 import {Tooltip,message,Input, Button} from 'antd';
 import {Link} from 'react-router-dom';
 import axios from 'axios'
@@ -60,7 +60,8 @@ class Fileslistitem extends Component{
 				if(list.content_type==="video/mp4"){
 					this.setState({
 						videoModalObj:true,
-						file_url:"https://"+document.domain+list.url+'?file_name='+list.title,
+						// file_url:"https://"+document.domain+list.url+'?file_name='+list.title+"&disposition=MP4",
+						file_url:getUrl()+list.url+'?file_name='+list.title+'&disposition=MP4',
 					})
 					return
 				}else{
@@ -92,7 +93,9 @@ class Fileslistitem extends Component{
 						if(list.content_type==="video/mp4"){
 							this.setState({
 								videoModalObj:true,
-								file_url:"https://"+document.domain+list.url+'?file_name='+list.title,
+								// file_url:"https://"+document.domain+list.url+'?file_name='+list.title+'&disposition=MP4',
+								file_url:getUrl()+list.url+'?file_name='+list.title+'&disposition=MP4',
+
 							})
 							return
 						}else{
@@ -126,10 +129,11 @@ class Fileslistitem extends Component{
 	}
 
 	Clicktobroadcastthevideo=(bool,url)=>{
-		this.setState({
-			videoModalObj:bool,
-			file_url:"https://"+document.domain+url,
-		})
+			this.setState({
+				videoModalObj:bool,
+				 // file_url:"https://"+document.domain+url+'&disposition=MP4',
+				file_url:getUrl()+url+'&disposition=MP4',
+			})
 	}
 
 
@@ -231,8 +235,8 @@ class Fileslistitem extends Component{
 							width={800 - 1}
 						>
 							<video
-								autoplay="true"
-								src={file_url} controls="true" controlslist="nodownload">
+								preload="auto"
+								src={file_url} controls="true" >
 								您的浏览器不支持 video 标签。
 							</video>
 							<div className="df copyLine">
@@ -259,7 +263,7 @@ class Fileslistitem extends Component{
 					{...this.props}
 					visible={this.state.Showoldfiles}
 					allfiles={this.state.allfiles}
-					Clicktobroadcastthevideo={(bool,urls)=>this.Clicktobroadcastthevideo(bool,urls)}
+					Clicktobroadcastthevideo={(bool,urls,index)=>this.Clicktobroadcastthevideo(bool,urls,index)}
 					closaoldfilesprops={this.closaoldfilesprops}
 				/>
 				<style>{`
diff --git a/public/react/src/modules/courses/coursesPublic/Showoldfiles.js b/public/react/src/modules/courses/coursesPublic/Showoldfiles.js
index 3b4928d4d..53148913f 100644
--- a/public/react/src/modules/courses/coursesPublic/Showoldfiles.js
+++ b/public/react/src/modules/courses/coursesPublic/Showoldfiles.js
@@ -49,6 +49,9 @@ class Showoldfiles extends Component{
 	isaboxonClick=(item)=>{
 		this.props.Clicktobroadcastthevideo(true,item.url+'&file_name='+item.title);
 	}
+	isaboxonClicks=(item)=>{
+		this.props.Clicktobroadcastthevideo(true,item.url+'?file_name='+item.title);
+	}
 	render(){
 		let {visible,allfiles}=this.props;
 
@@ -188,7 +191,7 @@ class Showoldfiles extends Component{
 
 														{
 															allfiles&&allfiles.content_type&&allfiles.content_type==="video/mp4"?
-																<a  className={"isabox"} target="_blank"  onClick={()=>this.isaboxonClick(allfiles)}>{allfiles.title}</a>
+																<a  className={"isabox"} target="_blank"  onClick={()=>this.isaboxonClicks(allfiles)}>{allfiles.title}</a>
 																:
 																<a className={"isabox"} href={allfiles.url} target="_blank" >{allfiles.title}</a>
 														}

From ac75188f05cc3ee4edb91d37dc43f1fd2ddcd430 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 22:37:44 +0800
Subject: [PATCH 11/34] 1

---
 app/controllers/attachments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 184d63120..a3352aaca 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -22,7 +22,7 @@ class AttachmentsController < ApplicationController
       send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
     elsif type_attachment == "MP4"
       response.header["Accept-Ranges"] = "bytes"
-      send_file absolute_path(local_path(@file)),filename: @file.title,type: @file.content_type.presence || 'application/octet-stream', x_sendfile: true
+      send_file absolute_path(local_path(@file)),filename: @file.title,type: @file.content_type.presence || 'application/octet-stream'
     else
       send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end

From eac9482c038b5c827c689a119c6386525f4d3e68 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 22:46:15 +0800
Subject: [PATCH 12/34] 1

---
 app/controllers/attachments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index a3352aaca..107932cd8 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -22,7 +22,7 @@ class AttachmentsController < ApplicationController
       send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
     elsif type_attachment == "MP4"
       response.header["Accept-Ranges"] = "bytes"
-      send_file absolute_path(local_path(@file)),filename: @file.title,type: @file.content_type.presence || 'application/octet-stream'
+      send_file absolute_path(local_path(@file)),filename: @file.title,type: @file.content_type.presence || 'application/octet-stream', status: 206
     else
       send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end

From e5ec1af383544c925c8623ed9536b3c454701c3b Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 22:51:27 +0800
Subject: [PATCH 13/34] 1

---
 app/controllers/attachments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 107932cd8..fd2226b1f 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -22,7 +22,7 @@ class AttachmentsController < ApplicationController
       send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
     elsif type_attachment == "MP4"
       response.header["Accept-Ranges"] = "bytes"
-      send_file absolute_path(local_path(@file)),filename: @file.title,type: @file.content_type.presence || 'application/octet-stream', status: 206
+      send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline', type: @file.content_type.presence || 'application/octet-stream'
     else
       send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end

From 49d93fb6aa0818bac8cb2b7b73dbd9172ba8ca4e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 22:55:40 +0800
Subject: [PATCH 14/34] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=8B=96=E6=8B=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index fd2226b1f..2485c44a7 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -22,7 +22,8 @@ class AttachmentsController < ApplicationController
       send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
     elsif type_attachment == "MP4"
       response.header["Accept-Ranges"] = "bytes"
-      send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline', type: @file.content_type.presence || 'application/octet-stream'
+      send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',
+                type: @file.content_type.presence || 'application/octet-stream', x_sendfile: true
     else
       send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end

From 0b891859c0bbbf296e53da74ef11c9e778eec307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 6 Feb 2020 22:56:58 +0800
Subject: [PATCH 15/34] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/Resource/Fileslistitem.js    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 27d8f471b..b038c836f 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -60,8 +60,8 @@ class Fileslistitem extends Component{
 				if(list.content_type==="video/mp4"){
 					this.setState({
 						videoModalObj:true,
-						// file_url:"https://"+document.domain+list.url+'?file_name='+list.title+"&disposition=MP4",
-						file_url:getUrl()+list.url+'?file_name='+list.title+'&disposition=MP4',
+						file_url:"https://"+document.domain+list.url+'?file_name='+list.title+"&disposition=MP4",
+						// file_url:getUrl()+list.url+'?file_name='+list.title+'&disposition=MP4',
 					})
 					return
 				}else{
@@ -93,8 +93,8 @@ class Fileslistitem extends Component{
 						if(list.content_type==="video/mp4"){
 							this.setState({
 								videoModalObj:true,
-								// file_url:"https://"+document.domain+list.url+'?file_name='+list.title+'&disposition=MP4',
-								file_url:getUrl()+list.url+'?file_name='+list.title+'&disposition=MP4',
+								file_url:"https://"+document.domain+list.url+'?file_name='+list.title+'&disposition=MP4',
+								// file_url:getUrl()+list.url+'?file_name='+list.title+'&disposition=MP4',
 
 							})
 							return
@@ -131,8 +131,8 @@ class Fileslistitem extends Component{
 	Clicktobroadcastthevideo=(bool,url)=>{
 			this.setState({
 				videoModalObj:bool,
-				 // file_url:"https://"+document.domain+url+'&disposition=MP4',
-				file_url:getUrl()+url+'&disposition=MP4',
+				 file_url:"https://"+document.domain+url+'&disposition=MP4',
+				// file_url:getUrl()+url+'&disposition=MP4',
 			})
 	}
 

From acc6ff0599a980fecd099dadb856c95f5a9dff83 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 23:04:58 +0800
Subject: [PATCH 16/34] =?UTF-8?q?=E5=88=86=E6=AE=B5=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 27 ++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 2485c44a7..bba33bd8e 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -21,9 +21,7 @@ class AttachmentsController < ApplicationController
     if type_attachment == "inline"
       send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',type: 'application/pdf'
     elsif type_attachment == "MP4"
-      response.header["Accept-Ranges"] = "bytes"
-      send_file absolute_path(local_path(@file)),filename: @file.title, disposition: 'inline',
-                type: @file.content_type.presence || 'application/octet-stream', x_sendfile: true
+      send_file_with_range absolute_path(local_path(@file)), disposition: 'inline', type: "video/mp4", range: true
     else
       send_file(absolute_path(local_path(@file)), filename: @file.title,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end
@@ -206,4 +204,27 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  def send_file_with_range(path, options = {})
+    if File.exist?(path)
+      size = File.size(path)
+      if !request.headers["Range"]
+        status_code = 200 # 200 OK
+        offset = 0
+        length = File.size(path)
+      else
+        status_code = 206 # 206 Partial Content
+        bytes = Rack::Utils.byte_ranges(request.headers, size)[0]
+        offset = bytes.begin
+        length = bytes.end - bytes.begin
+      end
+      response.header["Accept-Ranges"] = "bytes"
+      response.header["Content-Range"] = "bytes #{bytes.begin}-#{bytes.end}/#{size}" if bytes
+      response.header["status"] = status_code
+
+      send_data IO.binread(path, length, offset), options
+    else
+      raise ActionController::MissingFile, "Cannot read file #{path}."
+    end
+  end
+
 end

From e611a9403c925e373d32db1f8e7c23e402c800a1 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 23:20:06 +0800
Subject: [PATCH 17/34] =?UTF-8?q?head=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index bba33bd8e..05823ab46 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -207,6 +207,7 @@ class AttachmentsController < ApplicationController
   def send_file_with_range(path, options = {})
     if File.exist?(path)
       size = File.size(path)
+      logger.info("########request.headers: #{request.headers}")
       if !request.headers["Range"]
         status_code = 200 # 200 OK
         offset = 0

From 45ebf978cc1bf31fe68e61bebeac55811223d3db Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 6 Feb 2020 23:22:59 +0800
Subject: [PATCH 18/34] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 05823ab46..6ef43c694 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -205,6 +205,9 @@ class AttachmentsController < ApplicationController
   end
 
   def send_file_with_range(path, options = {})
+    logger.info("########request.headers: #{request.headers}")
+    logger.info("########request.headers: #{File.exist?(path)}")
+
     if File.exist?(path)
       size = File.size(path)
       logger.info("########request.headers: #{request.headers}")

From 28cebdbcf6d625eeab16ccf6351fe2a1cb73439e Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 11:01:33 +0800
Subject: [PATCH 19/34] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84?=
 =?UTF-8?q?=E9=80=89=E7=94=A8=E5=AE=9E=E8=AE=AD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weapps/shixun_lists_controller.rb         | 15 ++++++
 app/services/weapps/shixun_search_service.rb  | 48 +++++++++++++++++++
 .../weapps/shixun_lists/index.json.jbuilder   | 10 ++++
 config/routes.rb                              |  1 +
 4 files changed, 74 insertions(+)
 create mode 100644 app/controllers/weapps/shixun_lists_controller.rb
 create mode 100644 app/services/weapps/shixun_search_service.rb
 create mode 100644 app/views/weapps/shixun_lists/index.json.jbuilder

diff --git a/app/controllers/weapps/shixun_lists_controller.rb b/app/controllers/weapps/shixun_lists_controller.rb
new file mode 100644
index 000000000..4db1e171f
--- /dev/null
+++ b/app/controllers/weapps/shixun_lists_controller.rb
@@ -0,0 +1,15 @@
+class Weapps::ShixunListsController < ApplicationController
+  before_action :require_login
+
+  def index
+    results = Weapps::ShixunSearchService.call(search_params, current_laboratory)
+    @total_count = results.size
+    @results = paginate results
+  end
+
+  private
+
+  def search_params
+    params.permit(:keyword, :type, :page, :limit, :order, :status, :diff, :sort, :no_jupyter)
+  end
+end
\ No newline at end of file
diff --git a/app/services/weapps/shixun_search_service.rb b/app/services/weapps/shixun_search_service.rb
new file mode 100644
index 000000000..5c09cb4af
--- /dev/null
+++ b/app/services/weapps/shixun_search_service.rb
@@ -0,0 +1,48 @@
+class Weapps::ShixunSearchService < ApplicationService
+
+  attr_reader :params, :laboratory
+
+  def initialize(params, laboratory)
+    @params = params
+    @laboratory = laboratory
+  end
+
+  def call
+    shixuns = laboratory.shixuns.published.no_jupyter
+
+    # 超级管理员用户显示所有未隐藏的实训、非管理员显示所有已发布的实训（对本单位公开且未隐藏未关闭）
+    if User.current.admin? || User.current.business? || !User.current.school_id
+      shixuns = shixuns.where(hidden: 0)
+    else
+      shixun_ids = ShixunSchool.where(school_id: User.current.school_id).pluck(:shixun_id)
+      shixun_ids = shixun_ids.reject(&:blank?).length == 0 ? -1 : shixun_ids.join(",")
+
+      shixuns = shixuns.where("use_scope = 0 or id in (#{shixun_ids})").unhidden.publiced.or(shixuns.where(id: User.current.shixuns))
+    end
+
+    ## 筛选 难度
+    if params[:diff].present? && params[:diff].to_i != 0
+      shixuns = shixuns.where(trainee: params[:diff])
+    end
+
+    unless params[:keyword].blank?
+      keyword = params[:keyword].strip
+      shixuns = shixuns.joins(:user).
+        where("concat(lastname, firstname) like :keyword or shixuns.name like :keyword",
+              keyword: "%#{keyword}%", name: "%#{keyword.split(" ").join("%")}%").distinct.
+        order("#{sort_str} #{order_str}")
+    end
+
+    shixuns
+  end
+
+  private
+
+  def order_str
+    params[:order] || "desc"
+  end
+
+  def sort_str
+    params[:sort] || "myshixuns_count"
+  end
+end
\ No newline at end of file
diff --git a/app/views/weapps/shixun_lists/index.json.jbuilder b/app/views/weapps/shixun_lists/index.json.jbuilder
new file mode 100644
index 000000000..c83baa6aa
--- /dev/null
+++ b/app/views/weapps/shixun_lists/index.json.jbuilder
@@ -0,0 +1,10 @@
+json.shixun_list @results do |obj|
+  json.(obj, :id, :identifier)
+  json.title obj.name
+  json.level level_to_s(obj.trainee)
+  json.study_count obj.myshixuns_count
+  json.author_name obj.user.real_name
+  json.author_school_name obj.user.school_name
+  json.author_img url_to_avatar(obj.user)
+end
+json.shixuns_count @total_count
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 3eb02c95d..a4f8b80f6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1021,6 +1021,7 @@ Rails.application.routes.draw do
         post :cancel_sticky, on: :collection
       end
 
+      resources :shixun_lists, only: [:index]
       resources :subjects, path: :paths, only: [:index, :create, :update, :edit, :show]
 
       resources :courses, only: [:create, :update, :edit, :show] do

From 74992bcc2bf34c19c4a65a1680c012ade7e56d4c Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 12:03:04 +0800
Subject: [PATCH 20/34] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/weapps/shixun_search_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/weapps/shixun_search_service.rb b/app/services/weapps/shixun_search_service.rb
index 5c09cb4af..c0a0f2923 100644
--- a/app/services/weapps/shixun_search_service.rb
+++ b/app/services/weapps/shixun_search_service.rb
@@ -17,7 +17,7 @@ class Weapps::ShixunSearchService < ApplicationService
       shixun_ids = ShixunSchool.where(school_id: User.current.school_id).pluck(:shixun_id)
       shixun_ids = shixun_ids.reject(&:blank?).length == 0 ? -1 : shixun_ids.join(",")
 
-      shixuns = shixuns.where("use_scope = 0 or id in (#{shixun_ids})").unhidden.publiced.or(shixuns.where(id: User.current.shixuns))
+      shixuns = shixuns.where("use_scope = 0 or shixuns.id in (#{shixun_ids})").unhidden.publiced.or(shixuns.where(id: User.current.shixuns))
     end
 
     ## 筛选 难度

From 8636f2d2e85e61dbb694427483dad4647e8ac4db Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 13:12:32 +0800
Subject: [PATCH 21/34] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E9=80=89=E7=94=A8?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/subjects/choose_course.json.jbuilder    | 9 +++++++--
 app/views/weapps/shixun_lists/index.json.jbuilder | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/subjects/choose_course.json.jbuilder b/app/views/subjects/choose_course.json.jbuilder
index f5e33d4ee..252359710 100644
--- a/app/views/subjects/choose_course.json.jbuilder
+++ b/app/views/subjects/choose_course.json.jbuilder
@@ -4,12 +4,17 @@ json.courses @courses do |course|
   json.created_at course.created_at
 end
 
-json.stages @subject.stages do |stage|
+json.stages @subject.stages.includes(shixuns: [user: :user_extension]) do |stage|
   index = 1
   json.shixuns stage.shixuns do |shixun|
-    if shixun.status == 2 && !@none_shixun_ids.include?(shixun.id)
+    if shixun.status == 2 && !shixun.is_jupyter && !@none_shixun_ids.include?(shixun.id)
       json.shixun_id shixun.id
       json.shixun_name "#{stage.position}-#{index} #{shixun.name}"
+      json.title shixun.name
+      json.level level_to_s(shixun.trainee)
+      json.study_count shixun.myshixuns_count
+      json.author_name shixun.user.real_name
+      json.author_img url_to_avatar(shixun.user)
     end
     index += 1
   end
diff --git a/app/views/weapps/shixun_lists/index.json.jbuilder b/app/views/weapps/shixun_lists/index.json.jbuilder
index c83baa6aa..fac238f45 100644
--- a/app/views/weapps/shixun_lists/index.json.jbuilder
+++ b/app/views/weapps/shixun_lists/index.json.jbuilder
@@ -4,7 +4,6 @@ json.shixun_list @results do |obj|
   json.level level_to_s(obj.trainee)
   json.study_count obj.myshixuns_count
   json.author_name obj.user.real_name
-  json.author_school_name obj.user.school_name
   json.author_img url_to_avatar(obj.user)
 end
 json.shixuns_count @total_count
\ No newline at end of file

From fba7fd0deb32326f109f64774aafdeb674a59d7f Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 14:00:53 +0800
Subject: [PATCH 22/34] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=80=89?=
 =?UTF-8?q?=E7=94=A8=E5=AE=9E=E8=AE=AD=E5=A2=9E=E5=8A=A0=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E3=80=81=E6=88=91=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/weapps/shixun_search_service.rb | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/services/weapps/shixun_search_service.rb b/app/services/weapps/shixun_search_service.rb
index c0a0f2923..d5d8f7d47 100644
--- a/app/services/weapps/shixun_search_service.rb
+++ b/app/services/weapps/shixun_search_service.rb
@@ -8,16 +8,22 @@ class Weapps::ShixunSearchService < ApplicationService
   end
 
   def call
+    # 全部实训/我的实训
+    type = params[:type] || "all"
     shixuns = laboratory.shixuns.published.no_jupyter
 
-    # 超级管理员用户显示所有未隐藏的实训、非管理员显示所有已发布的实训（对本单位公开且未隐藏未关闭）
-    if User.current.admin? || User.current.business? || !User.current.school_id
-      shixuns = shixuns.where(hidden: 0)
+    if type == "mine"
+      @shixuns = @shixuns.where(id: User.current.shixuns)
     else
-      shixun_ids = ShixunSchool.where(school_id: User.current.school_id).pluck(:shixun_id)
-      shixun_ids = shixun_ids.reject(&:blank?).length == 0 ? -1 : shixun_ids.join(",")
-
-      shixuns = shixuns.where("use_scope = 0 or shixuns.id in (#{shixun_ids})").unhidden.publiced.or(shixuns.where(id: User.current.shixuns))
+      # 超级管理员用户显示所有未隐藏的实训、非管理员显示所有已发布的实训（对本单位公开且未隐藏未关闭）
+      if User.current.admin? || User.current.business? || !User.current.school_id
+        shixuns = shixuns.where(hidden: 0)
+      else
+        shixun_ids = ShixunSchool.where(school_id: User.current.school_id).pluck(:shixun_id)
+        shixun_ids = shixun_ids.reject(&:blank?).length == 0 ? -1 : shixun_ids.join(",")
+
+        shixuns = shixuns.where("use_scope = 0 or shixuns.id in (#{shixun_ids})").unhidden.publiced.or(shixuns.where(id: User.current.shixuns))
+      end
     end
 
     ## 筛选 难度

From de399372b7cce0821bcb33e16c9d3bc5645de638 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 14:58:32 +0800
Subject: [PATCH 23/34] =?UTF-8?q?=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/get_video_data.rake | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/tasks/get_video_data.rake b/lib/tasks/get_video_data.rake
index 05c33fb27..d38164923 100644
--- a/lib/tasks/get_video_data.rake
+++ b/lib/tasks/get_video_data.rake
@@ -45,9 +45,6 @@ namespace :video do
 
   task :get_play_url => :environment do
     Video.all.each do |video|
-      if video.uuid.present?
-
-      end
       result = AliyunVod::Service.get_play_info(video.uuid) rescue nil
       if result.present? && result["PlayInfoList"]["PlayInfo"].present?
         puts result

From 5bd82b9674b2e00fd3b0c027c9f0db2e0c274f4a Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 7 Feb 2020 15:32:32 +0800
Subject: [PATCH 24/34] =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=BD=AC=E7=A0=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/videos/dispatch_callback_service.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/services/videos/dispatch_callback_service.rb b/app/services/videos/dispatch_callback_service.rb
index e4ad1628a..b32c87c4e 100644
--- a/app/services/videos/dispatch_callback_service.rb
+++ b/app/services/videos/dispatch_callback_service.rb
@@ -20,6 +20,9 @@ class Videos::DispatchCallbackService < ApplicationService
       return if video.cover_url.present?
 
       video.update!(cover_url: params['CoverUrl'])
+    when 'TranscodeComplete' then # 转码完成
+      return if video.play_url.present?
+      video.update!(play_url: params['FileUrl'])
     end
 
   rescue => ex

From 319521ab6194649e466d3e2c133746a99e0d86f3 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 15:46:09 +0800
Subject: [PATCH 25/34] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/subjects/choose_course.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/subjects/choose_course.json.jbuilder b/app/views/subjects/choose_course.json.jbuilder
index 252359710..51eebd18f 100644
--- a/app/views/subjects/choose_course.json.jbuilder
+++ b/app/views/subjects/choose_course.json.jbuilder
@@ -9,6 +9,7 @@ json.stages @subject.stages.includes(shixuns: [user: :user_extension]) do |stage
   json.shixuns stage.shixuns do |shixun|
     if shixun.status == 2 && !shixun.is_jupyter && !@none_shixun_ids.include?(shixun.id)
       json.shixun_id shixun.id
+      json.identifier shixun.identifier
       json.shixun_name "#{stage.position}-#{index} #{shixun.name}"
       json.title shixun.name
       json.level level_to_s(shixun.trainee)

From f654248a27be681bea09100d58535088b48ee983 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 15:46:42 +0800
Subject: [PATCH 26/34] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/subjects/choose_course.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/subjects/choose_course.json.jbuilder b/app/views/subjects/choose_course.json.jbuilder
index 51eebd18f..2e03c5287 100644
--- a/app/views/subjects/choose_course.json.jbuilder
+++ b/app/views/subjects/choose_course.json.jbuilder
@@ -9,6 +9,7 @@ json.stages @subject.stages.includes(shixuns: [user: :user_extension]) do |stage
   json.shixuns stage.shixuns do |shixun|
     if shixun.status == 2 && !shixun.is_jupyter && !@none_shixun_ids.include?(shixun.id)
       json.shixun_id shixun.id
+      json.id shixun.id
       json.identifier shixun.identifier
       json.shixun_name "#{stage.position}-#{index} #{shixun.name}"
       json.title shixun.name

From d741fd99072f3c3ac93951955084b60359c3109d Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 15:53:09 +0800
Subject: [PATCH 27/34] =?UTF-8?q?=E9=80=89=E7=94=A8=E5=AE=9E=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/weapps/shixun_search_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/weapps/shixun_search_service.rb b/app/services/weapps/shixun_search_service.rb
index d5d8f7d47..333024cc4 100644
--- a/app/services/weapps/shixun_search_service.rb
+++ b/app/services/weapps/shixun_search_service.rb
@@ -13,7 +13,7 @@ class Weapps::ShixunSearchService < ApplicationService
     shixuns = laboratory.shixuns.published.no_jupyter
 
     if type == "mine"
-      @shixuns = @shixuns.where(id: User.current.shixuns)
+      shixuns = shixuns.where(id: User.current.shixuns)
     else
       # 超级管理员用户显示所有未隐藏的实训、非管理员显示所有已发布的实训（对本单位公开且未隐藏未关闭）
       if User.current.admin? || User.current.business? || !User.current.school_id

From 7ed500530535e6236efc314f76b50db886564c9c Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 15:57:43 +0800
Subject: [PATCH 28/34] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E8=87=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/subjects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index e820c383d..1f66555f9 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -242,7 +242,7 @@ class SubjectsController < ApplicationController
     ## 云上实验室过滤
     @courses = @courses.where(id: current_laboratory.all_courses)
 
-    @none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id).to_i}").pluck(:shixun_id)
+    @none_shixun_ids = @subject.shixuns.joins(:shixun_schools).where("school_id != #{current_user.user_extension.try(:school_id).to_i}").where(use_scope: 1).pluck(:id)
   end
 
   def send_to_course

From 81ceac90e7558fa9a2d1ce4fef7a72a9aea0177b Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 16:04:47 +0800
Subject: [PATCH 29/34] =?UTF-8?q?=E9=80=89=E7=94=A8=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/weapps/shixun_search_service.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/services/weapps/shixun_search_service.rb b/app/services/weapps/shixun_search_service.rb
index 333024cc4..448bb1992 100644
--- a/app/services/weapps/shixun_search_service.rb
+++ b/app/services/weapps/shixun_search_service.rb
@@ -35,11 +35,10 @@ class Weapps::ShixunSearchService < ApplicationService
       keyword = params[:keyword].strip
       shixuns = shixuns.joins(:user).
         where("concat(lastname, firstname) like :keyword or shixuns.name like :keyword",
-              keyword: "%#{keyword}%", name: "%#{keyword.split(" ").join("%")}%").distinct.
-        order("#{sort_str} #{order_str}")
+              keyword: "%#{keyword}%", name: "%#{keyword.split(" ").join("%")}%").distinct
     end
 
-    shixuns
+    shixuns.order("#{sort_str} #{order_str}")
   end
 
   private

From d71c181d12b90c4d6f6773fa928d8a008967a961 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 7 Feb 2020 17:30:50 +0800
Subject: [PATCH 30/34] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course.rb                                 | 10 ++++++----
 .../20200207090252_add_video_to_course_module.rb     | 12 ++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20200207090252_add_video_to_course_module.rb

diff --git a/app/models/course.rb b/app/models/course.rb
index 1d5175ed3..eb7ffd91f 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -206,7 +206,7 @@ class Course < ApplicationRecord
   end
 
   def all_course_module_types
-    %w[activity announcement online_learning shixun_homework common_homework group_homework exercise attachment course_group graduation poll board statistics]
+    %w[activity announcement online_learning shixun_homework common_homework group_homework exercise attachment course_group graduation poll board statistics video]
   end
 
   def get_course_module_by_type(type)
@@ -406,6 +406,7 @@ class Course < ApplicationRecord
     when 'exercise'        then '试卷'
     when 'poll'            then '问卷'
     when 'attachment'      then '资源'
+    when 'video'           then '视频'
     when 'board'           then '讨论'
     when 'course_group'    then '分班'
     when 'statistics'      then '统计'
@@ -425,9 +426,10 @@ class Course < ApplicationRecord
     when 'exercise'        then 8
     when 'poll'            then 9
     when 'attachment'      then 10
-    when 'board'           then 11
-    when 'course_group'    then 12
-    when 'statistics'      then 13
+    when 'video'           then 11
+    when 'board'           then 12
+    when 'course_group'    then 13
+    when 'statistics'      then 14
     else 100
     end
   end
diff --git a/db/migrate/20200207090252_add_video_to_course_module.rb b/db/migrate/20200207090252_add_video_to_course_module.rb
new file mode 100644
index 000000000..1d0364524
--- /dev/null
+++ b/db/migrate/20200207090252_add_video_to_course_module.rb
@@ -0,0 +1,12 @@
+class AddVideoToCourseModule < ActiveRecord::Migration[5.2]
+  def change
+    Course.all.each do |course|
+      unless course.course_modules.exists?(module_type: "video")
+        atta_position = course.course_modules.find_by(module_type: 'attachment')&.position.to_i
+        video_position = atta_position != 0 ? (atta_position + 1) : 11
+        course.course_modules.where("position >= #{video_position}").update_all("position = position + 1")
+        course.course_modules << CourseModule.new(module_type: "video", hidden: 1, module_name: "视频", position: video_position)
+      end
+    end
+  end
+end

From 4435771abe9e3e1ec92e368881b50246e76f438f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 7 Feb 2020 17:49:43 +0800
Subject: [PATCH 31/34] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/Resource/Fileslistitem.js | 110 ++----------------
 1 file changed, 9 insertions(+), 101 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index b038c836f..53f607b2e 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -1,29 +1,22 @@
 import React,{ Component } from "react";
-import { WordsBtn,ActionBtn,getmyUrl,getUrl } from 'educoder';
-import {Tooltip,message,Input, Button} from 'antd';
+import { WordsBtn } from 'educoder';
+import {Tooltip,message} from 'antd';
 import {Link} from 'react-router-dom';
+import {getImageUrl} from 'educoder';
 import axios from 'axios'
+import {getUrl} from 'educoder';
 import moment from 'moment'
 import CoursesListType from '../coursesPublic/CoursesListType';
 import Showoldfiles from "../coursesPublic/Showoldfiles";
 import Modals from '../../modals/Modals';
-import HeadlessModal from '../../user/usersInfo/common/HeadlessModal'
-import ClipboardJS from 'clipboard'
-import  '../../user/usersInfo/video/InfosVideo.css'
-let _clipboard = null;
+
 class Fileslistitem extends Component{
 	constructor(props){
 		super(props);
 		this.state = {
-			videoModalObj:false,
-			file_url:null,
+
 		}
 	}
-	setVisible=(bool)=>{
-		this.setState({
-			videoModalObj:bool
-		})
-	}
 
 	settingList=()=>{
 		let {discussMessage}=this.props
@@ -35,9 +28,6 @@ class Fileslistitem extends Component{
 	}
 
 	showfiles=(list)=>{
-		// console.log("showfiles");
-		// console.log(list);
-
 		if(this.props.checkIfLogin()===false){
 			this.props.showLoginDialog()
 			return
@@ -56,21 +46,7 @@ class Fileslistitem extends Component{
 		if(list.is_history_file===false){
 			// this.props.DownloadFileA(list.title,list.url)
 			//window.location.href=list.url;
-			if(list.content_type){
-				if(list.content_type==="video/mp4"){
-					this.setState({
-						videoModalObj:true,
-						file_url:"https://"+document.domain+list.url+'?file_name='+list.title+"&disposition=MP4",
-						// file_url:getUrl()+list.url+'?file_name='+list.title+'&disposition=MP4',
-					})
-					return
-				}else{
-					window.open(list.url, '_blank');
-				}
-
-			}else{
-				window.open(list.url, '_blank');
-			}
+			window.open(list.url, '_blank');
 		}else{
 			let {discussMessage,coursesId}=this.props
 			let file_id=discussMessage.id
@@ -89,24 +65,7 @@ class Fileslistitem extends Component{
 					//
 					// }
 					// this.props.DownloadFileA(result.data.title,result.data.url)
-					if(list.content_type){
-						if(list.content_type==="video/mp4"){
-							this.setState({
-								videoModalObj:true,
-								file_url:"https://"+document.domain+list.url+'?file_name='+list.title+'&disposition=MP4',
-								// file_url:getUrl()+list.url+'?file_name='+list.title+'&disposition=MP4',
-
-							})
-							return
-						}else{
-							window.open(list.url, '_blank');
-						}
-
-					}else{
-						window.open(list.url, '_blank');
-					}
-
-
+					window.open(list.url, '_blank');
 				}else{
 					this.setState({
 						Showoldfiles:true,
@@ -128,17 +87,6 @@ class Fileslistitem extends Component{
 		})
 	}
 
-	Clicktobroadcastthevideo=(bool,url)=>{
-			this.setState({
-				videoModalObj:bool,
-				 file_url:"https://"+document.domain+url+'&disposition=MP4',
-				// file_url:getUrl()+url+'&disposition=MP4',
-			})
-	}
-
-
-
-
 	onDelete = (id) => {
 
 		this.setState({
@@ -163,17 +111,6 @@ class Fileslistitem extends Component{
 
 	}
 
-	copyurls =()=>{
-		//复制网络链接
-		setTimeout(() => {
-			if (!_clipboard) {
-				_clipboard = new ClipboardJS('.copybtn');
-				_clipboard.on('success', (e) => {
-					this.props.showNotification("复制成功");
-				});
-			}
-		}, 200)
-	}
 	savedelete=(id)=>{
 
 		this.setState({
@@ -215,40 +152,13 @@ class Fileslistitem extends Component{
 	}
 
 	render(){
-		const {videoModalObj,file_url}=this.state
+
 		const { checkBox,
 			discussMessage,index
 		} = this.props;
-		// console.log("Fileslistitem");
-		// console.log( document.domain);
-		// console.log(this.props.imhost);
-		// console.log( window.location.href);
 
 		return(
 			<div className="graduateTopicList boardsList">
-				{
-					videoModalObj&&videoModalObj===true?
-						<HeadlessModal
-							visible={videoModalObj}
-							setVisible={(bool)=>this.setVisible(bool)}
-							className="showVideoModal"
-							width={800 - 1}
-						>
-							<video
-								preload="auto"
-								src={file_url} controls="true" >
-								您的浏览器不支持 video 标签。
-							</video>
-							<div className="df copyLine">
-								<Input value={file_url}
-											 className="dark"
-								></Input>
-								<ActionBtn className="copybtn" data-clipboard-text={file_url} onClick={() =>this.copyurls()}>复制视频地址</ActionBtn>
-							</div>
-						</HeadlessModal>
-
-						:""
-				}
 
 				{/*提示*/}
 				{this.state.Modalstype&&this.state.Modalstype===true?<Modals
@@ -263,7 +173,6 @@ class Fileslistitem extends Component{
 					{...this.props}
 					visible={this.state.Showoldfiles}
 					allfiles={this.state.allfiles}
-					Clicktobroadcastthevideo={(bool,urls,index)=>this.Clicktobroadcastthevideo(bool,urls,index)}
 					closaoldfilesprops={this.closaoldfilesprops}
 				/>
 				<style>{`
@@ -457,4 +366,3 @@ class Fileslistitem extends Component{
 	}
 }
 export default Fileslistitem;
-

From 8914a41ac634fa4f24eefcb4222864b7eff0f5d6 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 7 Feb 2020 18:14:40 +0800
Subject: [PATCH 32/34] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb             | 8 ++++++++
 app/helpers/courses_helper.rb                     | 2 ++
 app/models/course.rb                              | 4 ++++
 app/models/course_video.rb                        | 4 ++++
 app/models/video.rb                               | 1 +
 app/services/videos/batch_publish_service.rb      | 5 +++++
 app/views/courses/course_videos.json.jbuilder     | 2 ++
 config/routes.rb                                  | 1 +
 db/migrate/20200207094432_create_course_videos.rb | 9 +++++++++
 spec/models/course_video_spec.rb                  | 5 +++++
 10 files changed, 41 insertions(+)
 create mode 100644 app/models/course_video.rb
 create mode 100644 app/views/courses/course_videos.json.jbuilder
 create mode 100644 db/migrate/20200207094432_create_course_videos.rb
 create mode 100644 spec/models/course_video_spec.rb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index c946cd5c1..89b77fd3e 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1,6 +1,7 @@
 class CoursesController < ApplicationController
   include MessagesHelper
   include ExportHelper
+  include CustomSortable
 
   # model validation error
   rescue_from ActiveRecord::RecordInvalid do |ex|
@@ -100,6 +101,13 @@ class CoursesController < ApplicationController
     @courses = @courses.preload(:school, :none_hidden_course_modules, teacher: :user_extension)
   end
 
+  def course_videos
+    videos = @course.videos
+    videos = custom_sort(videos, params[:sort_by], params[:sort_direction])
+    @count  = videos.count
+    @videos = paginate videos
+  end
+
   def visits_plus_one
     new_visits = @course.visits + 1
     @course.update_visits(new_visits)
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index a28668c6b..769314815 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -65,6 +65,8 @@ module CoursesHelper
       "/courses/#{course.id}/course_groups"
     when "statistics"
       "/courses/#{course.id}/statistics"
+    when "video"
+      "/courses/#{course.id}/course_videos"
     end
   end
 
diff --git a/app/models/course.rb b/app/models/course.rb
index eb7ffd91f..0326842ef 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -81,6 +81,10 @@ class Course < ApplicationRecord
   # 老版的members弃用  现用course_members
   has_many :members
 
+  # 视频
+  has_many :course_videos, dependent: :destroy
+  has_many :videos, through: :course_videos
+
   validate :validate_sensitive_string
 
   scope :hidden,      ->(is_hidden = true) { where(is_hidden: is_hidden) }
diff --git a/app/models/course_video.rb b/app/models/course_video.rb
new file mode 100644
index 000000000..e61a439dc
--- /dev/null
+++ b/app/models/course_video.rb
@@ -0,0 +1,4 @@
+class CourseVideo < ApplicationRecord
+  belongs_to :course
+  belongs_to :video
+end
diff --git a/app/models/video.rb b/app/models/video.rb
index 9af87fe85..6f5f79ca6 100644
--- a/app/models/video.rb
+++ b/app/models/video.rb
@@ -4,6 +4,7 @@ class Video < ApplicationRecord
   belongs_to :user
 
   has_many :video_applies, dependent: :destroy
+  has_many :course_videos, dependent: :destroy
   has_one :processing_video_apply, -> { where(status: :pending) }, class_name: 'VideoApply'
 
   aasm(:status) do
diff --git a/app/services/videos/batch_publish_service.rb b/app/services/videos/batch_publish_service.rb
index e435b9508..fbd7e7c73 100644
--- a/app/services/videos/batch_publish_service.rb
+++ b/app/services/videos/batch_publish_service.rb
@@ -27,6 +27,11 @@ class Videos::BatchPublishService < ApplicationService
         video.video_applies.create!
 
         video_ids << video.id
+
+        # 如果是课堂上传则创建课堂记录
+        if params[:course_id].present?
+          video.course_videos.create!(course_id: params[:course_id])
+        end
       end
     end
 
diff --git a/app/views/courses/course_videos.json.jbuilder b/app/views/courses/course_videos.json.jbuilder
new file mode 100644
index 000000000..e88ea6e28
--- /dev/null
+++ b/app/views/courses/course_videos.json.jbuilder
@@ -0,0 +1,2 @@
+json.count @count
+json.videos @videos, partial: 'users/videos/video', as: :video
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index a4f8b80f6..2ed53511e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -515,6 +515,7 @@ Rails.application.routes.draw do
         get 'work_score'
         get 'act_score'
         get 'statistics'
+        get 'course_videos'
         post :inform_up
         post :inform_down
         get :calculate_all_shixun_scores
diff --git a/db/migrate/20200207094432_create_course_videos.rb b/db/migrate/20200207094432_create_course_videos.rb
new file mode 100644
index 000000000..f6628762c
--- /dev/null
+++ b/db/migrate/20200207094432_create_course_videos.rb
@@ -0,0 +1,9 @@
+class CreateCourseVideos < ActiveRecord::Migration[5.2]
+  def change
+    create_table :course_videos do |t|
+      t.references :course
+      t.references :video
+      t.timestamps
+    end
+  end
+end
diff --git a/spec/models/course_video_spec.rb b/spec/models/course_video_spec.rb
new file mode 100644
index 000000000..ea9553e23
--- /dev/null
+++ b/spec/models/course_video_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CourseVideo, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 360b2a88a3c49184a320c0801f0039f1df6f9a7e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 7 Feb 2020 18:20:17 +0800
Subject: [PATCH 33/34] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 89b77fd3e..d819b1039 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -24,7 +24,7 @@ class CoursesController < ApplicationController
                                      :course_group_list, :set_course_group, :change_course_admin, :change_course_teacher,
                                      :delete_course_teacher, :teacher_application_review, :students, :all_course_groups,
                                      :transfer_to_course_group, :delete_from_course, :search_users, :add_students_by_search,
-                                     :base_info, :get_historical_courses, :create_group_by_importing_file,
+                                     :base_info, :get_historical_courses, :create_group_by_importing_file, :course_videos,
                                      :attahcment_category_list,:export_member_scores_excel, :duplicate_course,
                                      :switch_to_teacher, :switch_to_assistant, :switch_to_student, :exit_course,
                                      :informs, :update_informs, :online_learning, :update_task_position, :tasks_list,
@@ -102,6 +102,7 @@ class CoursesController < ApplicationController
   end
 
   def course_videos
+    logger.info("########[#{@course}")
     videos = @course.videos
     videos = custom_sort(videos, params[:sort_by], params[:sort_direction])
     @count  = videos.count

From 76ad7098a034328186735ee91515a29dd199d7ca Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 7 Feb 2020 18:38:08 +0800
Subject: [PATCH 34/34] =?UTF-8?q?=E6=92=AD=E6=94=BEurl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/videos/_video.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/videos/_video.json.jbuilder b/app/views/users/videos/_video.json.jbuilder
index 749532e7d..e28363a34 100644
--- a/app/views/users/videos/_video.json.jbuilder
+++ b/app/views/users/videos/_video.json.jbuilder
@@ -1,4 +1,4 @@
-json.extract! video, :id, :title, :cover_url, :file_url, :vv
+json.extract! video, :id, :title, :cover_url, :file_url, :play_url, :vv
 
 json.play_duration video.video_play_duration
 json.published_at video.display_published_at