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

@@ -442,8 +442,8 @@ class HtmlCollect extends Command
         foreach ($source as $vs) {
         foreach ($source as $vs) {
 
 
             if ($vs['download']) {
             if ($vs['download']) {
-                if ($project_id == 1355 && in_array(substr($vs['url_complete'], -3), ['pdf', 'zip', 'rar', '.gz'])) {
-                    //项目id为1355的项目，可下载类资源要保持原名称，做特殊处理
+                if (in_array(substr($vs['url_complete'], -3), ['pdf', 'zip', 'rar', '.gz'])) {
+                    //可下载类资源要保持原名称
                     $new_source = CosService::uploadRemote($project_id, 'source', $vs['url_complete'], '', '', 1);
                     $new_source = CosService::uploadRemote($project_id, 'source', $vs['url_complete'], '', '', 1);
                 } else {
                 } else {
                     $new_source = CosService::uploadRemote($project_id, 'source', $vs['url_complete']);
                     $new_source = CosService::uploadRemote($project_id, 'source', $vs['url_complete']);

@@ -64,7 +64,6 @@ class ServersIpController extends BaseController
             'servers_id.required' => '服务器servers_id不能为空'
             'servers_id.required' => '服务器servers_id不能为空'
         ]);
         ]);
         $serversIpModel = new ServersIpModel();
         $serversIpModel = new ServersIpModel();
-        $this->map['status'] = 0;
         $data = $serversIpModel->lists($this->map,$this->page,$this->row,$this->order);
         $data = $serversIpModel->lists($this->map,$this->page,$this->row,$this->order);
         if(!empty($data) && !empty($data['list'])){
         if(!empty($data) && !empty($data['list'])){
             $projectModel = new Project();
             $projectModel = new Project();