优化依赖

hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/src/main/java/org/hswebframework/web/example/oauth2/OAuth2ServerApplication.java

@@ -21,7 +21,6 @@ package org.hswebframework.web.example.oauth2;
 import com.alibaba.fastjson.JSON;
 import org.hswebframework.web.authorization.Permission;
 import org.hswebframework.web.authorization.access.DataAccessConfig;
-import org.hswebframework.web.authorization.entity.*;
 import org.hswebframework.web.authorization.oauth2.server.entity.OAuth2ClientEntity;
 import org.hswebframework.web.authorization.simple.SimpleFieldFilterDataAccessConfig;
 import org.hswebframework.web.commons.entity.DataStatus;

hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/SpringBootExample.java

@@ -24,7 +24,6 @@ import org.hswebframework.web.authorization.Permission;
 import org.hswebframework.web.authorization.access.DataAccessConfig;
 import org.hswebframework.web.authorization.basic.configuration.EnableAopAuthorize;
 import org.hswebframework.web.authorization.define.AuthorizeDefinitionInitializedEvent;
-import org.hswebframework.web.authorization.entity.*;
 import org.hswebframework.web.authorization.simple.SimpleFieldFilterDataAccessConfig;
 import org.hswebframework.web.commons.entity.DataStatus;
 import org.hswebframework.web.commons.entity.factory.EntityFactory;

hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/TestController.java

@@ -5,6 +5,7 @@ import org.hswebframework.web.authorization.Authentication;
 import org.hswebframework.web.authorization.Permission;
 import org.hswebframework.web.authorization.annotation.Authorize;
 import org.hswebframework.web.authorization.annotation.RequiresDataAccess;
+import org.hswebframework.web.authorization.controller.model.UserModel;
 import org.hswebframework.web.authorization.exception.UnAuthorizedException;
 import org.hswebframework.web.commons.entity.Entity;
 import org.hswebframework.web.commons.entity.PagerResult;
@@ -14,7 +15,6 @@ import org.hswebframework.web.controller.message.ResponseMessage;
 import org.hswebframework.web.entity.authorization.SimpleUserEntity;
 import org.hswebframework.web.entity.authorization.UserEntity;
 import org.hswebframework.web.logging.AccessLogger;
-import org.hswebframework.web.model.authorization.UserModel;
 import org.hswebframework.web.organizational.authorization.PersonnelAuthorization;
 import org.hswebframework.web.service.QueryByEntityService;
 import org.hswebframework.web.service.QueryService;

hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml

@@ -29,7 +29,7 @@
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-service-api</artifactId>
+            <artifactId>hsweb-system-authorization-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/src/main/java/org/hswebframework/web/controller/dashboard/DashBoardUserConfigController.java

@@ -11,8 +11,8 @@ import org.hswebframework.web.controller.dashboard.model.UserDashBoardResponse;
 import org.hswebframework.web.controller.message.ResponseMessage;
 import org.hswebframework.web.dashboard.DashBoardConfigEntity;
 import org.hswebframework.web.dashboard.DashBoardService;
-import org.hswebframework.web.authorization.entity.UserSettingEntity;
-import org.hswebframework.web.authorization.service.UserSettingService;
+import org.hswebframework.web.entity.authorization.UserSettingEntity;
+import org.hswebframework.web.service.authorization.UserSettingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;

hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/pom.xml

@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-service-api</artifactId>
+            <artifactId>hsweb-system-authorization-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/src/main/java/org/hswebframework/web/service/oauth2/server/simple/SimplePasswordService.java

@@ -19,8 +19,8 @@
 package org.hswebframework.web.service.oauth2.server.simple;
 
 import org.hswebframework.web.authorization.oauth2.server.support.password.PasswordService;
