周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 958eec881146fb81ec1b923ce3195fe146d1be48 1 个父辈 7fd8f499

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 15 行增加 和 15 行删除
@@ -59,7 +59,7 @@ class RankDataTask extends Command @@ -59,7 +59,7 @@ class RankDataTask extends Command
59 $api = new QuanqiusouApi(); 59 $api = new QuanqiusouApi();
60 $site_res = $api->getSiteRes(); 60 $site_res = $api->getSiteRes();
61 61
62 - (new RankDataLogic())->syncRankData($item['data']['api_no'], $site_res); 62 + (new RankDataLogic())->syncRankData($item['data']['api_no'], $site_res, true);
63 63
64 $item->status = NoticeLog::STATUS_SUCCESS; 64 $item->status = NoticeLog::STATUS_SUCCESS;
65 $item->save(); 65 $item->save();
@@ -34,7 +34,7 @@ class QuanqiusouApi @@ -34,7 +34,7 @@ class QuanqiusouApi
34 $res = HttpUtils::get($api_url, []); 34 $res = HttpUtils::get($api_url, []);
35 if($res){ 35 if($res){
36 $res = Arr::s2a($res); 36 $res = Arr::s2a($res);
37 - Cache::put($key, $res, 24 * 3600); 37 + Cache::put($key, $res, 2 * 3600);
38 } 38 }
39 } catch (\Exception | GuzzleException $e) { 39 } catch (\Exception | GuzzleException $e) {
40 errorLog('获取站点收录页面数', [], $e); 40 errorLog('获取站点收录页面数', [], $e);
@@ -60,7 +60,7 @@ class QuanqiusouApi @@ -60,7 +60,7 @@ class QuanqiusouApi
60 $res = HttpUtils::get($api_url, ['apino' => $api_no]); 60 $res = HttpUtils::get($api_url, ['apino' => $api_no]);
61 if($res){ 61 if($res){
62 $res = Arr::s2a($res); 62 $res = Arr::s2a($res);
63 - Cache::put($key, $res, 24 * 3600); 63 + Cache::put($key, $res, 2 * 3600);
64 } 64 }
65 } catch (\Exception | GuzzleException $e) { 65 } catch (\Exception | GuzzleException $e) {
66 errorLog('获取站点收录页面数', [], $e); 66 errorLog('获取站点收录页面数', [], $e);
@@ -80,11 +80,11 @@ class QuanqiusouApi @@ -80,11 +80,11 @@ class QuanqiusouApi
80 * @author zbj 80 * @author zbj
81 * @date 2023/5/11 81 * @date 2023/5/11
82 */ 82 */
83 - public function getGoogleRank($api_no, int $lang = 0, int $day = 7) 83 + public function getGoogleRank($api_no, int $lang = 0, int $day = 7, $force = true)
84 { 84 {
85 $key = "quanqiusou_api_rank_{$api_no}_{$lang}_{$day}_" . date('Y-m-d'); 85 $key = "quanqiusou_api_rank_{$api_no}_{$lang}_{$day}_" . date('Y-m-d');
86 $res = Cache::get($key); 86 $res = Cache::get($key);
87 - if (!$res) { 87 + if (!$res || $force) {
88 $param = [ 88 $param = [
89 'key' => '289c1fc81c89d79c04ed4fd72822948e', 89 'key' => '289c1fc81c89d79c04ed4fd72822948e',
90 'w' => $api_no, 90 'w' => $api_no,
@@ -100,7 +100,7 @@ class QuanqiusouApi @@ -100,7 +100,7 @@ class QuanqiusouApi
100 $res = HttpUtils::get($api_url, $param); 100 $res = HttpUtils::get($api_url, $param);
101 if($res){ 101 if($res){
102 $res = Arr::s2a($res); 102 $res = Arr::s2a($res);
103 - Cache::put($key, $res, 24 * 3600); 103 + Cache::put($key, $res, 2 * 3600);
104 } 104 }
105 } catch (\Exception | GuzzleException $e) { 105 } catch (\Exception | GuzzleException $e) {
106 errorLog('获取谷歌排名数据失败', $api_no, $e); 106 errorLog('获取谷歌排名数据失败', $api_no, $e);
@@ -127,7 +127,7 @@ class QuanqiusouApi @@ -127,7 +127,7 @@ class QuanqiusouApi
127 $res = HttpUtils::get($api_url, []); 127 $res = HttpUtils::get($api_url, []);
128 if($res){ 128 if($res){
129 $res = Arr::s2a($res); 129 $res = Arr::s2a($res);
130 - Cache::put($key, $res, 24 * 3600); 130 + Cache::put($key, $res, 2 * 3600);
131 } 131 }
132 } catch (\Exception | GuzzleException $e) { 132 } catch (\Exception | GuzzleException $e) {
133 errorLog('获取每周谷歌排名数据失败', [], $e); 133 errorLog('获取每周谷歌排名数据失败', [], $e);
@@ -162,7 +162,7 @@ class QuanqiusouApi @@ -162,7 +162,7 @@ class QuanqiusouApi
162 $res = HttpUtils::get($api_url, $param); 162 $res = HttpUtils::get($api_url, $param);
163 if($res){ 163 if($res){
164 $res = Arr::s2a($res); 164 $res = Arr::s2a($res);
165 - Cache::put($key, $res, 24 * 3600); 165 + Cache::put($key, $res, 2 * 3600);
166 } 166 }
167 } catch (\Exception | GuzzleException $e) { 167 } catch (\Exception | GuzzleException $e) {
168 errorLog('获取历史排名统计数据失败', [], $e); 168 errorLog('获取历史排名统计数据失败', [], $e);
@@ -221,7 +221,7 @@ class QuanqiusouApi @@ -221,7 +221,7 @@ class QuanqiusouApi
221 $res = HttpUtils::get($api_url, $param); 221 $res = HttpUtils::get($api_url, $param);
222 if($res){ 222 if($res){
223 $res = Arr::s2a($res); 223 $res = Arr::s2a($res);
224 - Cache::put($key, $res, 24 * 3600); 224 + Cache::put($key, $res, 2 * 3600);
225 } 225 }
226 } catch (\Exception | GuzzleException $e) { 226 } catch (\Exception | GuzzleException $e) {
227 errorLog('获取项目小语种数据失败', [], $e); 227 errorLog('获取项目小语种数据失败', [], $e);
@@ -249,7 +249,7 @@ class QuanqiusouApi @@ -249,7 +249,7 @@ class QuanqiusouApi
249 $res = HttpUtils::get($api_url, $param); 249 $res = HttpUtils::get($api_url, $param);
250 if($res){ 250 if($res){
251 $res = Arr::s2a($res); 251 $res = Arr::s2a($res);
252 - Cache::put($key, $res, 24 * 3600); 252 + Cache::put($key, $res, 2 * 3600);
253 } 253 }
254 } catch (\Exception | GuzzleException $e) { 254 } catch (\Exception | GuzzleException $e) {
255 errorLog('获取项目API_NO数据失败', [], $e); 255 errorLog('获取项目API_NO数据失败', [], $e);
@@ -357,7 +357,7 @@ class RankDataLogic extends BaseLogic @@ -357,7 +357,7 @@ class RankDataLogic extends BaseLogic
357 * @author zbj 357 * @author zbj
358 * @date 2023/9/20 358 * @date 2023/9/20
359 */ 359 */
360 - public function syncRankData($api_no, $site_res){ 360 + public function syncRankData($api_no, $site_res, $force){
361 $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('project_id'); 361 $project_ids = DeployOptimize::where('api_no', $api_no)->pluck('project_id');
362 foreach ($project_ids as $project_id) { 362 foreach ($project_ids as $project_id) {
363 $project = Project::find($project_id); 363 $project = Project::find($project_id);
@@ -368,8 +368,8 @@ class RankDataLogic extends BaseLogic @@ -368,8 +368,8 @@ class RankDataLogic extends BaseLogic
368 $api = new QuanqiusouApi(); 368 $api = new QuanqiusouApi();
369 369
370 $model = RankData::where('project_id', $project_id)->where('lang', '')->first(); 370 $model = RankData::where('project_id', $project_id)->where('lang', '')->first();
371 - if (!$model || $model->updated_date != date('Y-m-d')) {  
372 - $res = $api->getGoogleRank($api_no); 371 + if (!$model || $model->updated_date != date('Y-m-d') || $force) {
  372 + $res = $api->getGoogleRank($api_no, 0, 7, $force);
373 if (!$res) { 373 if (!$res) {
374 throw new \Exception('接口数据获取失败'); 374 throw new \Exception('接口数据获取失败');
375 } 375 }
@@ -381,8 +381,8 @@ class RankDataLogic extends BaseLogic @@ -381,8 +381,8 @@ class RankDataLogic extends BaseLogic
381 $lang_list = $api->getLangList(); 381 $lang_list = $api->getLangList();
382 if (!empty($lang_list[$api_no])) { 382 if (!empty($lang_list[$api_no])) {
383 $model = RankData::where('project_id', $project_id)->where('lang', '<>', '')->first(); 383 $model = RankData::where('project_id', $project_id)->where('lang', '<>', '')->first();
384 - if (!$model || $model->updated_date != date('Y-m-d')) {  
385 - $res = $api->getGoogleRank($api_no, 1); 384 + if (!$model || $model->updated_date != date('Y-m-d') || $force) {
  385 + $res = $api->getGoogleRank($api_no, 1, 7, $force);
386 if (!$res) { 386 if (!$res) {
387 throw new \Exception('接口数据获取失败'); 387 throw new \Exception('接口数据获取失败');
388 } 388 }