合并分支 'lyh-server' 到 'master'

gxgeo设置搜索历史记录



查看合并请求 !2433

@@ -210,7 +210,7 @@ class CNoticeController extends BaseController
      * 更新通知C端
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
-     * @param : type : 1->主站更新 4->聚合页更新 7->ai博客
+     * @param : route : 1->主站更新 4->聚合页更新 7->ai博客
      */
     public function sendNotify(Request $request)
     {
@@ -223,7 +223,7 @@ class CNoticeController extends BaseController
         $url = $request->input('url', []);
         $language = $request->input('language', []);
         $is_sitemap = intval($request->input('is_sitemap', 0));
-        if($type == 4){//代表聚合页更新
+        if($route == 4){//代表聚合页更新
             $keywordModel = new Keyword();
             $keywordInfo = $keywordModel->whereNull('seo_title')->orWhereNull('seo_keywords')->orWhereNull('seo_description')->first();
             if(!empty($keywordInfo)){
@@ -302,7 +302,7 @@ class CNoticeController extends BaseController
                 'is_sitemap' => $is_sitemap
             ];
             try {
-                http_post($c_url, json_encode($c_param));
+                http_post($c_url, json_encode($c_param,true));
             }catch (\Exception $e){
                 NoticeLog::createLog(NoticeLog::GENERATE_PAGE, ['c_url'=>$c_url,'c_params'=>$c_param]);
             }

@@ -88,19 +88,17 @@ class GeoQuestionResLogic extends BaseLogic
         $questionModel = new GeoQuestion();
         $list = $questionModel->list(['project_id'=>$this->user['project_id']],['question','keywords','url']);
         $questionTotalCount = $urlTotalCount = $keywordsTotalCount = $keywordUrlCount = 0;
+        $keywordArr = [];
+        $questionLogModel = new GeoQuestionLog();
+        $keywordUrlCount = $questionLogModel->counts(['project_id'=>$this->user['project_id'],'hit'=>['!=',0]]);
         foreach ($list as $item){
             $questionTotalCount += count($item['question'] ?? []);
             $keywordsTotalCount += count($item['keywords'] ?? []);
             $urlTotalCount += count($item['url'] ?? []);
-        }
-        $keywordArr = [];
-        $questionResModel = new GeoQuestionLog();
-        $resList = $questionResModel->list(['project_id'=>$this->user['project_id']],['keywords','url','keywords_num','url_num']);
-        foreach ($resList as $resItem){
-            $keywordUrlCount += count($resItem['keywords']);
-            $keywordUrlCount += count($resItem['url']);
-            foreach ($resItem['keywords_num'] as $key => $value) {
-                $keywordArr[$key] = ($keywordArr[$key] ?? 0) + (($value != 0) ? 1 : 0);
+            foreach ($item['keywords'] as $keyWordItem){
+                if (!array_key_exists($keyWordItem, $keywordArr)) {
+                    $keywordArr[$keyWordItem] = $questionLogModel->counts(['keywords'=>['like','%"'.$keyWordItem.'"%']]);
+                }
             }
         }
         $data = [
@@ -124,7 +122,7 @@ class GeoQuestionResLogic extends BaseLogic
         $data = [];
         $platformModel = new GeoPlatform();
         $list = $platformModel->list(['status'=>1],'id',['name','en_name']);
-        $questionResModel = new GeoQuestionResult();
+        $questionResModel = new GeoQuestionLog();
         foreach ($list as $item){
              $data[$item['name']] = $questionResModel->counts(['project_id'=>$this->user['project_id'],'hit'=>['!=',0],'platform'=>$item['en_name']]);
         }