周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 98f67092197ea73dc97e4ac78406223b311c8307 2 个父辈 b5eddd77 67b055a1

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

内嵌 并排对比
正在显示 5 个修改的文件 包含 24 行增加 和 10 行删除
@@ -83,10 +83,12 @@ class HtmlCollect extends Command @@ -83,10 +83,12 @@ class HtmlCollect extends Command
83 //采集html页面，下载资源到本地并替换 83 //采集html页面，下载资源到本地并替换
84 try { 84 try {
85 $html = curl_c('https://' . $collect_info->domain . $collect_info->route, false); 85 $html = curl_c('https://' . $collect_info->domain . $collect_info->route, false);
86 - if ($html == '0') { 86 + if ($html == '0' || strpos($html,'404 Not Found') !== false) {
87 $collect_info->status = CollectTask::STATUS_FAIL; 87 $collect_info->status = CollectTask::STATUS_FAIL;
88 $collect_info->save(); 88 $collect_info->save();
89 - echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: no html' . PHP_EOL; 89 +
  90 + $error = $html == '0' ? 'no html' : '404 not found';
  91 + echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: ' . $error . PHP_EOL;
90 sleep(2); 92 sleep(2);
91 return true; 93 return true;
92 } 94 }
@@ -85,10 +85,12 @@ class HtmlLanguageCollect extends Command @@ -85,10 +85,12 @@ class HtmlLanguageCollect extends Command
85 //采集html页面，下载资源到本地并替换 85 //采集html页面，下载资源到本地并替换
86 try { 86 try {
87 $html = curl_c('https://' . $collect_info->domain . $collect_info->route, false); 87 $html = curl_c('https://' . $collect_info->domain . $collect_info->route, false);
88 - if ($html == '0') { 88 + if ($html == '0' || strpos($html,'404 Not Found') !== false) {
89 $collect_info->status = CollectTask::STATUS_FAIL; 89 $collect_info->status = CollectTask::STATUS_FAIL;
90 $collect_info->save(); 90 $collect_info->save();
91 - echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: no html' . PHP_EOL; 91 +
  92 + $error = $html == '0' ? 'no html' : '404 not found';
  93 + echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: ' . $error . PHP_EOL;
92 sleep(2); 94 sleep(2);
93 return true; 95 return true;
94 } 96 }
@@ -85,10 +85,12 @@ class HtmlLanguageSpecialCollect extends Command @@ -85,10 +85,12 @@ class HtmlLanguageSpecialCollect extends Command
85 //采集html页面，下载资源到本地并替换 85 //采集html页面，下载资源到本地并替换
86 try { 86 try {
87 $html = curl_c('https://' . $collect_info->domain . $collect_info->route, false); 87 $html = curl_c('https://' . $collect_info->domain . $collect_info->route, false);
88 - if ($html == '0') { 88 + if ($html == '0' || strpos($html,'404 Not Found') !== false) {
89 $collect_info->status = CollectTask::STATUS_FAIL; 89 $collect_info->status = CollectTask::STATUS_FAIL;
90 $collect_info->save(); 90 $collect_info->save();
91 - echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: no html' . PHP_EOL; 91 +
  92 + $error = $html == '0' ? 'no html' : '404 not found';
  93 + echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: ' . $error . PHP_EOL;
92 sleep(2); 94 sleep(2);
93 return true; 95 return true;
94 } 96 }
@@ -13,6 +13,7 @@ use App\Models\Com\UpdateOldInfo; @@ -13,6 +13,7 @@ use App\Models\Com\UpdateOldInfo;
13 use App\Models\News\News; 13 use App\Models\News\News;
14 use App\Models\News\NewsCategory; 14 use App\Models\News\NewsCategory;
15 use App\Models\Product\Category; 15 use App\Models\Product\Category;
  16 +use App\Models\Product\CategoryRelated;
16 use App\Models\Product\Extend; 17 use App\Models\Product\Extend;
17 use App\Models\Product\ExtendInfo; 18 use App\Models\Product\ExtendInfo;
18 use App\Models\Product\Keyword; 19 use App\Models\Product\Keyword;
@@ -290,7 +291,7 @@ class ProjectUpdate extends Command @@ -290,7 +291,7 @@ class ProjectUpdate extends Command
290 'route' => $route 291 'route' => $route
291 ]); 292 ]);
292 $this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id); 293 $this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id);
293 - 294 + CategoryRelated::saveRelated($id, array_column($category_arr, 'id'));
294 CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $link_type, $language_list, $page_list); 295 CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $link_type, $language_list, $page_list);
295 } else { 296 } else {
296 $id = $product['id']; 297 $id = $product['id'];
@@ -308,6 +309,7 @@ class ProjectUpdate extends Command @@ -308,6 +309,7 @@ class ProjectUpdate extends Command
308 ]), 309 ]),
309 'sort' => $item['sort'] ?? 0, 310 'sort' => $item['sort'] ?? 0,
310 ], ['id' => $id]); 311 ], ['id' => $id]);
  312 + CategoryRelated::saveRelated($id, array_column($category_arr, 'id'));
311 } 313 }
312 314
313 //扩展字段 315 //扩展字段
@@ -51,6 +51,10 @@ class ProjectAssociationController extends BaseController @@ -51,6 +51,10 @@ class ProjectAssociationController extends BaseController
51 $this->response('success'); 51 $this->response('success');
52 } 52 }
53 53
  54 + /**
  55 + * 获取aicc用户列表 并返回绑定的数据
  56 + * @return array|void
  57 + */
54 public function check() 58 public function check()
55 { 59 {
56 $project_id = (int)request()->input('project_id', 0); 60 $project_id = (int)request()->input('project_id', 0);
@@ -87,17 +91,19 @@ class ProjectAssociationController extends BaseController @@ -87,17 +91,19 @@ class ProjectAssociationController extends BaseController
87 } 91 }
88 } catch (\Exception $exception) { 92 } catch (\Exception $exception) {
89 DB::rollBack(); 93 DB::rollBack();
90 - $this->response('数据错误，请重试！', Code::SERVER_ERROR); 94 + // 数据错误，请重试
  95 + $this->response('error', Code::SERVER_ERROR);
91 } 96 }
92 if (is_null($isRes)) { 97 if (is_null($isRes)) {
93 - $this->response('请开启AICC绑定！', Code::USER_ERROR, []); 98 + // 请开启AICC绑定
  99 + $this->response('success', Code::SERVER_ERROR);
94 } 100 }
95 $redis_key = 'aicc_friend_lists_' . (int)env('AICC_WECHAT_USER_ID'); 101 $redis_key = 'aicc_friend_lists_' . (int)env('AICC_WECHAT_USER_ID');
96 $result = isset($cache) ? false : redis_get($redis_key); 102 $result = isset($cache) ? false : redis_get($redis_key);
97 if (empty($result)) { 103 if (empty($result)) {
98 $url = env('AICC_URL') . env('AICC_WECHAT_FRIEND_API_URL'); 104 $url = env('AICC_URL') . env('AICC_WECHAT_FRIEND_API_URL');
99 $result = curlGet($url); 105 $result = curlGet($url);
100 - redis_set($redis_key, json_encode($result)); 106 + redis_set($redis_key, json_encode($result), 60);
101 } else { 107 } else {
102 $result = json_decode($result, true); 108 $result = json_decode($result, true);
103 } 109 }