Merge remote-tracking branch 'origin/2.10' into 2.10

Author: zhou-hao

jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrgDimensionType.java

@@ -25,6 +25,7 @@
 import org.hswebframework.web.system.authorization.defaults.service.terms.DimensionTerm;
 import org.jetlinks.community.auth.entity.OrganizationEntity;
 import org.jetlinks.community.auth.service.OrganizationService;
+import org.jetlinks.community.authorize.OrgDimensionType;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;

jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/dimension/OrganizationDimensionProvider.java

@@ -31,7 +31,7 @@
 import org.hswebframework.web.validator.CreateGroup;
 import org.jetlinks.community.PropertyConstants;
 import org.jetlinks.community.auth.constants.AuthConstants;
-import org.jetlinks.community.auth.dimension.OrgDimensionType;
+import org.jetlinks.community.authorize.OrgDimensionType;
 import org.jetlinks.core.things.ThingInfo;
 
 import javax.persistence.Column;

jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/OrganizationEntity.java

@@ -28,7 +28,7 @@
 import org.hswebframework.web.authorization.Dimension;
 import org.hswebframework.web.bean.FastBeanCopier;
 import org.hswebframework.web.system.authorization.api.entity.UserEntity;
-import org.jetlinks.community.auth.dimension.OrgDimensionType;
+import org.jetlinks.community.authorize.OrgDimensionType;
 import org.jetlinks.community.auth.enums.*;
 import org.jetlinks.community.auth.service.info.UserLoginInfo;
 import org.jetlinks.reactor.ql.utils.CastUtils;

jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/entity/UserDetail.java

@@ -21,7 +21,7 @@
 import org.hswebframework.ezorm.rdb.operator.builder.fragments.SqlFragments;
 import org.hswebframework.ezorm.rdb.operator.builder.fragments.term.AbstractTermFragmentBuilder;
 import org.hswebframework.ezorm.rdb.utils.SqlUtils;
-import org.jetlinks.community.auth.dimension.OrgDimensionType;
+import org.jetlinks.community.authorize.OrgDimensionType;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/service/terms/OrgUserTermBuilder.java

@@ -20,6 +20,7 @@
 import org.hswebframework.web.authorization.DefaultDimensionType;
 import org.hswebframework.web.system.authorization.api.entity.DimensionUserEntity;
 import org.hswebframework.web.system.authorization.defaults.service.DefaultDimensionUserService;
+import org.jetlinks.community.authorize.OrgDimensionType;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;