Commit 6e1da601 authored by 杨培's avatar 杨培

读取视频信息部分优化,其它获取各种上传 Token 统一

parent 09e1f72d
...@@ -32,7 +32,6 @@ class MyCourseController extends \yii\web\Controller ...@@ -32,7 +32,6 @@ class MyCourseController extends \yii\web\Controller
return [ return [
'access' => [ 'access' => [
'class' => AccessControl::className(), 'class' => AccessControl::className(),
//'only' => ['index', 'publish', 'submit'],
'rules' => [ 'rules' => [
[ [
'allow' => true, 'allow' => true,
...@@ -68,18 +67,11 @@ class MyCourseController extends \yii\web\Controller ...@@ -68,18 +67,11 @@ class MyCourseController extends \yii\web\Controller
*/ */
public function actionPublish() public function actionPublish()
{ {
/* @var \common\components\Qiniu $qiniu */
$qiniu = Yii::$app->qiniu;
//图片上传Token //图片上传Token
//$imgName = 'preview/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20); $thumbToken = $this->getUploadToken('preview');
$imgPath = 'preview/' . $qiniu->generateRandomFilePath('$(min)$(sec)$(ext)', 12);
$thumbToken = $qiniu->getUploadToken('public', $imgPath);
//视频上传Token //视频上传Token
//$videoName = 'source/'.$qiniu->genRandomDir().'/'.Yii::$app->security->generateRandomString(20); $videoToken = $this->getUploadToken('video');
$videoName = 'source/' . $qiniu->generateRandomFilePath('$(ext)');
$videoToken = $qiniu->getUploadToken('video', $videoName, 86400);
return $this->render('publish', compact('thumbToken', 'videoToken')); return $this->render('publish', compact('thumbToken', 'videoToken'));
} }
...@@ -102,14 +94,42 @@ class MyCourseController extends \yii\web\Controller ...@@ -102,14 +94,42 @@ class MyCourseController extends \yii\web\Controller
$lesson = Courseware::findOne(['course_id'=>$course->id]); $lesson = Courseware::findOne(['course_id'=>$course->id]);
$teacherIds = CourseTeacher::getTeachersIdsByCourseId($course->id); $teacherIds = CourseTeacher::getTeachersIdsByCourseId($course->id);
//图片上传Token
$thumbToken = $this->getUploadToken('preview');
//视频上传Token
$videoToken = $this->getUploadToken('video');
return $this->render('edit', compact('course', 'lesson', 'teacherIds', 'thumbToken', 'videoToken'));
}
/**
* 获取相关文件的上传Token
*
* @param string $type video or preview
* @return string
*/
private function getUploadToken($type)
{
/* @var \common\components\Qiniu $qiniu */ /* @var \common\components\Qiniu $qiniu */
$qiniu = Yii::$app->qiniu; $qiniu = Yii::$app->qiniu;
//图片上传Token switch ($type) {
$imgPath = 'preview/' . $qiniu->generateRandomFilePath('$(min)$(sec)$(ext)', 12); case 'video':
$thumbToken = $qiniu->getUploadToken('public', $imgPath); //视频上传Token
$videoName = 'source/' . $qiniu->generateRandomFilePath('$(min)$(sec)$(ext)');
$token = $qiniu->getUploadToken('video', $videoName, 43200);
break;
case 'preview':
//图片上传Token
$imgPath = 'preview/' . $qiniu->generateRandomFilePath('$(min)$(sec)$(ext)', 16);
$token = $qiniu->getUploadToken('public', $imgPath);
break;
default:
return '';
}
return $this->render('edit', compact('course', 'lesson', 'teacherIds', 'thumbToken')); return $token;
} }
/** /**
...@@ -292,11 +312,6 @@ class MyCourseController extends \yii\web\Controller ...@@ -292,11 +312,6 @@ class MyCourseController extends \yii\web\Controller
//暂存到本地 //暂存到本地
$model = new AttachUpload(); $model = new AttachUpload();
//if (!Yii::$app->request->isPost) {
// return ['success'=>false, 'msg'=>'请求方式错误'];
//}
$model->file = UploadedFile::getInstance($model, 'file'); $model->file = UploadedFile::getInstance($model, 'file');
$model->tmp = Yii::$app->request->post('tmp'); $model->tmp = Yii::$app->request->post('tmp');
$result = $model->uploadStorage(); $result = $model->uploadStorage();
......
...@@ -10,6 +10,7 @@ namespace frontend\models; ...@@ -10,6 +10,7 @@ namespace frontend\models;
use common\libs\Utils; use common\libs\Utils;
use common\models\Teacher; use common\models\Teacher;
use common\models\UploadPools; use common\models\UploadPools;
use Qiniu\Http\Client;
use Qiniu\Storage\BucketManager; use Qiniu\Storage\BucketManager;
use yii\base\Model; use yii\base\Model;
...@@ -177,16 +178,19 @@ class CoursePublishForm extends Model ...@@ -177,16 +178,19 @@ class CoursePublishForm extends Model
//读取视频信息 //读取视频信息
$avUrl = $auth->privateDownloadUrl($poolFile['url'].'?avinfo'); $avUrl = $auth->privateDownloadUrl($poolFile['url'].'?avinfo');
$response = (new \GuzzleHttp\Client())->get($avUrl); $response = Client::get($avUrl);
$avInfo = $response->json();
$avInfo = $response->getBody();
if (!$avInfo) {
if ($avInfo) {
$return['av'] = \GuzzleHttp\json_decode($avInfo, true);
} else {
Utils::ajaxResponse(false, '读取视频信息失败'); Utils::ajaxResponse(false, '读取视频信息失败');
} }
if (isset($avInfo['error'])) {
Utils::ajaxResponse(false, '读取视频信息失败:'.$avInfo['error']);
}
$return['av'] = $avInfo;
return $return; return $return;
} }
......
...@@ -13,6 +13,16 @@ $this->title = '编辑课程信息'; ...@@ -13,6 +13,16 @@ $this->title = '编辑课程信息';
AppAsset::addScript($this, '@web/assets/course_edit.js'); AppAsset::addScript($this, '@web/assets/course_edit.js');
AppAsset::addCss($this, '@web/assets/css/course_publish.css'); AppAsset::addCss($this, '@web/assets/css/course_publish.css');
?> ?>
<?php if ($course->status == \common\models\Course::STATUS_FAILED) { ?>
<div class="alert alert-warning">
<p><i class="glyphicon glyphicon-ban-circle"></i> <b>经过审核,该课堂因为以下原因未通过审核,请根据原因进行修改。不明白之处可联系我们。</b></p>
<p>讲师您好,感谢您的参与!您的课堂因“<?=$course->reason?>“未能通过审核,请修改后重新提交。</p>
<p>烦请确认修改后再提交审核,勿重复操作,谢谢!</p>
<p>如有审核疑问,请联系 企业QQ 800008782,写明具体课堂及疑问。</p>
<p>办公时间:工作日9:30-18:00</p>
</div>
<?php } ?>
<div class="send-class" id="publishMain"> <div class="send-class" id="publishMain">
<div class="tit">编辑课程信息</div> <div class="tit">编辑课程信息</div>
...@@ -27,11 +37,6 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css'); ...@@ -27,11 +37,6 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
<teachers init-teachers="<?=join(',', $teacherIds)?>"></teachers> <teachers init-teachers="<?=join(',', $teacherIds)?>"></teachers>
</div> </div>
<div class="cls-part">
<div class="tit">更换视频<span class="required">*</span></div>
<video-upload uptoken="<?=$videoToken?>"></video-upload>
</div>
<div class="cls-part"> <div class="cls-part">
<div class="tit">规则设定</div> <div class="tit">规则设定</div>
<div class="clearfix"> <div class="clearfix">
......
...@@ -13,17 +13,6 @@ $this->title = '发布课程'; ...@@ -13,17 +13,6 @@ $this->title = '发布课程';
AppAsset::addScript($this, '@web/assets/course_publish.js'); AppAsset::addScript($this, '@web/assets/course_publish.js');
AppAsset::addCss($this, '@web/assets/css/course_publish.css'); AppAsset::addCss($this, '@web/assets/css/course_publish.css');
?> ?>
<!-- 课程审核未通过提示信息
<div class="alert alert-warning">
<p><i class="glyphicon glyphicon-ban-circle"></i> <b>经过审核,该课堂因为以下原因未通过审核,请根据原因进行修改。不明白之处可联系我们。</b></p>
<p>讲师您好,感谢您的参与!您的课堂因“……“未能通过审核,请修改后重新提交。</p>
<p>烦请确认修改后再提交审核,勿重复操作,谢谢!</p>
<p>如有审核疑问,请联系 企业QQ 800008782,写明具体课堂及疑问。</p>
<p>办公时间:工作日9:30-18:00</p>
</div>
-->
<div class="send-class" id="publishMain"> <div class="send-class" id="publishMain">
<div class="tit">发布课程</div> <div class="tit">发布课程</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment