合并分支 'master-server' 到 'master'

Master server



查看合并请求 !814

@@ -36,7 +36,7 @@ class ServersIpLogic extends BaseLogic
     public function infoServersIp(){
     public function infoServersIp(){
         $info = $this->model->read(['id'=>$this->param['id']]);
         $info = $this->model->read(['id'=>$this->param['id']]);
         $projectModel = new Project();
         $projectModel = new Project();
-        $info['project_title'] = $projectModel->formatQuery(['serve_id'=>$info['id']])->pluck('title')->toArray();
+        $info['project_title'] = $projectModel->formatQuery(['serve_id'=>$info['id'],'delete_status'=>0])->pluck('title')->toArray();
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 

@@ -185,12 +185,12 @@ class CustomTemplateLogic extends BaseLogic
                     $this->param['html_style'] = "<style id='globalsojs-styles'></style>";
                     $this->param['html_style'] = "<style id='globalsojs-styles'></style>";
                 }
                 }
             }
             }
+            if($this->param['url'] == 'news' || $this->param['url'] == 'product' || $this->param['url'] == 'blog'){
+                $this->fail('不允许修改路由为：'.$this->param['url']);
+            }
             $this->param['project_id'] = $this->user['project_id'];
             $this->param['project_id'] = $this->user['project_id'];
             $id = $this->model->addReturnId($this->param);
             $id = $this->model->addReturnId($this->param);
             $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
             $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
-            if($route == 'news' || $route == 'product' || $route == 'blog'){
-                $this->fail('不允许修改路由为：'.$this->param['url']);
-            }
             $this->addUpdateNotify(RouteMap::SOURCE_PAGE,$route);
             $this->addUpdateNotify(RouteMap::SOURCE_PAGE,$route);
             $this->model->edit(['url'=>$route],['id'=>$id]);
             $this->model->edit(['url'=>$route],['id'=>$id]);
         }
         }

@@ -120,6 +120,7 @@ class Project extends Base
             13 => 'AI站群',
             13 => 'AI站群',
             14 => '未达标',
             14 => '未达标',
             15 => 'AI案例',
             15 => 'AI案例',
+            16 => '6.0广告'
         ];
         ];
     }
     }