|
|
@@ -1394,59 +1394,84 @@ class PublicController extends AbstractController
|
|
|
);
|
|
|
if ($validator->fails()) {
|
|
|
$errorMessage = $validator->errors()->first();
|
|
|
+ var_dump($errorMessage);
|
|
|
return $this->response->json(
|
|
|
[
|
|
|
'id'=>uniqid(),
|
|
|
+ 'target'=>"采集失败",
|
|
|
+ 'desc'=>$errorMessage,
|
|
|
'error'=>$errorMessage
|
|
|
]
|
|
|
);
|
|
|
}
|
|
|
- $categoryInfo = $this->newsServiceClient->getCategoryInfo(['id'=>$requireData['catid']]);
|
|
|
- if($categoryInfo['code']!=200){
|
|
|
+
|
|
|
+ $arr_catid = explode(',',$requireData['catid']);
|
|
|
+ $arr_web_site_id = explode(',',$requireData['web_site_id']);
|
|
|
+ if(count($arr_catid) != count($arr_web_site_id)){
|
|
|
return $this->response->json(
|
|
|
[
|
|
|
'id'=>uniqid(),
|
|
|
- 'error'=>"栏目不存在"
|
|
|
+ 'target'=>"采集失败",
|
|
|
+ 'desc'=>"网站栏目不匹配",
|
|
|
+ 'error'=>"网站栏目不匹配"
|
|
|
]
|
|
|
);
|
|
|
}
|
|
|
- if($categoryInfo['data']['pid']!=0){
|
|
|
- $pid_arr = json_decode($categoryInfo['data']['pid_arr'],true);
|
|
|
- $requireData['cat_arr_id'] = array_push($pid_arr,intval($requireData['catid']));
|
|
|
- $requireData['cat_arr_id'] = isset($pid_arr) ? json_encode($pid_arr) : '';
|
|
|
- }else{
|
|
|
- $requireData['cat_arr_id'] = json_encode([intval($requireData['catid'])]);
|
|
|
+// var_dump($arr_catid,$arr_web_site_id);
|
|
|
+// die();
|
|
|
+ if($arr_catid){
|
|
|
+ foreach ($arr_catid as $key=>$val){
|
|
|
+ $categoryInfo = $this->newsServiceClient->getCategoryInfo(['id'=>$val]);
|
|
|
+ if($categoryInfo['code']!=200){
|
|
|
+ return $this->response->json(
|
|
|
+ [
|
|
|
+ 'id'=>uniqid(),
|
|
|
+ 'error'=>"栏目不存在"
|
|
|
+ ]
|
|
|
+ );
|
|
|
+ }
|
|
|
+ if($categoryInfo['data']['pid']!=0){
|
|
|
+ $pid_arr = json_decode($categoryInfo['data']['pid_arr'],true);
|
|
|
+ $requireData['cat_arr_id'] = array_push($pid_arr,intval($val));
|
|
|
+ $requireData['cat_arr_id'] = isset($pid_arr) ? json_encode($pid_arr) : '';
|
|
|
+ }else{
|
|
|
+ $requireData['cat_arr_id'] = json_encode([intval($val)]);
|
|
|
+ }
|
|
|
+ $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
|
|
|
+ $requireData['ip'] = $loginIp;
|
|
|
+ $requireData['admin_user_id'] = 0;
|
|
|
+ $requireData['level'] = isset($requireData['level']) && $requireData['level'] ? $requireData['level'] : 0;
|
|
|
+ $requireData['hits'] = isset($requireData['hits']) && $requireData['hits'] ? $requireData['hits'] : 0;
|
|
|
+ $requireData['is_original'] = isset($requireData['is_original']) && $requireData['is_original'] ? $requireData['is_original'] : 0;
|
|
|
+ $requireData['status'] = isset($requireData['status']) && $requireData['status'] ? $requireData['status'] : 1;
|
|
|
+ $requireData['imgurl'] = '';
|
|
|
+ $requireData['user_type'] = 10000;
|
|
|
+ $requireData['level'] = "[0]";
|
|
|
+ $requireData['nav_add_pool_id'] = [];
|
|
|
+ $requireData['city_id'] = 0;
|
|
|
+ $requireData['city_arr_id'] = "[]";
|
|
|
+ $requireData['department_arr_id'] = "[]";
|
|
|
+ $requireData['department_id'] = 0;
|
|
|
+ $requireData['islink'] = 0;
|
|
|
+ $requireData['linkurl'] = "";
|
|
|
+ $requireData['keyword'] = "";
|
|
|
+ $requireData['introduce'] = "";
|
|
|
+ $requireData['is_survey'] = 0;
|
|
|
+ $requireData['survey_name'] = "";
|
|
|
+ $requireData['suvey_array'] = "";
|
|
|
+ $requireData['survey_type'] = 0;
|
|
|
+ $requireData['commend_id'] = "[]";
|
|
|
+ $requireData['catid'] = $val;
|
|
|
+ $requireData['web_site_id'] = $arr_web_site_id[$key];
|
|
|
+ $result = $this->newsServiceClient->addArticle($requireData);
|
|
|
+ $data = [
|
|
|
+ 'id'=>$result['data']['id'],
|
|
|
+ 'target'=>$categoryInfo['data']['name'],
|
|
|
+ 'desc'=>$requireData['title'],
|
|
|
+ ];
|
|
|
+ }
|
|
|
}
|
|
|
- $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
|
|
|
- $requireData['ip'] = $loginIp;
|
|
|
- $requireData['admin_user_id'] = 0;
|
|
|
- $requireData['level'] = isset($requireData['level']) && $requireData['level'] ? $requireData['level'] : 0;
|
|
|
- $requireData['hits'] = isset($requireData['hits']) && $requireData['hits'] ? $requireData['hits'] : 0;
|
|
|
- $requireData['is_original'] = isset($requireData['is_original']) && $requireData['is_original'] ? $requireData['is_original'] : 0;
|
|
|
- $requireData['status'] = isset($requireData['status']) && $requireData['status'] ? $requireData['status'] : 1;
|
|
|
- $requireData['imgurl'] = '';
|
|
|
- $requireData['user_type'] = 10000;
|
|
|
- $requireData['level'] = "[0]";
|
|
|
- $requireData['nav_add_pool_id'] = [];
|
|
|
- $requireData['city_id'] = 0;
|
|
|
- $requireData['city_arr_id'] = "[]";
|
|
|
- $requireData['department_arr_id'] = "[]";
|
|
|
- $requireData['department_id'] = 0;
|
|
|
- $requireData['islink'] = 0;
|
|
|
- $requireData['linkurl'] = "";
|
|
|
- $requireData['keyword'] = "";
|
|
|
- $requireData['introduce'] = "";
|
|
|
- $requireData['is_survey'] = 0;
|
|
|
- $requireData['survey_name'] = "";
|
|
|
- $requireData['suvey_array'] = "";
|
|
|
- $requireData['survey_type'] = 0;
|
|
|
- $requireData['commend_id'] = "[]";
|
|
|
- $result = $this->newsServiceClient->addArticle($requireData);
|
|
|
- $data = [
|
|
|
- 'id'=>$result['data']['id'],
|
|
|
- 'target'=>$categoryInfo['data']['name'],
|
|
|
- 'desc'=>$requireData['title'],
|
|
|
- ];
|
|
|
+
|
|
|
return $this->response->json(
|
|
|
$data
|
|
|
);
|
rkljw