From 71c9ace5a2c24de99f43520d4330487322bb3642 Mon Sep 17 00:00:00 2001 From: fengr06 Date: Mon, 7 Jan 2019 17:50:15 +0800 Subject: [PATCH 01/15] fix dec --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index daef95d..be46373 100644 --- a/README.md +++ b/README.md @@ -199,7 +199,7 @@ service crond restart ``` crontab -e: //每天下午六点执行推送 - 0 18 * * * /usr/share/nginx/html/blog/crontab/indexer.sh + 0 18 * * * /usr/share/nginx/html/blog/crontab/push.sh service crond restart ``` From dc19369bdd061fcea757705b2ac426d486d84c03 Mon Sep 17 00:00:00 2001 From: fengr06 Date: Fri, 11 Jan 2019 00:02:13 +0800 Subject: [PATCH 02/15] fix article detail click to go --- app/Http/Controllers/ArticleController.php | 36 +++++++++++++++----- resources/views/next/articles/show.blade.php | 6 ++-- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index 87432d5..3b3dbf7 100644 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -130,20 +130,40 @@ public function show(Request $request, $id) $input = $comment ? $comment : $input; } - preg_match_all('#

(.*)

#', $article->content_html, $outline); - $outline = $outline[1]; - $preg = "#(.*?)#"; + $out = $outline[1]; + $outline = []; + foreach ($out as $k => $v) { + $outline[$k]['name'] = $v; + $outline[$k]['id'] = $this->formatContent($v); + } + + $preg = "#(.*)#"; $replace = '$2'; - $content = preg_replace($preg, $replace, $article->content_html); + $content = preg_replace_callback($preg, function ($matches) { + $title = $matches[2]; + $title = $this->formatContent($title); + $h2 = '' . $matches[2] . ''; + return $h2; + }, $article->content_html); -// $parse = new \Parsedown(); -// echo $parse->text($article->content_markdown); -// $article->content_html = $parse->text($article->content_markdown); -// exit; $article->content_html = $content; $tags = $article->tags; return view(env('BLOG_THEME') . '.articles.show', compact('article', 'comments', 'input', 'count', 'outline', 'tags', 'articleCount', 'catesCount', 'tagsCount')); } + + public function formatContent($content) + { + // Filter 英文标点符号 + $content = preg_replace("/[[:punct:]]/i", " ", $content); + // Filter 中文标点符号 + mb_regex_encoding('utf-8'); + $char = "。、！？：；﹑•＂…‘’“”〝〞∕¦‖—　〈〉﹞﹝「」‹›〖〗】【»«』『〕〔》《﹐¸﹕︰﹔！¡？¿﹖﹌﹏﹋＇´ˊˋ―﹫︳︴¯＿￣﹢﹦﹤‐­˜﹟﹩﹠﹪﹡﹨﹍﹉﹎﹊ˇ︵︶︷︸︹︿﹀︺︽︾ˉ﹁﹂﹃﹄︻︼（）"; + $content = mb_ereg_replace("[" . $char . "]", " ", $content, "UTF-8"); + // Filter 连续空格 + $content = preg_replace('# #', '', $content); + return $content; + } + } diff --git a/resources/views/next/articles/show.blade.php b/resources/views/next/articles/show.blade.php index ea2ae32..e1d5daf 100644 --- a/resources/views/next/articles/show.blade.php +++ b/resources/views/next/articles/show.blade.php @@ -329,7 +329,7 @@ class="vat" @@ -383,8 +383,8 @@ class="vat" @if($outline) @foreach($outline as $k => $item)
  • - - {{$k+1}}. {{$item}} + + {{$k+1}}. {{$item['name']}}
    • @endforeach From 961632b0fa2fa88e909b40da00e1723d8a80fdb6 Mon Sep 17 00:00:00 2001 From: fengr06 Date: Tue, 15 Jan 2019 16:32:36 +0800 Subject: [PATCH 03/15] change to full url --- README.md | 6 ++++++ resources/views/next/articles/show.blade.php | 14 +++++++------- resources/views/next/cates/list.blade.php | 8 ++++---- resources/views/next/cates/show.blade.php | 6 +++--- resources/views/next/layouts/app.blade.php | 20 ++++++++------------ resources/views/next/tags/list.blade.php | 10 +++++----- resources/views/next/tags/show.blade.php | 6 +++--- routes/web.php | 6 +++--- 8 files changed, 39 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index be46373..ec8f031 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,13 @@ * php artisan migrate (建表) * php artisan db:seed --class=UsersTableSeeder (填充初始密码account:admin@qq.com, pass:admin) * php artisan storage:link +* 配置主题支持 +``` +cd blog +vim /blog/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php +搜索auth.login为 env('BLOG_THEME').'.auth.login'; +``` 至此，blog已经可以访问了，后台地址为http://你的域名/mrcoderadmin/,不过搜索功能还不能使用 diff --git a/resources/views/next/articles/show.blade.php b/resources/views/next/articles/show.blade.php index e1d5daf..6a5b01f 100644 --- a/resources/views/next/articles/show.blade.php +++ b/resources/views/next/articles/show.blade.php @@ -39,7 +39,7 @@ 分类于 - @@ -86,7 +86,7 @@

    本文标题:客户端服务端消息推送模块设计

    -

    文章作者:Mrcoder

    +

    文章作者:Mrcoder

    发布时间:{{$article->created_at_date}}

    最后更新:{{$article->updated_at_date}}

    原始链接: @@ -114,7 +114,7 @@ class="fa fa-paw">感谢您的阅读-------------

    @if($tags) @foreach($tags as $tag) - + @endforeach @endif
    @@ -335,19 +335,19 @@ class="vat"