From bae186d82a8f72dbfb7ab00ef88e37af9582c834 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Sun, 20 Sep 2020 12:05:19 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=E7=94=A8=E6=88=B7=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/monitor/controller/Service.php        | 10 ++++++++++
 catch/permissions/request/CreateRequest.php |  2 +-
 catch/permissions/request/UpdateRequest.php |  2 +-
 extend/catcher/base/CatchRequest.php        |  3 ++-
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 catch/monitor/controller/Service.php

diff --git a/catch/monitor/controller/Service.php b/catch/monitor/controller/Service.php
new file mode 100644
index 0000000..ef90e0a
--- /dev/null
+++ b/catch/monitor/controller/Service.php
@@ -0,0 +1,10 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
diff --git a/catch/permissions/request/CreateRequest.php b/catch/permissions/request/CreateRequest.php
index ddc8bdb..e9ef0ce 100644
--- a/catch/permissions/request/CreateRequest.php
+++ b/catch/permissions/request/CreateRequest.php
@@ -17,7 +17,7 @@ class CreateRequest extends CatchRequest
         ];
     }
 
-    protected function message(): array
+    protected function message()
     {
         // TODO: Implement message() method.
     }
diff --git a/catch/permissions/request/UpdateRequest.php b/catch/permissions/request/UpdateRequest.php
index 5d69de4..be9b10b 100644
--- a/catch/permissions/request/UpdateRequest.php
+++ b/catch/permissions/request/UpdateRequest.php
@@ -16,7 +16,7 @@ class UpdateRequest extends CatchRequest
         ];
     }
 
-    protected function message(): array
+    protected function message()
     {
         // TODO: Implement message() method.
     }
diff --git a/extend/catcher/base/CatchRequest.php b/extend/catcher/base/CatchRequest.php
index 2745639..e1cf765 100644
--- a/extend/catcher/base/CatchRequest.php
+++ b/extend/catcher/base/CatchRequest.php
@@ -48,7 +48,8 @@ class CatchRequest extends Request
             }
 
             // 验证
-            if (!$validate->message($this->message())->check(request()->param(), $this->rules())) {
+            $message = $this->message();
+            if (!$validate->message(empty($message) ? [] : $message)->check(request()->param(), $this->rules())) {
               throw new FailedException($validate->getError());
             }
           } catch (\Exception $e) {