-import org.hswebframework.web.authorization.entity.UserEntity;
-import org.hswebframework.web.authorization.service.UserService;
+import org.hswebframework.web.entity.authorization.UserEntity;
+import org.hswebframework.web.service.authorization.UserService;
 
 /**
  * @author zhouhao

hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/src/main/java/org/hswebframework/web/oauth2/OAuth2GranterAutoConfiguration.java

@@ -39,7 +39,7 @@ import org.hswebframework.web.commons.entity.factory.EntityFactory;
 import org.hswebframework.web.dao.oauth2.AuthorizationCodeDao;
 import org.hswebframework.web.dao.oauth2.OAuth2AccessDao;
 import org.hswebframework.web.dao.oauth2.OAuth2ClientDao;
-import org.hswebframework.web.authorization.service.UserService;
+import org.hswebframework.web.service.authorization.UserService;
 import org.hswebframework.web.service.oauth2.server.simple.*;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-service-api</artifactId>
+            <artifactId>hsweb-system-authorization-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

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

@@ -1,6 +1,6 @@
 package org.hswebframework.web.organizational.authorization;
 
-import org.hswebframework.web.authorization.service.AuthorizationSettingTypeSupplier;
+import org.hswebframework.web.service.authorization.AuthorizationSettingTypeSupplier;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.HashSet;

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/pom.xml

@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-service-api</artifactId>
+            <artifactId>hsweb-system-authorization-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePersonService.java

@@ -20,7 +20,7 @@ import org.hswebframework.web.commons.entity.DataStatus;
 import org.hswebframework.web.commons.entity.TreeSupportEntity;
 import org.hswebframework.web.dao.dynamic.QueryByEntityDao;
 import org.hswebframework.web.dao.organizational.*;
-import org.hswebframework.web.authorization.entity.UserEntity;
+import org.hswebframework.web.entity.authorization.UserEntity;
 import org.hswebframework.web.entity.organizational.*;
 import org.hswebframework.web.id.IDGenerator;
 import org.hswebframework.web.organizational.authorization.*;
@@ -30,7 +30,7 @@ import org.hswebframework.web.organizational.authorization.relation.SimpleRelati
 import org.hswebframework.web.organizational.authorization.simple.*;
 import org.hswebframework.web.service.DefaultDSLQueryService;
 import org.hswebframework.web.service.GenericEntityService;
-import org.hswebframework.web.authorization.service.UserService;
+import org.hswebframework.web.service.authorization.UserService;
 import org.hswebframework.web.service.organizational.*;
 import org.hswebframework.web.service.organizational.event.ClearPersonCacheEvent;
 import org.springframework.beans.factory.annotation.Autowired;

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/pom.xml

@@ -92,7 +92,7 @@
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-service-api</artifactId>
+            <artifactId>hsweb-system-authorization-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/FlowableAutoConfiguration.java

@@ -2,7 +2,7 @@ package org.hswebframework.web.workflow.flowable;
 
 import org.activiti.engine.impl.interceptor.SessionFactory;
 import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer;
-import org.hswebframework.web.authorization.service.UserService;
+import org.hswebframework.web.service.authorization.UserService;
 import org.hswebframework.web.workflow.flowable.utils.CustomGroupEntityManager;
 import org.hswebframework.web.workflow.flowable.utils.CustomGroupEntityManagerFactory;
 import org.hswebframework.web.workflow.flowable.utils.CustomUserEntityManager;

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/ActivitiUserUtil.java

@@ -3,7 +3,7 @@ package org.hswebframework.web.workflow.flowable.utils;
 import org.activiti.engine.identity.Group;
 import org.activiti.engine.impl.persistence.entity.GroupEntity;
 import org.activiti.engine.impl.persistence.entity.UserEntity;
-import org.hswebframework.web.authorization.entity.RoleEntity;
+import org.hswebframework.web.entity.authorization.RoleEntity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
  * @Date 2017/8/3.
  */
 public class ActivitiUserUtil {
-    public static UserEntity toActivitiUser(org.hswebframework.web.authorization.entity.UserEntity bUser) {
+    public static UserEntity toActivitiUser(org.hswebframework.web.entity.authorization.UserEntity bUser) {
         UserEntity userEntity = new UserEntity();
         userEntity.setId(bUser.getId());
         userEntity.setFirstName(bUser.getUsername());

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomGroupEntityManager.java

@@ -5,8 +5,8 @@ import org.activiti.engine.impl.GroupQueryImpl;
 import org.activiti.engine.impl.Page;
 import org.activiti.engine.impl.persistence.entity.GroupEntity;
 import org.activiti.engine.impl.persistence.entity.GroupEntityManager;
-import org.hswebframework.web.authorization.entity.RoleEntity;
-import org.hswebframework.web.authorization.service.UserService;
+import org.hswebframework.web.entity.authorization.RoleEntity;
+import org.hswebframework.web.service.authorization.UserService;
 import org.springframework.dao.EmptyResultDataAccessException;
 
 import java.util.ArrayList;

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/src/main/java/org/hswebframework/web/workflow/flowable/utils/CustomUserEntityManager.java

@@ -6,8 +6,8 @@ import org.activiti.engine.impl.UserQueryImpl;
 import org.activiti.engine.impl.persistence.entity.IdentityInfoEntity;
 import org.activiti.engine.impl.persistence.entity.UserEntity;
 import org.activiti.engine.impl.persistence.entity.UserEntityManager;
-import org.hswebframework.web.authorization.entity.RoleEntity;
-import org.hswebframework.web.authorization.service.UserService;
+import org.hswebframework.web.entity.authorization.RoleEntity;
+import org.hswebframework.web.service.authorization.UserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -29,7 +29,7 @@ public class CustomUserEntityManager extends UserEntityManager {
             return null;
         }
         try {
-            org.hswebframework.web.authorization.entity.UserEntity user = userService.selectByPk(userId);
+            org.hswebframework.web.entity.authorization.UserEntity user = userService.selectByPk(userId);
             return ActivitiUserUtil.toActivitiUser(user);
         } catch (EmptyResultDataAccessException e) {
             return null;
@@ -49,23 +49,23 @@ public class CustomUserEntityManager extends UserEntityManager {
 
     @Override
     public List<org.activiti.engine.identity.User> findUserByQueryCriteria(UserQueryImpl query, Page page) {
-        throw new RuntimeException("not implement method..");
+        throw new UnsupportedOperationException("not implement method..");
     }
 
     @Override
     public IdentityInfoEntity findUserInfoByUserIdAndKey(String userId,
                                                          String key) {
-        throw new RuntimeException("not implement method.");
+        throw new UnsupportedOperationException("not implement method.");
     }
 
     @Override
     public List<String> findUserInfoKeysByUserIdAndType(String userId,
                                                         String type) {
-        throw new RuntimeException("not implement method.");
+        throw new UnsupportedOperationException("not implement method.");
     }
 
     @Override
     public long findUserCountByQueryCriteria(UserQueryImpl query) {
-        throw new RuntimeException("not implement method.");
+        throw new UnsupportedOperationException("not implement method.");
     }
 }

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-simple/pom.xml

@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-authorization-service-api</artifactId>
+            <artifactId>hsweb-system-authorization-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>