正在显示
1 个修改的文件
包含
19 行增加
和
12 行删除
| @@ -3,6 +3,7 @@ | @@ -3,6 +3,7 @@ | ||
| 3 | namespace App\Console\Commands\Test; | 3 | namespace App\Console\Commands\Test; |
| 4 | 4 | ||
| 5 | use App\Helper\Arr; | 5 | use App\Helper\Arr; |
| 6 | +use App\Jobs\UpdatePageJob; | ||
| 6 | use App\Models\Com\Notify; | 7 | use App\Models\Com\Notify; |
| 7 | use App\Models\Devops\ServerConfig; | 8 | use App\Models\Devops\ServerConfig; |
| 8 | use App\Models\Devops\ServersIp; | 9 | use App\Models\Devops\ServersIp; |
| @@ -38,7 +39,7 @@ class Temp extends Command | @@ -38,7 +39,7 @@ class Temp extends Command | ||
| 38 | * @author Akun | 39 | * @author Akun |
| 39 | * @date 2024/12/10 10:43 | 40 | * @date 2024/12/10 10:43 |
| 40 | */ | 41 | */ |
| 41 | - public function handle() | 42 | + public function handle6() |
| 42 | { | 43 | { |
| 43 | //获取所有组内推广项目 | 44 | //获取所有组内推广项目 |
| 44 | $leader_mid = 16; | 45 | $leader_mid = 16; |
| @@ -49,27 +50,35 @@ class Temp extends Command | @@ -49,27 +50,35 @@ class Temp extends Command | ||
| 49 | foreach ($project_list as $project) { | 50 | foreach ($project_list as $project) { |
| 50 | $project_id = $project->id; | 51 | $project_id = $project->id; |
| 51 | 52 | ||
| 52 | - $this->output('项目id:' . $project_id . ',start'); | ||
| 53 | - | ||
| 54 | //获取项目域名情况 | 53 | //获取项目域名情况 |
| 55 | $domain_info = DomainInfo::where('project_id', $project_id)->where('status', 1)->first(); | 54 | $domain_info = DomainInfo::where('project_id', $project_id)->where('status', 1)->first(); |
| 56 | if (!$domain_info) { | 55 | if (!$domain_info) { |
| 57 | - $this->output('未绑定正式域名'); | 56 | + $this->output('项目id:' . $project_id . ' | 未绑定正式域名'); |
| 58 | continue; | 57 | continue; |
| 59 | } | 58 | } |
| 60 | $domain_id = $domain_info->id; | 59 | $domain_id = $domain_info->id; |
| 61 | $domain = $domain_info->domain; | 60 | $domain = $domain_info->domain; |
| 62 | 61 | ||
| 63 | //获取项目所在服务器 | 62 | //获取项目所在服务器 |
| 64 | - $serve_ip_info = ServersIp::where('id', $project->serve_id)->first(); | 63 | + $serve_ip_info = ServersIp::select(['id', 'ip', 'domain', 'servers_id'])->where('id', $project->serve_id)->first()->toArray(); |
| 65 | if (!$serve_ip_info) { | 64 | if (!$serve_ip_info) { |
| 66 | - $this->output('未查询到服务器数据'); | 65 | + $this->output('项目id:' . $project_id . ' | 未查询到服务器数据'); |
| 67 | continue; | 66 | continue; |
| 68 | } | 67 | } |
| 69 | - $servers_id = $serve_ip_info->servers_id; | 68 | + $servers_id = $serve_ip_info['servers_id']; |
| 70 | 69 | ||
| 71 | if ($servers_id == ServerConfig::SELF_SITE_ID) { | 70 | if ($servers_id == ServerConfig::SELF_SITE_ID) { |
| 72 | - $this->output('自建站项目过滤'); | 71 | + $this->output('项目id:' . $project_id . ' | 自建站项目过滤'); |
| 72 | + continue; | ||
| 73 | + } | ||
| 74 | + | ||
| 75 | + if ($servers_id == ServerConfig::SELF_TEST_ID) { | ||
| 76 | + $this->output('项目id:' . $project_id . ' | 测试项目过滤'); | ||
| 77 | + continue; | ||
| 78 | + } | ||
| 79 | + | ||
| 80 | + if (!check_domain_record($domain_info['domain'], $serve_ip_info)) { | ||
| 81 | + $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | 未解析到目标服务器'); | ||
| 73 | continue; | 82 | continue; |
| 74 | } | 83 | } |
| 75 | 84 | ||
| @@ -99,7 +108,7 @@ class Temp extends Command | @@ -99,7 +108,7 @@ class Temp extends Command | ||
| 99 | ]); | 108 | ]); |
| 100 | 109 | ||
| 101 | //请求对应C端页面更新接口 | 110 | //请求对应C端页面更新接口 |
| 102 | - $c_url = $domain . '/api/update_page/'; | 111 | + $c_url = 'https://' . $domain . '/api/update_page/'; |
| 103 | $c_params = [ | 112 | $c_params = [ |
| 104 | 'project_id' => $project_id, | 113 | 'project_id' => $project_id, |
| 105 | 'type' => 3 | 114 | 'type' => 3 |
| @@ -110,8 +119,6 @@ class Temp extends Command | @@ -110,8 +119,6 @@ class Temp extends Command | ||
| 110 | } else { | 119 | } else { |
| 111 | $this->output($c_url . ' | ' . ($re['message'] ?? '未返回失败原因')); | 120 | $this->output($c_url . ' | ' . ($re['message'] ?? '未返回失败原因')); |
| 112 | } | 121 | } |
| 113 | - | ||
| 114 | - $this->output('项目id:' . $project_id . ',end'); | ||
| 115 | } | 122 | } |
| 116 | } | 123 | } |
| 117 | 124 | ||
| @@ -375,7 +382,7 @@ class Temp extends Command | @@ -375,7 +382,7 @@ class Temp extends Command | ||
| 375 | } | 382 | } |
| 376 | } else { | 383 | } else { |
| 377 | //其他服务器:请求对应C端接口 | 384 | //其他服务器:请求对应C端接口 |
| 378 | - $c_url = $domain . '/api/update_page/'; | 385 | + $c_url = 'https://' . $domain . '/api/update_page/'; |
| 379 | $c_params = [ | 386 | $c_params = [ |
| 380 | 'project_id' => $project_id, | 387 | 'project_id' => $project_id, |
| 381 | 'type' => 3 | 388 | 'type' => 3 |
-
请 注册 或 登录 后发表评论