|
|
@@ -459,19 +459,19 @@ class NewsController extends AbstractController
|
|
|
[
|
|
|
'page' => 'required',
|
|
|
'pageSize' => 'required',
|
|
|
- 'website_id' => 'required'
|
|
|
],
|
|
|
[
|
|
|
'page.required' => 'page不能为空',
|
|
|
'pageSize.required' => 'limit不能为空',
|
|
|
- 'website_id.required' => 'website_id不能为空',
|
|
|
]
|
|
|
);
|
|
|
if ($validator->fails()) {
|
|
|
$errorMessage = $validator->errors()->first();
|
|
|
return Result::error($errorMessage);
|
|
|
}
|
|
|
-
|
|
|
+ $requireData['user_id'] = Context::get("UserId");
|
|
|
+ $requireData['website_id'] = $requireData['website_id'];
|
|
|
+ $requireData['web_id'] = Context::get("SiteId");
|
|
|
$result = $this->newsServiceClient->getArticleCommend($requireData);
|
|
|
return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
@@ -3086,7 +3086,7 @@ class NewsController extends AbstractController
|
|
|
return Result::error($errorMessage);
|
|
|
}
|
|
|
$requireData['user_id'] = Context::get('UserId');
|
|
|
- $requireData['website_id'] = empty($requireData['website_id']) ? Context::get('SiteId') : $requireData['website_id'];
|
|
|
+ $requireData['web_id'] = Context::get('SiteId');
|
|
|
$result = $this->newsServiceClient->getAdviceSinglePages($requireData);
|
|
|
return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|