登录返回角色信息

(cherry picked from commit 23c3aa914de9915f57f48f04b04e9ca1d48d7cca)

Author: chengyu2333

api/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -102,6 +102,9 @@ public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){
 		userInfo(sysUser, result);
 		sysBaseAPI.addLog("用户名: " + username + ",登录成功！", CommonConstant.LOG_TYPE_1, null);
 
+		List<String> roleCodes = sysUserService.getRole(sysUser.getUsername());
+		result.getResult().put("role", roleCodes);
+
 		return result;
 	}
 

web/public/js/common.js

@@ -27,6 +27,15 @@ window.getUserInfo = function() {
   }
 }
 
+window.getUserRole = function(){
+  userRole = localStorage.getItem('pro__Login_UserRole')
+  if(userRole){
+    userRole = JSON.parse(userRole).value
+    console.log(userRole)
+    return userRole
+  }
+}
+
 window.getUserToken = function() {
   var token = JSON.parse(localStorage.getItem("pro__Access-Token"))
   return token==null?null:token.value

web/src/store/modules/user.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { login, logout, phoneLogin, thirdLogin } from "@/api/login"
-import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
+import { ACCESS_TOKEN, USER_NAME,USER_INFO, USER_ROLE, USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
 import { welcome } from "@/utils/util"
 import { queryPermissionsByUser } from '@/api/api'
 import { getAction } from '@/api/manage'
@@ -13,7 +13,8 @@ const user = {
     welcome: '',
     avatar: '',
     permissionList: [],
-    info: {}
+    info: {},
+    userRole: [],
   },
 
   mutations: {
@@ -34,6 +35,9 @@ const user = {
     SET_INFO: (state, info) => {
       state.info = info
     },
+    SET_USER_ROLE: (state, info) => {
+      state.userRole = info
+    },
   },
 
   actions: {
@@ -68,12 +72,16 @@ const user = {
           if(response.code =='200'){
             const result = response.result
             const userInfo = result.userInfo
-            Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
-            Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
-            Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
-            Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
+            const userRole = result.role
+            const expire = 7 * 24 * 60 * 60 * 1000
+            Vue.ls.set(ACCESS_TOKEN, result.token, expire)
+            Vue.ls.set(USER_NAME, userInfo.username, expire)
+            Vue.ls.set(USER_INFO, userInfo, expire)
+            Vue.ls.set(USER_ROLE, userRole, expire)
+            Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, expire)
             commit('SET_TOKEN', result.token)
             commit('SET_INFO', userInfo)
+            commit('SET_USER_ROLE', userRole)
             commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() })
             commit('SET_AVATAR', userInfo.avatar)
             resolve(response)

web/src/store/mutation-types.js

@@ -11,6 +11,7 @@ export const DEFAULT_CONTENT_WIDTH_TYPE = 'DEFAULT_CONTENT_WIDTH_TYPE'
 export const DEFAULT_MULTI_PAGE = 'DEFAULT_MULTI_PAGE'
 export const USER_NAME = 'Login_Username'
 export const USER_INFO = 'Login_Userinfo'
+export const USER_ROLE = 'Login_UserRole'
 export const USER_AUTH = 'LOGIN_USER_BUTTON_AUTH'
 export const SYS_BUTTON_AUTH = 'SYS_BUTTON_AUTH'
 export const ENCRYPTED_STRING = 'ENCRYPTED_STRING'