Merge pull request #82 from codingapi/dev

Dev

Author: xlorne

example/example-application/pom.xml

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

example/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.27</version>
+    <version>3.3.30</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.27</version>
+    <version>3.3.30</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.27</version>
+        <version>3.3.30</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>

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

@@ -2,13 +2,15 @@
 
 import com.codingapi.springboot.authorization.filter.DataAuthorizationFilter;
 import com.codingapi.springboot.authorization.handler.Condition;
+import com.codingapi.springboot.authorization.interceptor.SQLInterceptState;
 import lombok.Getter;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- *  数据权限上下文
+ * 数据权限上下文
  */
 public class DataAuthorizationContext {
 
@@ -25,19 +27,27 @@ public void addDataAuthorizationFilter(DataAuthorizationFilter filter) {
         this.filters.add(filter);
     }
 
-    public <T> T columnAuthorization(String tableName, String columnName, T value) {
-        for (DataAuthorizationFilter filter : filters) {
-            if (filter.supportColumnAuthorization(tableName, columnName, value)) {
-                return filter.columnAuthorization(tableName, columnName, value);
+    public void clearDataAuthorizationFilters(){
+        this.filters.clear();
+    }
+
+    public <T> T columnAuthorization(SQLInterceptState interceptState, String tableName, String columnName, T value) {
+        if (interceptState != null && interceptState.hasIntercept() && StringUtils.hasText(tableName)) {
+            for (DataAuthorizationFilter filter : filters) {
+                if (filter.supportColumnAuthorization(tableName, columnName, value)) {
+                    return filter.columnAuthorization(tableName, columnName, value);
+                }
             }
         }
         return value;
     }
 
     public Condition rowAuthorization(String tableName, String tableAlias) {
-        for (DataAuthorizationFilter filter : filters) {
-            if (filter.supportRowAuthorization(tableName, tableAlias)) {
-                return filter.rowAuthorization(tableName, tableAlias);
+        if(StringUtils.hasText(tableName) && StringUtils.hasText(tableAlias)) {
+            for (DataAuthorizationFilter filter : filters) {
+                if (filter.supportRowAuthorization(tableName, tableAlias)) {
+                    return filter.rowAuthorization(tableName, tableAlias);
+                }
             }
         }
         return null;

springboot-starter-data-authorization/src/main/java/com/codingapi/springboot/authorization/filter/DefaultDataAuthorizationFilter.java

@@ -0,0 +1,27 @@
+package com.codingapi.springboot.authorization.filter;
+
+import com.codingapi.springboot.authorization.handler.Condition;
+
+public class DefaultDataAuthorizationFilter implements DataAuthorizationFilter{
+
+    @Override
+    public <T> T columnAuthorization(String tableName, String columnName, T value) {
+        return value;
+    }
+
+    @Override
+    public Condition rowAuthorization(String tableName, String tableAlias) {
+        return null;
+    }
+
+    @Override
+    public boolean supportColumnAuthorization(String tableName, String columnName, Object value) {
+        return false;
+    }
+
+    @Override
+    public boolean supportRowAuthorization(String tableName, String tableAlias) {
+        return false;
+    }
+
+}