From a6d4ae4b392364073f264ad85eca7df197f6addc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=81=E7=81=AB=E8=A1=8C=E8=80=85?= Date: Tue, 7 Sep 2021 10:36:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Http/Middleware/CheckoutSite.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Http/Middleware/CheckoutSite.php b/src/Http/Middleware/CheckoutSite.php index 51a48e1..052af1c 100644 --- a/src/Http/Middleware/CheckoutSite.php +++ b/src/Http/Middleware/CheckoutSite.php @@ -68,7 +68,8 @@ class CheckoutSite implements MiddlewareInterface 'posts', // 帖子 'backAdmin/login', 'emoji', - 'view.count' + 'view.count', + 'swagger' ]; public function __construct(Application $app, SettingsRepository $settings) { -- Gitee From 997c9fb06725dfddffbcba3840bb0a5cbef39922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=81=E7=81=AB=E8=A1=8C=E8=80=85?= Date: Tue, 7 Sep 2021 10:38:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Http/Middleware/CheckUserStatus.php | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/Http/Middleware/CheckUserStatus.php b/src/Http/Middleware/CheckUserStatus.php index 675c41a..568dada 100644 --- a/src/Http/Middleware/CheckUserStatus.php +++ b/src/Http/Middleware/CheckUserStatus.php @@ -118,14 +118,13 @@ class CheckUserStatus implements MiddlewareInterface ResponseCode::$codeMap[ResponseCode::VALIDATE_REJECT], User::getUserReject($actor->id) ); -// $this->exceptionResponse($actor->id,'validate_reject'); } // 审核忽略 if ($actor->status == User::STATUS_IGNORE) { Utils::outPut(ResponseCode::VALIDATE_IGNORE); } // 待填写扩展审核字段的用户 - if ($actor->status == User::STATUS_NEED_FIELDS || $this->isJumpSiginFields($actor)) { + if ($actor->status == User::STATUS_NEED_FIELDS || $this->isJumpSignFields($actor)) { if (!in_array($api, $this->noAuditAction) && !(strpos($api, 'users') === 0)) { Utils::outPut(ResponseCode::JUMP_TO_SIGIN_FIELDS); } @@ -133,26 +132,7 @@ class CheckUserStatus implements MiddlewareInterface return $handler->handle($request); } - private function exceptionResponse($userId, $msg) - { - $crossHeaders = DiscuzResponseFactory::getCrossHeaders(); - foreach ($crossHeaders as $k=>$v) { - header($k . ':' . $v); - } - $response = [ - 'errors' => [ - [ - 'status' => '401', - 'code' => $msg, - 'data' => User::getUserReject($userId) - ] - ] - ]; - header('Content-Type:application/json; charset=utf-8', true, 401); - exit(json_encode($response, 256)); - } - - private function isJumpSiginFields($actor){ + private function isJumpSignFields($actor){ $userId = !empty($actor->id) ? (int)$actor->id : 0; $settings = app(SettingsRepository::class); $openExtFields = $settings->get('open_ext_fields'); -- Gitee From 7499d238265bdbb6e89f53125eaa10212fb3a72b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=81=E7=81=AB=E8=A1=8C=E8=80=85?= Date: Tue, 7 Sep 2021 11:27:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4detail=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Http/Middleware/CheckUserStatus.php | 2 -- src/Http/Middleware/CheckoutSite.php | 1 - 2 files changed, 3 deletions(-) diff --git a/src/Http/Middleware/CheckUserStatus.php b/src/Http/Middleware/CheckUserStatus.php index 297caa4..8facc12 100644 --- a/src/Http/Middleware/CheckUserStatus.php +++ b/src/Http/Middleware/CheckUserStatus.php @@ -24,7 +24,6 @@ use App\Models\UserSignInFields; use Discuz\Auth\Exception\PermissionDeniedException; use Discuz\Common\Utils; use Discuz\Contracts\Setting\SettingsRepository; -use Discuz\Http\DiscuzResponseFactory; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; @@ -78,7 +77,6 @@ class CheckUserStatus implements MiddlewareInterface 'user/signinfields', // 查询、提交扩展字段 'attachments', //上传图片、附件 'unreadnotification', // 消息 - 'thread.detail', // 帖子详情 'posts', // 帖子 'backAdmin/login', 'emoji', diff --git a/src/Http/Middleware/CheckoutSite.php b/src/Http/Middleware/CheckoutSite.php index 4d5f598..117b302 100644 --- a/src/Http/Middleware/CheckoutSite.php +++ b/src/Http/Middleware/CheckoutSite.php @@ -64,7 +64,6 @@ class CheckoutSite implements MiddlewareInterface 'user/signinfields', // 查询、提交扩展字段 'attachments', //上传图片、附件 'unreadnotification', - 'thread.detail', // 帖子详情 'posts', // 帖子 'backAdmin/login', 'emoji', -- Gitee