remove feehi/assets directory replace config cdn resource with config…

… file components section assetManager bundles and optimize sql query use lazy loading
swg0110 · Nov 29, 2017 · 1c549d0 · 1c549d0
1 parent 2b1d875
commit 1c549d0
Show file tree

Hide file tree

Showing 38 changed files with 143 additions and 411 deletions.
diff --git a/backend/assets/AppAsset.php b/backend/assets/AppAsset.php
@@ -45,7 +45,7 @@ public function init()
     ];
 
     public $depends = [
-        'feehi\assets\YiiAsset',
-        'feehi\assets\BootstrapAsset',
+        'yii\web\YiiAsset',
+        'yii\bootstrap\BootstrapAsset',
     ];
 }
diff --git a/backend/assets/IndexAsset.php b/backend/assets/IndexAsset.php
@@ -39,7 +39,7 @@ public function init()
     ];
 
     public $depends = [
-        'feehi\assets\YiiAsset',
-        'feehi\assets\BootstrapAsset',
+        'yii\web\YiiAsset',
+        'yii\bootstrap\BootstrapAsset',
     ];
 }
diff --git a/backend/grid/GridView.php b/backend/grid/GridView.php
@@ -11,7 +11,7 @@
 use yii;
 use yii\helpers\ArrayHelper;
 use yii\widgets\LinkPager;
-use feehi\assets\GridViewAsset;
+use yii\grid\GridViewAsset;
 use yii\helpers\Json;
 use yii\widgets\BaseListView;
 

diff --git a/backend/models/Article.php b/backend/models/Article.php
@@ -16,6 +16,15 @@
 
 class Article extends \common\models\Article
 {
+    /**
+     * @var string
+     */
+    public $tag = '';
+
+    /**
+     * @var null|string
+     */
+    public $content = null;
 
     /**
      * @inheritdoc
@@ -129,8 +138,13 @@ public function beforeDelete()
     public function afterFind()
     {
         parent::afterFind();
-        $metaModel = new ArticleMetaTag();
-        $this->tag = $metaModel->getTagsByArticle($this->id, true);
+        $this->tag = call_user_func(function(){
+            $tags = '';
+            foreach ($this->articleTags as $tag) {
+                $tags .= $tag->value . ',';
+            }
+            return rtrim($tags, ',');
+        });
         $this->content = ArticleContent::findOne(['aid' => $this->id])['content'];
     }
 

diff --git a/backend/models/search/ArticleSearch.php b/backend/models/search/ArticleSearch.php
@@ -8,6 +8,7 @@
 
 namespace backend\models\search;
 
+use common\models\Article as CommonArticle;
 use backend\models\Article;
 use common\models\Category;
 use yii\data\ActiveDataProvider;
@@ -72,7 +73,7 @@ public function scenarios()
      */
     public function search($params, $type = self::ARTICLE)
     {
-        $query = Article::find()->select([])->where(['type' => $type]);
+        $query = CommonArticle::find()->select([])->where(['type' => $type])->with('category');
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
             'sort' => [

diff --git a/backend/models/search/CommentSearch.php b/backend/models/search/CommentSearch.php
@@ -42,7 +42,7 @@ public function rules()
      */
     public function search($params)
     {
-        $query = self::find();
+        $query = self::find()->with('article');
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
             'sort' => [
@@ -111,9 +111,6 @@ public function search($params)
             }
             $query->andFilterWhere(['aid' => $aidArray]);
         }
-        if( $this->aid ){
-            $this->article_title = Article::findOne($this->aid)['title'];
-        }
         return $dataProvider;
     }
 }
diff --git a/backend/views/article/index.php b/backend/views/article/index.php
@@ -20,7 +20,7 @@
 use common\libs\Constants;
 use yii\helpers\Html;
 use backend\widgets\Bar;
-use common\widgets\Pjax;
+use yii\widgets\Pjax;
 use backend\grid\CheckboxColumn;
 use backend\grid\ActionColumn;
 use backend\grid\StatusColumn;

diff --git a/backend/views/comment/index.php b/backend/views/comment/index.php
@@ -48,7 +48,7 @@
                             'attribute' => 'article_title',
                             'label' => yii::t('app', 'Article Title'),
                             'value' => function ($model) {
-                                return Article::getArticleById($model->aid)['title'];
+                                return $model->article->title;
                             }
                         ],
                         [

diff --git a/backend/views/site/login.php b/backend/views/site/login.php
@@ -15,7 +15,7 @@
 use yii\helpers\Html;
 use backend\widgets\ActiveForm;
 use yii\helpers\Url;
-use feehi\components\Captcha;
+use yii\captcha\Captcha;
 
 AppAsset::register($this);
 $this->title = yii::t('app', 'Login');

diff --git a/backend/widgets/ActiveForm.php b/backend/widgets/ActiveForm.php
@@ -12,7 +12,7 @@
 use yii\base\InvalidCallException;
 use yii\helpers\Html;
 use yii\helpers\Json;
-use feehi\assets\ActiveFormAsset;
+use yii\widgets\ActiveFormAsset;
 
 class ActiveForm extends \yii\widgets\ActiveForm
 {

diff --git a/common/config/main.php b/common/config/main.php
@@ -42,15 +42,40 @@
                 'from' => ['admin@feehi.com' => 'Feehi CMS robot ']
             ],
         ],
