diff --git a/catchAdmin/CatchAdminService.php b/catchAdmin/CatchAdminService.php
index 7809200..18044e6 100644
--- a/catchAdmin/CatchAdminService.php
+++ b/catchAdmin/CatchAdminService.php
@@ -6,6 +6,7 @@ use catchAdmin\permissions\OperateLogListener;
 use catchAdmin\permissions\PermissionsMiddleware;
 use catchAdmin\system\event\LoginLogEvent;
 use catchAdmin\system\event\OperateLogEvent;
+use catchAdmin\user\Auth;
 use catcher\command\BackupCommand;
 use catcher\command\InstallCommand;
 use catcher\command\MigrateRunCommand;
@@ -26,12 +27,12 @@ class CatchAdminService extends Service
      */
     public function boot()
     {
-
         $this->registerCommands();
         $this->registerValidates();
         $this->registerMiddleWares();
         $this->registerEvents();
         $this->registerListeners();
+        $this->registerClassAlias();
     }
 
     /**
@@ -116,4 +117,10 @@ class CatchAdminService extends Service
         ]);
     }
 
+
+    public function registerClassAlias()
+    {
+        class_alias(Auth::class, 'Auth');
+    }
+
 }
\ No newline at end of file
diff --git a/catchAdmin/helper.php b/catchAdmin/helper.php
index 7a1b907..51f1295 100644
--- a/catchAdmin/helper.php
+++ b/catchAdmin/helper.php
@@ -17,7 +17,7 @@ function deleteButton($name = '删除', $event = 'del')
 function addButton($name = '新增', $event = 'add')
 {
     return sprintf(
-        '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="%s">%s</a>',
+        '<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="%s">%s</a>',
         $event, $name);
 }
 
diff --git a/catchAdmin/login/controller/Index.php b/catchAdmin/login/controller/Index.php
index a8cf774..176b6c9 100644
--- a/catchAdmin/login/controller/Index.php
+++ b/catchAdmin/login/controller/Index.php
@@ -1,6 +1,7 @@
 <?php
 namespace catchAdmin\login\controller;
 
+use app\exceptions\LoginFailedException;
 use catchAdmin\user\Auth;
 use catchAdmin\login\request\LoginRequest;
 use catcher\base\CatchController;
@@ -29,7 +30,7 @@ class Index extends CatchController
      * @return bool|string
      * @throws \catcher\exceptions\LoginFailedException
      * @throws \cather\exceptions\LoginFailedException
-     * @throws \app\exceptions\LoginFailedException
+     * @throws LoginFailedException
      */
     public function login(LoginRequest $request)
     {
@@ -37,7 +38,7 @@ class Index extends CatchController
         $isSucceed = Auth::login($params);
         // 登录事件
         $params['success'] = $isSucceed;
-        event('log', $params);
+        event('loginLog', $params);
 
         return $isSucceed ? CatchResponse::success('', '登录成功') :
 
diff --git a/catchAdmin/login/view/index.html b/catchAdmin/login/view/index.html
index 4307043..0b63d05 100644
--- a/catchAdmin/login/view/index.html
+++ b/catchAdmin/login/view/index.html
@@ -27,7 +27,7 @@
 <body>
 <div class="login-wrapper">
     <div class="login-header">
-        <img src="/static/assets/images/logo.png"> EasyWeb后台开发框架
+        <img src="/static/assets/images/logo.png"> CatchAdmin 后台管理系统
     </div>
     <div class="login-body">
         <div class="layui-card">
diff --git a/catchAdmin/permissions/view/permission/index.html b/catchAdmin/permissions/view/permission/index.html
index 2327f54..c0aab3f 100644
--- a/catchAdmin/permissions/view/permission/index.html
+++ b/catchAdmin/permissions/view/permission/index.html
@@ -20,9 +20,9 @@
 <table class="layui-table" id="tablePermission" lay-filter="tablePermission"></table>
 <!-- 表格操作列 -->
 <script type="text/html" id="tableBarAuth">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
-    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="add">新增子菜单</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+    {:editButton()}
+    {:addButton('新增子菜单')}
+    {:deleteButton()}
 </script>
 {/block}
 {block name="script"}
diff --git a/catchAdmin/permissions/view/role/index.html b/catchAdmin/permissions/view/role/index.html
index 5687279..e3c3033 100644
--- a/catchAdmin/permissions/view/role/index.html
+++ b/catchAdmin/permissions/view/role/index.html
@@ -20,9 +20,9 @@
 <table class="layui-table" id="tableRole"></table>
 <!-- 表格操作列 -->
 <script type="text/html" id="tableBarAuth">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
-    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="add">新增子角色</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+    {:editButton()}
+    {:addButton('新增子角色')}
+    {:deleteButton()}
 </script>
 {/block}
 {block name="script"}
diff --git a/catchAdmin/user/Auth.php b/catchAdmin/user/Auth.php
index 6095ad3..848c3bb 100644
--- a/catchAdmin/user/Auth.php
+++ b/catchAdmin/user/Auth.php
@@ -1,8 +1,8 @@
 <?php
 namespace catchAdmin\user;
 
+use catchAdmin\permissions\model\Permissions;
 use catchAdmin\user\model\Users;
-use catcher\exceptions\FailedException;
 use catcher\exceptions\LoginFailedException;
 use think\facade\Session;
 
@@ -15,8 +15,11 @@ class Auth
      *
      * @time 2019年11月28日
      * @param $params
-     * @throws LoginFailedException
      * @return bool
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws LoginFailedException
      */
     public static function login($params)
     {
@@ -57,13 +60,40 @@ class Auth
         return true;
     }
 
+    /**
+     *
+     * @time 2019年12月15日
+     * @return mixed
+     */
     public static function user()
     {
         return Session::get(self::getLoginUserKey(), null);
     }
 
+    /**
+     *
+     * @time 2019年12月15日
+     * @return string
+     */
     protected static function getLoginUserKey(): string
     {
         return md5(self::USER_KEY);
     }
+
+    /**
+     *
+     * @time 2019年12月15日
+     * @param $mark
+     * @param $module
+     * @return bool
+     */
+    public static function hasPermissions($mark, $module): bool
+    {
+        $permissionIds = self::user()->get->getPermissionsBy();
+
+        $permissionId = Permissions::where('module', $module)
+                            ->where('permission_mark', $mark)->value('id');
+
+        return in_array($permissionId, $permissionIds);
+    }
 }
diff --git a/catchAdmin/user/view/index.html b/catchAdmin/user/view/index.html
index 39d23c2..51e899f 100644
--- a/catchAdmin/user/view/index.html
+++ b/catchAdmin/user/view/index.html
@@ -47,7 +47,7 @@
 <table class="layui-table" id="tableUser" lay-filter="tableUser"></table>
 <!-- 表格操作列 -->
 <script type="text/html" id="tableBarUser">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
+    {:editButton()}
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="{{d.deleted_at ? 'recover' : 'del'}}">{{d.deleted_at ? '恢复' : '删除'}}</a>
 </script>
 <!-- 表格状态列 -->
diff --git a/extend/catcher/exceptions/CatchException.php b/extend/catcher/exceptions/CatchException.php
new file mode 100644
index 0000000..b3d9bbc
--- /dev/null
+++ b/extend/catcher/exceptions/CatchException.php
@@ -0,0 +1 @@
+<?php
