From bd840134ad86d5feaba8576b7d7b00313d2e7a7c Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Tue, 30 Jun 2020 17:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Request.php                               |  2 +-
 .../install/{ => traits}/GetModuleTrait.php   |  0
 .../{ => traits}/UninstallModuleCommand.php   |  0
 .../{ => traits}/UpdateCatchModuleCommand.php |  0
 extend/catcher/library/rate/GrantLimit.php    | 10 ++++++
 extend/catcher/library/rate/Redis.php         | 36 +++++++++++++++++++
 6 files changed, 47 insertions(+), 1 deletion(-)
 rename extend/catcher/command/install/{ => traits}/GetModuleTrait.php (100%)
 rename extend/catcher/command/install/{ => traits}/UninstallModuleCommand.php (100%)
 rename extend/catcher/command/install/{ => traits}/UpdateCatchModuleCommand.php (100%)
 create mode 100644 extend/catcher/library/rate/GrantLimit.php
 create mode 100644 extend/catcher/library/rate/Redis.php

diff --git a/app/Request.php b/app/Request.php
index edcc841..478a693 100644
--- a/app/Request.php
+++ b/app/Request.php
@@ -38,7 +38,7 @@ class Request extends \think\Request
         if ($e instanceof TokenInvalidException) {
             throw new FailedException('token 不合法', Code::LOST_LOGIN);
         }
-        throw new FailedException('auth failed', Code::LOST_LOGIN);
+        throw new FailedException('认证失败: '. $e->getMessage(), Code::LOST_LOGIN);
     }
 
     return $user;
diff --git a/extend/catcher/command/install/GetModuleTrait.php b/extend/catcher/command/install/traits/GetModuleTrait.php
similarity index 100%
rename from extend/catcher/command/install/GetModuleTrait.php
rename to extend/catcher/command/install/traits/GetModuleTrait.php
diff --git a/extend/catcher/command/install/UninstallModuleCommand.php b/extend/catcher/command/install/traits/UninstallModuleCommand.php
similarity index 100%
rename from extend/catcher/command/install/UninstallModuleCommand.php
rename to extend/catcher/command/install/traits/UninstallModuleCommand.php
diff --git a/extend/catcher/command/install/UpdateCatchModuleCommand.php b/extend/catcher/command/install/traits/UpdateCatchModuleCommand.php
similarity index 100%
rename from extend/catcher/command/install/UpdateCatchModuleCommand.php
rename to extend/catcher/command/install/traits/UpdateCatchModuleCommand.php
diff --git a/extend/catcher/library/rate/GrantLimit.php b/extend/catcher/library/rate/GrantLimit.php
new file mode 100644
index 0000000..fa9d783
--- /dev/null
+++ b/extend/catcher/library/rate/GrantLimit.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 ]
+// +----------------------------------------------------------------------
\ No newline at end of file
diff --git a/extend/catcher/library/rate/Redis.php b/extend/catcher/library/rate/Redis.php
new file mode 100644
index 0000000..0aa15e2
--- /dev/null
+++ b/extend/catcher/library/rate/Redis.php
@@ -0,0 +1,36 @@
+<?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 ]
+// +----------------------------------------------------------------------
+namespace catcher\library;
+
+use think\facade\Cache;
+
+class Redis
+{
+    protected $handle = null;
+
+
+    public function __construct()
+    {
+        if (!$this->handle) {
+            $this->handle = Cache::store('redis')->handler();
+        }
+
+        return $this->handle;
+    }
+
+
+
+    public function __call($name, $arguments)
+    {
+        // TODO: Implement __call() method.
+        return $this->handle->{$name}(...$arguments);
+    }
+}
\ No newline at end of file