From a9839e1855758400873623b4303ea3d799bd0221 Mon Sep 17 00:00:00 2001
From: zzlkk <381814048@qq.com>
Date: Mon, 24 Apr 2017 18:52:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=B3=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E9=93=BE=E6=8E=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA=E8=B5=84?=
 =?UTF-8?q?=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/general/Profile.php | 7 +++++++
 application/admin/view/common/header.html        | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/admin/controller/general/Profile.php b/application/admin/controller/general/Profile.php
index 0379bdddc..94b6527b4 100644
--- a/application/admin/controller/general/Profile.php
+++ b/application/admin/controller/general/Profile.php
@@ -62,6 +62,13 @@ class Profile extends Backend
             {
                 model('admin')->where('id', $this->auth->id)->update($params);
                 AdminLog::record(__('Update'), $params);
+                //因为个人资料面板读取的Session显示，修改自己资料后同时更新Session
+                $admin = \think\Session::get('admin');
+                $admin_id = $admin ? $admin->id : 0;
+                if($this->auth->id==$admin_id){
+                    $admin = model('admin')->get(['id' => $admin_id]);
+                    \think\Session::set("admin", $admin);
+                }
                 $this->code = 1;
             }
         }
diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html
index c0ed16be4..815d1e704 100644
--- a/application/admin/view/common/header.html
+++ b/application/admin/view/common/header.html
@@ -91,7 +91,7 @@
                     <!-- Menu Footer-->
                     <li class="user-footer">
                         <div class="pull-left">
-                            <a href="{:url('general.profile/index')}" class="btn btn-default btn-flat">{:__('Profile')}</a>
+                            <a href="{:url('general.profile/index')}" addtabs="10457" url="{:url('general.profile/index')}" class="btn btn-default btn-flat">{:__('Profile')}</a>
                         </div>
                         <div class="pull-right">
                             <a href="{:url('index/logout')}" class="btn btn-default btn-flat">{:__('Logout')}</a>
-- 
Gitee


From ec0ef6966f3fe4d67245865ac02e7494f77f4faa Mon Sep 17 00:00:00 2001
From: zzlkk <381814048@qq.com>
Date: Mon, 24 Apr 2017 23:17:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/general/Profile.php | 5 +++--
 application/admin/view/common/header.html        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/general/Profile.php b/application/admin/controller/general/Profile.php
index 94b6527b4..1f9c2319a 100644
--- a/application/admin/controller/general/Profile.php
+++ b/application/admin/controller/general/Profile.php
@@ -2,6 +2,7 @@
 
 namespace app\admin\controller\general;
 
+use think\Session;
 use app\admin\model\AdminLog;
 use app\common\controller\Backend;
 use fast\Random;
@@ -63,11 +64,11 @@ class Profile extends Backend
                 model('admin')->where('id', $this->auth->id)->update($params);
                 AdminLog::record(__('Update'), $params);
                 //因为个人资料面板读取的Session显示，修改自己资料后同时更新Session
-                $admin = \think\Session::get('admin');
+                $admin = Session::get('admin');
                 $admin_id = $admin ? $admin->id : 0;
                 if($this->auth->id==$admin_id){
                     $admin = model('admin')->get(['id' => $admin_id]);
-                    \think\Session::set("admin", $admin);
+                    Session::set("admin", $admin);
                 }
                 $this->code = 1;
             }
diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html
index 815d1e704..6307d3128 100644
--- a/application/admin/view/common/header.html
+++ b/application/admin/view/common/header.html
@@ -91,7 +91,7 @@
                     <!-- Menu Footer-->
                     <li class="user-footer">
                         <div class="pull-left">
-                            <a href="{:url('general.profile/index')}" addtabs="10457" url="{:url('general.profile/index')}" class="btn btn-default btn-flat">{:__('Profile')}</a>
+                            <a href="{:url('general.profile/index')}" addtabs="" url="{:url('general.profile/index')}" class="btn btn-default btn-flat">{:__('Profile')}</a>
                         </div>
                         <div class="pull-right">
                             <a href="{:url('index/logout')}" class="btn btn-default btn-flat">{:__('Logout')}</a>
-- 
Gitee