fix DataAuthorization

Author: xlorne

example/example-application/pom.xml

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

example/pom.xml

@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.42</version>
+    <version>3.3.43</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.42</version>
+    <version>3.3.43</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.42</version>
+        <version>3.3.43</version>
     </parent>
 
     <artifactId>springboot-starter-data-authorization</artifactId>

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

@@ -5,11 +5,13 @@
 import com.codingapi.springboot.authorization.handler.ColumnHandler;
 import com.codingapi.springboot.authorization.handler.RowHandler;
 import com.codingapi.springboot.authorization.interceptor.SQLInterceptor;
+import com.codingapi.springboot.authorization.properties.DataAuthorizationProperty;
 import com.codingapi.springboot.authorization.register.ConditionHandlerRegister;
 import com.codingapi.springboot.authorization.register.DataAuthorizationContextRegister;
 import com.codingapi.springboot.authorization.register.ResultSetHandlerRegister;
 import com.codingapi.springboot.authorization.register.SQLInterceptorRegister;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -18,6 +20,12 @@
 @Configuration
 public class DataAuthorizationConfiguration {
 
+    @Bean
+    @ConfigurationProperties(prefix = "codingapi.data-authorization")
+    public DataAuthorizationProperty dataAuthorizationProperty(){
+        return new DataAuthorizationProperty();
+    }
+
     @Bean
     public ConditionHandlerRegister conditionHandlerRegister(@Autowired(required = false) RowHandler rowHandler) {
         return new ConditionHandlerRegister(rowHandler);

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

@@ -27,23 +27,24 @@ public void addDataAuthorizationFilter(DataAuthorizationFilter filter) {
         this.filters.add(filter);
     }
 
-    public void clearDataAuthorizationFilters(){
+    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)) {
+        if (interceptState != null && interceptState.hasIntercept()) {
+            String realTableName = interceptState.getTableName(tableName);
             for (DataAuthorizationFilter filter : filters) {
-                if (filter.supportColumnAuthorization(tableName, columnName, value)) {
-                    return filter.columnAuthorization(tableName, columnName, value);
+                if (filter.supportColumnAuthorization(realTableName, columnName, value)) {
+                    return filter.columnAuthorization(realTableName, columnName, value);
                 }
             }
         }
         return value;
     }
 
     public Condition rowAuthorization(String tableName, String tableAlias) {
-        if(StringUtils.hasText(tableName) && StringUtils.hasText(tableAlias)) {
+        if (StringUtils.hasText(tableName) && StringUtils.hasText(tableAlias)) {
             for (DataAuthorizationFilter filter : filters) {
                 if (filter.supportRowAuthorization(tableName, tableAlias)) {
                     return filter.rowAuthorization(tableName, tableAlias);