center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #1981 from dataease/pr@dev@fix_aop_stack_info

Browse Source 
fix: aop中不能捕获原方法异常堆栈
This commit is contained in:
fit2cloud-chenyw 2022-03-28 16:40:15 +08:00 committed by GitHub
commit cce82f628d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
View File

@ -26,12 +26,14 @@ import java.util.stream.Collectors;
public class DePermissionAnnotationHandler { public class DePermissionAnnotationHandler {
@Around(value = "@annotation(io.dataease.auth.annotation.DePermissions)") @Around(value = "@annotation(io.dataease.auth.annotation.DePermissions)")
public Object PermissionsAround(ProceedingJoinPoint point) { public Object PermissionsAround(ProceedingJoinPoint point) throws Throwable{
if (AuthUtils.getUser().getIsAdmin()) {
return point.proceed(point.getArgs());
}
Boolean access = false;
try { try {
if (AuthUtils.getUser().getIsAdmin()) {
return point.proceed(point.getArgs());
}
MethodSignature ms = (MethodSignature) point.getSignature(); MethodSignature ms = (MethodSignature) point.getSignature();
Method method = ms.getMethod(); Method method = ms.getMethod();
DePermissions annotation = method.getAnnotation(DePermissions.class); DePermissions annotation = method.getAnnotation(DePermissions.class);
@ -43,37 +45,40 @@ public class DePermissionAnnotationHandler {
DePermission permission = dePermissions[i]; DePermission permission = dePermissions[i];
boolean currentAccess = access(args[permission.paramIndex()], permission, 0); boolean currentAccess = access(args[permission.paramIndex()], permission, 0);
if (!currentAccess) { if (!currentAccess) {
return null; access = false;
break;
} }
} }
} else { } else {
List<Exception> exceptions = new ArrayList<>(); List<Exception> exceptions = new ArrayList<>();
Boolean someAccess = false;
for (int i = 0; i < dePermissions.length; i++) { for (int i = 0; i < dePermissions.length; i++) {
DePermission permission = dePermissions[i]; DePermission permission = dePermissions[i];
try { try {
boolean currentAccess = access(args[permission.paramIndex()], permission, 0); boolean currentAccess = access(args[permission.paramIndex()], permission, 0);
if (currentAccess) { if (currentAccess) {
someAccess = true; access = true;
break; break;
} }
} catch (Exception e) { } catch (Exception e) {
exceptions.add(e); exceptions.add(e);
} }
} }
if (!someAccess) { if (!access && exceptions.size() > 0) {
throw exceptions.get(0); throw exceptions.get(0);
} }
} }
return point.proceed(point.getArgs());
} catch (Throwable throwable) { } catch (Throwable throwable) {
LogUtil.error(throwable.getMessage(), throwable); LogUtil.error(throwable.getMessage(), throwable);
throw new RuntimeException(throwable.getMessage()); throw new RuntimeException(throwable.getMessage());
} }
return access ? point.proceed(point.getArgs()) : null;
} }
@Around(value = "@annotation(io.dataease.auth.annotation.DePermission)") @Around(value = "@annotation(io.dataease.auth.annotation.DePermission)")
public Object PermissionAround(ProceedingJoinPoint point) { public Object PermissionAround(ProceedingJoinPoint point) throws Throwable{
Boolean access = false;
try { try {
if (AuthUtils.getUser().getIsAdmin()) { if (AuthUtils.getUser().getIsAdmin()) {
return point.proceed(point.getArgs()); return point.proceed(point.getArgs());
@ -84,14 +89,14 @@ public class DePermissionAnnotationHandler {
DePermission annotation = method.getAnnotation(DePermission.class); DePermission annotation = method.getAnnotation(DePermission.class);
Object arg = point.getArgs()[annotation.paramIndex()]; Object arg = point.getArgs()[annotation.paramIndex()];
if (access(arg, annotation, 0)) { if (access(arg, annotation, 0)) {
return point.proceed(point.getArgs()); access = true;
} }
return false;
} catch (Throwable throwable) { } catch (Throwable throwable) {
LogUtil.error(throwable.getMessage(), throwable); LogUtil.error(throwable.getMessage(), throwable);
throw new RuntimeException(throwable.getMessage()); throw new RuntimeException(throwable.getMessage());
} }
return access ? point.proceed(point.getArgs()) : null;
} }
private Boolean access(Object arg, DePermission annotation, int layer) throws Exception { private Boolean access(Object arg, DePermission annotation, int layer) throws Exception {

1
frontend/src/styles/index.scss
View File

@ -151,6 +151,7 @@ div:focus {
.el-tabs__content { .el-tabs__content {
height: calc(100% - 55px) !important; height: calc(100% - 55px) !important;
margin-top: 5px;
.el-tab-pane { .el-tab-pane {
height: 100% !important; height: 100% !important;