From ace6ee5e210af512d9aabb3b2cb3228d6aac509d Mon Sep 17 00:00:00 2001 From: taoser Date: Wed, 9 Jun 2021 14:48:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B8=96=E5=AD=90=E5=92=8C?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=AE=A1=E6=A0=B8=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Forum.php | 13 +- app/admin/controller/Index.php | 7 +- app/admin/view/forum/list.html | 48 ++----- app/admin/view/forum/replys.html | 61 ++++----- app/admin/view/index/home.html | 10 +- app/install/data/taoler.sql | 6 +- composer.lock | 66 ++++----- config/taoler.php | 2 +- public/static/admin/modules/forum.js | 38 +++--- public/static/admin/modules/useradmin.js | 19 +-- vendor/composer/InstalledVersions.php | 30 ++-- vendor/composer/installed.json | 76 +++++------ vendor/composer/installed.php | 30 ++-- .../php-jwt/.github/actions/entrypoint.sh | 18 +++ .../php-jwt/.github/workflows/tests.yml | 77 +++++++++++ vendor/firebase/php-jwt/LICENSE | 2 +- vendor/firebase/php-jwt/README.md | 46 ++++++- .../php-jwt/src/BeforeValidException.php | 1 + .../firebase/php-jwt/src/ExpiredException.php | 1 + vendor/firebase/php-jwt/src/JWK.php | 2 +- vendor/firebase/php-jwt/src/JWT.php | 38 ++++-- .../php-jwt/src/SignatureInvalidException.php | 1 + vendor/services.php | 2 +- vendor/symfony/polyfill-mbstring/Mbstring.php | 46 +++---- .../Resources/unidata/lowerCase.php | 2 +- .../Resources/unidata/upperCase.php | 129 ++++++++++++++---- .../symfony/polyfill-mbstring/bootstrap.php | 2 +- .../symfony/polyfill-mbstring/bootstrap80.php | 6 +- .../symfony/polyfill-mbstring/composer.json | 2 +- vendor/symfony/polyfill-php72/Php72.php | 2 +- vendor/symfony/polyfill-php72/composer.json | 2 +- vendor/symfony/polyfill-php80/composer.json | 2 +- vendor/symfony/var-dumper/README.md | 10 +- view/taoler/index/public/footer.html | 2 +- 34 files changed, 501 insertions(+), 298 deletions(-) create mode 100644 vendor/firebase/php-jwt/.github/actions/entrypoint.sh create mode 100644 vendor/firebase/php-jwt/.github/workflows/tests.yml diff --git a/app/admin/controller/Forum.php b/app/admin/controller/Forum.php index 2535e56..1a0ebc8 100644 --- a/app/admin/controller/Forum.php +++ b/app/admin/controller/Forum.php @@ -37,6 +37,9 @@ class Forum extends AdminController $data['is_reply'] = 0; break; case '5': + $data['a.status'] = -1; + break; + case '6': $data['a.status'] = 0; break; } @@ -120,7 +123,7 @@ class Forum extends AdminController //审核帖子 public function check() { - $data = Request::param(); + $data = Request::only(['id','status']); //获取状态 $res = Db::name('article')->where('id',$data['id'])->save(['status' => $data['status']]); @@ -211,13 +214,17 @@ class Forum extends AdminController public function replys() { if(Request::isAjax()) { - $data = Request::only(['name','content']); + $data = Request::only(['name','content','status']); $map = array_filter($data); $where = array(); if(!empty($map['content'])){ $where[] = ['a.content','like','%'.$map['content'].'%']; unset($map['content']); } + if(isset($data['status'])){ + $where[] = ['a.status','=',(int)$data['status']]; + unset($map['status']); + } /* $replys = Comment::field('id,article_id,user_id,content,create_time')->with([ @@ -252,7 +259,7 @@ class Forum extends AdminController $res = ['code'=>-1,'msg'=>'没有查询结果！']; } return json($res); - } + } return View::fetch(); } diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index d9f990f..0f25543 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -67,6 +67,11 @@ class Index extends AdminController } else { $versions ='当前无可更新版本'; } + //评论、帖子状态 + $comm = Db::name('comment')->field('id')->where(['delete_time'=>0,'status'=>0])->select(); + $forum = Db::name('article')->field('id')->where(['delete_time'=>0,'status'=>0])->select(); + $comms = count($comm); + $forums = count($forum); //运行时间 $now = time(); $count = $now-$this->sys['create_time']; @@ -79,7 +84,7 @@ class Index extends AdminController } $runTime = $years ? "{$years}年{$days}天{$hos}时{$mins}分" : "{$days}天{$hos}时{$mins}分"; - View::assign(['runTime'=>$runTime,'versions'=>$versions]); + View::assign(['runTime'=>$runTime,'versions'=>$versions,'comms'=>$comms,'forums'=>$forums]); return View::fetch(); } diff --git a/app/admin/view/forum/list.html b/app/admin/view/forum/list.html index 86be7f4..755f8cc 100644 --- a/app/admin/view/forum/list.html +++ b/app/admin/view/forum/list.html @@ -6,7 +6,7 @@
- +
@@ -18,21 +18,22 @@
- +
- +
@@ -64,7 +65,7 @@