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

@@ -6,6 +6,7 @@ use App\Helper\Arr;
 use App\Helper\SemrushApi;
 use App\Models\RankData\ExternalLinks as ExternalLinksModel;
 use App\Models\Project\DeployOptimize;
+use App\Utils\LogUtils;
 
 /**
  * Class ExternalLinks
@@ -39,7 +40,7 @@ class ExternalLinks extends BaseCommands
         $semrushApi = new SemrushApi();
         //有排名api编号的项目
         $list = DeployOptimize::where('api_no', '>', 0)->pluck('domain', 'project_id')->toArray();
-
+        LogUtils::info('start rank_data_external_links:' . count($list));
         foreach ($list as $project_id => $domain) {
             if(!$domain){
                 continue;

@@ -5,6 +5,7 @@ namespace App\Console\Commands\RankData;
 use App\Helper\QuanqiusouApi;
 use App\Models\Project\DeployOptimize;
 use App\Models\RankData\IndexedPages as IndexedPagesModel;
+use App\Utils\LogUtils;
 
 /**
  * Class IndexedPages
@@ -38,7 +39,7 @@ class IndexedPages extends BaseCommands
         $api = new QuanqiusouApi();
         //有排名api编号的项目
         $list = DeployOptimize::where('api_no', '>', 0)->pluck('api_no', 'project_id')->toArray();
-
+        LogUtils::info('start rank_data_indexed_pages:' . count($list));
         foreach ($list as $project_id => $api_no) {
             $model = IndexedPagesModel::where('project_id', $project_id)->first();
             if($model && $model->updated_date == getThisWeekStarDate()){

@@ -7,6 +7,7 @@ use App\Helper\QuanqiusouApi;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\RankData\RankData as GoogleRankModel;
+use App\Utils\LogUtils;
 
 /**
  * Class GoogleRank
@@ -41,6 +42,7 @@ class RankData extends BaseCommands
         $api = new QuanqiusouApi();
         //有排名api编号的项目
         $list = DeployOptimize::where('api_no', '>' , 0)->select('api_no','minor_languages','project_id')->get();
+        LogUtils::info('start rank_data:' . count($list));
         //当日所有站点谷歌收录数据
         $site_res = $api->getSiteRes();
         if(!$site_res){

@@ -7,6 +7,7 @@ use App\Helper\Arr;
 use App\Helper\QuanqiusouApi;
 use App\Models\Project\DeployOptimize;
 use App\Models\RankData\RankWeek as RankWeekModel;
+use App\Utils\LogUtils;
 
 /**
  * Class WeekRank
@@ -49,7 +50,7 @@ class RankWeek extends BaseCommands
         $res = Arr::s2a($res);
         //有排名api编号的项目
         $list = DeployOptimize::where('api_no', '>', 0)->pluck('api_no', 'project_id')->toArray();
-
+        LogUtils::info('start rank_data_week:' . count($list));
         foreach ($list as $project_id => $api_no) {
             $rank_week = RankWeekModel::where('project_id', $project_id)->first();
             if ($rank_week && $rank_week->updated_date == getThisWeekStarDate()) {

@@ -5,6 +5,7 @@ namespace App\Console\Commands\RankData;
 use App\Helper\SemrushApi;
 use App\Models\RankData\RecommDomain as RecommDomainModel;
 use App\Models\Project\DeployOptimize;
+use App\Utils\LogUtils;
 
 /**
  * Class RecommDomain
@@ -38,7 +39,7 @@ class RecommDomain extends BaseCommands
         $semrushApi = new SemrushApi();
         //有排名api编号的项目
         $list = DeployOptimize::where('api_no', '>', 0)->pluck('domain', 'project_id')->toArray();
-
+        LogUtils::info('start rank_data_recomm_domain:' . count($list));
         foreach ($list as $project_id => $domain) {
             if(!$domain){
                 continue;

@@ -6,6 +6,7 @@ use App\Helper\Arr;
 use App\Helper\GoogleSpeedApi;
 use App\Models\Project\DeployOptimize;
 use App\Models\RankData\Speed as GoogleSpeedModel;
+use App\Utils\LogUtils;
 
 /**
  * Class GoogleSpeed
@@ -42,7 +43,7 @@ class Speed extends BaseCommands
 
         //有排名api编号的项目
         $list = DeployOptimize::where('api_no', '>', 0)->pluck('domain', 'project_id')->toArray();
-
+        LogUtils::info('start rank_data_speed:' . count($list));
         foreach ($list as $project_id => $domain) {
             $model = GoogleSpeedModel::where('project_id', $project_id)->first();
             if ($model && $model->updated_date == getThisWeekStarDate()) {

@@ -228,7 +228,7 @@ class LoginController extends BaseController
      */
     public function globalSo_v6_login(UserLoginLogic $logic){
         $common = new Common();
-        $arr = $common->decrypt($this->param['token']);
+        $arr = $common->decrypt(urldecode($this->param['token']));
         if(empty($arr)){
             $this->response('登录失败',Code::USER_ERROR);
         }