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

app/libs/aliyun_vod/service/video_manage.rb

@@ -45,9 +45,9 @@ module AliyunVod::Service::VideoManage
       VideoId: video_id,
       StartTime: start_time,
       EndTime: end_time,
-      Interval: 'day'
     }.merge(base_params)
 
+    puts params
     result = request(:post, params)
 
     result

db/migrate/20200206110845_add_play_url_to_videos.rb

@@ -0,0 +1,5 @@
+class AddPlayUrlToVideos < ActiveRecord::Migration[5.2]
+  def change
+    add_column :videos, :play_url, :string
+  end
+end

lib/tasks/get_video_data.rake

@@ -33,8 +33,8 @@ namespace :video do
   task :sample => :environment do
     if ENV['args']
       video_id = ENV['args'].split(",")[0]
-      start_time = ENV['args'].split(",")[1].to_s.to_time.utc.strftime('%Y-%m-%dT%H:%M:%SZ') # 表示参与人数
+      start_time = ENV['args'].split(",")[1].to_s.to_time.utc.iso8601 # 表示开始时间
-      end_time = ENV['args'].split(",")[2].to_s.to_time.utc.strftime('%Y-%m-%dT%H:%M:%SZ') # 表示通过人数
+      end_time = ENV['args'].split(",")[2].to_s.to_time.utc.iso8601 # 表示结束时间
 
       video=Video.find video_id
       data = AliyunVod::Service.video_data(video.uuid, start_time, end_time)
@@ -42,4 +42,21 @@ namespace :video do
       puts data
     end
   end
+
+  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
+        play_url = result["PlayInfoList"]["PlayInfo"].first["PlayURL"]
+        puts play_url
+        # play_url  = (result.dig('PlayInfoList', 'PlayInfo') || []).first&.[]('PlayURL')
+
+        video.update!(play_url: play_url) if play_url.present?
+      end
+    end
+  end
 end

public/react/src/common/UrlTool.js

@@ -100,6 +100,10 @@ export function Railsgettimes() {
 	railsgettimess(`${getUrl()}/api/main/first_stamp.json`);
 	// railsgettimess(`https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp`);
 }
