From 5ffa9e247f36bae399b61116b5e82efec88e10d5 Mon Sep 17 00:00:00 2001
From: "udf_admin@163.com" <udf_admin@163.com>
Date: Fri, 1 May 2020 22:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/App.vue                             | 55 ++++++++++++++++---
 admin/src/api/user.js                         |  4 +-
 .../itkk/udf/api/rbac/web/UserController.java | 11 ++++
 3 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/admin/src/App.vue b/admin/src/App.vue
index a016c63..3619d30 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -39,8 +39,29 @@
             </el-badge>
           </div>
           <div v-show="!showSearchInput" class="avatarDiv">
-            <el-avatar shape="square" size="large" icon="el-icon-user-solid">
-            </el-avatar>
+            <el-popover
+              placement="top-start"
+              trigger="hover">
+              <div class="userPanel">
+                <el-row>
+                  <el-col :span="24">
+                    <el-avatar shape="square" size="small" icon="el-icon-user-solid" style="vertical-align: middle;">
+                    </el-avatar>
+                    <span>{{userDto.nickName}}</span>
+                    <el-divider></el-divider>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <span><el-button type="text" :style="userDtoBtnStyle">基本资料</el-button></span>
+                    <el-divider direction="vertical"></el-divider>
+                    <span><el-button type="text" :style="logoutBtnStyle">退出登录</el-button></span>
+                  </el-col>
+                </el-row>
+              </div>
+              <el-avatar slot="reference" shape="square" size="large" icon="el-icon-user-solid">
+              </el-avatar>
+            </el-popover>
           </div>
         </div>
       </el-header>
@@ -71,6 +92,7 @@
 <script>
 
   import glob from "./assets/js/glob";
+  import api_user from "./api/user";
 
   export default {
     name: 'App',
@@ -115,18 +137,17 @@
           "max-width": "400px",
           width: "150px"
         },
+        userDtoBtnStyle: {},
+        logoutBtnStyle: {},
         showSearchInput: false,
-        searchInputText: null
+        searchInputText: null,
+        userDto: {}
       }
     },
-    created() {
+    mounted() {
       //初始化
       this.init();
     },
-    mounted() {
-      //检查登陆
-      glob.checkLogin();
-    },
     methods: {
       //初始化
       init() {
@@ -141,6 +162,11 @@
         window.addEventListener('resize', this.resizeListener);
         //主动调用一次resize监听
         this.resizeListener();
+        //检查登陆
+        glob.checkLogin();
+        //获得用户信息
+        const userDtoResponse = await api_user.infoByToken(glob.getToken());
+        this.userDto = userDtoResponse.data.result;
       },
       //重设主题属性
       resetTheme() {
@@ -153,6 +179,8 @@
         this.mainLogoBtnStyle.color = this.golbSetting.themeBackground;
         this.backtopStyle.background = this.golbSetting.themeBackground;
         this.backtopStyle.color = this.golbSetting.themeColor;
+        this.userDtoBtnStyle.color = this.golbSetting.themeBackground;
+        this.logoutBtnStyle.color = this.golbSetting.themeBackground;
       },
       //resize监听器
       resizeListener() {
@@ -310,4 +338,15 @@
       }
     }
   }
+
+  .userPanel {
+    .el-divider--horizontal {
+      margin: 10px 0px;
+    }
+
+    .el-button {
+      padding-top: 0px;
+      padding-bottom: 0px;
+    }
+  }
 </style>
diff --git a/admin/src/api/user.js b/admin/src/api/user.js
index 977dfd7..577b52b 100644
--- a/admin/src/api/user.js
+++ b/admin/src/api/user.js
@@ -1,5 +1,5 @@
 const api_user = {
-  //登出
-  logout: () => axios.delete('/private/rbac/user/logout')
+  logout: () => axios.delete('/private/rbac/user/logout'),
+  infoByToken: (token = '') => axios.get('/private/rbac/user/info/by/token/' + token)
 };
 export default api_user;
diff --git a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/web/UserController.java b/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/web/UserController.java
index 53184eb..51dd94c 100644
--- a/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/web/UserController.java
+++ b/udf-api/udf-api-rbac/src/main/java/org/itkk/udf/api/rbac/web/UserController.java
@@ -76,4 +76,15 @@ public class UserController {
         return new RestResponse<>(userService.info(userId));
     }
 
+    /**
+     * 获得用户信息
+     *
+     * @param token token
+     * @return RestResponse<UserDto>
+     */
+    @GetMapping("info/by/token/{token}")
+    public RestResponse<UserDto> infoByToken(@PathVariable String token) {
+        return new RestResponse<>(userService.infoByToken(token));
+    }
+
 }