Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -403,11 +403,18 @@ class DomainInfo extends Command
      * @param $domain_id
      * @param $domain_id
      * @param $domain
      * @param $domain
      * @param $is_end
      * @param $is_end
+     * @return  bool
      * @author Akun
      * @author Akun
      * @date 2025/08/14 9:56
      * @date 2025/08/14 9:56
      */
      */
     public function domainChatMessage($project_id, $domain_id, $domain, $is_end)
     public function domainChatMessage($project_id, $domain_id, $domain, $is_end)
     {
     {
+        //每周一推送
+        $week_day = date('w');
+        if ($week_day != 1) {
+            return true;
+        }
+
         //项目是否有绑定群
         //项目是否有绑定群
         $friend_id = ProjectAssociation::where('project_id', $project_id)
         $friend_id = ProjectAssociation::where('project_id', $project_id)
             ->where('status', ProjectAssociation::STATUS_NORMAL)
             ->where('status', ProjectAssociation::STATUS_NORMAL)
@@ -431,6 +438,8 @@ class DomainInfo extends Command
             $messagePushModel = new MessagePush();
             $messagePushModel = new MessagePush();
             $messagePushModel->add($param);
             $messagePushModel->add($param);
         }
         }
+
+        return true;
     }
     }
 
 
     /**
     /**
@@ -439,6 +448,12 @@ class DomainInfo extends Command
      */
      */
     public function domainChatMessageV5()
     public function domainChatMessageV5()
     {
     {
+        //每周一推送
+        $week_day = date('w');
+        if ($week_day != 1) {
+            return true;
+        }
+
         $domain_json = @file_get_contents('https://www.quanqiusou.cn/extend_api/aicc/domain_expire_lists.php');
         $domain_json = @file_get_contents('https://www.quanqiusou.cn/extend_api/aicc/domain_expire_lists.php');
         $domains = json_decode($domain_json, true);
         $domains = json_decode($domain_json, true);
         if (empty($domains))
         if (empty($domains))

@@ -83,7 +83,7 @@ class RankData extends BaseCommands
             //白帽SEO版
             //白帽SEO版
             $list = Project::leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             $list = Project::leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.delete_status',0)
-                ->where('gl_project_deploy_build.seo_plan', 1)
+                ->where('gl_project_deploy_build.seo_plan', '>', 0)
                 ->whereIn('gl_project.type',[2,3,4])
                 ->whereIn('gl_project.type',[2,3,4])
                 ->orderBy('gl_project.id', 'asc')
                 ->orderBy('gl_project.id', 'asc')
                 ->pluck('gl_project.id')->toArray();
                 ->pluck('gl_project.id')->toArray();

@@ -1178,7 +1178,14 @@ class ProjectController extends BaseController
             $this->response('success');
             $this->response('success');
         }
         }
 
 
-        if($projectInfo['serve_id'] == 8){
+        //获取服务器数据
+        $serverIpModel = new ServersIp();
+        $serversIpInfo = $serverIpModel->read(['id' => $projectInfo['serve_id']], ['servers_id']);
+        if(!$serversIpInfo){
+            $this->fail('获取项目所属服务器失败');
+        }
+
+        if($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID){
             //自建站项目
             //自建站项目
             if($this->param['site_status'] == 1){
             if($this->param['site_status'] == 1){
                 //关闭站点
                 //关闭站点
@@ -1206,12 +1213,6 @@ class ProjectController extends BaseController
                 }
                 }
             }else{
             }else{
                 //开启站点：创建建站任务
                 //开启站点：创建建站任务
-                $serverIpModel = new ServersIp();
-                $serversIpInfo = $serverIpModel->read(['id' => $projectInfo['serve_id']], ['servers_id']);
-                if(!$serversIpInfo){
-                    $this->fail('获取项目所属服务器失败');
-                }
-
                 if ($projectInfo['project_type'] == Project::PROJECT_TYPE_SEO) {
                 if ($projectInfo['project_type'] == Project::PROJECT_TYPE_SEO) {
                     $type = DomainCreateTask::TYPE_BLOG;
                     $type = DomainCreateTask::TYPE_BLOG;
                 } else {
                 } else {

@@ -103,9 +103,10 @@ return [
         ],
         ],
         //域名解析别处记录日志
         //域名解析别处记录日志
         'analyze_other' => [
         'analyze_other' => [
-            'driver' => 'custom',
-            'via' => \App\Factory\LogFormatterFactory::class,
-            'prefix' => 'analyze_other',
+            'driver' => 'daily',
+            'path' => storage_path('logs/analyze_other/laravel.log'),
+            'level' => 'debug',
+            'days' => 14,
         ],
         ],
         'stack' => [
         'stack' => [
             'driver' => 'stack',
             'driver' => 'stack',