From 07df90f99b5592fffbb238f9d082a69adaf39127 Mon Sep 17 00:00:00 2001 From: JuJu <857815116@qq.com> Date: Fri, 23 Oct 2020 15:33:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/security/aspect/PreAuthorizeAspect.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java index 64c9f17b..e568b2b0 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java @@ -35,6 +35,9 @@ public class PreAuthorizeAspect /** 管理员角色权限标识 */ private static final String SUPER_ADMIN = "admin"; + /** 数组为0时 */ + private static final Integer ARRAY_EMPTY = 0; + @Around("@annotation(com.ruoyi.common.security.annotation.PreAuthorize)") public Object around(ProceedingJoinPoint point) throws Throwable { @@ -63,7 +66,7 @@ public class PreAuthorizeAspect } throw new PreAuthorizeException(); } - else if (!StringUtils.isEmpty(annotation.hasAnyPermi())) + else if (ARRAY_EMPTY < annotation.hasAnyPermi().length) { if (hasAnyPermi(annotation.hasAnyPermi())) { @@ -87,7 +90,7 @@ public class PreAuthorizeAspect } throw new PreAuthorizeException(); } - else if (!StringUtils.isEmpty(annotation.hasAnyRoles())) + else if (ARRAY_EMPTY < annotation.hasAnyRoles().length) { if (hasAnyRoles(annotation.hasAnyRoles())) { From 8fdcd576c91b567c3e3424549f170aac024f9464 Mon Sep 17 00:00:00 2001 From: JuJu <857815116@qq.com> Date: Fri, 23 Oct 2020 16:00:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3hasRole=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E4=B8=BAequals?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/security/aspect/PreAuthorizeAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java index e568b2b0..3a44d82b 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java @@ -168,7 +168,7 @@ public class PreAuthorizeAspect } for (String roleKey : userInfo.getRoles()) { - if (SUPER_ADMIN.contains(roleKey) || roleKey.contains(role)) + if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(role)) { return true; } From 24fb0b712adc1f3d60802a708c935fd73d92d1ac Mon Sep 17 00:00:00 2001 From: JuJu <857815116@qq.com> Date: Mon, 26 Oct 2020 15:39:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/logback.xml | 2 +- ruoyi-gateway/src/main/resources/logback.xml | 2 +- ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml | 2 +- ruoyi-modules/ruoyi-job/src/main/resources/logback.xml | 2 +- ruoyi-modules/ruoyi-system/src/main/resources/logback.xml | 2 +- ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-auth/src/main/resources/logback.xml b/ruoyi-auth/src/main/resources/logback.xml index b27adc5d..098a610b 100644 --- a/ruoyi-auth/src/main/resources/logback.xml +++ b/ruoyi-auth/src/main/resources/logback.xml @@ -3,7 +3,7 @@ - :ss} %-5level ${springAppName:-} %thread %logger %msg%n"/> + diff --git a/ruoyi-gateway/src/main/resources/logback.xml b/ruoyi-gateway/src/main/resources/logback.xml index e644524f..f8e7f8af 100644 --- a/ruoyi-gateway/src/main/resources/logback.xml +++ b/ruoyi-gateway/src/main/resources/logback.xml @@ -3,7 +3,7 @@ - :ss} %-5level ${springAppName:-} %thread %logger %msg%n"/> + diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml index 098dca64..250c080f 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml @@ -3,7 +3,7 @@ - :ss} %-5level ${springAppName:-} %thread %logger %msg%n"/> + diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml index 94a59638..5d7d3f50 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml @@ -3,7 +3,7 @@ - :ss} %-5level ${springAppName:-} %thread %logger %msg%n"/> + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml index 9c065a53..96bc0bbe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml @@ -3,7 +3,7 @@ - :ss} %-5level ${springAppName:-} %thread %logger %msg%n"/> + diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml index a287cda5..ab95c683 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml @@ -3,7 +3,7 @@ - :ss} %-5level ${springAppName:-} %thread %logger %msg%n"/> +