Merge branch 'feature/optimize' into 'master'

api/controllers/ArticleController.php

@@ -10,7 +10,7 @@ namespace api\controllers;
 
 use Yii;
 use api\base\BaseController;
-use common\models\pwallet\Article;
+use common\models\pwallet\News;
 
 class ArticleController extends BaseController
 {
@@ -50,7 +50,7 @@ class ArticleController extends BaseController
         if (isset($post['update_at'])) {
             $condition[] = ['>=', 'update_at', $post['update_at']];
         }
-        $data = Article::getList($page, $limit, $condition);
+        $data = News::getList($page, $limit, $condition);
 
         return $data;
     }

api/controllers/CoinDogController.php

@@ -3,7 +3,7 @@
 namespace api\controllers;
 
 use backend\models\coin\ArticleForm;
-use common\models\pwallet\Article;
+use common\models\pwallet\News;
 use common\service\bishijie\BishijieService;
 use linslin\yii2\curl\Curl;
 use Yii;
@@ -127,7 +127,7 @@ class CoinDogController extends BaseController
     public function actionArticleBanner()
     {
         $type = Yii::$app->request->get('type', 1);
-        $data = Article::find()
+        $data = News::find()
             ->select('id, image_url ,title, url')
             ->where(['type' => $type])
             ->orderBy('update_at desc')

backend/controllers/SourceController.php

@@ -11,7 +11,7 @@ namespace backend\controllers;
 use backend\models\coin\ArticleForm;
 use backend\models\coin\NoticeForm;
 use Yii;
-use common\models\pwallet\Article;
+use common\models\pwallet\News;
 use common\models\pwallet\Notice;
 use common\models\pwallet\Feedback;
 use yii\db\Exception;
@@ -37,7 +37,7 @@ class SourceController extends BaseController
             if ($status != 'all') {
                 $condition[] = ['status' => $status];
             }
-            $results                    = Article::getList($page, $limit, $condition);
+            $results                    = News::getList($page, $limit, $condition);
             Yii::$app->response->format = 'json';
             Yii::$app->response->data   = $results;
             Yii::$app->response->send();
@@ -56,7 +56,7 @@ class SourceController extends BaseController
         if (Yii::$app->request->isPost) {
             $request = Yii::$app->request;
             if ($model->load($request->post()) && $model->validate()) {
-                $article = new Article();
+                $article = new News();
                 $res     = $article->addOne($request->post());
                 if ($res === true) {
                     $this->success('添加成功', '/admin/source/article');
@@ -85,7 +85,7 @@ class SourceController extends BaseController
         $model->scenario = 'edit';
         $id              = Yii::$app->request->get('id', null);
         if ($id) {
-            $article = Article::findOne(['id' => $id]);
+            $article = News::findOne(['id' => $id]);
             if ($article) {
                 if (Yii::$app->request->isPost) {
                     if ($model->load(Yii::$app->request->post()) && $model->validate()) {
@@ -118,7 +118,7 @@ class SourceController extends BaseController
     {
         $id = Yii::$app->request->get('id', null);
         if ($id) {
-            $article = Article::findOne(['id' => $id]);
+            $article = News::findOne(['id' => $id]);
             if ($article) {
                 try {
                     $article->delete();

common/models/pwallet/News.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: rlgyzhcn
+ * Date: 18-6-4
+ * Time: 上午9:53
+ */
+
+namespace common\models\pwallet;
+
+use common\base\Exception;
+use common\core\BaseActiveRecord;
+use Yii;
+
+class News extends BaseActiveRecord
+{
+    public static function getDb()
+    {
+        return Yii::$app->get('db_pwallet');
+    }
+
+    public static function tableName()
+    {
+        return '{{%news}}';
+    }
+
+    /**
+     * 获取文章列表
+     * @param int $page
+     * @param int $limit
+     * @param array $condition
+     * @return array
+     */
+    public static function getList($page = 1, $limit = 10, $condition = [])
+    {
+        $query = self::find();
+        foreach ($condition as $item) {
+            $query = $query->andWhere($item);
+        }
+        $count = $query->count();
+        if ($count) {
+            $data = $query->offset(($page - 1) * $limit)->limit($limit)->asArray()->all();
+            return ['code' => 0, 'count' => $count, 'data' => $data];
+        }
+        return ['code' => 1, 'msg' => '数据为空'];
+    }
+
+    /**
+     * 添加文章
+     * @param $params
+     * @return bool|array
+     */
+    public function addOne($params)
+    {
+        return $this->realWrite($params);
+    }
+
+    /**
+     * 更新文章
+     * @param $params
+     * @return bool|array
+     */
+    public function updateOne($params)
+    {
+        return $this->realWrite($params);
+    }
+
+    /**
+     * 实际操作数据方法
+     */
+    private function realWrite($params)
+    {
+        if (!is_array($params)) {
+            $params = [$params];
+        }
+        $params = array_filter($params, function ($value, $key) {
+            if (ctype_digit($key) || empty($value)) {
+                return false;
+            }
+            return true;
+        }, ARRAY_FILTER_USE_BOTH);
+        if (isset($params['id'])) {
+            $article = self::findOne($params['id']);
+            if ($article === null) {
+                return ['code' => 1, 'msg' => '文章不存在'];
+            }
+            unset($params['id']);
+        } else {
+            $article = $this;
+            $params  = array_merge($params, ['create_at' => date('Y-m-d H:i:s')]);
+        }
+        $params = array_merge($params, ['update_at' => date('Y-m-d H:i:s', time())]);
+        if (!isset($params['status'])) {
+            $params['status'] = 0;
+        }
+        $article->setAttributes($params, false);
+        try {
+            return (bool)$article->save();
+        } catch (Exception $exception) {
+            return ['code' => $exception->getCode(), 'msg' => $exception->getMessage()];
+        }
+    }
+}
\ No newline at end of file

console/controllers/ArticleController.php

@@ -4,61 +4,48 @@ namespace console\controllers;
 
 use Yii;
 use yii\console\Controller;
-use linslin\yii2\curl\Curl;
 use common\components\Tools;
 use common\models\pwallet\Article;
+use common\service\bishijie\BishijieService;
 
 class ArticleController extends Controller
 {
     public function actionIndex()
     {
-        $coindog = Yii::$app->params['coindog'];
+        $page = 1;
+        $size = 20;
 
-        $accessKey = $coindog['accessKey'];
-        $secretKey = $coindog['secretKey'];
-        $httpParams = array(
-            'access_key' => $accessKey,
-            'date' => time()
-        );
+        $bishijie = Yii::$app->params['bishijie'];
+        $appid = $bishijie['Appid'];
+        $appSecret = $bishijie['AppSecret'];
+        $bishijie_service = new BishijieService($appid, $appSecret);
+        $resp = $bishijie_service->getArticleList($page, $size);
 
-        $signParams = array_merge($httpParams, array('secret_key' => $secretKey));
-
-        ksort($signParams);
-        $signString = http_build_query($signParams);
-
-        $httpParams = [
-            'sign' => strtolower(md5($signString)),
-        ];
-
-        $url = $coindog['live'] . '?' . http_build_query($httpParams);
-        $curl = new Curl();
-        $resp = $curl->get($url, false);
         if (!isset($resp['list'])) {
             return 0;
         }
         $create_time = Article::find()->where(['platform_id' => -1])->max('create_time');
 
-        $list = $resp['list'][0]['lives'];
-        if ($create_time >= $list[0]['created_at']) {
+        $list = $resp['list'];
+        if ($create_time >= $list[0]['issue_time']) {
             return 0;
         }
 
-        $list = Tools::arraySort($list, 'created_at', SORT_ASC);
+        $list = Tools::arraySort($list, 'issue_time', SORT_ASC);
 
         $article = new Article();
         foreach ($list as &$item) {
             go(function () use ($item, $article, $create_time) {
                 \Co::sleep(0.5);
-                if ($item['created_at'] > $create_time) {
-                    preg_match_all("/\【(.+?)\】/", $item['content'], $match);
-                    $title = $match[1][0];
-                    $content = str_replace('【' . $title . '】', '', $item['content']);
-
+                if ($item['issue_time'] > $create_time) {
                     $article->setIsNewRecord(true);
-                    $article->title = $title;
-                    $article->content = $content;
+                    $article->title = $item['title'];
+                    $article->source = $item['source'];
+                    $article->content = $item['id'];
+                    $article->logo_pic = $item['promulgator']['logo_pic'];
+                    $article->img_url = $item['img_url'];
                     $article->platform_id = -1;
-                    $article->create_time = $item['created_at'];
+                    $article->create_time = $item['issue_time'];
                     $article->save() && $article->id = 0;;
                 }
             });

console/controllers/NewsController.php

+<?php
+
+namespace console\controllers;
+
+use Yii;
+use yii\console\Controller;
+use linslin\yii2\curl\Curl;
+use common\components\Tools;
+use common\models\pwallet\News;
+
+class NewsController extends Controller
+{
+    public function actionIndex()
+    {
+        $coindog = Yii::$app->params['coindog'];
+
+        $accessKey = $coindog['accessKey'];
+        $secretKey = $coindog['secretKey'];
+        $httpParams = array(
+            'access_key' => $accessKey,
+            'date' => time()
+        );
+
+        $signParams = array_merge($httpParams, array('secret_key' => $secretKey));
+
+        ksort($signParams);
+        $signString = http_build_query($signParams);
+
+        $httpParams = [
+            'sign' => strtolower(md5($signString)),
+        ];
+
+        $url = $coindog['live'] . '?' . http_build_query($httpParams);
+        $curl = new Curl();
+        $resp = $curl->get($url, false);
+        if (!isset($resp['list'])) {
+            return 0;
+        }
+        $create_time = News::find()->where(['platform_id' => -1])->max('create_time');
+
+        $list = $resp['list'][0]['lives'];
+        if ($create_time >= $list[0]['created_at']) {
+            return 0;
+        }
+
+        $list = Tools::arraySort($list, 'created_at', SORT_ASC);
+
+        $article = new News();
+        foreach ($list as &$item) {
+            go(function () use ($item, $article, $create_time) {
+                \Co::sleep(0.5);
+                if ($item['created_at'] > $create_time) {
+                    preg_match_all("/\【(.+?)\】/", $item['content'], $match);
+                    $title = $match[1][0];
+                    $content = str_replace('【' . $title . '】', '', $item['content']);
+
+                    $article->setIsNewRecord(true);
+                    $article->title = $title;
+                    $article->content = $content;
+                    $article->platform_id = -1;
+                    $article->create_time = $item['created_at'];
+                    $article->save() && $article->id = 0;;
+                }
+            });
+        }
+        return 0;
+    }
+}