diff --git a/pom.xml b/pom.xml
index 8f9d08bc8..fb909a959 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,9 @@
3.11.0
3.0.0
1.3.0
+
+
+ 7.0.0.M1
@@ -311,6 +314,26 @@
${ip2region.version}
+
+
+ org.flowable
+ flowable-spring-boot-starter
+ ${flowable.version}
+
+
+ org.mybatis
+ mybatis
+
+
+
+
+
+
+ org.flowable
+ flowable-image-generator
+ ${flowable.version}
+
+
org.dromara
ruoyi-system
@@ -335,6 +358,13 @@
${revision}
+
+
+ org.dromara
+ ruoyi-workflow
+ ${revision}
+
+
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index af5f23967..70241f0b5 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -65,6 +65,12 @@
ruoyi-demo
+
+
+ org.dromara
+ ruoyi-workflow
+
+
de.codecentric
spring-boot-admin-starter-client
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 92a3640e9..fef1fa054 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -98,6 +98,24 @@ spring:
# 多久检查一次连接的活性
keepaliveTime: 30000
+--- #flowable配置
+flowable:
+ async-executor-activate: false #关闭定时任务JOB
+ # 将databaseSchemaUpdate设置为true。当Flowable发现库与数据库表结构不一致时,会自动将数据库表结构升级至新版本。
+ database-schema-update: true
+ activity-font-name: 宋体
+ label-font-name: 宋体
+ annotation-font-name: 宋体
+ # 关闭各个模块生成表,目前只使用工作流基础表
+ idm:
+ enabled: false
+ cmmn:
+ enabled: false
+ dmn:
+ enabled: false
+ app:
+ enabled: false
+
--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
spring.data:
redis:
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index e760823ad..fb76f2d82 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -101,6 +101,24 @@ spring:
# 多久检查一次连接的活性
keepaliveTime: 30000
+--- #flowable配置
+flowable:
+ async-executor-activate: false #关闭定时任务JOB
+ # 将databaseSchemaUpdate设置为true。当Flowable发现库与数据库表结构不一致时,会自动将数据库表结构升级至新版本。
+ database-schema-update: false
+ activity-font-name: 宋体
+ label-font-name: 宋体
+ annotation-font-name: 宋体
+ # 关闭各个模块生成表,目前只使用工作流基础表
+ idm:
+ enabled: false
+ cmmn:
+ enabled: false
+ dmn:
+ enabled: false
+ app:
+ enabled: false
+
--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
spring.data:
redis:
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index 4044916fb..daff497a0 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -14,6 +14,7 @@
ruoyi-generator
ruoyi-job
ruoyi-system
+ ruoyi-workflow
ruoyi-modules
diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/ruoyi-modules/ruoyi-workflow/pom.xml
new file mode 100644
index 000000000..f65d7fc6c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/pom.xml
@@ -0,0 +1,73 @@
+
+
+
+ org.dromara
+ ruoyi-modules
+ ${revision}
+ ../pom.xml
+
+ 4.0.0
+ jar
+ ruoyi-workflow
+
+
+ 工作流模块
+
+
+
+ 2.11.0
+ 1.10
+
+
+
+
+
+
+ org.flowable
+ flowable-spring-boot-starter
+
+
+ org.mybatis
+ mybatis
+
+
+
+
+
+
+ org.flowable
+ flowable-image-generator
+
+
+
+
+ org.dromara
+ ruoyi-system
+
+
+
+
+ org.apache.xmlgraphics
+ batik-all
+ ${batik.version}
+
+
+ xalan
+ xalan
+
+
+
+
+
+
+ xerces
+ xercesImpl
+ ${xerces.version}
+
+
+
+
+
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/package-info.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/package-info.java
new file mode 100644
index 000000000..cf6a7552e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/package-info.java
@@ -0,0 +1 @@
+package org.dromara.workflow.controller;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/package-info.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/package-info.java
new file mode 100644
index 000000000..9cc89e510
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/package-info.java
@@ -0,0 +1 @@
+package org.dromara.workflow.domain;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/package-info.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/package-info.java
new file mode 100644
index 000000000..580707211
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/package-info.java
@@ -0,0 +1 @@
+package org.dromara.workflow.mapper;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/package-info.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/package-info.java
new file mode 100644
index 000000000..429bd2904
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/package-info.java
@@ -0,0 +1 @@
+package org.dromara.workflow.service.impl;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/package-info.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/package-info.java
new file mode 100644
index 000000000..6e68be40f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/package-info.java
@@ -0,0 +1 @@
+package org.dromara.workflow.service;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md
new file mode 100644
index 000000000..c938b1e50
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md
@@ -0,0 +1,3 @@
+java包使用 `.` 分割 resource 目录使用 `/` 分割
+
+此文件目的 防止文件夹粘连找不到 `xml` 文件
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/package-info.md b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/package-info.md
new file mode 100644
index 000000000..c938b1e50
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/package-info.md
@@ -0,0 +1,3 @@
+java包使用 `.` 分割 resource 目录使用 `/` 分割
+
+此文件目的 防止文件夹粘连找不到 `xml` 文件
\ No newline at end of file