Commit 339e7a1e authored by 汪波's avatar 汪波

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ui/html/index-play.html
parents 02b6d1c7 7364a947
...@@ -17,7 +17,7 @@ return [ ...@@ -17,7 +17,7 @@ return [
'csrfParam' => '_csrf-backend', 'csrfParam' => '_csrf-backend',
], ],
'user' => [ 'user' => [
'identityClass' => 'common\models\User', 'identityClass' => 'backend\models\User',
'enableAutoLogin' => true, 'enableAutoLogin' => true,
'identityCookie' => ['name' => '_identity-backend', 'httpOnly' => true], 'identityCookie' => ['name' => '_identity-backend', 'httpOnly' => true],
], ],
......
...@@ -13,6 +13,7 @@ use common\libs\Utils; ...@@ -13,6 +13,7 @@ use common\libs\Utils;
use common\models\Classes; use common\models\Classes;
use common\models\User; use common\models\User;
use Yii; use Yii;
use yii\filters\AccessControl;
use yii\web\Controller; use yii\web\Controller;
class ClassesController extends Controller class ClassesController extends Controller
...@@ -20,6 +21,24 @@ class ClassesController extends Controller ...@@ -20,6 +21,24 @@ class ClassesController extends Controller
public $layout = 'back'; public $layout = 'back';
/**
* @inheritdoc
*/
public function behaviors()
{
return [
'access' => [
'class' => AccessControl::className(),
'rules' => [
[
'allow' => true,
'roles' => ['@'],
]
]
]
];
}
public function actionIndex() public function actionIndex()
{ {
$status = Yii::$app->request->get('status', Classes::STATUS_OK); $status = Yii::$app->request->get('status', Classes::STATUS_OK);
......
...@@ -17,6 +17,7 @@ use common\models\TranscodeQueue; ...@@ -17,6 +17,7 @@ use common\models\TranscodeQueue;
use common\models\User; use common\models\User;
use Yii; use Yii;
use yii\base\ExitException; use yii\base\ExitException;
use yii\filters\AccessControl;
use yii\web\Controller; use yii\web\Controller;
use yii\web\NotFoundHttpException; use yii\web\NotFoundHttpException;
...@@ -25,6 +26,24 @@ class CourseController extends Controller ...@@ -25,6 +26,24 @@ class CourseController extends Controller
public $layout = 'back'; public $layout = 'back';
/**
* @inheritdoc
*/
public function behaviors()
{
return [
'access' => [
'class' => AccessControl::className(),
'rules' => [
[
'allow' => true,
'roles' => ['@'],
]
]
]
];
}
public function actionIndex() public function actionIndex()
{ {
$status = Yii::$app->request->get('status', Course::STATUS_OK); $status = Yii::$app->request->get('status', Course::STATUS_OK);
...@@ -53,8 +72,13 @@ class CourseController extends Controller ...@@ -53,8 +72,13 @@ class CourseController extends Controller
$courseware = Courseware::findOne(['course_id'=>$course->id]); $courseware = Courseware::findOne(['course_id'=>$course->id]);
$class = Classes::findOne(['id'=>$course->class_id]); $class = Classes::findOne(['id'=>$course->class_id]);
/* @var $qiniu \common\components\Qiniu */
$qiniu = \Yii::$app->qiniu;
$previewUrl = $qiniu->getUrl('public', $course->preview_pic);
$sourceUrl = $qiniu->getUrl('video', $courseware->name);
return $this->render('detail', compact('course', 'courseware', 'class')); return $this->render('detail', compact('course', 'courseware', 'class', 'previewUrl', 'sourceUrl'));
} }
/** /**
......
<?php <?php
namespace backend\controllers; namespace backend\controllers;
use backend\models\LoginForm;
use backend\models\User;
use common\libs\Utils;
use Yii; use Yii;
use yii\web\Controller; use yii\web\Controller;
use yii\filters\AccessControl; use yii\filters\AccessControl;
use common\models\LoginForm;
/** /**
* Site controller * Site controller
*/ */
class SiteController extends Controller class SiteController extends Controller
{ {
public $layout = 'lte';
/** /**
* @inheritdoc * @inheritdoc
*/ */
...@@ -53,7 +58,7 @@ class SiteController extends Controller ...@@ -53,7 +58,7 @@ class SiteController extends Controller
*/ */
public function actionIndex() public function actionIndex()
{ {
return $this->render('index'); return $this->redirect(['course/index']);
} }
/** /**
...@@ -63,6 +68,15 @@ class SiteController extends Controller ...@@ -63,6 +68,15 @@ class SiteController extends Controller
*/ */
public function actionLogin() public function actionLogin()
{ {
//$user = new User();
//$user->username = 'admin';
//$user->password_hash = \Yii::$app->security->generatePasswordHash('111111');
//$user->ip = Utils::getRealIP();
//$user->logged_at = time();
//$user->save();
//
//print_r($user->errors);
if (!Yii::$app->user->isGuest) { if (!Yii::$app->user->isGuest) {
return $this->goHome(); return $this->goHome();
} }
...@@ -85,7 +99,6 @@ class SiteController extends Controller ...@@ -85,7 +99,6 @@ class SiteController extends Controller
public function actionLogout() public function actionLogout()
{ {
Yii::$app->user->logout(); Yii::$app->user->logout();
return $this->goHome(); return $this->goHome();
} }
} }
<?php
namespace backend\models;
use common\libs\Utils;
use Yii;
use yii\base\Model;
/**
* Login form
*/
class LoginForm extends Model
{
const MAX_LOGIN_NUM = 5;
const LOGIN_CYCLE = 900; //second
const REDIS_KEY_PREFIX = 'yy_adminlogin_ip';
public $username;
public $password;
public $rememberMe = true;
private $_user;
public function formName()
{
return '';
}
/**
* @inheritdoc
*/
public function rules()
{
return [
// username and password are both required
[['username', 'password'], 'required'],
// password is validated by validatePassword()
['password', 'validatePassword'],
['username', 'string']
];
}
/**
* @return array
*/
public function attributeLabels()
{
return [
'username' => '用户名',
'password' => '密码',
];
}
/**
* Validates the password.
* This method serves as the inline validation for password.
*
* @param string $attribute the attribute currently being validated
* @param array $params the additional name-value pairs given in the rule
*/
public function validatePassword($attribute, $params)
{
$redis = Yii::$app->redis;
$key = self::REDIS_KEY_PREFIX . '::' . Utils::getRealIP();
$value = $redis->get($key);
if ($value === NULL) {
$redis->setex($key, self::LOGIN_CYCLE, self::MAX_LOGIN_NUM);
} else {
if ($value <= 0) {
$this->addError('password', '登陆已经被限制了.');
}
}
if (!$this->hasErrors()) {
$user = $this->getUser();
if (!$user || !$user->validatePassword($this->password)) {
if ($value !== NULL) {
$redis->decr($key);
}
$this->addError($attribute, '用户名或者密码错误');
}
}
}
/**
* Logs in a user using the provided username and password.
*
* @return boolean whether the user is logged in successfully
*/
public function login()
{
if ($this->validate()) {
return Yii::$app->user->login($this->getUser(), 86400*7);
} else {
return false;
}
}
/**
* Finds user by [[username]]
*
* @return User
*/
protected function getUser()
{
if ($this->_user === NULL) {
$this->_user = User::findOne(['username'=>$this->username]);
}
return $this->_user;
}
}
<?php
namespace backend\models;
use yii\behaviors\TimestampBehavior;
use yii\db\ActiveRecord;
/**
* 后台管理用户类
*
* @property integer $id
* @property string $username
* @property string $auth_key
* @property string $password_hash
* @property integer $status
* @property string $ip
* @property string $created_at
* @property string $updated_at
* @property string $logged_at
*/
class User extends ActiveRecord implements \yii\web\IdentityInterface
{
public static function tableName()
{
return '{{%admin_users}}';
}
/**
* @inheritdoc
*/
public function behaviors()
{
return [
[
'class' => TimestampBehavior::className(),
'attributes' => [
ActiveRecord::EVENT_BEFORE_INSERT => ['created_at', 'updated_at'],
ActiveRecord::EVENT_BEFORE_UPDATE => ['updated_at'],
]
]
];
}
public function rules()
{
return [
[['username', 'password_hash', 'ip', 'logged_at'], 'required'],
[['id', 'status'], 'integer'],
[['created_at', 'updated_at', 'logged_at'], 'safe'],
[['username', 'auth_key', 'ip'], 'string', 'max' => 32],
[['password_hash'], 'string', 'max' => 255],
['status', 'default', 'value' => 1]
];
}
public function getId()
{
return $this->id;
}
public function getAuthKey()
{
return $this->auth_key;
}
public function validateAuthKey($authKey)
{
return $this->getAuthKey() == $authKey;
}
/**
* Validates password
*
* @param string $password password to validate
* @return boolean if password provided is valid for current user
*/
public function validatePassword($password)
{
return \Yii::$app->security->validatePassword($password, $this->password_hash);
}
public function beforeSave($insert)
{
if (parent::beforeSave($insert)) {
if ($this->isNewRecord) {
$this->auth_key = \Yii::$app->security->generateRandomString();
}
return true;
}
return false;
}
public static function findIdentity($id)
{
return self::findOne(['id'=>$id]);
}
public static function findIdentityByAccessToken($token, $type = null)
{
throw new \yii\base\NotSupportedException('"findIdentityByAccessToken" is not implemented.');
}
}
\ No newline at end of file
<?php
/**
* @var $course \common\models\Course
*/
use yii\helpers\Html;
$this->title = $course->name;
?>
<p><?=$class->name?></p>
<div><img src="<?=$previewUrl?>-m.preview"></div>
<div><?=$course->intro?></div>
<p>[<a href="<?=$sourceUrl?>" target="_blank">下载源视频</a>]</p>
\ No newline at end of file
This diff is collapsed.
...@@ -24,12 +24,8 @@ AppAsset::register($this); ...@@ -24,12 +24,8 @@ AppAsset::register($this);
<script src="http://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script> <script src="http://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body class="hold-transition skin-blue sidebar-mini">
<div class="wrapper">
<?php $this->beginBody() ?> <?php $this->beginBody() ?>
<?=$content?> <?=$content?>
<?php $this->endBody() ?> <?php $this->endBody() ?>
</div>
</body>
</html> </html>
<?php $this->endPage() ?> <?php $this->endPage() ?>
\ No newline at end of file
<?php <?php
/**
/* @var $this yii\web\View */ * @var $this yii\web\View
/* @var $form yii\bootstrap\ActiveForm */ * @var $form yii\bootstrap\ActiveForm
/* @var $model \common\models\LoginForm */ * @var $model \backend\models\LoginForm
*/
use yii\helpers\Html; use yii\helpers\Html;
use yii\bootstrap\ActiveForm; use yii\bootstrap\ActiveForm;
$this->title = 'Login'; $this->title = 'Login';
$this->params['breadcrumbs'][] = $this->title; //$this->params['breadcrumbs'][] = $this->title;
?>
<div class="site-login">
<h1><?= Html::encode($this->title) ?></h1>
<p>Please fill out the following fields to login:</p>
<div class="row">
<div class="col-lg-5">
<?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
<?= $form->field($model, 'username')->textInput(['autofocus' => true]) ?> $usernameError = $model->getFirstError('username');
$passwordError = $model->getFirstError('password');
<?= $form->field($model, 'password')->passwordInput() ?> ?>
<?= $form->field($model, 'rememberMe')->checkbox() ?>
<div class="form-group"> <body class="hold-transition login-page">
<?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?> <div class="login-box">
<div class="login-logo"><b>Admin</b>YunYa</div>
<!-- /.login-logo -->
<div class="login-box-body">
<p class="login-box-msg">Sign in to start your session</p>
<?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
<div class="form-group<?php if ($usernameError) { ?> has-error<?php } ?>">
<?php if ($usernameError) { ?>
<label class="control-label" for="inputError">
<i class="fa fa-times-circle-o"></i> <?=$usernameError?>
</label>
<?php } ?>
<input type="text" name="username" class="form-control" placeholder="Username" value="<?=$model->username?>">
<span class="glyphicon glyphicon-user form-control-feedback"></span>
</div>
<div class="form-group<?php if ($passwordError) { ?> has-error<?php } ?>">
<?php if ($passwordError) { ?>
<label class="control-label" for="inputError">
<i class="fa fa-times-circle-o"></i> <?=$passwordError?>
</label>
<?php } ?>
<input type="password" name="password" class="form-control" placeholder="Password" value="<?=$model->password?>">
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
<div class="row">
<div class="col-xs-8"></div>
<div class="col-xs-4">
<?= Html::submitButton('Sign In', ['class' => 'btn btn-primary btn-block btn-flat', 'name' => 'login-button']) ?>
</div> </div>
</div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div>
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -136,7 +136,7 @@ class Qiniu extends Object ...@@ -136,7 +136,7 @@ class Qiniu extends Object
$callbackUrl = YII_ENV == 'dev' $callbackUrl = YII_ENV == 'dev'
? 'http://t.pp.cc/tmp/qiniu_callback.php' ? 'http://t.pp.cc/tmp/qiniu_callback.php'
: Url::to(['qiniu-callback/rem-upload'], true); : \Yii::$app->params['baseUrl'].Url::to(['qiniu-callback/rem-upload']);
$policy = [ $policy = [
'returnBody' => '{"key":$(key)}', 'returnBody' => '{"key":$(key)}',
......
...@@ -53,20 +53,14 @@ class QiniuTranscode ...@@ -53,20 +53,14 @@ class QiniuTranscode
$fops = self::transcodeFops($avInfo); $fops = self::transcodeFops($avInfo);
$bucket = $qiniu->getStorageConfig('video', 'bucket'); $bucket = $qiniu->getStorageConfig('video', 'bucket');
$target = $bucket.':'.$targetKey; //存储位置
//存储位置
$target = $bucket.':'.$targetKey;
$notifyUrl = YII_ENV == 'dev'
? 'http://t.pp.cc/tmp/qiniu_callback.php'
: Url::to(['qiniu-callback/transcode'], true);;
/* @var $err null|\Qiniu\Http\Error */ /* @var $err null|\Qiniu\Http\Error */
if ($fops) { if ($fops) {
$fops .= '|saveas/'.\Qiniu\base64_urlSafeEncode($target); $fops .= '|saveas/'.\Qiniu\base64_urlSafeEncode($target);
//发送处理请求 //发送处理请求
$persistent = new PersistentFop($auth, $bucket, null, $notifyUrl); $persistent = new PersistentFop($auth, $bucket, null, self::getNotifyUrl());
list($presistendId, $err) = $persistent->execute($sourceKey, $fops); list($presistendId, $err) = $persistent->execute($sourceKey, $fops);
if ($err) { if ($err) {
...@@ -124,17 +118,11 @@ class QiniuTranscode ...@@ -124,17 +118,11 @@ class QiniuTranscode
//存储位置 //存储位置
$target = $bucket.':'.$targetKey; $target = $bucket.':'.$targetKey;
$fops = $fops.'/ss/0/t/'.($freeTime*60).'|saveas/'.\Qiniu\base64_urlSafeEncode($target); $fops = $fops.'/ss/0/t/'.($freeTime*60).'|saveas/'.\Qiniu\base64_urlSafeEncode($target);
$notifyUrl = YII_ENV == 'dev'
? 'http://t.pp.cc/tmp/qiniu_callback.php'
: Url::to(['qiniu-callback/transcode'], true);;
//发送处理请求 //发送处理请求
/* @var $err null|\Qiniu\Http\Error */ /* @var $err null|\Qiniu\Http\Error */
$persistent = new PersistentFop($auth, $bucket, null, $notifyUrl); $persistent = new PersistentFop($auth, $bucket, null, self::getNotifyUrl());
list($presistendId, $err) = $persistent->execute($standKey, $fops); list($presistendId, $err) = $persistent->execute($standKey, $fops);
if ($err) { if ($err) {
...@@ -176,10 +164,8 @@ class QiniuTranscode ...@@ -176,10 +164,8 @@ class QiniuTranscode
$fopsAddon .= '/ar/'.$target['ar']; $fopsAddon .= '/ar/'.$target['ar'];
} }
//视频采样率对比 //视频采样率对比,七牛文档指出如果给出的码率大于原码率,则会使用原码率转换,但某些视频仍然会出现码率变大,所以此处加上判断
//if ($video['bit_rate'] > $target['vb']) { $fopsAddon .= '/vb/'.($video['bit_rate'] > $target['vb'] ? $target['vb'] : $video['bit_rate']);
$fopsAddon .= '/vb/'.$target['vb'];
//}
//编码对比 //编码对比
if ($video['codec_name'] != 'h264') { if ($video['codec_name'] != 'h264') {
...@@ -213,5 +199,12 @@ class QiniuTranscode ...@@ -213,5 +199,12 @@ class QiniuTranscode
return $fops; return $fops;
} }
protected static function getNotifyUrl()
{
return YII_ENV == 'dev'
? 'http://t.pp.cc/tmp/qiniu_callback.php'
: \Yii::$app->params['baseUrl'].Url::to(['qiniu-callback/transcode']);
}
} }
\ No newline at end of file
...@@ -186,7 +186,7 @@ class User extends ActiveRecord implements IdentityInterface ...@@ -186,7 +186,7 @@ class User extends ActiveRecord implements IdentityInterface
public static function getAvatarUrl($avatar, $size = 'm') public static function getAvatarUrl($avatar, $size = 'm')
{ {
if (!$avatar) { if (!$avatar) {
return \frontend\assets\AppAsset::getStaticUrl('img/avatarMax.png'); return \Yii::$app->params['baseUrl'].\frontend\assets\AppAsset::getStaticUrl('img/avatarMax.png');
} }
$url = Yii::$app->qiniu->getUrl('public', $avatar); $url = Yii::$app->qiniu->getUrl('public', $avatar);
......
...@@ -36,5 +36,6 @@ return [ ...@@ -36,5 +36,6 @@ return [
'mchid' => '1399794002', 'mchid' => '1399794002',
'key' => '8934e7d15453e97507ef794cf7b0519d', 'key' => '8934e7d15453e97507ef794cf7b0519d',
'appsecret' => '7c18222c6ec31efa65d21606a629585d', 'appsecret' => '7c18222c6ec31efa65d21606a629585d',
] ],
'baseUrl' => 'http://dev.zuiketang.com'
]; ];
...@@ -36,5 +36,6 @@ return [ ...@@ -36,5 +36,6 @@ return [
'mchid' => '1399794002', 'mchid' => '1399794002',
'key' => '8934e7d15453e97507ef794cf7b0519d', 'key' => '8934e7d15453e97507ef794cf7b0519d',
'appsecret' => '7c18222c6ec31efa65d21606a629585d', 'appsecret' => '7c18222c6ec31efa65d21606a629585d',
] ],
'baseUrl' => 'http://c.pp.cc'
]; ];
...@@ -21,6 +21,7 @@ use yii\filters\AccessControl; ...@@ -21,6 +21,7 @@ use yii\filters\AccessControl;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\ForbiddenHttpException; use yii\web\ForbiddenHttpException;
use yii\web\HttpException;
class HomeController extends \yii\web\Controller class HomeController extends \yii\web\Controller
{ {
...@@ -60,6 +61,7 @@ class HomeController extends \yii\web\Controller ...@@ -60,6 +61,7 @@ class HomeController extends \yii\web\Controller
* 首页 * 首页
* @param $classId 课堂id * @param $classId 课堂id
* @return string * @return string
* @throws HttpException
*/ */
public function actionIndex($classId) public function actionIndex($classId)
{ {
...@@ -71,7 +73,7 @@ class HomeController extends \yii\web\Controller ...@@ -71,7 +73,7 @@ class HomeController extends \yii\web\Controller
'classInfo' => $classInfo 'classInfo' => $classInfo
]); ]);
} else { } else {
throw new InvalidParamException('参数错误'); throw new HttpException(404, '页面不存在');
} }
} }
...@@ -82,7 +84,7 @@ class HomeController extends \yii\web\Controller ...@@ -82,7 +84,7 @@ class HomeController extends \yii\web\Controller
* @param $classId * @param $classId
* @param $page * @param $page
* @param int $num * @param int $num
* @throws ForbiddenHttpException * @throws HttpException
*/ */
public function actionGetCourseLists($classId, $page, $num = 10) public function actionGetCourseLists($classId, $page, $num = 10)
{ {
...@@ -90,7 +92,7 @@ class HomeController extends \yii\web\Controller ...@@ -90,7 +92,7 @@ class HomeController extends \yii\web\Controller
if ($page >= 0 and $num > 0) { if ($page >= 0 and $num > 0) {
$result = Course::getCourseListsByClassId($classId, $page, $num); $result = Course::getCourseListsByClassId($classId, $page, $num);
} else { } else {
throw new InvalidParamException('参数错误'); throw new HttpException(404, '页面不存在');
} }
} else { } else {
throw new ForbiddenHttpException('非法请求'); throw new ForbiddenHttpException('非法请求');
...@@ -118,18 +120,19 @@ class HomeController extends \yii\web\Controller ...@@ -118,18 +120,19 @@ class HomeController extends \yii\web\Controller
* 视频播放页面 * 视频播放页面
* @param $courseId * @param $courseId
* @return string * @return string
* @throws HttpException
*/ */
public function actionVideo($courseId) public function actionVideo($courseId)
{ {
$coursewareInfo = Courseware::findOne(['course_id' => $courseId, 'status' => Courseware::STATUS_OK]); $coursewareInfo = Courseware::findOne(['course_id' => $courseId, 'status' => Courseware::STATUS_OK]);
$course = Course::findOne(['id' => $courseId]); $course = Course::findOne(['id' => $courseId]);
if($course === NULL){ if ($course === NULL and $coursewareInfo['status'] != Courseware::STATUS_OK) {
throw new InvalidParamException('参数错误'); throw new HttpException(404, '页面不存在');
} }
$teachers = $course->teachers; $teachers = $course->teachers;
$userId = Yii::$app->user->id; $userId = Yii::$app->user->id;
if ($coursewareInfo === NULL) { if ($coursewareInfo === NULL) {
throw new InvalidParamException('参数错误'); throw new HttpException(404, '页面不存在');
} else { } else {
$coursewareInfo = $coursewareInfo->toArray(); $coursewareInfo = $coursewareInfo->toArray();
$coursewareInfo['previewUrl'] = Yii::$app->qiniu->getUrl('public', $course->preview_pic); $coursewareInfo['previewUrl'] = Yii::$app->qiniu->getUrl('public', $course->preview_pic);
...@@ -145,9 +148,9 @@ class HomeController extends \yii\web\Controller ...@@ -145,9 +148,9 @@ class HomeController extends \yii\web\Controller
$order = Orders::findByUserIdAndCourseId($userId, $courseId); $order = Orders::findByUserIdAndCourseId($userId, $courseId);
$coursewareInfo['isShop'] = ($order !== NULL and $order->status === Orders::PAID ? TRUE : FALSE); $coursewareInfo['isShop'] = ($order !== NULL and $order->status === Orders::PAID ? TRUE : FALSE);
} }
if($coursewareInfo['isShop']){ if ($coursewareInfo['isShop']) {
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_stand']); $coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_stand']);
}else{ } else {
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_free']); $coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_free']);
} }
unset($coursewareInfo['src_stand']); unset($coursewareInfo['src_stand']);
...@@ -157,7 +160,7 @@ class HomeController extends \yii\web\Controller ...@@ -157,7 +160,7 @@ class HomeController extends \yii\web\Controller
$coursewareInfo['className'] = Classes::findOne(['id' => $course->class_id])->name; $coursewareInfo['className'] = Classes::findOne(['id' => $course->class_id])->name;
$coursewareInfo['isMobile'] = Yii::$app->deviceDetect->isMobile(); $coursewareInfo['isMobile'] = Yii::$app->deviceDetect->isMobile();
//处理讲师头像 //处理讲师头像
foreach ($coursewareInfo['teachers'] as $key => $value){ foreach ($coursewareInfo['teachers'] as $key => $value) {
$coursewareInfo['teachers'][$key]['avatar'] = User::getAvatarUrl($value['avatar']); $coursewareInfo['teachers'][$key]['avatar'] = User::getAvatarUrl($value['avatar']);
} }
return $this->render('video', [ return $this->render('video', [
...@@ -166,6 +169,58 @@ class HomeController extends \yii\web\Controller ...@@ -166,6 +169,58 @@ class HomeController extends \yii\web\Controller
} }
} }
/**
* 预览页
*/
public function actionPreview($courseId)
{
$coursewareInfo = Courseware::findOne(['course_id' => $courseId, 'status' => Courseware::STATUS_OK]);
$course = Course::findOne(['id' => $courseId]);
if ($course === NULL or Yii::$app->user->id !== $coursewareInfo['user_id']) {
throw new HttpException(404, '页面不存在');
}
$teachers = $course->teachers;
$userId = Yii::$app->user->id;
if ($coursewareInfo === NULL) {
throw new HttpException(404, '页面不存在');
} else {
$coursewareInfo = $coursewareInfo->toArray();
$coursewareInfo['previewUrl'] = Yii::$app->qiniu->getUrl('public', $course->preview_pic);
$coursewareInfo['intro'] = $course->intro;
$coursewareInfo['courseName'] = $course->name;
$coursewareInfo['teachers'] = ArrayHelper::toArray($teachers);
$coursewareInfo['isGuest'] = Yii::$app->user->isGuest;
$coursewareInfo['isSupport'] = (Support::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE);
$coursewareInfo['isFavorite'] = (Favorite::findByUserIdAndCoursewareId($userId, $coursewareInfo['id']) === NULL ? FALSE : TRUE);
$coursewareInfo['isShop'] = FALSE;
if (!Yii::$app->user->isGuest) {
$coursewareInfo['userAvatar'] = User::getAvatarUrl(Yii::$app->user->identity->avatar);
$order = Orders::findByUserIdAndCourseId($userId, $courseId);
$coursewareInfo['isShop'] = ($order !== NULL and $order->status === Orders::PAID ? TRUE : FALSE);
}
if ($coursewareInfo['isShop']) {
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_stand']);
} else {
$coursewareInfo['videoUrl'] = Yii::$app->qiniu->getUrl('video', $coursewareInfo['src_free']);
}
unset($coursewareInfo['src_stand']);
unset($coursewareInfo['src_free']);
$coursewareInfo['price'] = $course->price;
$coursewareInfo['classId'] = $course->class_id;
$coursewareInfo['className'] = Classes::findOne(['id' => $course->class_id])->name;
$coursewareInfo['isMobile'] = Yii::$app->deviceDetect->isMobile();
//处理讲师头像
foreach ($coursewareInfo['teachers'] as $key => $value) {
$coursewareInfo['teachers'][$key]['avatar'] = User::getAvatarUrl($value['avatar']);
}
return $this->render('preview', [
'coursewareInfo' => $coursewareInfo
]);
}
}
/** /**
* 获取评论列表 * 获取评论列表
* @param $coursewareId * @param $coursewareId
......
...@@ -66,6 +66,8 @@ class QiniuCallbackController extends \yii\web\Controller ...@@ -66,6 +66,8 @@ class QiniuCallbackController extends \yii\web\Controller
*/ */
public function actionTranscode() public function actionTranscode()
{ {
Yii::$app->response->format = Response::FORMAT_JSON;
$post = Yii::$app->request->getRawBody(); $post = Yii::$app->request->getRawBody();
$data = json_decode($post, true); $data = json_decode($post, true);
......
<?php
/**
* Created by PhpStorm.
* User: xiabin
* Date: 2016/10/26
* Time: 下午5:55
*/
$this->title = "{$coursewareInfo['courseName']}-{$coursewareInfo['className']}";
\frontend\assets\AppAsset::addCss($this, '@web/assets/css/main.css');
\frontend\assets\AppAsset::addScript($this, '@web/assets/home_video.js');
\frontend\assets\AppAsset::addCss($this, '@web/assets/css/home_video.css');
$coursewareInfo['isPreview'] = true;
?>
<input type="hidden" id="courseware-info" value="<?= \yii\helpers\Html::encode(json_encode($coursewareInfo)) ?>"/>
<div id="video-container">
<video-play :courseware-info="coursewareInfo"></video-play>
<video-intro :courseware-info="coursewareInfo"></video-intro>
</div>
<div class="xs-show-bg"></div>
<div class="copyright">© 2016 c.pp.cc 皖ICP备13046642号</div>
<script type='text/javascript'>
$(function () {
modeldialog = $('.modal-dialog');
winh = $(window).height();
mth = (winh - 245)/2;
modeldialog.css('margin-top',mth);
})
</script>
\ No newline at end of file
...@@ -34,9 +34,6 @@ $this->registerJs($js); ...@@ -34,9 +34,6 @@ $this->registerJs($js);
\frontend\assets\AppAsset::addScript($this, '@web/assets/home_video.js'); \frontend\assets\AppAsset::addScript($this, '@web/assets/home_video.js');
\frontend\assets\AppAsset::addCss($this, '@web/assets/css/home_video.css'); \frontend\assets\AppAsset::addCss($this, '@web/assets/css/home_video.css');
?> ?>
<style>
</style>
<input type="hidden" id="courseware-info" value="<?= \yii\helpers\Html::encode(json_encode($coursewareInfo)) ?>"/> <input type="hidden" id="courseware-info" value="<?= \yii\helpers\Html::encode(json_encode($coursewareInfo)) ?>"/>
<div id="video-container"> <div id="video-container">
<video-play :courseware-info="coursewareInfo"></video-play> <video-play :courseware-info="coursewareInfo"></video-play>
......
...@@ -45,7 +45,6 @@ $qiniu = \Yii::$app->qiniu; ...@@ -45,7 +45,6 @@ $qiniu = \Yii::$app->qiniu;
target="_blank"><?= $course['name'] ?></a></div> target="_blank"><?= $course['name'] ?></a></div>
<?php endif; ?> <?php endif; ?>
<div class="teacher"> <div class="teacher">
<?php if ($course['teachers']) { ?>讲师:<?= join(', ', array_column($course['teachers'], 'name')) ?><?php } ?> <?php if ($course['teachers']) { ?>讲师:<?= join(', ', array_column($course['teachers'], 'name')) ?><?php } ?>
</div> </div>
......
...@@ -38,7 +38,9 @@ ...@@ -38,7 +38,9 @@
<img :src="coursewareInfo.userAvatar"> <img :src="coursewareInfo.userAvatar">
</div> </div>
<button @click="comment" class="btn btn-primary pull-right m-t-10 m-r-10">发表评论</button> <button v-if="!coursewareInfo.isPreview" @click="comment" class="btn btn-primary pull-right m-t-10 m-r-10">发表评论</button>
<button v-else="!coursewareInfo.isPreview" class="btn btn-primary pull-right m-t-10 m-r-10">发表评论</button>
</div> </div>
</div> </div>
......
...@@ -2,13 +2,25 @@ ...@@ -2,13 +2,25 @@
<div class="container"> <div class="container">
<div class="cnt-tit"> <div class="cnt-tit">
<h3>{{coursewareInfo.courseName}}</h3> <h3>{{coursewareInfo.courseName}}</h3>
<div class="tit-share hidden-xs bdsharebuttonbox"> <div v-if="!coursewareInfo.isPreview" class="tit-share hidden-xs bdsharebuttonbox">
<a href="javascript:;" class="wechat post-icons bds_weixin" data-cmd="weixin" title="分享到微信"></a>
<a href="javascript:;" class="weibo post-icons bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
<a href="javascript:;" class="qzone post-icons bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
</div>
<div v-else class="tit-share hidden-xs bdsharebuttonbox">
<a href="javascript:;" class="wechat post-icons bds_weixin" data-cmd="weixin" title="分享到微信"></a> <a href="javascript:;" class="wechat post-icons bds_weixin" data-cmd="weixin" title="分享到微信"></a>
<a href="javascript:;" class="weibo post-icons bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a> <a href="javascript:;" class="weibo post-icons bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
<a href="javascript:;" class="qzone post-icons bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a> <a href="javascript:;" class="qzone post-icons bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
</div> </div>
</div> </div>
<myvideo :preview-url="coursewareInfo.previewUrl" :video-url="coursewareInfo.videoUrl"></myvideo> <myvideo v-if="!coursewareInfo.isPreview" :preview-url="coursewareInfo.previewUrl" :video-url="coursewareInfo.videoUrl"></myvideo>
<div v-else class="video-main">
<div class="video-empty" style="height:500px; width: 100%; background-color: #444; color: #fff; text-align: center;">
<i class="icon-clock"></i>
<p>课程审核中,审核通过后大家才可以看到您的课程 <br />
审核结果将以短信形式通知您</p>
</div>
</div>
<div class="video-detail-info"> <div class="video-detail-info">
<div v-for="(index,item) in coursewareInfo.teachers" class="video-teacher"> <div v-for="(index,item) in coursewareInfo.teachers" class="video-teacher">
<a data-toggle="modal" data-target="{{{'#teacherInfo'+index}}}"><img <a data-toggle="modal" data-target="{{{'#teacherInfo'+index}}}"><img
...@@ -16,38 +28,47 @@ ...@@ -16,38 +28,47 @@
<p><a href="javascript:;" data-toggle="modal" data-target="#myModal2">{{item.name}}</a></p> <p><a href="javascript:;" data-toggle="modal" data-target="#myModal2">{{item.name}}</a></p>
</div> </div>
<div class="video-sm-info pull-right"> <div class="video-sm-info pull-right">
<p class="mb-right"> <p v-if="!coursewareInfo.isPreview" class="mb-right">
<a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a> <a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a>
<a @click="favorite" href="javascript:;"><i <a @click="favorite" href="javascript:;"><i
:class="{'icon-fav-full':coursewareInfo.isFavorite,'icon-fav-empty':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_count}}</a> :class="{'icon-fav-full':coursewareInfo.isFavorite,'icon-fav-empty':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_count}}</a>
<a @click="support" href="javascript:;"><i <a @click="support" href="javascript:;"><i
:class="{'icon-zan-full':coursewareInfo.isSupport,'icon-zan-empty':!coursewareInfo.isSupport}"></i>{{coursewareInfo.support_count}}</a> :class="{'icon-zan-full':coursewareInfo.isSupport,'icon-zan-empty':!coursewareInfo.isSupport}"></i>{{coursewareInfo.support_count}}</a>
</p> </p>
<p v-else class="mb-right">
<a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a>
<a href="javascript:;"><i
:class="{'icon-fav-full':coursewareInfo.isFavorite,'icon-fav-empty':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_count}}</a>
<a href="javascript:;"><i
:class="{'icon-zan-full':coursewareInfo.isSupport,'icon-zan-empty':!coursewareInfo.isSupport}"></i>{{coursewareInfo.support_count}}</a>
</p>
<button v-if="coursewareInfo.isPreview" class="btn btn-danger m-l-20 mb-left">购买
<button v-if="coursewareInfo.isGuest" @click="login" class="btn btn-danger m-l-20 mb-left">购买
¥{{coursewareInfo.price}} ¥{{coursewareInfo.price}}
</button> </button>
<template v-else> <template v-else>
<button v-if="coursewareInfo.isShop" class="btn btn-danger m-l-20 hidden-xs mb-left" <button v-if="coursewareInfo.isGuest" @click="login" class="btn btn-danger m-l-20 mb-left">购买
data-toggle="modal" disabled="disabled">已购买 ¥{{coursewareInfo.price}}
</button> </button>
<template v-else> <template v-else>
<button v-if="isMobile === false && isWeixin === false" class="btn btn-danger m-l-20 mb-left" <button v-if="coursewareInfo.isShop" class="btn btn-danger m-l-20 hidden-xs mb-left"
data-toggle="modal" data-toggle="modal" disabled="disabled">已购买
data-target="#pay">购买 ¥{{coursewareInfo.price}}
</button>
<button v-if="isMobile === true && isWeixin === false" class="btn btn-danger m-l-20 mb-left"
@click="mobileAliPay(coursewareInfo.course_id)">购买 ¥{{coursewareInfo.price}}
</button>
<button v-if="isWeixin === true" class="btn btn-danger m-l-20 mb-left"
@click="weixinJsPay(coursewareInfo.course_id)">购买 ¥{{coursewareInfo.price}}
</button> </button>
</template> <template v-else>
<button v-if="isMobile === false && isWeixin === false" class="btn btn-danger m-l-20 mb-left"
data-toggle="modal"
data-target="#pay">购买 ¥{{coursewareInfo.price}}
</button>
<button v-if="isMobile === true && isWeixin === false" class="btn btn-danger m-l-20 mb-left"
@click="mobileAliPay(coursewareInfo.course_id)">购买 ¥{{coursewareInfo.price}}
</button>
<button v-if="isWeixin === true" class="btn btn-danger m-l-20 mb-left"
@click="weixinJsPay(coursewareInfo.course_id)">购买 ¥{{coursewareInfo.price}}
</button>
</template>
</template>
</template> </template>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
</div> </div>
<!--视频介绍-->
<div class="warp-box"> <div class="warp-box">
<div class="container"> <div class="container">
<div class="video-description"> <div class="video-description">
...@@ -147,9 +144,10 @@ ...@@ -147,9 +144,10 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<!--视频介绍-->
<div class="copyright">© 2016 c.pp.cc 皖ICP备13046642号</div> <div class="copyright">© 2016 c.pp.cc 皖ICP备13046642号</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