From 878833d6bf23678208f6498556f6b9de84cc5bc4 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 21 Mar 2018 22:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=A4=E4=B8=AAapi?=
 =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=9A/a/authInfo=EF=BC=9B=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E8=8F=9C=E5=8D=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=EF=BC=9A/a/menuTree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/web/LoginController.java      | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
index 6a914857..9e7a12a0 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
@@ -3,6 +3,7 @@
  */
 package com.jeesite.modules.sys.web;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -20,6 +21,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.jeesite.common.config.Global;
 import com.jeesite.common.lang.ObjectUtils;
@@ -30,6 +32,7 @@ import com.jeesite.common.shiro.realm.LoginInfo;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.common.web.CookieUtils;
 import com.jeesite.common.web.http.ServletUtils;
+import com.jeesite.modules.sys.entity.Menu;
 import com.jeesite.modules.sys.entity.User;
 import com.jeesite.modules.sys.service.UserService;
 import com.jeesite.modules.sys.utils.UserUtils;
@@ -257,15 +260,6 @@ public class LoginController extends BaseController{
 			model.addAttribute("message", text("获取信息成功！"));
 		}
 		model.addAttribute("sessionid", (String)session.getId());
-		// 授权信息获取
-		AuthorizationInfo authInfo = null;
-		// 获取当前用户权限字符串
-		if (WebUtils.isTrue(request, "permi")){
-			if (authInfo == null){
-				authInfo = (AuthorizationInfo)UserUtils.getCache(UserUtils.CACHE_AUTH_INFO);
-			}
-			model.addAttribute("permi", authInfo.getStringPermissions());
-		}
 		
 		// 登录操作如果是Ajax操作，直接返回登录信息字符串。
 		if (ServletUtils.isAjaxRequest(request)){
@@ -306,6 +300,26 @@ public class LoginController extends BaseController{
 		// 返回主页面视图
 		return "modules/sys/sysIndex";
 	}
+	
+	/**
+	 * 获取当前用户权限字符串数据
+	 */
+	@RequiresPermissions("user")
+	@RequestMapping(value = "authInfo")
+	@ResponseBody
+	public AuthorizationInfo authInfo() {
+		return UserUtils.getAuthInfo();
+	}
+
+	/**
+	 * 获取当前用户菜单数据
+	 */
+	@RequiresPermissions("user")
+	@RequestMapping(value = "menuTree")
+	@ResponseBody
+	public List<Menu> menuTree(String parentCode) {
+		return UserUtils.getMenuTree();
+	}
 
 	/**
 	 * 切换系统菜单（仅超级管理员有权限）