fix conflict

smadol · Jul 28, 2017 · ea46660 · ea46660
2 parents 59ba1ba + 2ad1c1c
commit ea46660
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php
@@ -24,11 +24,11 @@ public function __construct()
 
  public function index()
  {
- $TopNovels = Cache::remember('TopNovels', 60, function () {
+ $topNovels = Cache::remember('TopNovels', 60, function () {
  return Novel::top()->take(8)->get();
  });
- $LastNovels = Novel::with('author')->latest()->take(15)->get();
- return view('index.index', compact('TopNovels', 'LastNovels'));
+ $lastNovels = Novel::with('author')->latest()->take(15)->get();
+ return view('index.index', compact('topNovels', 'lastNovels'));
  }
 
  public function category($category)

diff --git a/app/Repositories/Snatch/Biquge.php b/app/Repositories/Snatch/Biquge.php
@@ -64,10 +64,16 @@ public function repair(Novel $novel, $force)
  $start = $i * $this->page_size;
  Log::info("修复小说[{$novel->id}], 第[{$i}]次循环开始，从第[{$start}]条取[{$this->page_size}]条");
  $splice_list = array_slice($url_list, $start, $this->page_size);
- $contents = $this->multi_send_test(self::DOMAIN . $novel->source_link . $splice_list, $this->page_size, 'utf-8');
+ $sourceLink = $novel->source_link;
+ $repairUrl = array_map(function($v) use($sourceLink) {
+ $chapterInfo = explode('/', $v);
+ $chapterId = end($chapterInfo);
+ return self::DOMAIN . $sourceLink . $chapterId;
+ }, $splice_list);
+ $contents = $this->multi_send_test($repairUrl, $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);
@@ -266,7 +272,7 @@ public function update(Novel $novel)
  $biquge_id = end($biquge_idChunk);
  $link = $filter_list[1][$k];
  $value_array[] = [
- 'source_link' => self::DOMAIN . $novel->source_link . $link,
+ 'source_link' => self::DOMAIN . $link,
  'name' => $name,
  'content' => @$temp[$biquge_id],
  'novel_id' => $novel->id,
@@ -334,7 +340,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 +350,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 . $link,
  'name' => $name,
  'content' => @$temp[$biquge_id],
  'novel_id' => $novel->id,

diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
@@ -10,7 +10,7 @@
  <h2 class="title">热门推荐</h2>
  <div class="l-grid">
  <div class="e-wrapper">
- @foreach($TopNovels as $novel)
+ @foreach($topNovels as $novel)
  <div class="element">
  <a href="{{ route('book', ['bookId' => $novel->id]) }}" class="crop" title="{{ $novel->name }}"><img class="thumb" src="{{ $novel->cover }}" border="0" alt="{{ $novel->name }}" /></a>
  <div class="content">
@@ -26,7 +26,7 @@
  <h1 class="title"><a href="/" title="最近更新" >最近更新</a></h1>
  <div class="l-category box category-home">
  <ul class="content">
- @foreach($LastNovels as $novel)
+ @foreach($lastNovels as $novel)
  <li>
  <a href="{{ route('author', ['authorId' => $novel->author_id]) }}" title="{{ $novel->author->name }}" class="cate-li-right">{{ $novel->author->name }}</a>
  <a class="c-title" href="{{ route('book', ['bookId' => $novel->id]) }}" title="{{ $novel->name }}">{{ $novel->name }}</a>
@@ -39,6 +39,11 @@
  <!--/ left -->
  @include('common.right')
  <div class="clr"></div>
+ <a href="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/copyrenzhe/novel" class="github-corner" aria-label="View source on Github">
+ <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg>
+ </a>
+ <style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+
 @stop
 @section('js')
  <script type="text/javascript">