Skip to content

Commit 10914de

Browse files
zhou-haozhou-hao
committed
优化依赖
1 parent 177112a commit 10914de

File tree

18 files changed

+27
-29
lines changed

18 files changed

+27
-29
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.alibaba.fastjson.JSON;
2222
import org.hswebframework.web.authorization.Permission;
2323
import org.hswebframework.web.authorization.access.DataAccessConfig;
24-
import org.hswebframework.web.authorization.entity.*;
2524
import org.hswebframework.web.authorization.oauth2.server.entity.OAuth2ClientEntity;
2625
import org.hswebframework.web.authorization.simple.SimpleFieldFilterDataAccessConfig;
2726
import org.hswebframework.web.commons.entity.DataStatus;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.hswebframework.web.authorization.access.DataAccessConfig;
2525
import org.hswebframework.web.authorization.basic.configuration.EnableAopAuthorize;
2626
import org.hswebframework.web.authorization.define.AuthorizeDefinitionInitializedEvent;
27-
import org.hswebframework.web.authorization.entity.*;
2827
import org.hswebframework.web.authorization.simple.SimpleFieldFilterDataAccessConfig;
2928
import org.hswebframework.web.commons.entity.DataStatus;
3029
import org.hswebframework.web.commons.entity.factory.EntityFactory;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.hswebframework.web.authorization.Permission;
66
import org.hswebframework.web.authorization.annotation.Authorize;
77
import org.hswebframework.web.authorization.annotation.RequiresDataAccess;
8+
import org.hswebframework.web.authorization.controller.model.UserModel;
89
import org.hswebframework.web.authorization.exception.UnAuthorizedException;
910
import org.hswebframework.web.commons.entity.Entity;
1011
import org.hswebframework.web.commons.entity.PagerResult;
@@ -14,7 +15,6 @@
1415
import org.hswebframework.web.entity.authorization.SimpleUserEntity;
1516
import org.hswebframework.web.entity.authorization.UserEntity;
1617
import org.hswebframework.web.logging.AccessLogger;
17-
import org.hswebframework.web.model.authorization.UserModel;
1818
import org.hswebframework.web.organizational.authorization.PersonnelAuthorization;
1919
import org.hswebframework.web.service.QueryByEntityService;
2020
import org.hswebframework.web.service.QueryService;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</dependency>
3030
<dependency>
3131
<groupId>org.hswebframework.web</groupId>
32-
<artifactId>hsweb-system-authorization-service-api</artifactId>
32+
<artifactId>hsweb-system-authorization-api</artifactId>
3333
<version>${project.version}</version>
3434
</dependency>
3535
</dependencies>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import org.hswebframework.web.controller.message.ResponseMessage;
1212
import org.hswebframework.web.dashboard.DashBoardConfigEntity;
1313
import org.hswebframework.web.dashboard.DashBoardService;
14-
import org.hswebframework.web.authorization.entity.UserSettingEntity;
15-
import org.hswebframework.web.authorization.service.UserSettingService;
14+
import org.hswebframework.web.entity.authorization.UserSettingEntity;
15+
import org.hswebframework.web.service.authorization.UserSettingService;
1616
import org.springframework.beans.factory.annotation.Autowired;
1717
import org.springframework.util.StringUtils;
1818
import org.springframework.web.bind.annotation.*;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</dependency>
3939
<dependency>
4040
<groupId>org.hswebframework.web</groupId>
41-
<artifactId>hsweb-system-authorization-service-api</artifactId>
41+
<artifactId>hsweb-system-authorization-api</artifactId>
4242
<version>${project.version}</version>
4343
</dependency>
4444
<dependency>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
package org.hswebframework.web.service.oauth2.server.simple;
2020

2121
import org.hswebframework.web.authorization.oauth2.server.support.password.PasswordService;
22-
import org.hswebframework.web.authorization.entity.UserEntity;
23-
import org.hswebframework.web.authorization.service.UserService;
22+
import org.hswebframework.web.entity.authorization.UserEntity;
23+
import org.hswebframework.web.service.authorization.UserService;
2424

