Przeglądaj źródła

update 优化 异常处理器自动装配逻辑

疯狂的狮子Li 2 lat temu
rodzic
commit
f383ab057d

+ 18 - 0
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfiguration.java

@@ -11,7 +11,9 @@ import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerIntercept
 import org.dromara.common.core.factory.YmlPropertySourceFactory;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.mybatis.handler.InjectionMetaObjectHandler;
+import org.dromara.common.mybatis.handler.MybatisExceptionHandler;
 import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor;
+import org.dromara.common.mybatis.service.SysDataScopeService;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.BeansException;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -89,6 +91,22 @@ public class MybatisPlusConfiguration {
         return new DefaultIdentifierGenerator(NetUtil.getLocalhost());
     }
 
+    /**
+     * 异常处理器
+     */
+    @Bean
+    public MybatisExceptionHandler mybatisExceptionHandler() {
+        return new MybatisExceptionHandler();
+    }
+
+    /**
+     * 数据权限处理实现
+     */
+    @Bean
+    public SysDataScopeService sysDataScopeService() {
+        return new SysDataScopeService();
+    }
+
     /**
      * PaginationInnerInterceptor 分页插件,自动识别数据库类型
      * https://baomidou.com/pages/97710a/

+ 0 - 2
ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1 @@
 org.dromara.common.mybatis.config.MybatisPlusConfiguration
-org.dromara.common.mybatis.handler.MybatisExceptionHandler
-org.dromara.common.mybatis.service.SysDataScopeService

+ 9 - 0
ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfiguration.java

@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.redis.config.properties.RedissonProperties;
 import org.dromara.common.redis.handler.KeyPrefixHandler;
+import org.dromara.common.redis.handler.RedisExceptionHandler;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.codec.CompositeCodec;
 import org.redisson.codec.TypedJsonJacksonCodec;
@@ -97,6 +98,14 @@ public class RedisConfiguration {
         };
     }
 
+    /**
+     * 异常处理器
+     */
+    @Bean
+    public RedisExceptionHandler redisExceptionHandler() {
+        return new RedisExceptionHandler();
+    }
+
     /**
      * redis集群配置 yml
      *