谢百川 / seniors_say · 提交

转到一个项目

作者 谢百川
提交 3f847eb3a82079d1a782d7b81570b0bd07171aaf 1 个父辈 1193d1f0

ok

内嵌 并排对比
正在显示 2 个修改的文件 包含 87 行增加 和 29 行删除
... ... @@ -372,36 +372,40 @@ class Article extends Api
* @ApiReturn ({
"code": 1,
"msg": "获取我收藏的文章成功",
"time": "1586483115",
"time": "1586844029",
"data": [
{
"id": 1,
"createtime": 0,
"updatetime": 0,
"article_id": 1（文章ID）,
"id": 8,
"createtime": 1586770381,
"updatetime": 1586770381,
"article_id": 8,
"user_id": 1,
"deletetime": null,
"level": "1",
"nickname": "谢百川（发表人的名字）",
"head_image": "www.a.jpg发表人的头像）",
"school_id": 1,
"nickname": "我是高中生",
"head_image": "www.qiniu.com/uploads/20200413/39270b1276af4c6af020cc85eb80fb29.jpg",
"school_id": 11,
"subject_ids": "",
"up_id": 1,
"college_id": 1,
"university_id": 1,
"graduated_id": 1,
"starttime": 1286640000,
"up_id": 0,
"college_id": 0,
"university_id": 0,
"graduated_id": 0,
"starttime": 1586769446,
"endtime": null,
"show_switch": 1,
"email": "1",
"title": "",
"show_switch": 0,
"email": "563771383@qq.com",
"vip_level": "0",
"vip_endtime": null,
"title": "还是经验",
"article_type_id": 1,
"show_type": "1",
"des_content": "1（文章的内容）",
"des_images": "",
"weigh": 0,
"is_like_user": 1（发表人1关注 0没关注）,
"article_type_name": "经验（文章的类型的名字）"
"show_type": "2",
"des_content": "经验经验经验经验经验经验经验经验经验经验经验经验经验经验经验经验经验经验经验经验经验经验经验经验",
"des_images": [
"www.qiniu.com/uploads/20200413/39270b1276af4c6af020cc85eb80fb29.jpg"
],
"weigh": 8,
"is_like_user": 1,
"article_type_name": "经验"
}
]
})
... ... @@ -409,7 +413,7 @@ class Article extends Api
public function getMyLikeArticle()
{
$userId = $this->auth->id;
$userId = 1;
$userId = 2;
$page = $this->request->param('page', 0, 'int');
$size = $this->request->param('size', 0, 'int');
... ... @@ -447,6 +451,18 @@ class Article extends Api
} else {
$likeArticleList[$k]['article_type_name'] = '';
}
if($v['des_images']) {
$desImagesArr = explode(',', $v['des_images']);
foreach ($desImagesArr as $kk => $vv) {
$desImagesArr[$kk] = $this->qiNiu.$vv;
}
$likeArticleList[$k]['des_images'] = $desImagesArr;
} else {
$likeArticleList[$k]['des_images'] = [];
}
$likeArticleList[$k]['head_image'] = $this->qiNiu.$v['head_image'];
}
$this->success('获取我收藏的文章成功', $likeArticleList);
}
... ... @@ -467,12 +483,17 @@ class Article extends Api
* @ApiReturnParams (name="code", type="integer", required=true, sample="0")
* @ApiReturnParams (name="msg", type="string", required=true, sample="返回成功")
* @ApiReturnParams (name="data", type="object", sample="{'user_id':'int','user_name':'string','profile':{'email':'string','age':'integer'}}", description="扩展数据返回")
* @ApiReturn ()
* @ApiReturn ({
"code": 1,
"msg": "您的文章发表成功，请您耐心等待审核",
"time": "1586844200",
"data": null
})
*/
public function addArticle()
{
$userId = $this->auth->id;
$userId = 2;
$userId = 1;
$title = $this->request->param('title', '', 'string');
if(!$title) {
... ... @@ -522,8 +543,10 @@ class Article extends Api
'article_type_id' => $articleTypeId,
'show_type' => $showType,
'des_content' => $desContent,
'des_images' => '',
'user_id' => $userId
'des_images' => $desImages,
'user_id' => $userId,
'createtime' => time(),
'updatetime' => time(),
];
$article = new ArticleModel();
... ... @@ -548,7 +571,31 @@ class Article extends Api
* @ApiReturnParams (name="code", type="integer", required=true, sample="0")
* @ApiReturnParams (name="msg", type="string", required=true, sample="返回成功")
* @ApiReturnParams (name="data", type="object", sample="{'user_id':'int','user_name':'string','profile':{'email':'string','age':'integer'}}", description="扩展数据返回")
* @ApiReturn ()
* @ApiReturn ({
"code": 1,
"msg": "获取我发布的文章",
"time": "1586844908",
"data": [
{
"id": 11,
"createtime": 1586844201,
"updatetime": 1586844201,
"show_switch": 0,
"title": "1",
"article_type_id": 1,
"show_type": "1",
"des_content": "1",
"des_images": [
"www.qiniu.com1.jpg",
"www.qiniu.com2.jpg"
],
"weigh": 0,
"user_id": 1,
"deletetime": null,
"article_type_name": "经验"
}
]
})
*/
public function getMyArticle()
{
... ... @@ -577,6 +624,17 @@ class Article extends Api
} else {
$articleTypeList[$k]['article_type'] = '';
}
if($v['des_images']) {
$desImagesArr = explode(',', $v['des_images']);
foreach ($desImagesArr as $kk => $vv) {
$desImagesArr[$kk] = $this->qiNiu.$vv;
}
$articleList[$k]['des_images'] = $desImagesArr;
} else {
$articleList[$k]['des_images'] = [];
}
}
$this->success('获取我发布的文章', $articleList);
}
... ...
... ... @@ -21,7 +21,7 @@ use think\Db;
*/
class Common extends Api
{
protected $noNeedLogin = ['init'];
protected $noNeedLogin = ['init', 'getSessionKey'];
protected $noNeedRight = '*';
/**
... ...