Commit Graph

1255 Commits

Author SHA1 Message Date
0a8a58d71f Merge branch 'master' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
2025-10-23 14:46:37 +08:00
8d554d8b48 Merge remote-tracking branch 'origin/feature/starter_add_doc_event' into release-20251022 2025-10-22 13:49:45 +08:00
f1eb549ade Merge remote-tracking branch 'origin/hotfix/node-alter' into release-20251022 2025-10-22 11:09:26 +08:00
05a9657222 Merge remote-tracking branch 'origin/feature/REQ-4418_Enum' into release-20251022
# Conflicts:
#	workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/PrintFieldCategoryEnum.java
2025-10-22 11:09:15 +08:00
224bbd5473 Merge remote-tracking branch 'origin/feature/REQ-5369' into release-20251022 2025-10-22 11:06:15 +08:00
a7e28e6914 Merge branch 'feature/countersign_ext' into dev
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java
2025-10-22 10:12:19 +08:00
5298b5f320 feat - 修复测试仅业务自定义文档是发现的一些问题 2025-10-22 10:09:38 +08:00
8b1fc0e108 Merge branch 'feature/countersign_ext' into dev 2025-10-21 11:51:34 +08:00
ba95e4850f feat - 新增创建流程实例时,支持业务传入自定义文档 2025-10-21 10:51:48 +08:00
c4701c1bd3 Merge branch 'feature/countersign_ext' into dev 2025-10-20 19:59:20 +08:00
0161cddf03 feat - 调整启动时的动态加签恢复可能产生的 NPE 2025-10-20 19:58:45 +08:00
67a760d083 Merge branch 'feature/countersign_ext' into dev 2025-10-20 19:44:13 +08:00
1070085454 feat - 审批日志增加节点其他属性 2025-10-20 18:12:03 +08:00
3b771aa153 feat - 表单字段用于打印模板,文档模板左侧时,增加是否支持打印的参数控制 2025-10-20 17:30:13 +08:00
a1e65b73f6 Merge branch 'feature/countersign_ext' into dev 2025-10-20 14:39:49 +08:00
a422f44c69 feat - 修改后加签实现逻辑,采用前加签相同原理实现 2025-10-20 14:39:25 +08:00
c8daa07437 Merge branch 'feature/countersign_ext' into dev 2025-10-20 13:39:36 +08:00
ad1efc673a feat - 加签实现调整新节点的 ID 生成逻辑 2025-10-20 13:38:44 +08:00
74af59508d Merge branch 'feature/countersign_ext' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
2025-10-20 11:16:54 +08:00
1e4d9e2ea9 feat - 项目启动完成后,提供 web 服务前,恢复动态加签逻辑 2025-10-20 11:15:41 +08:00
4d1193d333 feat - 新增一张加签记录表,用于 JVM 实例重启后的动态模型重载 2025-10-17 18:39:14 +08:00
2b81ac21f4 Merge remote-tracking branch 'origin/dev' into dev 2025-10-15 11:11:02 +08:00
015bcd8f53 Merge branch 'feature/countersign_ext' into dev 2025-10-15 11:10:57 +08:00
TanJ
b2653baec2 Merge branch 'feature/RDMP-5834' into dev 2025-10-15 10:10:03 +08:00
TanJ
93acbd775e feta(RDMP-5834) keys命令异常抛出 2025-10-15 10:09:45 +08:00
5187af00cd feat - 增加后加签的代码,待测试 2025-10-14 20:03:59 +08:00
56ad249278 Merge branch 'feature/REQ-5369' into dev 2025-10-11 18:30:09 +08:00
14f57091d9 feat(REQ-5369) - 调整获取打印字段变量的接口 2025-10-11 18:10:37 +08:00
87a3fb93a1 Merge remote-tracking branch 'origin/master' into hotfix/node-alter 2025-10-10 14:28:10 +08:00
d3ca61723e Merge remote-tracking branch 'origin/master' into feature/REQ-4418_Enum
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/SupportRefreshProperties.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/alter/DingTalkAlter.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/check/ImplementationReadyChecker.java
2025-10-10 14:24:07 +08:00
51c29cc660 Merge branch 'feature/starter_add_doc_event' into dev 2025-10-10 11:01:49 +08:00
2e7d420ab3 feat - 调整发送 DocChange 事件的实现 2025-10-10 10:59:19 +08:00
19df0b5816 Merge remote-tracking branch 'origin/master' into feature/starter_add_doc_event 2025-10-10 10:07:54 +08:00
e1e6b038c7 Merge branch 'feature/starter_add_doc_event' into dev 2025-09-29 11:38:52 +08:00
bd596e8fb1 feat - Starter 增加 DocChange 事件 2025-09-29 11:35:34 +08:00
1352028fa5 Merge branch 'feature/REQ-4100' into dev 2025-09-18 15:00:00 +08:00
b17582842d feat(REQ-4100) - 支撑业务节点操作回退 2025-09-18 14:58:38 +08:00
2b83b07774 feat(REQ-4100) - 支撑业务节点操作回退 2025-09-18 14:24:53 +08:00
eedee65c92 Merge branch 'feature/REQ-5369' into dev 2025-09-15 11:49:36 +08:00
5db322023b feat(REQ-5369) - 新增变量查询接口 2025-09-15 11:49:18 +08:00
917c0afea6 Merge branch 'feature/REQ-5369' into dev
# Conflicts:
#	workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/PrintFieldCategoryEnum.java
2025-09-15 11:46:58 +08:00
809fe778dd feat(REQ-5369) - 新增变量查询接口 2025-09-15 11:45:20 +08:00
d14696f8d6 fix - 处理XXL——JOB 定时任务的逻辑处理 2025-09-12 10:20:15 +08:00
7d75eccfc2 fix - 添加节点告警逻辑 2025-09-08 11:44:42 +08:00
0600c5c65b fix - 添加节点告警逻辑 2025-09-08 11:29:05 +08:00
7c60c3c179 fix - 添加节点告警逻辑 2025-09-08 11:28:48 +08:00
1294f4d096 Merge branch 'hotfix/node-alter' into dev 2025-09-08 10:37:56 +08:00
74b462d1fc Merge remote-tracking branch 'origin/feature/REQ-4418_Enum' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/SupportRefreshProperties.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/alter/DingTalkAlter.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/check/ImplementationReadyChecker.java
2025-09-08 10:37:24 +08:00
wangli
f566fb0009 fix - 调整设置因数据字段修改为不能为空后引起的异常 2025-09-06 11:31:06 +08:00
f4168959e7 fix - 增加一张新表来支撑业务节点告警问题 2025-09-05 17:10:23 +08:00