Merge remote-tracking branch 'origin/develop' into akun

@@ -149,6 +149,7 @@ class BaseLogic extends Logic
     function updateNotify($data)
     function updateNotify($data)
     {
     {
         $updateNotifyModel = new UpdateNotify();
         $updateNotifyModel = new UpdateNotify();
+        if($data['route'] != 'all'){
             $info = $updateNotifyModel->read(['project_id'=>$data['project_id'],'route'=>$data['route'],'status'=>1]);
             $info = $updateNotifyModel->read(['project_id'=>$data['project_id'],'route'=>$data['route'],'status'=>1]);
             if($info === false){
             if($info === false){
                 $param = [
                 $param = [
@@ -160,6 +161,9 @@ class BaseLogic extends Logic
             }
             }
             //单页面直接通知更新
             //单页面直接通知更新
             $url = $this->user['domain'].'api/delHtml/?project_id='.$this->user['project_id'].'&route='.$data['route'];
             $url = $this->user['domain'].'api/delHtml/?project_id='.$this->user['project_id'].'&route='.$data['route'];
+        }else{
+            $url = $this->user['domain'].'api/webInfo/?type=clear_website';
+        }
         curlGet($url);
         curlGet($url);
         return $this->success();
         return $this->success();
     }
     }