Commit ed9c662a authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

parents b7c19b43 bac5a4fe
...@@ -20,6 +20,10 @@ return [ ...@@ -20,6 +20,10 @@ return [
'identityClass' => 'backend\models\User', 'identityClass' => 'backend\models\User',
'enableAutoLogin' => true, 'enableAutoLogin' => true,
'identityCookie' => ['name' => '_identity-backend', 'httpOnly' => true], 'identityCookie' => ['name' => '_identity-backend', 'httpOnly' => true],
'on afterLogin' => function ($event) {
$event->identity->logged_at = time();
$event->identity->update();
}
], ],
'session' => [ 'session' => [
// this is the name of the session cookie used for login on the backend // this is the name of the session cookie used for login on the backend
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
namespace backend\controllers; namespace backend\controllers;
use backend\models\LoginForm; 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;
...@@ -82,6 +80,7 @@ class SiteController extends Controller ...@@ -82,6 +80,7 @@ class SiteController extends Controller
} }
$model = new LoginForm(); $model = new LoginForm();
if ($model->load(Yii::$app->request->post()) && $model->login()) { if ($model->load(Yii::$app->request->post()) && $model->login()) {
return $this->goBack(); return $this->goBack();
} else { } else {
......
...@@ -52,7 +52,7 @@ $qiniu = \Yii::$app->qiniu; ...@@ -52,7 +52,7 @@ $qiniu = \Yii::$app->qiniu;
<th>时长/秒</th> <th>时长/秒</th>
<th>文件大小</th> <th>文件大小</th>
<th>原始格式</th> <th>原始格式</th>
<th>价格/元</th> <th>价格/分钟</th>
<th>免费试看/秒</th> <th>免费试看/秒</th>
<th>ACTION</th> <th>ACTION</th>
</tr> </tr>
......
...@@ -254,9 +254,9 @@ class Course extends \yii\db\ActiveRecord ...@@ -254,9 +254,9 @@ class Course extends \yii\db\ActiveRecord
return self::find()->where($where)->sum('comment_count'); return self::find()->where($where)->sum('comment_count');
} }
public static function url($courseId, $schema=false) public static function url($courseId)
{ {
return Url::to(['home/video', 'courseId'=>$courseId], $schema); return \Yii::$app->params['baseUrl'].Url::to(['home/video', 'courseId'=>$courseId]);
} }
/** /**
......
...@@ -5,7 +5,7 @@ use yii\db\Migration; ...@@ -5,7 +5,7 @@ use yii\db\Migration;
class m161026_085127_transcode_queue extends Migration class m161026_085127_transcode_queue extends Migration
{ {
public $table = '{{%ranscode_queue}}'; public $table = '{{%transcode_queue}}';
public function up() public function up()
{ {
......
<?php
use yii\db\Migration;
class m161026_111007_admin_users extends Migration
{
public $table = '{{%admin_users}}';
public function up()
{
$this->createTable($this->table, [
'id' => $this->primaryKey(10)->unsigned()->notNull(),
'username' => $this->string(50)->notNull(),
'auth_key' => $this->string(30)->notNull(),
'password_hash' => $this->string(255)->notNull(),
'status' => $this->smallInteger(2)->notNull()->defaultValue(0)->comment('0正常, 1锁定'),
'ip' => $this->string(32)->notNull(),
'created_at' => $this->integer(10)->unsigned()->notNull(),
'updated_at' => $this->integer(10)->unsigned()->notNull(),
'logged_at' => $this->integer(10)->unsigned()->notNull()
]);
$this->addCommentOnTable($this->table, '管理员用户');
$this->createIndex('uesrname', $this->table, 'username', true);
}
public function down()
{
$this->dropTable($this->table);
}
/*
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
}
public function safeDown()
{
}
*/
}
<?php <?php
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', false);
defined('YII_ENV') or define('YII_ENV', 'dev'); defined('YII_ENV') or define('YII_ENV', 'prod');
if(!function_exists('fnmatch')) { if(!function_exists('fnmatch')) {
function fnmatch($pattern, $string) { function fnmatch($pattern, $string) {
......
...@@ -14,6 +14,7 @@ use common\models\Courseware; ...@@ -14,6 +14,7 @@ use common\models\Courseware;
use common\models\TranscodeQueue; use common\models\TranscodeQueue;
use common\models\UploadPools; use common\models\UploadPools;
use Yii; use Yii;
use yii\log\Logger;
use yii\web\Response; use yii\web\Response;
class QiniuCallbackController extends \yii\web\Controller class QiniuCallbackController extends \yii\web\Controller
......
...@@ -12,34 +12,39 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -12,34 +12,39 @@ $this->beginContent('@app/views/layouts/center.php');
<div class="logo"><a href="/"><img src="<?= Yii::$app->assetManager->baseUrl ?>/img/logo.png"></a></div> <div class="logo"><a href="/"><img src="<?= Yii::$app->assetManager->baseUrl ?>/img/logo.png"></a></div>
<div class="side-menu"> <div class="side-menu">
<!-- Contenedor --> <!-- Contenedor -->
<ul id="accordion" class="accordion"> <ul id="accordion" class="accordion" data-route="<?=Yii::$app->controller->id?>_<?=Yii::$app->requestedAction->id?>">
<li> <li>
<div class="link"><i class="icon-school"></i>我的课堂<i class="icon-navigate_next"></i></div> <div class="link"><i class="icon-school"></i>我的课堂<i class="icon-navigate_next"></i></div>
<ul class="submenu"> <ul class="submenu">
<li class="active"><a href="/classes-info">课堂概况</a></li> <li class="RT_classes-info_index"><a href="/classes-info">课堂概况</a></li>
<li><a href="/teacher-manager">讲师管理</a></li> <li class="RT_teacher-manager_index RT_teacher-manager_edit RT_teacher-manager_add"><a href="/teacher-manager">讲师管理</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<div class="link"><i class="icon-play_circle_outline"></i>我的课程<i class="icon-navigate_next"></i></div> <div class="link"><i class="icon-play_circle_outline"></i>我的课程<i class="icon-navigate_next"></i></div>
<ul class="submenu"> <ul class="submenu">
<li><a href="/my-course/publish">发布课程</a></li> <li class="RT_my-course_publish RT_my-course_edit"><a href="/my-course/publish">发布课程</a></li>
<li><a href="/my-course">课程列表</a></li> <li class="RT_my-course_index"><a href="/my-course">课程列表</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<div class="link"><i class="icon-person_pin"></i>我的会员<i class="icon-navigate_next"></i></div> <div class="link"><i class="icon-person_pin"></i>我的会员<i class="icon-navigate_next"></i></div>
<ul class="submenu"> <ul class="submenu">
<li><a href="/my-member">会员列表</a></li> <li class="RT_my-member_index"><a href="/my-member">会员列表</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<div class="link"><i class="icon-layers"></i>知识有价<i class="icon-navigate_next"></i></div> <div class="link"><i class="icon-layers"></i>知识有价<i class="icon-navigate_next"></i></div>
<ul class="submenu"> <ul class="submenu">
<li><a href="/my-income">购买记录</a></li> <li class="RT_my-income_index"><a href="/my-income">购买记录</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
<script>
var accordion = $("#accordion");
var currentRoute = accordion.data("route");
accordion.find("li.RT_"+currentRoute).addClass("active");
</script>
<a class="loginout" href="<?=\yii\helpers\Url::base() .'/site/logout'?>"><i class="icon-power_settings_new"></i>退出登录</a> <a class="loginout" href="<?=\yii\helpers\Url::base() .'/site/logout'?>"><i class="icon-power_settings_new"></i>退出登录</a>
</div> </div>
</div> </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