-        'view' => [
-            'class' => feehi\components\View::className(),
-        ],
         'feehi' => [
             'class' => feehi\components\Feehi::className(),
         ],
         'authManager' => [
             'class' => yii\rbac\DbManager::className(),
         ],
+        'assetManager' => [
+            'bundles' => [
+                yii\widgets\ActiveFormAsset::className() => [
+                    'js' => ['yii.activeForm.js'],
+                ],
+                yii\bootstrap\BootstrapAsset::className() => [
+                    'css' => ['css/bootstrap.css'],
+                ],
+                yii\captcha\CaptchaAsset::className() => [
+                    'js' => ['yii.captcha.js'],
+                ],
+                yii\grid\GridViewAsset::className() => [
+                    'js' => ['yii.gridView.js'],
+                ],
+                yii\web\JqueryAsset::className() => [
+                    'js' => ['jquery.js'],
+                ],
+                yii\widgets\PjaxAsset::className() => [
+                    'js' => ['jquery.pjax.js'],
+                ],
+                yii\web\YiiAsset::className() => [
+                    'js' => ['yii.js'],
+                ],
+                yii\validators\ValidationAsset::className() => [
+                    'js' => ['yii.validation.js'],
+                ],
+            ],
+        ],
     ],
 ];
 $install = yii::getAlias('@common/config/conf/db.php');

diff --git a/common/models/Article.php b/common/models/Article.php
@@ -8,6 +8,8 @@
 
 namespace common\models;
 
+use common\models\meta\ArticleMetaLike;
+use common\models\meta\ArticleMetaTag;
 use Yii;
 use common\libs\Constants;
 use yii\behaviors\TimestampBehavior;
@@ -54,10 +56,6 @@ class Article extends \yii\db\ActiveRecord
     const ARTICLE_PUBLISHED = 1;
     const ARTICLE_DRAFT = 0;
 
-    public $tag = '';
-
-    public $content = null;
-
     public function behaviors()
     {
         return [
@@ -232,12 +230,26 @@ public function getArticleContent()
     }
 
     /**
-     * @param $id
-     * @return static
+     * @return \yii\db\ActiveQuery
+     */
+    public function getArticleLikes()
+    {
+        $tempModel = new ArticleMetaLike();
+        return $this->hasMany(ArticleMetaLike::className(), ['aid' => 'id'])->where(['key'=>$tempModel->keyName]);
+    }
+
+    public function getArticleTags()
+    {
+        $tempModel = new ArticleMetaTag();
+        return $this->hasMany(ArticleMetaLike::className(), ['aid' => 'id'])->where(['key'=>$tempModel->keyName]);
+    }
+
+    /**
+     * @return integer
      */
-    public static function getArticleById($id)
+    public function getArticleLikeCount()
     {
-        return self::findOne(['id' => $id]);
+        return $this->getArticleLikes()->count('id');
     }
 
     public function afterFind()

diff --git a/common/models/Comment.php b/common/models/Comment.php
@@ -104,7 +104,6 @@ public function getCommentByAid($id)
             $v = $row->getAttributes();
             if ($v['reply_to'] == 0) {
                 $v['sub'] = self::getCommentChildren($list, $v['id']);
-                $v['content'] = $v['content'];
                 $newList[] = $v;
             }
         }

diff --git a/common/models/meta/ArticleMetaTag.php b/common/models/meta/ArticleMetaTag.php
@@ -17,7 +17,7 @@ class ArticleMetaTag extends \common\models\ArticleMeta
 
     public function getTagsByArticle($aid, $isString=false)
     {
-        $result = $this->find()->where(['key'=>$this->keyName])->where(['aid'=>$aid])->asArray()->all();
+        $result = $this->find()->where(['key'=>$this->keyName])->andWhere(['aid'=>$aid])->asArray()->all();
         if( $result === null ){
             if( $isString ){
                 return '';

diff --git a/common/widgets/Pjax.php b/common/widgets/Pjax.php
diff --git a/feehi/assets/ActiveFormAsset.php b/feehi/assets/ActiveFormAsset.php
diff --git a/feehi/assets/BootstrapAsset.php b/feehi/assets/BootstrapAsset.php
diff --git a/feehi/assets/CaptchaAsset.php b/feehi/assets/CaptchaAsset.php
diff --git a/feehi/assets/GridViewAsset.php b/feehi/assets/GridViewAsset.php
diff --git a/feehi/assets/JqueryAsset.php b/feehi/assets/JqueryAsset.php