diff --git a/application/admin/controller/Base.php b/application/admin/controller/Base.php
index 2bde42f..9b5ee93 100644
--- a/application/admin/controller/Base.php
+++ b/application/admin/controller/Base.php
@@ -8,6 +8,7 @@
 namespace app\admin\controller;
 
 use app\admin\model\Menu;
+use app\admin\model\User;
 use think\Controller;
 
 class Base extends Controller {
@@ -19,7 +20,8 @@ class Base extends Controller {
     public $menuInfo;
 
     private $superUrl = [
-        'User/login'
+        'User/login',
+        'User/logout'
     ];
 
     public function _initialize(){
@@ -72,7 +74,7 @@ class Base extends Controller {
                     $this->error("您的账号在别的地方登录了，请重新登录！", url('User/login'));
                 }else{
                     cache($this->uid, $sidNow, config('online_time'));
-//                    $this->userInfo = User::get([ $this->primaryKey => $this->uid ]);
+                    $this->userInfo = User::get([ $this->primaryKey => $this->uid ])->toArray();
 //                    if( $this->userInfo['updateTime'] === 0 ){
 //                        $this->error('初次登录请重置用户密码！', url('User/changePassWord'));
 //                    }else{
diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index 4ad6ad8..41d929e 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -16,6 +16,7 @@ class Index extends Base  {
         $data = listToTree($data);
         $this->assign('title', '首页');
         $this->assign('menuData', $data);
+        $this->assign('userInfo', $this->userInfo);
         return $this->fetch();
     }
 }
diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php
index 34ae035..2d7a58f 100644
--- a/application/admin/controller/User.php
+++ b/application/admin/controller/User.php
@@ -203,6 +203,12 @@ class User extends Base {
         }
     }
 
+    public function logout(){
+        cache(session('uid'), null);
+        session('uid', null);
+        $this->success('登出成功',url('User/login'));
+    }
+
     public function add(){
         if( $this->request->isPost() ){
             $userModel = new \app\admin\model\User();
diff --git a/application/admin/view/public/base.html b/application/admin/view/public/base.html
index ba3fc46..6735fb4 100644
--- a/application/admin/view/public/base.html
+++ b/application/admin/view/public/base.html
@@ -50,6 +50,36 @@
                 <a href="javascript:void(0);" class="sidebar-toggle" data-toggle="offcanvas" role="button">
                     <span class="sr-only">Toggle navigation</span>
                 </a>
+                <div class="navbar-custom-menu">
+                    <ul class="nav navbar-nav">
+                        <li class="dropdown user user-menu">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                                <img src="__IMG__/logo.jpg" class="user-image" alt="User Image">
+                                <span class="hidden-xs">{$userInfo['username']}</span>
+                            </a>
+                            <ul class="dropdown-menu">
+                                <!-- User image -->
+                                <li class="user-header">
+                                    <img src="__IMG__/logo.jpg" class="img-circle" alt="User Image">
+
+                                    <p>
+                                        {$userInfo['username']} - {$userInfo['nickname']}
+                                        <small>注册时间：{$userInfo['regTime'] | date='Y-m-d',###}</small>
+                                    </p>
+                                </li>
+                                <!-- Menu Footer-->
+                                <li class="user-footer">
+                                    <div class="pull-left">
+                                        <a href="#" class="btn btn-default btn-flat">修改信息</a>
+                                    </div>
+                                    <div class="pull-right">
+                                        <a href="{:url('User/logout')}" class="btn btn-default btn-flat">退出登录</a>
+                                    </div>
+                                </li>
+                            </ul>
+                        </li>
+                    </ul>
+                </div>
             </nav>
         </header>
         <!-- 左侧导航栏 -->
@@ -61,7 +91,7 @@
                         <img src="__IMG__/logo.jpg" class="img-circle" alt="头像">
                     </div>
                     <div class="pull-left info">
-                        <p>系统管理员</p>
+                        <p>{$userInfo['nickname']}</p>
                         <a href="javascript:void(0);"><i class="fa fa-circle text-success"></i> Online</a>
                     </div>
                 </div>