修复目录错误,增加自动配置

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml

@@ -32,6 +32,10 @@
             <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
 

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/OrganizationalAuthorizationAutoConfiguration.java

@@ -0,0 +1,45 @@
+package org.hswebframework.web.organizational.authorization;
+
+import org.hswebframework.web.organizational.authorization.simple.*;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * TODO 完成注释
+ *
+ * @author zhouhao
+ */
+@Configuration
+public class OrganizationalAuthorizationAutoConfiguration {
+
+    @Bean
+    @ConditionalOnMissingBean(AreaScopeDataAccessHandler.class)
+    public AreaScopeDataAccessHandler areaScopeDataAccessHandler() {
+        return new AreaScopeDataAccessHandler();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(DepartmentScopeDataAccessHandler.class)
+    public DepartmentScopeDataAccessHandler departmentScopeDataAccessHandler() {
+        return new DepartmentScopeDataAccessHandler();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(OrgScopeDataAccessHandler.class)
+    public OrgScopeDataAccessHandler orgScopeDataAccessHandler() {
+        return new OrgScopeDataAccessHandler();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(PersonScopeDataAccessHandler.class)
+    public PersonScopeDataAccessHandler personScopeDataAccessHandler() {
+        return new PersonScopeDataAccessHandler();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean(PositionScopeDataAccessHandler.class)
+    public PositionScopeDataAccessHandler positionScopeDataAccessHandler() {
+        return new PositionScopeDataAccessHandler();
+    }
+}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/Personnel.java

@@ -1,4 +1,4 @@
-package organizational;
+package org.hswebframework.web.organizational.authorization;
 
 import java.io.Serializable;
 

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/PersonnelAuthorization.java

@@ -1,4 +1,4 @@
-package organizational;
+package org.hswebframework.web.organizational.authorization;
 
 import org.hswebframework.web.authorization.Authentication;
 

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/TreeNode.java

@@ -1,4 +1,4 @@
-package organizational;
+package org.hswebframework.web.organizational.authorization;
 
 import java.io.Serializable;
 import java.util.ArrayList;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/access/DataAccessType.java

@@ -1,4 +1,4 @@
-package organizational.access;
+package org.hswebframework.web.organizational.authorization.access;
 
 import java.io.Serializable;
 

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/access/ScopeDataAccessConfig.java

@@ -1,4 +1,4 @@
-package organizational.access;
+package org.hswebframework.web.organizational.authorization.access;
 
 import org.hswebframework.web.authorization.access.DataAccessConfig;
 

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresDepartment.java

@@ -1,4 +1,4 @@
-package organizational.annotation;
+package org.hswebframework.web.organizational.authorization.annotation;
 
 import org.hswebframework.web.authorization.annotation.Logical;
 

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresOrg.java

@@ -1,4 +1,4 @@
-package organizational.annotation;
+package org.hswebframework.web.organizational.authorization.annotation;
 
 import org.hswebframework.web.authorization.annotation.Logical;
 

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresPosition.java

@@ -1,4 +1,4 @@
-package organizational.annotation;
+package org.hswebframework.web.organizational.authorization.annotation;
 
 import org.hswebframework.web.authorization.annotation.Logical;
 

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/AreaAttachEntity.java

@@ -0,0 +1,14 @@
+package org.hswebframework.web.organizational.authorization.entity;
+
+import org.hswebframework.web.commons.entity.Entity;
+
+/**
+ * @author zhouhao
+ */
+public interface AreaAttachEntity extends Entity {
+    String areaId = "areaId";
+
+    String getAreaId();
+
+    void setAreaId(String areaId);
+}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/DepartmentAttachEntity.java

@@ -1,6 +1,6 @@
-package organizational.entity;
+package org.hswebframework.web.organizational.authorization.entity;
 
-import java.io.Serializable;
+import org.hswebframework.web.commons.entity.Entity;
 
 /**
  * 关联部门信息的实体,实现此接口,才能对相应的操作进行部门相关的权限控制
@@ -8,7 +8,7 @@ import java.io.Serializable;
  * @author zhouhao
  * @since 3.0
  */
-public interface DepartmentAttachEntity extends Serializable {
+public interface DepartmentAttachEntity extends Entity {
 
     /*-------------------------------------------
      |               属性名常量               |

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/OrgAttachEntity.java

@@ -0,0 +1,14 @@
+package org.hswebframework.web.organizational.authorization.entity;
+
+import org.hswebframework.web.commons.entity.Entity;
+
+/**
+ * @author zhouhao
+ */
+public interface OrgAttachEntity extends Entity {
+    String orgId = "orgId";
+
+    String getOrgId();
+
+    void setOrgId(String orgId);
+}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/PersonAttachEntity.java

@@ -0,0 +1,14 @@
+package org.hswebframework.web.organizational.authorization.entity;
+
+import org.hswebframework.web.commons.entity.Entity;
+
+/**
+ * @author zhouhao
+ */
+public interface PersonAttachEntity  extends Entity {
+    String personId = "personId";
+
+    String getPersonId();
+
+    void setPersonId(String personId);
+}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/PositionAttachEntity.java

@@ -0,0 +1,14 @@
+package org.hswebframework.web.organizational.authorization.entity;
+
+import org.hswebframework.web.commons.entity.Entity;
+
+/**
+ * @author zhouhao
+ */
+public interface PositionAttachEntity extends Entity {
+    String positionId = "positionId";
+
+    String getPositionId();
+
+    void setPositionId(String positionId);
+}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/AbstractScopeDataAccessHander.java

@@ -1,14 +1,14 @@
-package organizational.simple;
+package org.hswebframework.web.organizational.authorization.simple;
 
 import org.hsweb.ezorm.core.param.Term;
 import org.hswebframework.web.authorization.Permission;
 import org.hswebframework.web.authorization.access.DataAccessConfig;
 import org.hswebframework.web.authorization.access.DataAccessHandler;
 import org.hswebframework.web.authorization.annotation.RequiresDataAccess;
-import organizational.PersonnelAuthorization;
-import organizational.access.DataAccessType;
-import organizational.access.ScopeDataAccessConfig;
-import organizational.entity.OrgAttachEntity;
+import org.hswebframework.web.organizational.authorization.access.DataAccessType;
+import org.hswebframework.web.organizational.authorization.PersonnelAuthorization;
+import org.hswebframework.web.organizational.authorization.access.ScopeDataAccessConfig;
+import org.hswebframework.web.organizational.authorization.entity.OrgAttachEntity;
 import org.hswebframework.web.boost.aop.context.MethodInterceptorParamContext;
 import org.hswebframework.web.commons.entity.Entity;
 import org.hswebframework.web.commons.entity.param.QueryParamEntity;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/AreaScopeDataAccessHandler.java

@@ -1,10 +1,10 @@
-package organizational.simple;
+package org.hswebframework.web.organizational.authorization.simple;
 
 import org.hsweb.ezorm.core.param.Term;
 import org.hsweb.ezorm.core.param.TermType;
-import organizational.PersonnelAuthorization;
-import organizational.access.DataAccessType;
-import organizational.entity.AreaAttachEntity;
+import org.hswebframework.web.organizational.authorization.PersonnelAuthorization;
+import org.hswebframework.web.organizational.authorization.access.DataAccessType;
+import org.hswebframework.web.organizational.authorization.entity.AreaAttachEntity;
 
 import java.util.Collections;
 import java.util.Set;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/DepartmentScopeDataAccessHandler.java

@@ -1,10 +1,10 @@
-package organizational.simple;
+package org.hswebframework.web.organizational.authorization.simple;
 
 import org.hsweb.ezorm.core.param.Term;
 import org.hsweb.ezorm.core.param.TermType;
-import organizational.PersonnelAuthorization;
-import organizational.access.DataAccessType;
-import organizational.entity.DepartmentAttachEntity;
+import org.hswebframework.web.organizational.authorization.PersonnelAuthorization;
+import org.hswebframework.web.organizational.authorization.access.DataAccessType;
+import org.hswebframework.web.organizational.authorization.entity.DepartmentAttachEntity;
 
 import java.util.Collections;
 import java.util.Set;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/OrgScopeDataAccessHandler.java

@@ -1,10 +1,10 @@
-package organizational.simple;
+package org.hswebframework.web.organizational.authorization.simple;
 
 import org.hsweb.ezorm.core.param.Term;
 import org.hsweb.ezorm.core.param.TermType;
-import organizational.PersonnelAuthorization;
-import organizational.access.DataAccessType;
-import organizational.entity.OrgAttachEntity;
+import org.hswebframework.web.organizational.authorization.PersonnelAuthorization;
+import org.hswebframework.web.organizational.authorization.access.DataAccessType;
+import org.hswebframework.web.organizational.authorization.entity.OrgAttachEntity;
 
 import java.util.Collections;
 import java.util.Set;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/PersonScopeDataAccessHandler.java

@@ -1,10 +1,10 @@
-package organizational.simple;
+package org.hswebframework.web.organizational.authorization.simple;
 
 import org.hsweb.ezorm.core.param.Term;
 import org.hsweb.ezorm.core.param.TermType;
-import organizational.PersonnelAuthorization;
-import organizational.access.DataAccessType;
-import organizational.entity.PersonAttachEntity;
+import org.hswebframework.web.organizational.authorization.access.DataAccessType;
+import org.hswebframework.web.organizational.authorization.PersonnelAuthorization;
+import org.hswebframework.web.organizational.authorization.entity.PersonAttachEntity;
 
 import java.util.Collections;
 import java.util.Set;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/PositionScopeDataAccessHandler.java

@@ -1,10 +1,10 @@
-package organizational.simple;
+package org.hswebframework.web.organizational.authorization.simple;
 
 import org.hsweb.ezorm.core.param.Term;
 import org.hsweb.ezorm.core.param.TermType;
-import organizational.PersonnelAuthorization;
-import organizational.access.DataAccessType;
-import organizational.entity.PositionAttachEntity;
+import org.hswebframework.web.organizational.authorization.access.DataAccessType;
+import org.hswebframework.web.organizational.authorization.PersonnelAuthorization;
+import org.hswebframework.web.organizational.authorization.entity.PositionAttachEntity;
 
 import java.util.Collections;
 import java.util.Set;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/AreaAttachEntity.java

@@ -1,14 +0,0 @@
-package organizational.entity;
-
-import java.io.Serializable;
-
-/**
- * @author zhouhao
- */
-public interface AreaAttachEntity extends Serializable {
-    String areaId = "areaId";
-
-    String getAreaId();
-
-    void setAreaId(String areaId);
-}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/OrgAttachEntity.java

@@ -1,14 +0,0 @@
-package organizational.entity;
-
-import java.io.Serializable;
-
-/**
- * @author zhouhao
- */
-public interface OrgAttachEntity extends Serializable {
-    String orgId = "orgId";
-
-    String getOrgId();
-
-    void setOrgId(String orgId);
-}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/PersonAttachEntity.java

@@ -1,14 +0,0 @@
-package organizational.entity;
-
-import java.io.Serializable;
-
-/**
- * @author zhouhao
- */
-public interface PersonAttachEntity extends Serializable {
-    String personId = "personId";
-
-    String getPersonId();
-
-    void setPersonId(String personId);
-}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/PositionAttachEntity.java

@@ -1,14 +0,0 @@
-package organizational.entity;
-
-import java.io.Serializable;
-
-/**
- * @author zhouhao
- */
-public interface PositionAttachEntity extends Serializable {
-    String positionId = "positionId";
-
-    String getPositionId();
-
-    void setPositionId(String positionId);
-}

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.hswebframework.web.organizational.authorization.OrganizationalAuthorizationAutoConfiguration