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

@@ -23,13 +23,15 @@ class AutoPullController extends BaseController
             $manage_model = new Manage();
             $manage_model = new Manage();
             foreach ($lists['list'] as $k => $v) {
             foreach ($lists['list'] as $k => $v) {
                 $lists['list'][$k]['operator_name'] = $manage_model->getName($v['user_id']);
                 $lists['list'][$k]['operator_name'] = $manage_model->getName($v['user_id']);
-                $lists['list'][$k]['server_name'] = AutoPullNotify::serversMap()[$v['server_id']];
+                $lists['list'][$k]['server_name'] = AutoPullNotify::serversMap()[$v['server_id']] ?? '';
 
 
                 $process = Arr::s2a($v['process']);
                 $process = Arr::s2a($v['process']);
                 $process_name = [];
                 $process_name = [];
                 if ($process) {
                 if ($process) {
                     foreach ($process as $kp => $vp) {
                     foreach ($process as $kp => $vp) {
-                        $process_name[$kp] = AutoPullNotify::processMap()[$vp];
+                        if(isset(AutoPullNotify::processMap()[$vp])){
+                            $process_name[$kp] = AutoPullNotify::processMap()[$vp];
+                        }
                     }
                     }
                 }
                 }
 
 

@@ -58,7 +58,7 @@ class DomainSettingLogic extends BaseLogic
                 }
                 }
             } else {
             } else {
                 //未绑定主域名，分配域名解析
                 //未绑定主域名，分配域名解析
-                $record = Servers::where('init_domain', 'like', 'seo%')->where('being_number', '<', 10)->orderBy('being_number', 'desc')->orderBy('id', 'asc')->value('init_domain') ?? '';
+                $record = Servers::where('init_domain', 'like', 'seo%')->whereRaw('being_number < ip_total')->orderBy('being_number', 'desc')->orderBy('id', 'asc')->value('init_domain') ?? '';
             }
             }
         }
         }
 
 

@@ -32,11 +32,11 @@ class AutoPullNotify extends Base
         return [
         return [
             'php artisan pack_site_dir' => '打包站点静态页面',
             'php artisan pack_site_dir' => '打包站点静态页面',
             'php artisan handle_html' => '拉取页面zip文件并解压',
             'php artisan handle_html' => '拉取页面zip文件并解压',
-            'php artisan create_update_page_route' => '创建主站路由',
+//            'php artisan create_update_page_route' => '创建主站路由',
             'php artisan create_update_page_master' => '生成主站页面',
             'php artisan create_update_page_master' => '生成主站页面',
             'php artisan create_update_page_minor' => '生成小语种页面',
             'php artisan create_update_page_minor' => '生成小语种页面',
             'php artisan create_update_page_sitemap' => '生成主站sitemap,robots',
             'php artisan create_update_page_sitemap' => '生成主站sitemap,robots',
-            'php artisan create_update_amp_route' => '创建amp站路由',
+//            'php artisan create_update_amp_route' => '创建amp站路由',
             'php artisan create_update_page_amp' => '生成amp站页面',
             'php artisan create_update_page_amp' => '生成amp站页面',
             'php artisan create_update_amp_sitemap' => '生成amp站sitemap,robots',
             'php artisan create_update_amp_sitemap' => '生成amp站sitemap,robots',
         ];
         ];