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

张关杰
app/Http/Controllers/Aside/Optimize/OptimizeController.php
app/Http/Logic/Aside/Project/ProjectLogic.php
app/Http/Logic/Bside/Product/ProductLogic.php
app/Models/ASide/APublicModel.php
--- a/app/Http/Controllers/Aside/Optimize/OptimizeController.php
查看文件 @6f81e3c
+++ b/app/Http/Controllers/Aside/Optimize/OptimizeController.php
查看文件 @6f81e3c
@@ -138,6 +138,7 @@ class OptimizeController extends BaseController
         }
         $item['product_num'] = $data['product'] ?? 0;
         $item['keyword_num'] = $item['key'] ?? 0;
+        $item['inquiry_num'] = $data['inquiry'] ?? 0;
         $item['autologin_code'] = getAutoLoginCode($item['id']);
         return $item;
     }
--- a/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @6f81e3c
+++ b/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @6f81e3c
@@ -17,6 +17,12 @@ use App\Models\Project\InquiryFilterConfig;
 use App\Models\Project\MinorLanguages;
 use App\Models\Project\ProjectRenew;
 use App\Models\Project\WebTrafficConfig;
+use App\Models\RankData\ExternalLinks;
+use App\Models\RankData\IndexedPages;
+use App\Models\RankData\RankData;
+use App\Models\RankData\RankWeek;
+use App\Models\RankData\RecommDomain;
+use App\Models\RankData\Speed;
 use App\Models\Template\Setting;
 use App\Models\User\ProjectMenu;
 use App\Models\User\ProjectRole;
@@ -296,7 +302,17 @@ class ProjectLogic extends BaseLogic
         //是否更新了api_no
         $api_no = DeployOptimize::where('id', $deploy_optimize['id'])->value('api_no');
         if($api_no != $deploy_optimize['api_no']){
-            NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, ['api_no' => $deploy_optimize['api_no']]);
+            if($deploy_optimize['api_no']){
+                NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, ['api_no' => $deploy_optimize['api_no'] ?: 0]);
+            }else{
+                //清空已有排名数据
+                RankData::where('project_id', $deploy_optimize['project_id'])->delete();
+                ExternalLinks::where('project_id', $deploy_optimize['project_id'])->delete();
+                IndexedPages::where('project_id', $deploy_optimize['project_id'])->delete();
+                RecommDomain::where('project_id', $deploy_optimize['project_id'])->delete();
+                Speed::where('project_id', $deploy_optimize['project_id'])->delete();
+                RankWeek::where('project_id', $deploy_optimize['project_id'])->delete();
+            }
         }
         $deployOptimizeModel->edit($deploy_optimize,['id'=>$deploy_optimize['id']]);
         return $this->success();
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @6f81e3c
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @6f81e3c
@@ -294,6 +294,8 @@ class ProductLogic extends  BaseLogic
             $param['video']['url'] = str_replace_url($param['video']['url']);
             $param['video']['video_image'] = str_replace_url($param['video']['video_image']);
             $param['video'] = Arr::a2s($param['video'] ?? []);
+        }else{
+            $param['video'] = Arr::a2s([]);
         }
         if(isset($param['keyword_id']) && !empty($param['keyword_id'])){
             $param['keyword_id'] = ','.Arr::arrToSet($param['keyword_id']).',';
@@ -309,6 +311,8 @@ class ProductLogic extends  BaseLogic
                 $param['icon'][$k1] = str_replace_url($v1);
             }
             $param['icon'] = Arr::a2s($param['icon'] ?? []);
+        }else{
+            $param['icon'] = Arr::a2s([]);
         }
         $param['created_uid'] = $this->user['id'];
         return $param;
--- a/app/Models/ASide/APublicModel.php
查看文件 @6f81e3c
+++ b/app/Models/ASide/APublicModel.php
查看文件 @6f81e3c
@@ -10,9 +10,11 @@
 namespace App\Models\ASide;
 use App\Helper\AyrShare as AyrShareHelper;
+use App\Helper\FormGlobalsoApi;
 use App\Models\AyrShare\AyrShare as AyrShareModel;
 use App\Models\Base;
 use App\Services\ProjectServer;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 class APublicModel extends Base
@@ -30,6 +32,8 @@ class APublicModel extends Base
      */
     public static function getNumByProjectId($project_id){
         ProjectServer::useProject($project_id);
+        $data = Cache::get('product_blog_news_'.$project_id);
+        if(!$data){
             $productNumber = DB::connection('custom_mysql')->table('gl_product')
                 ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
             $blogNumber = DB::connection('custom_mysql')->table('gl_blog')
@@ -38,8 +42,19 @@ class APublicModel extends Base
                 ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
             $keyNumber = DB::connection('custom_mysql')->table('gl_product_keyword')
                 ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
+            //获取项目的询盘数量
+            $inquiryNumber = 0;
+//            $countInfo = DB::table('gl_count')->where('project_id', $project_id)->orderBy('id', 'desc')
+//                ->first();
+//            if(!empty($countInfo)){
+//                @file_put_contents(storage_path('logs/lyh_error.log'), var_export($countInfo, true) . PHP_EOL, FILE_APPEND);
+//                $inquiryNumber = $countInfo['inquiry_num'] ?? 0;
+//            }
+            $data  = ['product'=>$productNumber,'blog'=>$blogNumber,'news'=>$newsNumber,'key'=>$keyNumber,'inquiry'=>$inquiryNumber];
+            Cache::add('product_blog_news_'.$project_id,$data,30 * 60);
+        }
         DB::disconnect('custom_mysql');
-        return ['product'=>$productNumber,'blog'=>$blogNumber,'news'=>$newsNumber,'key'=>$keyNumber];
+        return $data;
     }
 }