+export function getmyUrl(geturl) {
+
+	return `${getUrl()}${geturl}`;
+}
 
 export function getUploadActionUrl(path, goTest) {
 	Railsgettimes()

public/react/src/common/educoder.js

@@ -2,7 +2,7 @@
 
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
-export { getImageUrl as getImageUrl, getRandomNumber as getRandomNumber,getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
+export { getImageUrl as getImageUrl,getmyUrl as getmyUrl, getRandomNumber as getRandomNumber,getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
 	, getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
 	, getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode ,getupload_git_file as getupload_git_file} from                './UrlTool';
 

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

@@ -1,21 +1,28 @@
 import React,{ Component } from "react";
-import { WordsBtn } from 'educoder';
+import { WordsBtn,ActionBtn,getmyUrl } from 'educoder';
-import {Tooltip,message} from 'antd';
+import {Tooltip,message,Input, Button} 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=()=>{
@@ -28,6 +35,9 @@ class Fileslistitem extends Component{
 	}
 
 	showfiles=(list)=>{
+		// console.log("showfiles");
+		// console.log(list);
+
 		if(this.props.checkIfLogin()===false){
 			this.props.showLoginDialog()
 			return
@@ -46,7 +56,20 @@ 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,
+					})
+					return
+				}else{
+					window.open(list.url, '_blank');
+				}
+
+			}else{
 				window.open(list.url, '_blank');
+			}
 		}else{
 			let {discussMessage,coursesId}=this.props
 			let file_id=discussMessage.id
@@ -65,7 +88,22 @@ 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,
+							})
+							return
+						}else{
 							window.open(list.url, '_blank');
+						}
+
+					}else{
+						window.open(list.url, '_blank');
+					}
+
+
 				}else{
 					this.setState({
 						Showoldfiles:true,
@@ -87,6 +125,16 @@ class Fileslistitem extends Component{
 		})
 	}
 
+	Clicktobroadcastthevideo=(bool,url)=>{
+		this.setState({
+			videoModalObj:bool,
+			file_url:"https://"+document.domain+url,
+		})
+	}
+
+
+
+
 	onDelete = (id) => {
 
 		this.setState({
@@ -111,6 +159,17 @@ class Fileslistitem extends Component{
 
 	}
 
+	copyurls =()=>{
+		//复制网络链接
+		setTimeout(() => {
+			if (!_clipboard) {
+				_clipboard = new ClipboardJS('.copybtn');
+				_clipboard.on('success', (e) => {
+					this.props.showNotification("复制成功");
+				});
+			}
+		}, 200)
+	}
 	savedelete=(id)=>{
 
 		this.setState({
@@ -152,13 +211,40 @@ 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
+								autoplay="true"
+								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>
+						</HeadlessModal>
+
+						:""
+				}
 
 				{/*提示*/}
 				{this.state.Modalstype&&this.state.Modalstype===true?<Modals
@@ -173,6 +259,7 @@ class Fileslistitem extends Component{
 					{...this.props}
 					visible={this.state.Showoldfiles}
 					allfiles={this.state.allfiles}
+					Clicktobroadcastthevideo={(bool,urls)=>this.Clicktobroadcastthevideo(bool,urls)}
 					closaoldfilesprops={this.closaoldfilesprops}
 				/>
 				<style>{`
@@ -366,3 +453,4 @@ class Fileslistitem extends Component{
 	}
 }
 export default Fileslistitem;
+

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,6 @@ import _ from 'lodash'
 import './style.css';
 import '../css/members.css';
 import moment from 'moment';
-
 class Fileslists extends Component{
   constructor(props){
     super(props);

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

@@ -45,6 +45,10 @@ class Showoldfiles extends Component{
 	showfiless=(url)=>{
 		this.props.ShowOnlinePdf(url)
 	}
+
+	isaboxonClick=(item)=>{
+		this.props.Clicktobroadcastthevideo(true,item.url+'&file_name='+item.title);
+	}
 	render(){
 		let {visible,allfiles}=this.props;
 
@@ -68,6 +72,9 @@ class Showoldfiles extends Component{
 						width="600px"
 						destroyOnClose={true}
 						keyboard={false}
+						style={{
+							marginTop: '30px',
+						}}
 					>
 						<a id='closeIcon' onClick={this.cloasshanchudiao}><i className='iconfont icon-shanchudiao'></i></a>
 						<style>
@@ -178,11 +185,13 @@ class Showoldfiles extends Component{
 												<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" id={allfiles.id}>
 
 													<li className="fl fontlefts">
+
+														{
+															allfiles&&allfiles.content_type&&allfiles.content_type==="video/mp4"?
+																<a  className={"isabox"} target="_blank"  onClick={()=>this.isaboxonClick(allfiles)}>{allfiles.title}</a>
+																:
 																<a className={"isabox"} href={allfiles.url} target="_blank" >{allfiles.title}</a>
-														{/*{allfiles.is_pdf===false?*/}
+														}
-														{/*<a className={"isabox"} href={allfiles.url} >{allfiles.title}</a>:*/}
-															{/*<a className={"isabox"} onClick={()=>this.showfiless(allfiles.url)} >{allfiles.title}</a>*/}
-														{/*}*/}
 														<span className={"newcolor-orange fl"}>当前版本</span>
 													</li>
 
@@ -198,7 +207,13 @@ class Showoldfiles extends Component{
 																<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" id={item.id} key={key}>
 
 																	<li className="fl fontlefts">
+																		{
+																			item&&item.content_type&&item.content_type==="video/mp4"?
+																				<a  className={"isabox"} target="_blank"  onClick={()=>this.isaboxonClick(item)}>{item.title}</a>
+																				:
 																				<a  className={"isabox"} href={item.url} target="_blank" >{item.title}</a>
+																		}
+
 																		{/*{item.is_pdf===false?*/}
 																			{/*<a  className={"isabox"} href={item.url}>{item.title}</a>:*/}
 																			{/*<a className={"isabox"} onClick={()=>this.showfiless(item.url)} >{item.title}</a>*/}

public/react/src/modules/developer/components/myMonacoEditor/index.scss

@@ -88,3 +88,9 @@
     color: #fff;
   }
 }
+
+.monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input,
+.monaco-editor .margin,
+.minimap .minimap-decorations-layer{
+  background-color: transparent !important;
+}