2525
/**
2626
* @author zhouhao

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.hswebframework.web.dao.oauth2.AuthorizationCodeDao;
4040
import org.hswebframework.web.dao.oauth2.OAuth2AccessDao;
4141
import org.hswebframework.web.dao.oauth2.OAuth2ClientDao;
42-
import org.hswebframework.web.authorization.service.UserService;
42+
import org.hswebframework.web.service.authorization.UserService;
4343
import org.hswebframework.web.service.oauth2.server.simple.*;
4444
import org.springframework.beans.BeansException;
4545
import org.springframework.beans.factory.annotation.Autowired;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</dependency>
4444
<dependency>
4545
<groupId>org.hswebframework.web</groupId>
46-
<artifactId>hsweb-system-authorization-service-api</artifactId>
46+
<artifactId>hsweb-system-authorization-api</artifactId>
4747
<version>${project.version}</version>
4848
</dependency>
4949
</dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.hswebframework.web.organizational.authorization;
22

3-
import org.hswebframework.web.authorization.service.AuthorizationSettingTypeSupplier;
3+
import org.hswebframework.web.service.authorization.AuthorizationSettingTypeSupplier;
44
import org.springframework.beans.factory.annotation.Autowired;
55

66
import java.util.HashSet;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<dependency>
4343
<groupId>org.hswebframework.web</groupId>
44-
<artifactId>hsweb-system-authorization-service-api</artifactId>
44+
<artifactId>hsweb-system-authorization-api</artifactId>
4545
<version>${project.version}</version>
4646
</dependency>
4747
</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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.hswebframework.web.commons.entity.TreeSupportEntity;
2121
import org.hswebframework.web.dao.dynamic.QueryByEntityDao;
2222
import org.hswebframework.web.dao.organizational.*;
23-
import org.hswebframework.web.authorization.entity.UserEntity;
23+
import org.hswebframework.web.entity.authorization.UserEntity;
2424
import org.hswebframework.web.entity.organizational.*;
2525
import org.hswebframework.web.id.IDGenerator;
2626
import org.hswebframework.web.organizational.authorization.*;
@@ -30,7 +30,7 @@
3030
import org.hswebframework.web.organizational.authorization.simple.*;
3131
import org.hswebframework.web.service.DefaultDSLQueryService;
3232
import org.hswebframework.web.service.GenericEntityService;
33-
import org.hswebframework.web.authorization.service.UserService;
33+
import org.hswebframework.web.service.authorization.UserService;
3434
import org.hswebframework.web.service.organizational.*;
3535
import org.hswebframework.web.service.organizational.event.ClearPersonCacheEvent;
3636
import org.springframework.beans.factory.annotation.Autowired;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</dependency>
9393
<dependency>
9494
<groupId>org.hswebframework.web</groupId>
95-
<artifactId>hsweb-system-authorization-service-api</artifactId>
95+
<artifactId>hsweb-system-authorization-api</artifactId>
9696
<version>${project.version}</version>
9797
</dependency>
9898
<dependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.activiti.engine.impl.interceptor.SessionFactory;
44
import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer;
5-
import org.hswebframework.web.authorization.service.UserService;
5+
import org.hswebframework.web.service.authorization.UserService;
66
import org.hswebframework.web.workflow.flowable.utils.CustomGroupEntityManager;
77
import org.hswebframework.web.workflow.flowable.utils.CustomGroupEntityManagerFactory;
88
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.activiti.engine.identity.Group;
44
import org.activiti.engine.impl.persistence.entity.GroupEntity;
55
import org.activiti.engine.impl.persistence.entity.UserEntity;
6-
import org.hswebframework.web.authorization.entity.RoleEntity;
6+
import org.hswebframework.web.entity.authorization.RoleEntity;
77

88
import java.util.ArrayList;
99
import java.util.List;
@@ -13,7 +13,7 @@
1313
* @Date 2017/8/3.
1414
*/
1515
public class ActivitiUserUtil {
16-
public static UserEntity toActivitiUser(org.hswebframework.web.authorization.entity.UserEntity bUser) {
16+
public static UserEntity toActivitiUser(org.hswebframework.web.entity.authorization.UserEntity bUser) {
1717
UserEntity userEntity = new UserEntity();
1818
userEntity.setId(bUser.getId());
1919
userEntity.setFirstName(bUser.getUsername());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.activiti.engine.impl.Page;
66
import org.activiti.engine.impl.persistence.entity.GroupEntity;
77
import org.activiti.engine.impl.persistence.entity.GroupEntityManager;
8-
import org.hswebframework.web.authorization.entity.RoleEntity;
9-
import org.hswebframework.web.authorization.service.UserService;
8+
import org.hswebframework.web.entity.authorization.RoleEntity;
9+
import org.hswebframework.web.service.authorization.UserService;
1010
import org.springframework.dao.EmptyResultDataAccessException;
1111

1212
import java.util.ArrayList;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.activiti.engine.impl.persistence.entity.IdentityInfoEntity;
77
import org.activiti.engine.impl.persistence.entity.UserEntity;
88
import org.activiti.engine.impl.persistence.entity.UserEntityManager;
9-
import org.hswebframework.web.authorization.entity.RoleEntity;
10-
import org.hswebframework.web.authorization.service.UserService;
9+
import org.hswebframework.web.entity.authorization.RoleEntity;
10+
import org.hswebframework.web.service.authorization.UserService;
1111
import org.slf4j.Logger;
1212
import org.slf4j.LoggerFactory;
1313
import org.springframework.dao.EmptyResultDataAccessException;
@@ -29,7 +29,7 @@ public UserEntity findUserById(final String userId) {
2929
return null;
3030
}
3131
try {
32-
org.hswebframework.web.authorization.entity.UserEntity user = userService.selectByPk(userId);
32+
org.hswebframework.web.entity.authorization.UserEntity user = userService.selectByPk(userId);
3333
return ActivitiUserUtil.toActivitiUser(user);
3434
} catch (EmptyResultDataAccessException e) {
3535
return null;
@@ -49,23 +49,23 @@ public List<Group> findGroupsByUser(final String userId) {
4949

5050
@Override
5151
public List<org.activiti.engine.identity.User> findUserByQueryCriteria(UserQueryImpl query, Page page) {
52-
throw new RuntimeException("not implement method..");
52+
throw new UnsupportedOperationException("not implement method..");
5353
}
5454

5555
@Override
5656
public IdentityInfoEntity findUserInfoByUserIdAndKey(String userId,
5757
String key) {
58-
throw new RuntimeException("not implement method.");
58+
throw new UnsupportedOperationException("not implement method.");
5959
}
6060

6161
@Override
6262
public List<String> findUserInfoKeysByUserIdAndType(String userId,
6363
String type) {
64-
throw new RuntimeException("not implement method.");
64+
throw new UnsupportedOperationException("not implement method.");
6565
}
6666

6767
@Override
6868
public long findUserCountByQueryCriteria(UserQueryImpl query) {
69-
throw new RuntimeException("not implement method.");
69+
throw new UnsupportedOperationException("not implement method.");
7070
}
7171
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<dependency>
4343
<groupId>org.hswebframework.web</groupId>
44-
<artifactId>hsweb-system-authorization-service-api</artifactId>
44+
<artifactId>hsweb-system-authorization-api</artifactId>
4545
<version>${project.version}</version>
4646
</dependency>
4747
</dependencies>

0 commit comments

Comments
 (0)