fix SQLRunningContext#intercept

Author: xlorne

example/example-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.33</version>
+        <version>3.3.34</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.33</version>
+        <version>3.3.34</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.33</version>
+        <version>3.3.34</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.33</version>
+        <version>3.3.34</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.33</version>
+        <version>3.3.34</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.33</version>
+    <version>3.3.34</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.33</version>
+    <version>3.3.34</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.33</version>
+        <version>3.3.34</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/SQLRunningContext.java renamed to springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/interceptor/SQLRunningContext.java

@@ -1,12 +1,8 @@
-package com.codingapi.springboot.authorization.jdbc.proxy;
+package com.codingapi.springboot.authorization.interceptor;
 
-import com.codingapi.springboot.authorization.interceptor.SQLInterceptState;
-import com.codingapi.springboot.authorization.interceptor.SQLInterceptor;
-import com.codingapi.springboot.authorization.interceptor.SQLInterceptorContext;
 import lombok.Getter;
 
 import java.sql.SQLException;
-import java.util.function.Supplier;
 
 /**
  * SQLRunningContext SQL执行拦截上下文
@@ -18,9 +14,7 @@ public class SQLRunningContext {
 
     private final ThreadLocal<Boolean> skipInterceptor = ThreadLocal.withInitial(() -> false);
 
-    private SQLRunningContext() {
-
-    }
+    private SQLRunningContext() {}
 
     /**
      * 拦截SQL
@@ -29,40 +23,32 @@ private SQLRunningContext() {
      * @return SQLInterceptState
      * @throws SQLException SQLException
      */
-    SQLInterceptState intercept(String sql) throws SQLException {
+    public SQLInterceptState intercept(String sql) throws SQLException {
         SQLInterceptor sqlInterceptor = SQLInterceptorContext.getInstance().getSqlInterceptor();
 
         if (skipInterceptor.get()) {
             return SQLInterceptState.unIntercept(sql);
         }
 
         if (sqlInterceptor.beforeHandler(sql)) {
+            // 在拦截器中执行的查询操作将不会被拦截
+            skipInterceptor.set(true);
             try {
                 String newSql = sqlInterceptor.postHandler(sql);
                 sqlInterceptor.afterHandler(sql, newSql, null);
                 return SQLInterceptState.intercept(sql, newSql);
             } catch (SQLException exception) {
                 sqlInterceptor.afterHandler(sql, null, exception);
                 throw exception;
+            }finally {
+                // 重置拦截器状态
+                skipInterceptor.set(false);
             }
         }
         return SQLInterceptState.unIntercept(sql);
     }
 
 
-    /**
-     * 执行SQL查询 （非拦截模型执行）
-     *
-     * @param supplier 业务逻辑
-     * @param <T>      T
-     * @return T
-     */
-    public <T> T run(Supplier<T> supplier) {
-        try {
-            skipInterceptor.set(true);
-            return supplier.get();
-        } finally {
-            skipInterceptor.set(false);
-        }
-    }
+
+
 }

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/SQLRunningState.java

@@ -1,6 +1,7 @@
 package com.codingapi.springboot.authorization.jdbc.proxy;
 
 import com.codingapi.springboot.authorization.interceptor.SQLInterceptState;
+import com.codingapi.springboot.authorization.interceptor.SQLRunningContext;
 import lombok.AllArgsConstructor;
 
 import java.io.InputStream;

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/CallableStatementProxy.java

@@ -1,6 +1,7 @@
 package com.codingapi.springboot.authorization.jdbc.proxy;
 
 import com.codingapi.springboot.authorization.interceptor.SQLInterceptState;
+import com.codingapi.springboot.authorization.interceptor.SQLRunningContext;
 
 import java.sql.*;
 import java.util.Map;

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/ConnectionProxy.java

@@ -1,6 +1,7 @@
 package com.codingapi.springboot.authorization.jdbc.proxy;
 
 import com.codingapi.springboot.authorization.interceptor.SQLInterceptState;
+import com.codingapi.springboot.authorization.interceptor.SQLRunningContext;
 import lombok.AllArgsConstructor;
 
 import java.io.InputStream;

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/PreparedStatementProxy.java

@@ -1,6 +1,7 @@
 package com.codingapi.springboot.authorization.jdbc.proxy;
 
 import com.codingapi.springboot.authorization.interceptor.SQLInterceptState;
+import com.codingapi.springboot.authorization.interceptor.SQLRunningContext;
 import lombok.AllArgsConstructor;
 
 import java.sql.*;

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/StatementProxy.java

@@ -6,7 +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.jdbc.proxy.SQLRunningContext;
+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;
@@ -75,7 +75,8 @@ public Condition rowAuthorization(String tableName, String tableAlias) {
                     long departId = CurrentUser.getInstance().getUser().getDepartId();
                     String conditionTemplate = "%s.id = " + departId;
 
-                    List<Depart> departs =  SQLRunningContext.getInstance().run(() -> departRepository.findAll());
+                    // 在条件处理的过程中，执行的查询都将不会被拦截
+                    List<Depart> departs =  departRepository.findAll();
                     log.info("departs:{}", departs);
 
                     return Condition.formatCondition(conditionTemplate, tableAlias);

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

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

springboot-starter-data-fast/pom.xml

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

springboot-starter-flow/pom.xml

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

springboot-starter-security/pom.xml

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