fix: 角色权限注解失效

zzy-zhaozhiyi · May 18, 2019 · f886c31 · f886c31
1 parent 9cf4484
commit f886c31
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -1,6 +1,5 @@
 package com.ruoyi;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
@@ -17,7 +16,6 @@
  * @author ruoyi
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-@MapperScan("com.ruoyi.*.mapper")
 public class RuoYiApplication {
 
     private static final Logger log = LoggerFactory.getLogger(RuoYiApplication.class);

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SpringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SpringUtils.java
@@ -1,5 +1,6 @@
 package com.ruoyi.common.utils;
 
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.stereotype.Component;
@@ -84,4 +85,15 @@ public static Class<?> getType(String name){
     public static String[] getAliases(String name){
         return beanFactory.getAliases(name);
     }
+
+    /**
+     * 获取aop代理对象
+     *
+     * @param invoker
+     * @return 代理对象
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getAopProxy(T invoker){
+        return (T) AopContext.currentProxy();
+    }
 }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
@@ -0,0 +1,17 @@
+package com.ruoyi.framework.config;
+
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+
+/**
+ * 程序注解
+ * @author Administrator
+ */
+@Configuration
+@EnableAspectJAutoProxy(exposeProxy = true)
+@MapperScan("com.ruoyi.*.mapper")
+public class ApplicationConfig {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -4,6 +4,7 @@
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.exception.BusinessException;
 import com.ruoyi.common.support.Convert;
+import com.ruoyi.common.utils.SpringUtils;
 import com.ruoyi.system.domain.SysRole;
 import com.ruoyi.system.domain.SysRoleDept;
 import com.ruoyi.system.domain.SysRoleMenu;
@@ -98,7 +99,7 @@ public List<SysRole> selectRolesByUserId(Long userId) {
      */
     @Override
     public List<SysRole> selectRoleAll() {
-        return selectRoleList(new SysRole());
+        return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
     }
 
     /**