add SQLRunningContext#skipDataAuthorization 3.3.40

Author: xlorne

example/example-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.39</version>
+        <version>3.3.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.39</version>
+        <version>3.3.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-flow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.39</version>
+        <version>3.3.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-jpa/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.39</version>
+        <version>3.3.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.39</version>
+        <version>3.3.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.39</version>
+    <version>3.3.40</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.39</version>
+    <version>3.3.40</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.39</version>
+        <version>3.3.40</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/interceptor/SQLRunningContext.java

@@ -14,7 +14,8 @@ public class SQLRunningContext {
 
     private final ThreadLocal<Boolean> skipInterceptor = ThreadLocal.withInitial(() -> false);
 
-    private SQLRunningContext() {}
+    private SQLRunningContext() {
+    }
 
     /**
      * 拦截SQL
@@ -40,7 +41,7 @@ public SQLInterceptState intercept(String sql) throws SQLException {
             } catch (SQLException exception) {
                 sqlInterceptor.afterHandler(sql, null, exception);
                 throw exception;
-            }finally {
+            } finally {
                 // 重置拦截器状态
                 skipInterceptor.set(false);
             }
@@ -49,6 +50,19 @@ public SQLInterceptState intercept(String sql) throws SQLException {
     }
 
 
-
+    /**
+     * 跳过数据权限拦截
+     * @param supplier 业务逻辑
+     * @return T
+     * @param <T> T
+     */
+    public <T> T skipDataAuthorization(java.util.function.Supplier<T> supplier) {
+        try {
+            skipInterceptor.set(true);
+            return (T) supplier.get();
+        } finally {
+            skipInterceptor.set(false);
+        }
+    }
 
 }

springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/DataAuthorizationContextTest.java

@@ -6,6 +6,7 @@
 import com.codingapi.springboot.authorization.entity.User;
 import com.codingapi.springboot.authorization.filter.DefaultDataAuthorizationFilter;
 import com.codingapi.springboot.authorization.handler.Condition;
+import com.codingapi.springboot.authorization.interceptor.SQLRunningContext;
 import com.codingapi.springboot.authorization.mask.ColumnMaskContext;
 import com.codingapi.springboot.authorization.mask.impl.BankCardMask;
 import com.codingapi.springboot.authorization.mask.impl.IDCardMask;
@@ -182,6 +183,7 @@ public boolean supportColumnAuthorization(String tableName, String columnName, O
         userRepository.save(bob);
         userRepository.save(tom);
 
+        assertEquals(3, SQLRunningContext.getInstance().skipDataAuthorization(()->userRepository.findAll()).size());
 
         CurrentUser.getInstance().setUser(bob);
 

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.39</version>
+        <version>3.3.40</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.39</version>
+        <version>3.3.40</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.39</version>
+        <version>3.3.40</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.39</version>
+        <version>3.3.40</version>
     </parent>
     <artifactId>springboot-starter</artifactId>