合并分支 'akun' 到 'master'

Akun



查看合并请求 !468

@@ -42,27 +42,29 @@ class Temp extends Command
 
 
         $domain_list = $domain_model->list(['amp_status' => 1]);
         $domain_list = $domain_model->list(['amp_status' => 1]);
         foreach ($domain_list as $info) {
         foreach ($domain_list as $info) {
-            $notify_info = $notify_model->read(['project_id' => $info['project_id']]);
-            if (!$notify_info) {
+            if ($info['project_id'] > 0) {
+                $notify_info = $notify_model->read(['project_id' => $info['project_id'], 'type' => 3]);
+                if (!$notify_info) {
 
 
-                $domain_array = parse_url($info['domain']);
-                $host = $domain_array['host'] ?? $domain_array['path'];
-                $host_array = explode('.', $host);
-                if (count($host_array) <= 2) {
-                    array_unshift($host_array, 'm');
-                } else {
-                    $host_array[0] = 'm';
-                }
-                $amp_domain = implode('.', $host_array);
+                    $domain_array = parse_url($info['domain']);
+                    $host = $domain_array['host'] ?? $domain_array['path'];
+                    $host_array = explode('.', $host);
+                    if (count($host_array) <= 2) {
+                        array_unshift($host_array, 'm');
+                    } else {
+                        $host_array[0] = 'm';
+                    }
+                    $amp_domain = implode('.', $host_array);
 
 
-                $project_info = $project_model->read(['id' => $info['project_id']]);
+                    $project_info = $project_model->read(['id' => $info['project_id']]);
 
 
-                $notify_model->add([
-                    'project_id' => $info['project_id'],
-                    'type' => 3,
-                    'data' => json_encode(['domain' => $amp_domain, 'url' => [], 'language' => []]),
-                    'server_id' => $project_info['serve_id'],
-                ]);
+                    $notify_model->add([
+                        'project_id' => $info['project_id'],
+                        'type' => 3,
+                        'data' => json_encode(['domain' => $amp_domain, 'url' => [], 'language' => []]),
+                        'server_id' => $project_info['serve_id'],
+                    ]);
+                }
             }
             }
         }
         }
     }
     }

@@ -195,7 +195,8 @@ class ProjectUpdate extends Command
                     $custom_types = $data['data']['customposttypes'] ?? '';
                     $custom_types = $data['data']['customposttypes'] ?? '';
 
 
                     $model = new WebSettingReceiving();
                     $model = new WebSettingReceiving();
-                    if ($phones) {
+                    $has_phone = $model->read(['type' => 2]);
+                    if (!$has_phone && $phones) {
                         $phone_arr = explode(',', $phones);
                         $phone_arr = explode(',', $phones);
                         foreach ($phone_arr as $v_phone) {
                         foreach ($phone_arr as $v_phone) {
                             if ($v_phone) {
                             if ($v_phone) {
@@ -215,7 +216,8 @@ class ProjectUpdate extends Command
                             }
                             }
                         }
                         }
                     }
                     }
-                    if ($emails) {
+                    $has_email = $model->read(['type' => 1]);
+                    if (!$has_email && $emails) {
                         $email_arr = explode(',', $emails);
                         $email_arr = explode(',', $emails);
                         foreach ($email_arr as $v_email) {
                         foreach ($email_arr as $v_email) {
                             if ($v_email) {
                             if ($v_email) {