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

@@ -174,7 +174,7 @@ class BaseLogic extends Logic
         $data['project_id'] = $this->user['project_id'];
         $data['project_id'] = $this->user['project_id'];
         $str = http_build_query($data);
         $str = http_build_query($data);
         $url = $this->user['domain'].'api/delHtml/?'.$str;
         $url = $this->user['domain'].'api/delHtml/?'.$str;
-        if(isset($this->project['serve_id']) && ($this->project['serve_id'] == 3)){//TODO::当前项目通知不过 ，跳过自动更新
+        if(isset($this->project['serve_id']) && ($this->project['serve_id'] != 1)){//TODO::当前项目通知不过 ，跳过自动更新
             exec('curl -k "'.$url.'" > /dev/null 2>&1 &');
             exec('curl -k "'.$url.'" > /dev/null 2>&1 &');
         }else{
         }else{
             shell_exec('curl -k "'.$url.'"');
             shell_exec('curl -k "'.$url.'"');