diff --git a/README.md b/README.md index 79a350619a15bfd8364a1fdb8e425fd1fb268461..0c7eeddcd354801fa5f198ff1683d04dd886419a 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 e4ce07b1028d5711d37e9542004a871426575ff2..839929093af4c14317fd1787ac9b56569237c1c3 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 db790e3209c0d95b414cafa803d57b222b05ca5e..b243c367fabae43ca7fc2035382a7dac889f4486 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 3bd622792e9f202155852b088f32a33b9a4129f9..4129d80d1b27444df2a9d3cd1054084fa08c1ec2 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 7ab529c95937350604b27c8ea8d8de869c58b262..e99bcb915fc64bfd2cdd0a7e0769d8b7b3ac12f5 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(); } }