多模块重构 8：bom 模块的调整

pom.xml

@@ -12,10 +12,10 @@
         <module>yudao-framework</module>
 
         <module>yudao-admin-server</module>
-        <module>yudao-user-server</module>
+<!--        <module>yudao-user-server</module>-->
 
         <module>yudao-module-member</module>
-<!--        <module>yudao-module-bpm</module>-->
+        <module>yudao-module-bpm</module>
         <module>yudao-module-system</module>
         <module>yudao-module-infra</module>
         <module>yudao-module-tool</module>

yudao-admin-server/pom.xml

@@ -43,39 +43,26 @@
             <version>${revision}</version>
         </dependency>
 
-        <!-- 业务组件 -->
+<!--         默认引入bpm-activiti. 可以替换为bpm-flowable -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-core-service</artifactId>
+            <artifactId>yudao-module-bpm-activiti</artifactId>
+            <version>${revision}</version>
         </dependency>
 
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
-        </dependency>
+        <!-- 业务组件 -->
+
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-dict</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-sms</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
         </dependency>
 
-        <!-- 默认引入bpm-activiti. 可以替换为bpm-flowable -->
-        <!-- TODO 芋艿：临时注释，测试通过后，打开 -->
-<!--        <dependency>-->
-<!--            <groupId>cn.iocoder.boot</groupId>-->
-<!--            <artifactId>yudao-module-bpm-activiti</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>cn.iocoder.boot</groupId>-->
-<!--            <artifactId>yudao-module-bpm-core-service-impl</artifactId>-->
-<!--        </dependency>-->
+
 
         <!-- spring boot 配置所需依赖 -->
         <dependency>

yudao-dependencies/pom.xml

@@ -408,26 +408,6 @@
                 <artifactId>flowable-spring-boot-starter-actuator</artifactId>
                 <version>${flowable.version}</version>
             </dependency>
-            <dependency>
-                <groupId>cn.iocoder.boot</groupId>
-                <artifactId>yudao-module-bpm-core-service-impl</artifactId>
-                <version>${revision}</version>
-            </dependency>
-            <dependency>
-                <groupId>cn.iocoder.boot</groupId>
-                <artifactId>yudao-module-bpm-core-service-api</artifactId>
-                <version>${revision}</version>
-            </dependency>
-            <dependency>
-                <groupId>cn.iocoder.boot</groupId>
-                <artifactId>yudao-module-bpm-activiti</artifactId>
-                <version>${revision}</version>
-            </dependency>
-            <dependency>
-                <groupId>cn.iocoder.boot</groupId>
-                <artifactId>yudao-module-bpm-flowable</artifactId>
-                <version>${revision}</version>
-            </dependency>
             <!-- 工作流相关结束 -->
 
             <!-- 工具类相关 -->

yudao-module-bpm/pom.xml

@@ -7,12 +7,26 @@
         <groupId>cn.iocoder.boot</groupId>
         <version>${revision}</version>
     </parent>
-    <packaging>pom</packaging>
+    <modelVersion>4.0.0</modelVersion>
     <modules>
-        <module>yudao-module-bpm-flowable</module>
-        <module>yudao-module-bpm-activiti</module>
-        <module>yudao-module-bpm-core-service</module>
+        <module>yudao-module-bpm-api</module>
+        <module>yudao-module-bpm-base</module>
+        <module>yudao-module-bpm-impl-flowable</module>
+        <module>yudao-module-bpm-impl-activiti</module>
     </modules>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>yudao-module-bpm</artifactId>
-</project>
+    <packaging>pom</packaging>
+
+    <name>${artifactId}</name>
+    <description>
+        bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能。
+        例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等
+        bpm 解释：https://baike.baidu.com/item/BPM/1933
+
+        目前提供两套实现方案：
+            1. 基于 Activiti 7 实现的 yudao-module-bpm-impl-activiti
+            2. 基于 Flowable 6 实现的 yudao-module-bpm-impl-flowable
+        两套实现会存在共享的逻辑，所以会继承 yudao-module-impl-base
+    </description>
+
+</project>

yudao-module-bpm/yudao-module-bpm-core-service/yudao-module-bpm-core-service-api/pom.xml → yudao-module-bpm/yudao-module-bpm-api/pom.xml

@@ -3,22 +3,24 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yudao-module-bpm-core-service</artifactId>
         <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-module-bpm</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-module-bpm-api</artifactId>
+    <packaging>jar</packaging>
 
-    <artifactId>yudao-module-bpm-core-service-api</artifactId>
+    <name>${artifactId}</name>
+    <description>
+        bpm 模块 API，暴露给其它模块调用
+    </description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-common</artifactId>
         </dependency>
     </dependencies>
-</project>
+
+</project>

yudao-module-bpm/yudao-module-bpm-core-service/yudao-module-bpm-core-service-impl/pom.xml → yudao-module-bpm/yudao-module-bpm-base/pom.xml

@@ -3,33 +3,46 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yudao-module-bpm-core-service</artifactId>
         <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-module-bpm</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-module-bpm-base</artifactId>
+
+    <name>${artifactId}</name>
+    <description>
+        bpm-base 模块，实现公用的工作流的逻辑，提供给 bpm-activiti 和 bpm-flowable 复用
+    </description>
 
-    <artifactId>yudao-module-bpm-core-service-impl</artifactId>
     <dependencies>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-web</artifactId>
+            <artifactId>yudao-module-bpm-api</artifactId>
+            <version>${revision}</version>
         </dependency>
+
+        <!-- Web 相关 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-security</artifactId>
+            <artifactId>yudao-spring-boot-starter-web</artifactId>
         </dependency>
+
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
+            <artifactId>yudao-spring-boot-starter-security</artifactId>
         </dependency>
+
+        <!-- DB 相关 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-bpm-core-service-api</artifactId>
+            <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
         </dependency>
+
+        <!-- Test 测试相关 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-test</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>

yudao-module-bpm/yudao-module-bpm-core-service/yudao-module-bpm-core-service-impl/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormBaseVO.java → yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormBaseVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form;
 
+import com.sun.istack.internal.NotNull;
 import lombok.*;
 import io.swagger.annotations.*;
 import javax.validation.constraints.*;

yudao-module-bpm/yudao-module-bpm-core-service/pom.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yudao-module-bpm</artifactId>
-        <groupId>cn.iocoder.boot</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-    <modules>
-        <module>yudao-module-bpm-core-service-api</module>
-        <module>yudao-module-bpm-core-service-impl</module>
-    </modules>
-    <artifactId>yudao-module-bpm-core-service</artifactId>
-
-
-</project>

yudao-module-bpm/yudao-module-bpm-activiti/pom.xml → yudao-module-bpm/yudao-module-bpm-impl-activiti/pom.xml

@@ -3,26 +3,31 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>yudao-module-bpm</artifactId>
         <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-module-bpm</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-module-bpm-impl-activiti</artifactId>
+
+    <name>${artifactId}</name>
+    <description>
+        bpm-activiti 模块，基于 Activiti 7 实现工作流
+    </description>
 
-    <artifactId>yudao-module-bpm-activiti</artifactId>
     <dependencies>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-activiti</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-core-service</artifactId>
+            <artifactId>yudao-module-bpm-base</artifactId>
+            <version>${revision}</version>
         </dependency>
+
+        <!-- 工作流相关 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-bpm-core-service-api</artifactId>
+            <artifactId>yudao-spring-boot-starter-activiti</artifactId>
         </dependency>
+
         <!-- Test 测试相关 -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
@@ -30,4 +35,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>