diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml index e7eecc219..93638b713 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/pom.xml @@ -32,6 +32,10 @@ ${project.version} true + + org.springframework.boot + spring-boot-starter + diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/OrganizationalAuthorizationAutoConfiguration.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/OrganizationalAuthorizationAutoConfiguration.java new file mode 100644 index 000000000..b8810a82b --- /dev/null +++ b/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(); + } +} diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/Personnel.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/Personnel.java similarity index 81% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/Personnel.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/Personnel.java index 2cdb652e8..8605d3c0f 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/Personnel.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/Personnel.java @@ -1,4 +1,4 @@ -package organizational; +package org.hswebframework.web.organizational.authorization; import java.io.Serializable; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/PersonnelAuthorization.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorization.java similarity index 98% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/PersonnelAuthorization.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorization.java index de660ca2d..5dc97917b 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/PersonnelAuthorization.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/PersonnelAuthorization.java @@ -1,4 +1,4 @@ -package organizational; +package org.hswebframework.web.organizational.authorization; import org.hswebframework.web.authorization.Authentication; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/TreeNode.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/TreeNode.java similarity index 96% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/TreeNode.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/TreeNode.java index 2d37015c5..5f910aab7 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/TreeNode.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/TreeNode.java @@ -1,4 +1,4 @@ -package organizational; +package org.hswebframework.web.organizational.authorization; import java.io.Serializable; import java.util.ArrayList; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/access/DataAccessType.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/access/DataAccessType.java similarity index 92% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/access/DataAccessType.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/access/DataAccessType.java index c0e94cffd..2cdb2c649 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/access/DataAccessType.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/access/DataAccessType.java @@ -1,4 +1,4 @@ -package organizational.access; +package org.hswebframework.web.organizational.authorization.access; import java.io.Serializable; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/access/ScopeDataAccessConfig.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/access/ScopeDataAccessConfig.java similarity index 89% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/access/ScopeDataAccessConfig.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/access/ScopeDataAccessConfig.java index c91b8ba18..e04955841 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/access/ScopeDataAccessConfig.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/access/ScopeDataAccessConfig.java @@ -1,4 +1,4 @@ -package organizational.access; +package org.hswebframework.web.organizational.authorization.access; import org.hswebframework.web.authorization.access.DataAccessConfig; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresDepartment.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/annotation/RequiresDepartment.java similarity index 84% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresDepartment.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/annotation/RequiresDepartment.java index 630cfce2c..2696ffa8d 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresDepartment.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/annotation/RequiresDepartment.java @@ -1,4 +1,4 @@ -package organizational.annotation; +package org.hswebframework.web.organizational.authorization.annotation; import org.hswebframework.web.authorization.annotation.Logical; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresOrg.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/annotation/RequiresOrg.java similarity index 83% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresOrg.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/annotation/RequiresOrg.java index ae945dc55..06694ccef 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresOrg.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/annotation/RequiresOrg.java @@ -1,4 +1,4 @@ -package organizational.annotation; +package org.hswebframework.web.organizational.authorization.annotation; import org.hswebframework.web.authorization.annotation.Logical; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresPosition.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/annotation/RequiresPosition.java similarity index 83% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresPosition.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/annotation/RequiresPosition.java index af839ab43..efad1056b 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/annotation/RequiresPosition.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/annotation/RequiresPosition.java @@ -1,4 +1,4 @@ -package organizational.annotation; +package org.hswebframework.web.organizational.authorization.annotation; import org.hswebframework.web.authorization.annotation.Logical; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/AreaAttachEntity.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/AreaAttachEntity.java new file mode 100644 index 000000000..3caa23cf7 --- /dev/null +++ b/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); +} diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/DepartmentAttachEntity.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/DepartmentAttachEntity.java similarity index 72% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/DepartmentAttachEntity.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/DepartmentAttachEntity.java index 8d8b22a49..bd721db4d 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/DepartmentAttachEntity.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/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 { /*------------------------------------------- | 属性名常量 | diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/OrgAttachEntity.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/OrgAttachEntity.java new file mode 100644 index 000000000..4ac11a1d9 --- /dev/null +++ b/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); +} diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/PersonAttachEntity.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/PersonAttachEntity.java new file mode 100644 index 000000000..7377d9537 --- /dev/null +++ b/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); +} diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/PositionAttachEntity.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/entity/PositionAttachEntity.java new file mode 100644 index 000000000..687453859 --- /dev/null +++ b/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); +} diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/AbstractScopeDataAccessHander.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/AbstractScopeDataAccessHander.java similarity index 94% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/AbstractScopeDataAccessHander.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/AbstractScopeDataAccessHander.java index b89dfd05f..a99864046 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/AbstractScopeDataAccessHander.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/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; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/AreaScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/AreaScopeDataAccessHandler.java similarity index 80% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/AreaScopeDataAccessHandler.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/AreaScopeDataAccessHandler.java index 58bcdf17c..038db8cb3 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/AreaScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/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; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/DepartmentScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/DepartmentScopeDataAccessHandler.java similarity index 81% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/DepartmentScopeDataAccessHandler.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/DepartmentScopeDataAccessHandler.java index d3c83388f..dd955ce93 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/DepartmentScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/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; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/OrgScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/OrgScopeDataAccessHandler.java similarity index 80% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/OrgScopeDataAccessHandler.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/OrgScopeDataAccessHandler.java index e11689542..0551eaa14 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/OrgScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/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; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/PersonScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/PersonScopeDataAccessHandler.java similarity index 81% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/PersonScopeDataAccessHandler.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/PersonScopeDataAccessHandler.java index 00937347e..d36f62abe 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/PersonScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/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; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/PositionScopeDataAccessHandler.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/PositionScopeDataAccessHandler.java similarity index 81% rename from hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/PositionScopeDataAccessHandler.java rename to hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/simple/PositionScopeDataAccessHandler.java index ac5c5121d..61ba125a1 100644 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/simple/PositionScopeDataAccessHandler.java +++ b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/org/hswebframework/web/organizational/authorization/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; diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/AreaAttachEntity.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/AreaAttachEntity.java deleted file mode 100644 index 126fa18fb..000000000 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/AreaAttachEntity.java +++ /dev/null @@ -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); -} diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/OrgAttachEntity.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/OrgAttachEntity.java deleted file mode 100644 index 6fe6c50c3..000000000 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/OrgAttachEntity.java +++ /dev/null @@ -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); -} diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/PersonAttachEntity.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/PersonAttachEntity.java deleted file mode 100644 index 0b1eceb4f..000000000 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/PersonAttachEntity.java +++ /dev/null @@ -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); -} diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/PositionAttachEntity.java b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/PositionAttachEntity.java deleted file mode 100644 index 4491a4f80..000000000 --- a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/java/organizational/entity/PositionAttachEntity.java +++ /dev/null @@ -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); -} diff --git a/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/resources/META-INF/spring.factories b/hsweb-system/hsweb-system-organizational/hsweb-system-organizational-authorization/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..2173c669f --- /dev/null +++ b/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 \ No newline at end of file