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

Lyh server



查看合并请求 !1785

@@ -1206,6 +1206,9 @@ function paginateArray($array, $page = 1, $pageSize = 20) {
  * @time   :2025/4/3 16:19
  * @time   :2025/4/3 16:19
  */
  */
 function getDomain($url) {
 function getDomain($url) {
+    if(empty($url)){
+        return $url;
+    }
     $parsedUrl = parse_url($url);
     $parsedUrl = parse_url($url);
     return $parsedUrl['host'] ?? $url; // 如果解析失败，返回原始 URL
     return $parsedUrl['host'] ?? $url; // 如果解析失败，返回原始 URL
 }
 }

@@ -26,15 +26,16 @@ class GoogleLinkController extends BaseController
     public function getLink(){
     public function getLink(){
         $linkModel = new GoogleLink();
         $linkModel = new GoogleLink();
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $linkModel->lists($this->map,$this->page,$this->row,'id',['url','moz_da','status','google_search','date','project_id','domain']);
+        $this->map['status'] = 1;
+        $this->map['created_at'] = ['<=', date('Y-m-d 00:00:00', strtotime('-7 days'))];
+        $lists = $linkModel->lists($this->map,$this->page,$this->row,'id',['url','moz_da','status','url_domian','google_search','date','project_id','domain']);
         if(empty($lists['list'])){
         if(empty($lists['list'])){
             $linkService = new GoogleLinkService();
             $linkService = new GoogleLinkService();
             $data = $linkService->linkPageData($this->user['domain'],$this->user['project_id']);
             $data = $linkService->linkPageData($this->user['domain'],$this->user['project_id']);
             if(is_array($data)){
             if(is_array($data)){
                 $lists = paginateArray($data,$this->page,$this->row);
                 $lists = paginateArray($data,$this->page,$this->row);
             }else{
             }else{
-                @file_put_contents(storage_path('logs/lyh_error.log'), var_export($data, true) . PHP_EOL, FILE_APPEND);
-                $this->response('success',Code::SUCCESS,[]);
+                $this->response('success');
             }
             }
         }
         }
         $lists['y_total'] = $linkModel->counts(['status'=>1,'project_id'=>$this->user['project_id']]);
         $lists['y_total'] = $linkModel->counts(['status'=>1,'project_id'=>$this->user['project_id']]);

@@ -90,6 +90,9 @@ class GoogleLinkService
         foreach ($data as $val){
         foreach ($data as $val){
             $timestamp = strtotime($val['created_at']);
             $timestamp = strtotime($val['created_at']);
             $date = date('Y-m-d H:i:s', $timestamp ?? time());
             $date = date('Y-m-d H:i:s', $timestamp ?? time());
+            if($val['status'] != 1){
+                continue;
+            }
             $saveData[] = [
             $saveData[] = [
                 'url'=>$val['url'],
                 'url'=>$val['url'],
                 'moz_da'=>$val['mozDA'],
                 'moz_da'=>$val['mozDA'],
@@ -97,11 +100,15 @@ class GoogleLinkService
                 'google_search'=>$val['googlesearch'],
                 'google_search'=>$val['googlesearch'],
                 'date'=>$date,
                 'date'=>$date,
                 'project_id'=>$project_id,
                 'project_id'=>$project_id,
-                'domain'=>$domain
+                'domain'=>$domain,
+                'url_domain'=>getDomain($val['url'] ?? '')
             ];
             ];
         }
         }
         $linkModel = new GoogleLink();
         $linkModel = new GoogleLink();
+        if(!empty($saveData)){
+            $linkModel->del(['project_id'=>$project_id]);
             $linkModel->insertAll($saveData);
             $linkModel->insertAll($saveData);
+        }
         return $saveData;
         return $saveData;
     }
     }
 }
 }