From 9d3a0221b3ba6bf8610c6814cec1f74779a812a2 Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Thu, 29 Jun 2023 10:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BF=E9=97=AE=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/controller/BaseController.php | 25 +++++++++------
 app/index/controller/Index.php          | 23 ++++++++++++++
 view/index/common/_right.html           |  4 +++
 view/index/index/visit.html             | 41 +++++++++++++++++++++++++
 view/index/post/read.html               |  5 ++-
 5 files changed, 87 insertions(+), 11 deletions(-)
 create mode 100644 view/index/index/visit.html

diff --git a/app/index/controller/BaseController.php b/app/index/controller/BaseController.php
index e441826..87bd2c6 100644
--- a/app/index/controller/BaseController.php
+++ b/app/index/controller/BaseController.php
@@ -5,6 +5,7 @@ namespace app\index\controller;
 use app\BaseController as AppBaseController;
 use app\common\Bootstrap;
 use think\exception\HttpResponseException;
+use think\facade\Env;
 use think\facade\Request;
 use think\Paginator;
 
@@ -18,21 +19,25 @@ class BaseController extends AppBaseController
             return new Bootstrap($items, $listRows, $currentPage, $total, $simple, $options);
         });
 
-        $main_domain = get_system_config('main_domain');
-        $url = Request::url();
+        $debug = Env::get('app_debug');
 
-        if (!empty($main_domain)) {
-            if (Request::host() != $main_domain) {
+        if (!$debug) {
+            // 调试模式不要跳转域名和协议
+            $main_domain = get_system_config('main_domain');
+            $url = Request::url();
 
-                throw new HttpResponseException(redirect(Request::scheme() . '://' . $main_domain . '' . $url));
+            if (!empty($main_domain)) {
+                if (Request::host() != $main_domain) {
+                    throw new HttpResponseException(redirect(Request::scheme() . '://' . $main_domain . '' . $url));
+                }
             }
-        }
 
-        $is_jump_https = get_system_config('is_jump_https', 0);
+            $is_jump_https = get_system_config('is_jump_https', 0);
 
-        if ($is_jump_https == 1) {
-            if (Request::scheme() != 'https') {
-                throw new HttpResponseException(redirect('https://' . Request::host() . '' . $url));
+            if ($is_jump_https == 1) {
+                if (Request::scheme() != 'https') {
+                    throw new HttpResponseException(redirect('https://' . Request::host() . '' . $url));
+                }
             }
         }
     }
diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php
index b67489b..11dc92c 100644
--- a/app/index/controller/Index.php
+++ b/app/index/controller/Index.php
@@ -5,6 +5,7 @@ namespace app\index\controller;
 use app\model\Category;
 use app\model\Post;
 use app\model\PostCategory;
+use app\model\PostVisit;
 use think\facade\Cache;
 use think\facade\Session;
 use think\facade\View;
@@ -98,6 +99,28 @@ class Index extends Common
         return $content;
     }
 
+    public function visit()
+    {
+        $post_id = $this->request->param('post_id');
+
+        $model_list_visit = PostVisit::with(['post'])->order('id desc');
+
+        if(!empty($post_id)) {
+            $model_list_visit->where('post_id', $post_id);
+        }
+
+        $list_visit = $model_list_visit->paginate([
+            'url' => 'Index/visit',
+            'list_rows' => 20,
+            'query' => [
+                'post_id' => $post_id,
+            ],
+        ]);
+        View::assign('list_visit', $list_visit);
+
+        return View::fetch();
+    }
+
     public function logout()
     {
         Session::clear();
diff --git a/view/index/common/_right.html b/view/index/common/_right.html
index dca7991..6783467 100644
--- a/view/index/common/_right.html
+++ b/view/index/common/_right.html
@@ -39,6 +39,7 @@
     <div class="session border">
         <div class="header">
             <span>最近浏览</span>
+            
             <span style="font-size: 12px;">
                 {empty name='Request.session.user_uid'}
                 <a href="{$login_url|default=''}">点击登录</a>
@@ -64,6 +65,9 @@
                 </div>
                 {/volist}
             </div>
+            <div style="text-align: right;">
+                <a href="{:url('Index/visit')}" style="font-size: 12px;" title="">更多记录，大家在看什么？</a>
+            </div>
             <div>累计浏览次数：{$total_hits}</div>
             <div>一周浏览次数：{$total_week_hits}</div>
             <div>今日浏览次数：{$total_day_hits}</div>
diff --git a/view/index/index/visit.html b/view/index/index/visit.html
new file mode 100644
index 0000000..34d6267
--- /dev/null
+++ b/view/index/index/visit.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>访问记录-{:get_system_config('site_name')}</title>
+    {include file='common/_require'/}
+</head>
+
+<body>
+    <div class="layui-container main-container">
+        <div class="layui-row layui-col-space12">
+            {include file='common/_left'/}
+            <div class="layui-col-md7">
+                <div class="main-container">
+                    <div class="ul-avatar-sidebar-list">
+                        {volist name='list_visit' id='vo'}
+                        <div class="ul-avatar-sidebar-list-item" style="width: 100%;margin-bottom: 6px;">
+                            <div class="ul-avatar-sidebar-list-item-img" style="background-image: url({$vo.avatar_src});"></div>
+                            <div class="ul-avatar-sidebar-list-item-info">
+                                <div class="ul-avatar-sidebar-list-item-title">{$vo.nickname_title}</div>
+                                <div class="ul-avatar-sidebar-list-item-intro" style="color: #000;">
+                                    <span>{$vo.create_time_title}</span>
+                                    <a href="{$vo.post.read_url}" title="{$vo.post.title}">《{$vo.post.title}》</a>
+                                </div>
+                            </div>
+                        </div>
+                        {/volist}
+                    </div>
+                    {$list_visit->render()|raw}
+                </div>
+            </div>
+            {include file='common/_right'/}
+
+        </div>
+    </div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/view/index/post/read.html b/view/index/post/read.html
index b2c8929..d4fecc2 100644
--- a/view/index/post/read.html
+++ b/view/index/post/read.html
@@ -154,7 +154,10 @@
                                 </div>
                                 {/volist}
                             </div>
-                            <div class="layui-word-aux" >累计浏览次数：{$post->hits_title}</div>
+                            <div style="text-align: right;">
+                                <a href="{:url('Index/visit',['post_id'=>$post.id])}">更多记录，还有谁在看？</a>
+                            </div>
+                            <div class="layui-word-aux">累计浏览次数：{$post->hits_title}</div>
                         </div>
                     </fieldset>
                 </div>