From 66d59e40918b8ede35b8f957b000bf6d7385a6f2 Mon Sep 17 00:00:00 2001 From: zhuangqian Date: Sun, 18 Sep 2016 10:25:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- .../java/com/smallchill/core/aop/PermissionAop.java | 8 ++------ .../java/com/smallchill/core/interfaces/ICheck.java | 9 +++------ .../core/toolbox/check/PermissionCheckFactory.java | 6 ++++-- .../core/toolbox/check/PermissionCheckManager.java | 10 ++++------ 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 79a35061..0c7eeddc 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,9 @@ PS:因为喜欢刀锋战士所以取名了SpringBlade，当中有一个类也命 2.[eova](http://www.oschina.net/p/eova) 3.[hutool](http://www.oschina.net/p/hutool) 4.[beetl](http://www.oschina.net/p/beetl) +4.[beetlsql](http://www.oschina.net/p/beetlsql) 5.[dreamlu](http://www.oschina.net/p/dreamlu) -6.[kisso](https://git.oschina.net/baomidou/kisso) +6.[kisso](http://www.oschina.net/p/kisso) ## 内置功能 diff --git a/src/main/java/com/smallchill/core/aop/PermissionAop.java b/src/main/java/com/smallchill/core/aop/PermissionAop.java index e4ce07b1..83992909 100644 --- a/src/main/java/com/smallchill/core/aop/PermissionAop.java +++ b/src/main/java/com/smallchill/core/aop/PermissionAop.java @@ -17,8 +17,6 @@ package com.smallchill.core.aop; import java.lang.reflect.Method; -import javax.servlet.http.HttpServletRequest; - import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -30,7 +28,6 @@ import com.smallchill.core.annotation.Permission; import com.smallchill.core.exception.NoPermissionException; import com.smallchill.core.toolbox.Func; import com.smallchill.core.toolbox.check.PermissionCheckManager; -import com.smallchill.core.toolbox.kit.HttpKit; /** * AOP 权限自定义检查 @@ -46,7 +43,6 @@ public class PermissionAop { @Around("cutPermission()") public Object doPermission(ProceedingJoinPoint point) throws Throwable { - HttpServletRequest request = HttpKit.getRequest(); MethodSignature ms = (MethodSignature) point.getSignature(); Method method = ms.getMethod(); Permission permission = method.getAnnotation(Permission.class); @@ -54,7 +50,7 @@ public class PermissionAop { if ((permissions.length == 1 && Func.toStr(permissions[0]).equals("ALL")) || permissions == null || permissions.length == 0) { //检查全体角色 - boolean result = PermissionCheckManager.checkAll(request); + boolean result = PermissionCheckManager.checkAll(); if (result) { return point.proceed(); } else { @@ -62,7 +58,7 @@ public class PermissionAop { } } else { //检查指定角色 - boolean result = PermissionCheckManager.check(permissions, request); + boolean result = PermissionCheckManager.check(permissions); if (result) { return point.proceed(); } else { diff --git a/src/main/java/com/smallchill/core/interfaces/ICheck.java b/src/main/java/com/smallchill/core/interfaces/ICheck.java index db790e32..b243c367 100644 --- a/src/main/java/com/smallchill/core/interfaces/ICheck.java +++ b/src/main/java/com/smallchill/core/interfaces/ICheck.java @@ -15,7 +15,6 @@ */ package com.smallchill.core.interfaces; -import javax.servlet.http.HttpServletRequest; /** * 检查用接口 @@ -24,16 +23,14 @@ public interface ICheck { /** * 检查指定角色 - * @param request + * @param permissions * @return boolean */ - boolean check(Object[] permissions, HttpServletRequest request); + boolean check(Object[] permissions); /** * 检查全体角色 - * @param permissions - * @param request * @return boolean */ - boolean checkAll(HttpServletRequest request); + boolean checkAll(); } diff --git a/src/main/java/com/smallchill/core/toolbox/check/PermissionCheckFactory.java b/src/main/java/com/smallchill/core/toolbox/check/PermissionCheckFactory.java index 3bd62279..4129d80d 100644 --- a/src/main/java/com/smallchill/core/toolbox/check/PermissionCheckFactory.java +++ b/src/main/java/com/smallchill/core/toolbox/check/PermissionCheckFactory.java @@ -22,6 +22,7 @@ import com.smallchill.core.constant.Cst; import com.smallchill.core.interfaces.ICheck; import com.smallchill.core.shiro.ShiroKit; import com.smallchill.core.toolbox.kit.CollectionKit; +import com.smallchill.core.toolbox.kit.HttpKit; /** * @title 权限自定义检查 @@ -33,7 +34,7 @@ import com.smallchill.core.toolbox.kit.CollectionKit; public class PermissionCheckFactory implements ICheck { @Override - public boolean check(Object[] permissions, HttpServletRequest request) { + public boolean check(Object[] permissions) { ShiroUser user = ShiroKit.getUser(); if (null == user) { return false; @@ -46,7 +47,8 @@ public class PermissionCheckFactory implements ICheck { } @Override - public boolean checkAll(HttpServletRequest request) { + public boolean checkAll() { + HttpServletRequest request = HttpKit.getRequest(); ShiroUser user = ShiroKit.getUser(); if (null == user) { return false; diff --git a/src/main/java/com/smallchill/core/toolbox/check/PermissionCheckManager.java b/src/main/java/com/smallchill/core/toolbox/check/PermissionCheckManager.java index 7ab529c9..e99bcb91 100644 --- a/src/main/java/com/smallchill/core/toolbox/check/PermissionCheckManager.java +++ b/src/main/java/com/smallchill/core/toolbox/check/PermissionCheckManager.java @@ -15,8 +15,6 @@ */ package com.smallchill.core.toolbox.check; -import javax.servlet.http.HttpServletRequest; - import com.smallchill.core.constant.Cst; import com.smallchill.core.interfaces.ICheck; @@ -47,11 +45,11 @@ public class PermissionCheckManager { this.defaultCheckFactory = defaultCheckFactory; } - public static boolean check(Object[] permissions, HttpServletRequest request) { - return me.defaultCheckFactory.check(permissions, request); + public static boolean check(Object[] permissions) { + return me.defaultCheckFactory.check(permissions); } - public static boolean checkAll(HttpServletRequest request) { - return me.defaultCheckFactory.checkAll(request); + public static boolean checkAll() { + return me.defaultCheckFactory.checkAll(); } } -- GitLab