Merge branch 'feature/article' into develop

app/console/controller/ArticleController.php

@@ -41,6 +41,12 @@ class ArticleController extends BaseController
     {
         if ($scene === 'default' || $scene === 'show') {
             $item['publish_time'] = date('Y-m-d H:i:s', $item['publish_time']);
+
+            $item['cover_full'] = '';
+            if ($item['cover']) {
+                $item['cover_full'] = (new \app\mzl\modules\upload\service\OssService())->generatePrivateUrl($item['cover']);
+            }
+
         }
         
         return $item;

app/console/model/ArticleModel.php

@@ -53,4 +53,9 @@ class ArticleModel extends Model
      * 不允许自动填充模型字段
      */
     protected $guarded = [];
+
+    public function creater()
+    {
+        return $this->belongsTo(AdminsModel::class, 'user_id','id');
+    }
 }

app/console/service/ArticleService.php

@@ -33,6 +33,7 @@ class ArticleService extends BaseService
                     'filters' => $params['filters'],
                     'fields' => ['id', 'locale', 'title', 'subtitle', 'cover', 'content', 'user_id', 'is_top', 'sort', 'status', 'publish_time', 'created_at', 'updated_at'],
                     'relations'     => [
+                        'creater' => ['id', 'nickname',],
 //                        'translation' => ['model_id', 'name'],
 //                        'brand.translation' => ['brand_id', 'name']
                     ],