From 6bb0aa1453e7d733a6f47261b8e2c833f9382bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=81=E7=81=AB=E8=A1=8C=E8=80=85?= Date: Thu, 26 Nov 2020 15:35:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?pc=E7=AB=AF=E5=80=92=E5=BA=8F=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BD=BF=E7=94=A8=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Api/Controller/Posts/ListPostsController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Api/Controller/Posts/ListPostsController.php b/app/Api/Controller/Posts/ListPostsController.php index 1c86a770e..1d105a0ec 100644 --- a/app/Api/Controller/Posts/ListPostsController.php +++ b/app/Api/Controller/Posts/ListPostsController.php @@ -216,6 +216,10 @@ private function getCache($params, $filter, $document) private function canCache($params) { + //pc端倒序不允许使用缓存 + if($params['sort'] == '-createdAt'){ + return false; + } if (isset($params['filter'])) { if (strtolower($params['filter']['isComment']) == 'yes') { return false; From 5801ccd3a95212422b0a96227226fb09a2ec3259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=81=E7=81=AB=E8=A1=8C=E8=80=85?= Date: Thu, 26 Nov 2020 15:59:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E4=BD=BF=E7=94=A8=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Api/Controller/Posts/ListPostsController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Api/Controller/Posts/ListPostsController.php b/app/Api/Controller/Posts/ListPostsController.php index 1d105a0ec..23dcfd2ff 100644 --- a/app/Api/Controller/Posts/ListPostsController.php +++ b/app/Api/Controller/Posts/ListPostsController.php @@ -221,6 +221,9 @@ private function canCache($params) return false; } if (isset($params['filter'])) { + if(!isset($params['filter']['isComment'])){ + return false; + } if (strtolower($params['filter']['isComment']) == 'yes') { return false; } From 1be42e8538e7c2076f905b36782764a49f7004f1 Mon Sep 17 00:00:00 2001 From: gyn <920791506@qq.com> Date: Thu, 26 Nov 2020 16:31:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B7=B3=E8=BD=AC=E5=88=B0pc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/site/cont/contModeration/contReviewCon.js | 4 ++-- .../admin/view/site/cont/contModeration/contReviewView.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/frame/src/admin/controllers/site/cont/contModeration/contReviewCon.js b/resources/frame/src/admin/controllers/site/cont/contModeration/contReviewCon.js index f28471dd3..0b34d175c 100644 --- a/resources/frame/src/admin/controllers/site/cont/contModeration/contReviewCon.js +++ b/resources/frame/src/admin/controllers/site/cont/contModeration/contReviewCon.js @@ -291,9 +291,9 @@ export default { window.open(routeData.href, '_blank'); }, - editClick(id){ + editClick(id,typeId){ let routeData = this.$router.resolve({ - path: `/thread/post?type=1&operating=edit&threadId=${id}` + path: `/thread/post?type=${typeId}&operating=edit&threadId=${id}` }); window.open(routeData.href, '_blank'); }, diff --git a/resources/frame/src/admin/view/site/cont/contModeration/contReviewView.vue b/resources/frame/src/admin/view/site/cont/contModeration/contReviewView.vue index 97807f87a..e0f675c07 100644 --- a/resources/frame/src/admin/view/site/cont/contModeration/contReviewView.vue +++ b/resources/frame/src/admin/view/site/cont/contModeration/contReviewView.vue @@ -260,7 +260,7 @@ v-if="items.threadVideo && items.threadVideo._data.status == 2" >转码失败 查看 - 编辑 + 编辑 From 19538e4353adc5fb9beb9a4e650071794daa1433 Mon Sep 17 00:00:00 2001 From: ldd Date: Thu, 26 Nov 2020 16:53:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E9=97=AE=E7=AD=94=E5=B8=96=E5=9B=9E?= =?UTF-8?q?=E7=AD=94=E6=97=B6=E5=AE=A1=E6=A0=B8=E8=AF=8D=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Commands/Question/CreateQuestionAnswer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Commands/Question/CreateQuestionAnswer.php b/app/Commands/Question/CreateQuestionAnswer.php index 36501c992..ae604cee7 100644 --- a/app/Commands/Question/CreateQuestionAnswer.php +++ b/app/Commands/Question/CreateQuestionAnswer.php @@ -95,7 +95,7 @@ public function handle(EventDispatcher $events, Censor $censor, Question $questi // check $content = $censor->checkText(Arr::get($this->data, 'attributes.content')); if (count($censor->wordMod) > 0) { - throw new CensorNotPassedException('content_banned', $censor->wordMod); + throw new CensorNotPassedException('content_banned_show_words', $censor->wordMod); } $question->content = $content;