From 46da4c00a3e203b4d62c6a5ed7b8e733bd09e047 Mon Sep 17 00:00:00 2001
From: zwzw1219 <zwzw1219@192.168.1.111>
Date: Sun, 15 Oct 2017 21:20:52 +0800
Subject: [PATCH] 1

---
 .../controller/PermissionController.java      | 13 ++++------
 .../boot/security/server/utils/UserUtil.java  | 24 -------------------
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/boot/security/server/controller/PermissionController.java b/src/main/java/com/boot/security/server/controller/PermissionController.java
index 275547f..19fc25e 100644
--- a/src/main/java/com/boot/security/server/controller/PermissionController.java
+++ b/src/main/java/com/boot/security/server/controller/PermissionController.java
@@ -22,9 +22,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.boot.security.server.annotation.LogAnnotation;
 import com.boot.security.server.dao.PermissionDao;
+import com.boot.security.server.dto.LoginUser;
 import com.boot.security.server.model.Permission;
-import com.boot.security.server.model.SysUser;
 import com.boot.security.server.service.PermissionService;
+import com.boot.security.server.utils.UserUtil;
 import com.google.common.collect.Lists;
 
 import io.swagger.annotations.Api;
@@ -49,12 +50,8 @@ public class PermissionController {
 	@ApiOperation(value = "当前登录用户拥有的权限")
 	@GetMapping("/current")
 	public List<Permission> permissionsCurrent() {
-		List<Permission> list = UserUtil.getCurrentPermissions();
-		if (list == null) {
-			SysUser user = UserUtil.getCurrentUser();
-			list = permissionDao.listByUserId(user.getId());
-			UserUtil.setPermissionSession(list);
-		}
+		LoginUser loginUser = UserUtil.getLoginUser();
+		List<Permission> list = loginUser.getPermissions();
 		final List<Permission> permissions = list.stream().filter(l -> l.getType().equals(1))
 				.collect(Collectors.toList());
 
@@ -182,7 +179,7 @@ public class PermissionController {
 	@GetMapping("/owns")
 	@ApiOperation(value = "校验当前用户的权限")
 	public Set<String> ownsPermission() {
-		List<Permission> permissions = UserUtil.getCurrentPermissions();
+		List<Permission> permissions = UserUtil.getLoginUser().getPermissions();
 		if (CollectionUtils.isEmpty(permissions)) {
 			return Collections.emptySet();
 		}
diff --git a/src/main/java/com/boot/security/server/utils/UserUtil.java b/src/main/java/com/boot/security/server/utils/UserUtil.java
index 23b33d9..62a0ddf 100644
--- a/src/main/java/com/boot/security/server/utils/UserUtil.java
+++ b/src/main/java/com/boot/security/server/utils/UserUtil.java
@@ -1,17 +1,8 @@
 package com.boot.security.server.utils;
 
-import java.util.List;
-
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.Subject;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import com.boot.security.server.dto.LoginUser;
-import com.boot.security.server.model.SysUser;
-import com.zw.admin.server.constants.UserConstants;
-import com.zw.admin.server.model.Permission;
-import com.zw.admin.server.model.User;
 
 public class UserUtil {
 
@@ -21,19 +12,4 @@ public class UserUtil {
 		return loginUser;
 	}
 
-	public static void setUserSession(User user) {
-		getSession().setAttribute(UserConstants.LOGIN_USER, user);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static List<Permission> getCurrentPermissions() {
-		List<Permission> list = (List<Permission>) getSession().getAttribute(UserConstants.USER_PERMISSIONS);
-
-		return list;
-	}
-
-	public static void setPermissionSession(List<Permission> list) {
-		getSession().setAttribute(UserConstants.USER_PERMISSIONS, list);
-	}
-
 }