lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-07-01 00:34:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

3.0.0-RC-SNAPSHOT

Browse Source
This commit is contained in:
zhou-hao
2018-06-02 00:14:39 +08:00
parent 504f366730
commit 177112a961
221 changed files with 252 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/hsweb-system-workflow-dao-api/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-workflow-dao</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/hsweb-system-workflow-dao-mybatis/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-workflow-dao</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-dao/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-workflow</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-entity/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-workflow</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-flowable/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-workflow</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@@ -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.service.authorization.UserService;
import org.hswebframework.web.authorization.service.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;

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

@@ -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.entity.authorization.RoleEntity;
import org.hswebframework.web.authorization.entity.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.entity.authorization.UserEntity bUser) {
public static UserEntity toActivitiUser(org.hswebframework.web.authorization.entity.UserEntity bUser) {
UserEntity userEntity = new UserEntity();
userEntity.setId(bUser.getId());
userEntity.setFirstName(bUser.getUsername());

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

@@ -5,14 +5,11 @@ 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.entity.authorization.RoleEntity;
import org.hswebframework.web.service.authorization.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.hswebframework.web.authorization.entity.RoleEntity;
import org.hswebframework.web.authorization.service.UserService;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class CustomGroupEntityManager extends GroupEntityManager {

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

@@ -6,13 +6,11 @@ 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.entity.authorization.RoleEntity;
import org.hswebframework.web.service.authorization.UserService;
import org.hswebframework.web.authorization.entity.RoleEntity;
import org.hswebframework.web.authorization.service.UserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -31,7 +29,7 @@ public class CustomUserEntityManager extends UserEntityManager {
return null;
}
try {
org.hswebframework.web.entity.authorization.UserEntity user = userService.selectByPk(userId);
org.hswebframework.web.authorization.entity.UserEntity user = userService.selectByPk(userId);
return ActivitiUserUtil.toActivitiUser(user);
} catch (EmptyResultDataAccessException e) {
return null;

2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-api/pom.xml
View File

@@ -21,7 +21,7 @@
<parent>
<artifactId>hsweb-system-workflow-service</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/hsweb-system-workflow-service-simple/pom.xml
View File

@@ -21,7 +21,7 @@
<parent>
<artifactId>hsweb-system-workflow-service</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-service/pom.xml
View File

@@ -21,7 +21,7 @@
<parent>
<artifactId>hsweb-system-workflow</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-workflow/hsweb-system-workflow-starter/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-workflow</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-workflow/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>