合并分支 'zhl' 到 'master'

u bug



查看合并请求 !3

@@ -308,7 +308,7 @@ public function setEvent($id, $status, $note = '')
             if ($times == 2)
             if ($times == 2)
                 $event->start_at = date('Y-m-d H:i:s', time() + 600);
                 $event->start_at = date('Y-m-d H:i:s', time() + 600);
         }
         }
-        $event->stauts = $status;
+        $event->status = $status;
         $event->times = $times;
         $event->times = $times;
         $event->note = $note;
         $event->note = $note;
         $event->save();
         $event->save();

@@ -51,7 +51,7 @@ public function deleteSite(Request $request)
         try {
         try {
 //            $this->validate();
 //            $this->validate();
             $domain = $request->input('domain');
             $domain = $request->input('domain');
-            if (empty($domain) && filter_var($domain, FILTER_VALIDATE_URL))
+            if (empty($domain) || filter_var($domain, FILTER_VALIDATE_URL))
                 return $this->error('请提交有效domain信息');
                 return $this->error('请提交有效domain信息');
 
 
             $result = app(BtRepository::class)->deleteBtSite($domain);
             $result = app(BtRepository::class)->deleteBtSite($domain);

@@ -120,7 +120,7 @@ public function deleteBtSite($domain)
         // 获取bt数据 可能要可靠一些
         // 获取bt数据 可能要可靠一些
         $result = $bt->Websites($host);
         $result = $bt->Websites($host);
         if (empty($result['data']))
         if (empty($result['data']))
-            return false;
+            return true;
         $id = 0;
         $id = 0;
         foreach ($result['data'] as $v) {
         foreach ($result['data'] as $v) {
             if ($v['name'] == $host) {
             if ($v['name'] == $host) {