update snatch & format code

smadol · Jun 3, 2017 · c66ef5b · c66ef5b
1 parent d865aba
commit c66ef5b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/Console/Commands/SiteMonitor.php b/app/Console/Commands/SiteMonitor.php
@@ -46,14 +46,14 @@ public function handle()
  $output = curl_exec($ch);
  $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
  curl_close($ch);
- if($httpcode===200){
+ if ($httpcode === 200) {
  session(['siteMonitor' => 0]);
  } else {
  $error_times = session('siteMonitor') + 1;
  session(['siteMonitor' => $error_times]);
  }
  //连续一个小时访问异常
- if(session('siteMonitor') > 5){
+ if (session('siteMonitor') > 5) {
  Event::fire(new MailPostEvent('system', '网站访问异常', array()));
  session(['siteMonitor' => 0]);
  }

diff --git a/app/Repositories/Snatch/Biquge.php b/app/Repositories/Snatch/Biquge.php
@@ -334,7 +334,7 @@ public function snatch(Novel $novel)
  $contents = $this->multi_send_test($splice_list[1], self::DOMAIN . $novel->source_link, $this->page_size, 'utf-8');
  $temp = [];
  foreach ($contents as $k => $html) {
- preg_match('/var readid = "(.*?)"/s', $html, $read_match);
+ preg_match('/addBookMark\((\d+),.*?\)/s', $html, $read_match);
  if (@$read_match[1]) {
  $biquge_id = $read_match[1];
  $content = $this->getChapterContent($html);
@@ -344,10 +344,12 @@ public function snatch(Novel $novel)
  $value_array = [];
  $now = Carbon::now();
  foreach ($splice_list[2] as $k => $name) {
- $idArr = explode('.', $splice_list[1][$k]);
- $biquge_id = $idArr[0];
+ $biquge_idArr = explode('.', $splice_list[1][$k]);
+ $biquge_idChunk = explode('/', $biquge_idArr[0]);
+ $biquge_id = end($biquge_idChunk);
+ $link = $splice_list[1][$k];
  $value_array[] = [
- 'source_link' => self::DOMAIN . $novel->source_link . $splice_list[1][$k],
+ 'source_link' => self::DOMAIN . $novel->source_link . $link,
  'name' => $name,
  'content' => @$temp[$biquge_id],
  'novel_id' => $novel->id,