合并分支 'akun' 到 'master'

Akun



查看合并请求 !3103

@@ -111,9 +111,19 @@ class DomainSettingLogic extends BaseLogic
             if (count($domain_array) == 1) {
             if (count($domain_array) == 1) {
                 $this->fail('请填写正确的主域名');
                 $this->fail('请填写正确的主域名');
             } elseif (count($domain_array) == 2) {
             } elseif (count($domain_array) == 2) {
-                array_unshift($domain_array, 'blog');
+                if ($this->user['project_id'] == 5113) {
+                    //5113项目二级域名使用news
+                    array_unshift($domain_array, 'news');
+                } else {
+                    array_unshift($domain_array, 'blog');
+                }
             } else {
             } else {
-                $domain_array[0] = 'blog';
+                if ($this->user['project_id'] == 5113) {
+                    //5113项目二级域名使用news
+                    $domain_array[0] = 'news';
+                } else {
+                    $domain_array[0] = 'blog';
+                }
             }
             }
             $blog_domain = implode('.', $domain_array);
             $blog_domain = implode('.', $domain_array);
 
 
@@ -145,7 +155,7 @@ class DomainSettingLogic extends BaseLogic
 
 
                     //变更ip使用数量
                     //变更ip使用数量
                     $server_ip_model->edit(['total' => $record_info['total'] + 1], ['id' => $record_info['id']]);
                     $server_ip_model->edit(['total' => $record_info['total'] + 1], ['id' => $record_info['id']]);
-                    $server_model->where(['id'=>$record_info['servers_id']])->increment('being_number',1);
+                    $server_model->where(['id' => $record_info['servers_id']])->increment('being_number', 1);
 
 
                     //创建建站任务
                     //创建建站任务
                     $domain_create_model = new DomainCreateTask();
                     $domain_create_model = new DomainCreateTask();
@@ -204,7 +214,7 @@ class DomainSettingLogic extends BaseLogic
 
 
                     //变更ip使用数量
                     //变更ip使用数量
                     $server_ip_model->edit(['total' => $record_info['total'] + 1], ['id' => $record_info['id']]);
                     $server_ip_model->edit(['total' => $record_info['total'] + 1], ['id' => $record_info['id']]);
-                    $server_model->where(['id'=>$record_info['servers_id']])->increment('being_number',1);
+                    $server_model->where(['id' => $record_info['servers_id']])->increment('being_number', 1);
                 }
                 }
 
 
                 DB::commit();
                 DB::commit();