add SQLRunningContext#run()

xlorne · xlorne · commit 2b370a3f8b70 · 2024-12-09T16:28:59.000+08:00
diff --git a/example/example-application/pom.xml b/example/example-application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.32</version>
+        <version>3.3.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.32</version>
+        <version>3.3.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-flow/pom.xml b/example/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.32</version>
+        <version>3.3.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-infra-jpa/pom.xml b/example/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.32</version>
+        <version>3.3.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.32</version>
+        <version>3.3.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.32</version>
+    <version>3.3.33</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.32</version>
+    <version>3.3.33</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.32</version>
+        <version>3.3.33</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/interceptor/SQLRunningContext.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/interceptor/SQLRunningContext.java
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/SQLRunningState.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/SQLRunningState.java
@@ -0,0 +1,14 @@
+package com.codingapi.springboot.authorization.jdbc;
+
+public enum SQLRunningState {
+
+    /**
+     * 拦截
+     */
+    INTERCEPT,
+
+    /**
+     * 不拦截
+     */
+    UN_INTERCEPT;
+}
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/CallableStatementProxy.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/CallableStatementProxy.java
@@ -1,6 +1,5 @@
 package com.codingapi.springboot.authorization.jdbc.proxy;
 
-import com.codingapi.springboot.authorization.interceptor.SQLRunningContext;
 import com.codingapi.springboot.authorization.interceptor.SQLInterceptState;
 import lombok.AllArgsConstructor;
 
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/ConnectionProxy.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/ConnectionProxy.java
@@ -1,7 +1,6 @@
 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;
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/PreparedStatementProxy.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/PreparedStatementProxy.java
@@ -1,6 +1,5 @@
 package com.codingapi.springboot.authorization.jdbc.proxy;
 
-import com.codingapi.springboot.authorization.interceptor.SQLRunningContext;
 import com.codingapi.springboot.authorization.interceptor.SQLInterceptState;
 import lombok.AllArgsConstructor;
 
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/SQLRunningContext.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/SQLRunningContext.java
@@ -0,0 +1,68 @@
+package com.codingapi.springboot.authorization.jdbc.proxy;
+
+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执行拦截上下文
+ */
+public class SQLRunningContext {
+
+    @Getter
+    private final static SQLRunningContext instance = new SQLRunningContext();
+
+    private final ThreadLocal<Boolean> skipInterceptor = ThreadLocal.withInitial(() -> false);
+
+    private SQLRunningContext() {
+
+    }
+
+    /**
+     * 拦截SQL
+     *
+     * @param sql sql
+     * @return SQLInterceptState
+     * @throws SQLException SQLException
+     */
+    SQLInterceptState intercept(String sql) throws SQLException {
+        SQLInterceptor sqlInterceptor = SQLInterceptorContext.getInstance().getSqlInterceptor();
+
+        if (skipInterceptor.get()) {
+            return SQLInterceptState.unIntercept(sql);
+        }
+
+        if (sqlInterceptor.beforeHandler(sql)) {
+            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;
+            }
+        }
+        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);
+        }
+    }
+}
diff --git a/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/StatementProxy.java b/springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/jdbc/proxy/StatementProxy.java
@@ -1,6 +1,5 @@
 package com.codingapi.springboot.authorization.jdbc.proxy;
 
-import com.codingapi.springboot.authorization.interceptor.SQLRunningContext;
 import com.codingapi.springboot.authorization.interceptor.SQLInterceptState;
 import lombok.AllArgsConstructor;
 
diff --git a/springboot-starter-data-authorization/src/test/java/com/codingapi/springboot/authorization/DataAuthorizationContextTest.java b/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.jdbc.proxy.SQLRunningContext;
 import com.codingapi.springboot.authorization.mask.ColumnMaskContext;
 import com.codingapi.springboot.authorization.mask.impl.BankCardMask;
 import com.codingapi.springboot.authorization.mask.impl.IDCardMask;
@@ -25,6 +26,7 @@
 import org.springframework.test.annotation.Rollback;
 
 import java.time.LocalDate;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -72,6 +74,10 @@ public Condition rowAuthorization(String tableName, String tableAlias) {
                 if (tableName.equalsIgnoreCase("t_depart")) {
                     long departId = CurrentUser.getInstance().getUser().getDepartId();
                     String conditionTemplate = "%s.id = " + departId;
+
+                    List<Depart> departs =  SQLRunningContext.getInstance().run(() -> departRepository.findAll());
+                    log.info("departs:{}", departs);
+
                     return Condition.formatCondition(conditionTemplate, tableAlias);
                 }
                 if (tableName.equalsIgnoreCase("t_user")) {
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.32</version>
+        <version>3.3.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.32</version>
+        <version>3.3.33</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.32</version>
+        <version>3.3.33</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.32</version>
+        <version>3.3.33</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
