周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 20f2763d1744522116988434273ab06e13bf9f7d 2 个父辈 6e695743 7b3882f6

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

内嵌 并排对比
正在显示 7 个修改的文件 包含 13 行增加 和 6 行删除
@@ -6,6 +6,7 @@ use App\Helper\Arr; @@ -6,6 +6,7 @@ use App\Helper\Arr;
6 use App\Helper\SemrushApi; 6 use App\Helper\SemrushApi;
7 use App\Models\RankData\ExternalLinks as ExternalLinksModel; 7 use App\Models\RankData\ExternalLinks as ExternalLinksModel;
8 use App\Models\Project\DeployOptimize; 8 use App\Models\Project\DeployOptimize;
  9 +use App\Utils\LogUtils;
9 10
10 /** 11 /**
11 * Class ExternalLinks 12 * Class ExternalLinks
@@ -39,7 +40,7 @@ class ExternalLinks extends BaseCommands @@ -39,7 +40,7 @@ class ExternalLinks extends BaseCommands
39 $semrushApi = new SemrushApi(); 40 $semrushApi = new SemrushApi();
40 //有排名api编号的项目 41 //有排名api编号的项目
41 $list = DeployOptimize::where('api_no', '>', 0)->pluck('domain', 'project_id')->toArray(); 42 $list = DeployOptimize::where('api_no', '>', 0)->pluck('domain', 'project_id')->toArray();
42 - 43 + LogUtils::info('start rank_data_external_links:' . count($list));
43 foreach ($list as $project_id => $domain) { 44 foreach ($list as $project_id => $domain) {
44 if(!$domain){ 45 if(!$domain){
45 continue; 46 continue;
@@ -5,6 +5,7 @@ namespace App\Console\Commands\RankData; @@ -5,6 +5,7 @@ namespace App\Console\Commands\RankData;
5 use App\Helper\QuanqiusouApi; 5 use App\Helper\QuanqiusouApi;
6 use App\Models\Project\DeployOptimize; 6 use App\Models\Project\DeployOptimize;
7 use App\Models\RankData\IndexedPages as IndexedPagesModel; 7 use App\Models\RankData\IndexedPages as IndexedPagesModel;
  8 +use App\Utils\LogUtils;
8 9
9 /** 10 /**
10 * Class IndexedPages 11 * Class IndexedPages
@@ -38,7 +39,7 @@ class IndexedPages extends BaseCommands @@ -38,7 +39,7 @@ class IndexedPages extends BaseCommands
38 $api = new QuanqiusouApi(); 39 $api = new QuanqiusouApi();
39 //有排名api编号的项目 40 //有排名api编号的项目
40 $list = DeployOptimize::where('api_no', '>', 0)->pluck('api_no', 'project_id')->toArray(); 41 $list = DeployOptimize::where('api_no', '>', 0)->pluck('api_no', 'project_id')->toArray();
41 - 42 + LogUtils::info('start rank_data_indexed_pages:' . count($list));
42 foreach ($list as $project_id => $api_no) { 43 foreach ($list as $project_id => $api_no) {
43 $model = IndexedPagesModel::where('project_id', $project_id)->first(); 44 $model = IndexedPagesModel::where('project_id', $project_id)->first();
44 if($model && $model->updated_date == getThisWeekStarDate()){ 45 if($model && $model->updated_date == getThisWeekStarDate()){
@@ -7,6 +7,7 @@ use App\Helper\QuanqiusouApi; @@ -7,6 +7,7 @@ use App\Helper\QuanqiusouApi;
7 use App\Models\Project\DeployBuild; 7 use App\Models\Project\DeployBuild;
8 use App\Models\Project\DeployOptimize; 8 use App\Models\Project\DeployOptimize;
9 use App\Models\RankData\RankData as GoogleRankModel; 9 use App\Models\RankData\RankData as GoogleRankModel;
  10 +use App\Utils\LogUtils;
10 11
11 /** 12 /**
12 * Class GoogleRank 13 * Class GoogleRank
@@ -41,6 +42,7 @@ class RankData extends BaseCommands @@ -41,6 +42,7 @@ class RankData extends BaseCommands
41 $api = new QuanqiusouApi(); 42 $api = new QuanqiusouApi();
42 //有排名api编号的项目 43 //有排名api编号的项目
43 $list = DeployOptimize::where('api_no', '>' , 0)->select('api_no','minor_languages','project_id')->get(); 44 $list = DeployOptimize::where('api_no', '>' , 0)->select('api_no','minor_languages','project_id')->get();
  45 + LogUtils::info('start rank_data:' . count($list));
44 //当日所有站点谷歌收录数据 46 //当日所有站点谷歌收录数据
45 $site_res = $api->getSiteRes(); 47 $site_res = $api->getSiteRes();
46 if(!$site_res){ 48 if(!$site_res){
@@ -7,6 +7,7 @@ use App\Helper\Arr; @@ -7,6 +7,7 @@ use App\Helper\Arr;
7 use App\Helper\QuanqiusouApi; 7 use App\Helper\QuanqiusouApi;
8 use App\Models\Project\DeployOptimize; 8 use App\Models\Project\DeployOptimize;
9 use App\Models\RankData\RankWeek as RankWeekModel; 9 use App\Models\RankData\RankWeek as RankWeekModel;
  10 +use App\Utils\LogUtils;
10 11
11 /** 12 /**
12 * Class WeekRank 13 * Class WeekRank
@@ -49,7 +50,7 @@ class RankWeek extends BaseCommands @@ -49,7 +50,7 @@ class RankWeek extends BaseCommands
49 $res = Arr::s2a($res); 50 $res = Arr::s2a($res);
50 //有排名api编号的项目 51 //有排名api编号的项目
51 $list = DeployOptimize::where('api_no', '>', 0)->pluck('api_no', 'project_id')->toArray(); 52 $list = DeployOptimize::where('api_no', '>', 0)->pluck('api_no', 'project_id')->toArray();
52 - 53 + LogUtils::info('start rank_data_week:' . count($list));
53 foreach ($list as $project_id => $api_no) { 54 foreach ($list as $project_id => $api_no) {
54 $rank_week = RankWeekModel::where('project_id', $project_id)->first(); 55 $rank_week = RankWeekModel::where('project_id', $project_id)->first();
55 if ($rank_week && $rank_week->updated_date == getThisWeekStarDate()) { 56 if ($rank_week && $rank_week->updated_date == getThisWeekStarDate()) {
@@ -5,6 +5,7 @@ namespace App\Console\Commands\RankData; @@ -5,6 +5,7 @@ namespace App\Console\Commands\RankData;
5 use App\Helper\SemrushApi; 5 use App\Helper\SemrushApi;
6 use App\Models\RankData\RecommDomain as RecommDomainModel; 6 use App\Models\RankData\RecommDomain as RecommDomainModel;
7 use App\Models\Project\DeployOptimize; 7 use App\Models\Project\DeployOptimize;
  8 +use App\Utils\LogUtils;
8 9
9 /** 10 /**
10 * Class RecommDomain 11 * Class RecommDomain
@@ -38,7 +39,7 @@ class RecommDomain extends BaseCommands @@ -38,7 +39,7 @@ class RecommDomain extends BaseCommands
38 $semrushApi = new SemrushApi(); 39 $semrushApi = new SemrushApi();
39 //有排名api编号的项目 40 //有排名api编号的项目
40 $list = DeployOptimize::where('api_no', '>', 0)->pluck('domain', 'project_id')->toArray(); 41 $list = DeployOptimize::where('api_no', '>', 0)->pluck('domain', 'project_id')->toArray();
41 - 42 + LogUtils::info('start rank_data_recomm_domain:' . count($list));
42 foreach ($list as $project_id => $domain) { 43 foreach ($list as $project_id => $domain) {
43 if(!$domain){ 44 if(!$domain){
44 continue; 45 continue;
@@ -6,6 +6,7 @@ use App\Helper\Arr; @@ -6,6 +6,7 @@ use App\Helper\Arr;
6 use App\Helper\GoogleSpeedApi; 6 use App\Helper\GoogleSpeedApi;
7 use App\Models\Project\DeployOptimize; 7 use App\Models\Project\DeployOptimize;
8 use App\Models\RankData\Speed as GoogleSpeedModel; 8 use App\Models\RankData\Speed as GoogleSpeedModel;
  9 +use App\Utils\LogUtils;
9 10
10 /** 11 /**
11 * Class GoogleSpeed 12 * Class GoogleSpeed
@@ -42,7 +43,7 @@ class Speed extends BaseCommands @@ -42,7 +43,7 @@ class Speed extends BaseCommands
42 43
43 //有排名api编号的项目 44 //有排名api编号的项目
44 $list = DeployOptimize::where('api_no', '>', 0)->pluck('domain', 'project_id')->toArray(); 45 $list = DeployOptimize::where('api_no', '>', 0)->pluck('domain', 'project_id')->toArray();
45 - 46 + LogUtils::info('start rank_data_speed:' . count($list));
46 foreach ($list as $project_id => $domain) { 47 foreach ($list as $project_id => $domain) {
47 $model = GoogleSpeedModel::where('project_id', $project_id)->first(); 48 $model = GoogleSpeedModel::where('project_id', $project_id)->first();
48 if ($model && $model->updated_date == getThisWeekStarDate()) { 49 if ($model && $model->updated_date == getThisWeekStarDate()) {
@@ -228,7 +228,7 @@ class LoginController extends BaseController @@ -228,7 +228,7 @@ class LoginController extends BaseController
228 */ 228 */
229 public function globalSo_v6_login(UserLoginLogic $logic){ 229 public function globalSo_v6_login(UserLoginLogic $logic){
230 $common = new Common(); 230 $common = new Common();
231 - $arr = $common->decrypt($this->param['token']); 231 + $arr = $common->decrypt(urldecode($this->param['token']));
232 if(empty($arr)){ 232 if(empty($arr)){
233 $this->response('登录失败',Code::USER_ERROR); 233 $this->response('登录失败',Code::USER_ERROR);
234 } 234 }