Commit 2866b58741ff4c898cf82fd94640f6898cef9b3a
1 parent
d9aa0af1
1. 默认不开启 bpm 工作流模块，按需启动，提升启动速度
2. 完整移除 activiti 遗留的东东
Showing
10 changed files
with
17 additions
and
91 deletions
yudao-dependencies/pom.xml
| ... | ... | @@ -41,7 +41,6 @@ |
| 41 | 41 | <jedis-mock.version>0.1.16</jedis-mock.version> |
| 42 | 42 | <mockito-inline.version>4.0.0</mockito-inline.version> |
| 43 | 43 | <!-- Bpm 工作流相关 --> |
| 44 | - <activiti.version>7.1.0.M6</activiti.version> | |
| 45 | 44 | <flowable.version>6.7.0</flowable.version> |
| 46 | 45 | <!-- 工具类相关 --> |
| 47 | 46 | <jasypt-spring-boot-starter.version>3.0.4</jasypt-spring-boot-starter.version> |
| ... | ... | @@ -377,41 +376,6 @@ |
| 377 | 376 | |
| 378 | 377 | <!-- 工作流相关 --> |
| 379 | 378 | <dependency> |
| 380 | - <groupId>org.activiti</groupId> | |
| 381 | - <artifactId>activiti-spring-boot-starter</artifactId> | |
| 382 | - <version>${activiti.version}</version> | |
| 383 | - <exclusions> | |
| 384 | - <exclusion> | |
| 385 | - <groupId>de.odysseus.juel</groupId> | |
| 386 | - <artifactId>juel-api</artifactId> | |
| 387 | - </exclusion> | |
| 388 | - <exclusion> | |
| 389 | - <groupId>de.odysseus.juel</groupId> | |
| 390 | - <artifactId>juel-spi</artifactId> | |
| 391 | - </exclusion> | |
| 392 | - <exclusion> | |
| 393 | - <groupId>org.mybatis</groupId> | |
| 394 | - <artifactId>mybatis</artifactId> | |
| 395 | - </exclusion> | |
| 396 | - <exclusion> | |
| 397 | - <artifactId>el-api</artifactId> | |
| 398 | - <groupId>javax.el</groupId> | |
| 399 | - </exclusion> | |
| 400 | - </exclusions> | |
| 401 | - </dependency> | |
| 402 | - <dependency> | |
| 403 | - <groupId>org.activiti</groupId> | |
| 404 | - <artifactId>activiti-image-generator</artifactId> | |
| 405 | - <version>${activiti.version}</version> | |
| 406 | - </dependency> | |
| 407 | - | |
| 408 | - <dependency> | |
| 409 | - <groupId>cn.iocoder.boot</groupId> | |
| 410 | - <artifactId>yudao-spring-boot-starter-activiti</artifactId> | |
| 411 | - <version>${revision}</version> | |
| 412 | - </dependency> | |
| 413 | - <!-- 工作流相关 flowable --> | |
| 414 | - <dependency> | |
| 415 | 379 | <groupId>cn.iocoder.boot</groupId> |
| 416 | 380 | <artifactId>yudao-spring-boot-starter-flowable</artifactId> |
| 417 | 381 | <version>${revision}</version> | ... | ... |
yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
| ... | ... | @@ -34,9 +34,12 @@ public class BannerApplicationRunner implements ApplicationRunner { |
| 34 | 34 | |
| 35 | 35 | // 数据报表 |
| 36 | 36 | if (isNotPresent("cn.iocoder.yudao.module.visualization.framework.security.config.SecurityConfiguration")) { |
| 37 | - System.out.println("[报表模块 yudao-module-visualization-biz - 已禁用][参考 https://doc.iocoder.cn/report/ 开启]"); | |
| 37 | + System.out.println("[报表模块 yudao-module-visualization - 已禁用][参考 https://doc.iocoder.cn/report/ 开启]"); | |
| 38 | + } | |
| 39 | + // 工作流 | |
| 40 | + if (isNotPresent("cn.iocoder.yudao.framework.flowable.config.YudaoFlowableConfiguration")) { | |
| 41 | + System.out.println("[工作流模块 yudao-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]"); | |
| 38 | 42 | } |
| 39 | - // 支付模块 | |
| 40 | 43 | }); |
| 41 | 44 | } |
| 42 | 45 | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/pom.xml
| ... | ... | @@ -12,9 +12,9 @@ |
| 12 | 12 | |
| 13 | 13 | <name>${project.artifactId}</name> |
| 14 | 14 | <description> |
| 15 | - bpm-base 模块，实现公用的工作流的逻辑，提供给 bpm-activiti 和 bpm-flowable 复用 | |
| 15 | + bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能，基于 Flowable 6 版本实现。 | |
| 16 | + 例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等 | |
| 16 | 17 | </description> |
| 17 | - | |
| 18 | 18 | <dependencies> |
| 19 | 19 | <dependency> |
| 20 | 20 | <groupId>cn.iocoder.boot</groupId> | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmActivityMapper.java deleted
| 1 | -package cn.iocoder.yudao.module.bpm.dal.mysql.task; | |
| 2 | - | |
| 3 | -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 4 | -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmActivityDO; | |
| 5 | -import org.apache.ibatis.annotations.Mapper; | |
| 6 | -import org.apache.ibatis.annotations.Param; | |
| 7 | - | |
| 8 | -import java.util.List; | |
| 9 | - | |
| 10 | -@Mapper | |
| 11 | -public interface BpmActivityMapper extends BaseMapperX<BpmActivityDO> { | |
| 12 | - | |
| 13 | - | |
| 14 | - // TODO @ke：可以试试，把 activiti 的表，映射成对应的实体，然后读取下。我们尽量避免 xml 操作，因为要做多 db 类型的支持，例如说 oracle 等。通过 mybatis plus 帮助我们生成不同数据库的表操作 | |
| 15 | - /** | |
| 16 | - * 获取指定流程的历史任务 | |
| 17 | - * | |
| 18 | - * @param procInstId 流程id | |
| 19 | - * | |
| 20 | - * @return 返回历史任务 | |
| 21 | - */ | |
| 22 | - List<BpmActivityDO> listAllByProcInstIdAndDelete(@Param("procInstId") String procInstId); | |
| 23 | - | |
| 24 | - /** | |
| 25 | - * 逻辑删除hiActInst表任务 | |
| 26 | - * | |
| 27 | - * @param taskIdList 任务列表 | |
| 28 | - * | |
| 29 | - * @return 返回是否成功 | |
| 30 | - */ | |
| 31 | - Boolean delHiActInstByTaskId(@Param("taskIdList") List<String> taskIdList); | |
| 32 | - | |
| 33 | - /** | |
| 34 | - * 逻辑删除hiTaskInst任务 | |
| 35 | - * | |
| 36 | - * @param taskIdList 任务列表 | |
| 37 | - * | |
| 38 | - * @return 返回是否成功 | |
| 39 | - */ | |
| 40 | - Boolean delHiTaskInstByTaskId(@Param("taskIdList") List<String> taskIdList); | |
| 41 | -} |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java
yudao-server/pom.xml
| ... | ... | @@ -58,11 +58,11 @@ |
| 58 | 58 | <!-- <version>${revision}</version>--> |
| 59 | 59 | <!-- </dependency>--> |
| 60 | 60 | <!-- 工作流 --> |
| 61 | - <dependency> | |
| 62 | - <groupId>cn.iocoder.boot</groupId> | |
| 63 | - <artifactId>yudao-module-bpm-biz</artifactId> | |
| 64 | - <version>${revision}</version> | |
| 65 | - </dependency> | |
| 61 | +<!-- <dependency>--> | |
| 62 | +<!-- <groupId>cn.iocoder.boot</groupId>--> | |
| 63 | +<!-- <artifactId>yudao-module-bpm-biz</artifactId>--> | |
| 64 | +<!-- <version>${revision}</version>--> | |
| 65 | +<!-- </dependency>--> | |
| 66 | 66 | <dependency> |
| 67 | 67 | <groupId>cn.iocoder.boot</groupId> |
| 68 | 68 | <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId> | ... | ... |
yudao-ui-admin/src/views/bpm/definition/index.vue
yudao-ui-admin/src/views/bpm/model/index.vue
yudao-ui-admin/src/views/bpm/processInstance/create.vue