Commit Graph

784 Commits

Author SHA1 Message Date
f9573d06bf feat(REQ-2616) - 新增业务节点定时回调的事件 2024-08-20 17:52:50 +08:00
4a21d256dc feat(REQ-2616) - 新增业务接口定时触发流转的功能 2024-08-16 18:36:12 +08:00
a3b7b39068 update - 完善一些代码注释,并优化一些代码命名和执行逻辑 2024-08-09 17:28:15 +08:00
90a3c0cf71 fix - 完善自动驳回功能处理 2024-08-08 18:52:44 +08:00
37ed9a594d fix - 利用引擎 AsyncCmd 的能力解决通过监听事务状态不能正确发送 MQ 的问题 2024-08-08 18:08:20 +08:00
248ce361d1 fix - 利用引擎 AsyncCmd 的能力解决通过监听事务状态不能正确发送 MQ 的问题 2024-08-08 17:18:45 +08:00
f5b8f66a39 fix - 调整因为修复自动过审卡节点导致MQ 事件无法正确发出的问题 2024-08-08 16:27:15 +08:00
aba60920c8 fix - 调整因为修复自动过审卡节点导致MQ 事件无法正确发出的问题 2024-08-08 10:45:15 +08:00
1f78af48a9 fix - 在自动过审的逻辑中,通过注册事务完成后执行具体逻辑 2024-08-07 18:05:45 +08:00
yangqicheng
5c180f92a5 Merge branch 'refs/heads/feature/REQ-2596' into feature/merge-all 2024-07-29 10:39:11 +08:00
yangqicheng
00c7fa6812 Merge remote-tracking branch 'refs/remotes/origin/feature/REQ-2596' into feature/merge-all
# Conflicts:
#	pom.xml
#	workflow-engine-common/src/main/java/cn/axzo/workflow/common/constant/BpmnConstants.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnTaskRespCode.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBizSpecifyAssigneeToTaskCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ExtAxProperty.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
2024-07-29 10:25:18 +08:00
yangqicheng
5b2fa9e0ed Merge remote-tracking branch 'refs/remotes/origin/feature/starter' into feature/merge-all 2024-07-29 10:18:46 +08:00
76ee6c0f92 update(REQ-2596) - review code 2024-07-25 17:38:30 +08:00
yangqicheng
4f12272526 REQ-2596-加签参数日志输出json格式 2024-07-24 11:33:36 +08:00
656b2c371b add - 新增日志打印 2024-07-22 21:12:22 +08:00
250dd40831 update - 增加数据库脚本升级逻辑控制 2024-07-16 09:58:25 +08:00
yangqicheng
9b55b354e6 REQ-2596-修复自动过审条件判断错误问题 2024-07-15 15:07:27 +08:00
yangqicheng
ada988a158 REQ-2596-业务节点设置为指定审批人,还未指定审批人时,不进行自动过审操作 2024-07-15 14:35:52 +08:00
yangqicheng
6ea8b4b95b REQ-2596-自动过审判断,上一节点如果是业务节点,但是是人员审批,也需要加入到自动过审 2024-07-15 13:54:27 +08:00
yangqicheng
a155b2422c REQ-2596-业务节点参与自动过审 2024-07-15 10:47:44 +08:00
yangqicheng
eee3f4f882 REQ-2516-调整分批次发送mq消息代码 2024-07-12 09:51:18 +08:00
yangqicheng
ffd7170da8 Merge branch 'refs/heads/hotfix/improve-batch-operation' into feature/REQ-2596
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCarbonCopyUserSelectorCmd.java
2024-07-11 13:45:48 +08:00
yangqicheng
ffe4bfa527 REQ-2516-调整抄送人员数量限制为100 2024-07-11 13:44:18 +08:00
yangqicheng
300ff3c2b8 REQ-2516-自动过审配置设置到流程高级配置模型中 2024-07-11 10:40:34 +08:00
yangqicheng
6a7d6bfacd REQ-2516-通知mq消息按人数分批发送,调整人员数量截取代码 2024-07-10 20:21:31 +08:00
yangqicheng
da29cbd5e0 REQ-2516-调整人员数据截取代码 2024-07-10 18:05:02 +08:00
yangqicheng
c4dab46b74 Revert "REQ-2596-人员模型添加查询组织范围字段"
This reverts commit 81a7ebe5c4.
2024-07-10 14:34:28 +08:00
yangqicheng
8bd022dfab REQ-2516-修复设置请求记录并发冲突导致插入多条数据问题 2024-07-10 10:45:53 +08:00
yangqicheng
81a7ebe5c4 REQ-2596-人员模型添加查询组织范围字段 2024-07-09 18:26:21 +08:00
yangqicheng
cf394d9120 REQ-2596-调整自动过审代码逻辑 2024-07-09 15:50:33 +08:00
yangqicheng
d3a3364cfc 修复PROCESS_ACTIVITY_END事件,activityName值为空问题 2024-07-09 09:53:37 +08:00
yangqicheng
c6a7d43d6e Merge branch 'refs/heads/master' into feature/REQ-2596 2024-07-05 14:39:33 +08:00
yangqicheng
a486798683 REQ-2596-调整抄送mq消息按人员分批次拆分代码 2024-07-05 09:44:47 +08:00
yangqicheng
970e7e58ab REQ-2596-节点审批人大于指定人数,按指定数量截取 2024-07-04 16:22:31 +08:00
136297e9e1 update - 重复提交的 Value 修改为 TraceId 2024-07-03 14:40:12 +08:00
74665da129 Merge branch 'refs/heads/hotfix/improve-batch-operation' into feature/starter 2024-07-03 14:31:33 +08:00
7bb157c0b6 remove - 移除一些无用的类 2024-07-03 13:43:56 +08:00
eb3914a838 update - 解决多个任务同时操作同一个实例,出现的事务问题 2024-07-03 11:05:05 +08:00
5334b67e64 update - 解决多个任务同时操作同一个实例,出现的事务问题 2024-07-03 10:47:22 +08:00
8a0affbf44 update - 移除读 API 的防重提交功能 2024-07-02 18:20:29 +08:00
yangqicheng
b2315dfbe0 REQ-2596,自动过审配置调整为枚举 2024-07-02 17:29:55 +08:00
yangqicheng
872b84f1ae REQ-2596,自动过审支持不同流程数据版本执行不同业务代码 2024-07-02 16:04:06 +08:00
yangqicheng
21c4541a70 REQ-2596-自动过审配置处理 2024-06-28 18:56:06 +08:00
6922a2d9d3 Merge branch 'refs/heads/hotfix/improve-batch-operation' into feature/starter
# Conflicts:
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/config/WorkflowRequestInterceptor.java
2024-06-28 17:35:42 +08:00
2bebe80382 update - API log 日志记录,增加调用方和客户端版本 2024-06-28 17:33:52 +08:00
b97152eb85 update - 日志打印 2024-06-28 10:49:41 +08:00
05981a7002 Merge branch 'refs/heads/hotfix/improve-batch-operation' into feature/starter
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/aspectj/ErrorReportAspect.java
2024-06-28 10:48:33 +08:00
f7779c0ab5 hotfix - 调整记录 API Log 的逻辑 2024-06-28 09:43:12 +08:00
b80137164b hotfix - 不再通过后端的 validTask 进行节点类型校验 2024-06-27 18:40:16 +08:00
6dd8fb4709 update(REQ-2516) - 临时提交,记录微服务间的异常信息 2024-06-25 18:55:58 +08:00
7c4fce9c89 update(REQ-2516) - 兼容历史版本处理 2024-06-20 16:02:06 +08:00
e1b2db65ad update(REQ-2516) - warn 级别日志输出到 warn 文件夹中 2024-06-20 09:54:12 +08:00
355d9c3d1a update(REQ-2516) - 重新设置异常的处理类 2024-06-20 09:51:17 +08:00
66748ea386 update(REQ-2516) - 内置 ERROR 级别输出到指定文件目录 2024-06-19 18:17:46 +08:00
ee9b41b158 update(REQ-2516) - 打印 MQ 事件信息 2024-06-19 17:54:30 +08:00
08e469ce71 update(REQ-2516) - 解决一些异常日志的打印 2024-06-19 17:37:42 +08:00
a8d947f0f1 update(REQ-2516) - 完善处理事件中没有正确返回 processDefinitionKey 的问题 2024-06-19 16:55:18 +08:00
3843ad8584 update(REQ-2516) - 调整常量类路径,并记录接入方是否有开启 manageable 属性 2024-06-18 18:17:28 +08:00
7319ab90ad update(REQ-2516) - 完善记录接口调用方 2024-06-18 09:57:43 +08:00
cc2626b1a8 update(REQ-2516) - 重新确认 starter 需开放的接口范围 2024-06-17 10:26:08 +08:00
124b73888c update(REQ-2516) - 移除 Server 模块下引入的 Starter 包 2024-06-13 17:57:04 +08:00
dfe76872ac update(REQ-2516) - 完善 Starter 的 properties 的注释 2024-06-13 11:01:56 +08:00
afe5f7e707 update(REQ-2516) - 完善 Starter 的 properties 的注释 2024-06-13 10:43:34 +08:00
386cbf9597 update(REQ-2516) - 测试 Javaparser 生成代码的逻辑,并控制 Maven 在打包时,能自动先生成,再 package starter 包 2024-06-12 11:05:40 +08:00
wangli
a26d1321be update(REQ-2516) - 测试支持 properties 中的 manageable 属性 2024-06-11 22:14:38 +08:00
1de79ba629 update(REQ-2516) - 暂时提交代码 2024-06-11 18:41:01 +08:00
ce23fcbc69 update(REQ-2516) - 利用 javaparser 生成可用接口 2024-06-11 17:59:50 +08:00
1d1f9f240d update(REQ-2324) - 修复项目使用 Undertow 配合 Nacos 的注册中心时,停止应用会导致一些异常的输出 2024-06-07 12:21:09 +08:00
3f89d77d02 update(REQ-2516) - 调整默认的 trigger 的入参 2024-06-07 12:21:03 +08:00
a393cdce97 Merge branch 'refs/heads/hotfix/REQ-2324' into feature/starter 2024-06-06 16:18:52 +08:00
fefbbac8c9 update(REQ-2324) - 修复项目使用 Undertow 配合 Nacos 的注册中心时,停止应用会导致一些异常的输出 2024-06-06 15:35:06 +08:00
5d1da6be43 update(REQ-2516) - 调整默认的 trigger 的入参 2024-06-06 14:02:12 +08:00
f71a58e672 Merge branch 'refs/heads/master' into feature/starter
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java
2024-06-06 14:01:30 +08:00
42affea2e1 update - 添加一些 Controller 日志 2024-06-06 13:46:43 +08:00
ca48245c43 update(REQ-2516) - 新增 MQ 监控相关设置 2024-06-06 11:12:05 +08:00
531e46095f Merge branch 'refs/heads/feature/merged_all_req' into feature/starter
# Conflicts:
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessActivityApi.java
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessInstanceApi.java
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessCategoryApi.java
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessConfigApi.java
#	workflow-engine-common/src/main/java/cn/axzo/workflow/common/constant/BpmnConstants.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/mq/CustomRocketMQEventProducer.java
2024-06-06 09:34:48 +08:00
69034b3f85 update(REQ-2324) - trigger 方法先取消异步 2024-06-05 20:51:19 +08:00
6b118d7715 update(REQ-2324) - 调整 triggerId 方法的参数,为了兼容老版本 2024-06-05 10:47:12 +08:00
a2c5b0c7ee update(REQ-2324) - bootstrap.yml 移除 server 服务的关闭参数 2024-06-05 09:53:06 +08:00
57acaa792a update(REQ-2324) - bootstrap.yml 添加 server 服务的关闭参数 2024-06-05 09:43:28 +08:00
wangli
9cea35762a update(REQ-2516) - 完善广播消息,在 Starter 中的主动过滤 2024-06-04 23:15:50 +08:00
38a099cb11 update(REQ-2516) - 调整 MQ 事件增加 processDefinitionKey 属性, 未测试 2024-06-04 19:10:49 +08:00
51435465f6 update(REQ-2516) - 调整引擎服务端发出事件中 targetId 为 processDefinitionKey 2024-06-04 18:44:37 +08:00
3678665b9a update(REQ-2324) - 调整发送 Dingtalk 的策略,可动态控制哪些可以发送钉钉 2024-06-04 10:57:51 +08:00
fb323e3c9c update(REQ-2324) - 调整发送 Dingtalk 的策略,可动态控制哪些可以发送钉钉 2024-06-04 10:53:20 +08:00
3b319c0f02 update(REQ-2516) - 完善多个 RPC 异步动作,均成功调通 2024-06-03 20:24:58 +08:00
275220195f update(REQ-2324) - 发起人在审批日志中显示的文案不对的问题 2024-06-03 19:27:21 +08:00
832bc5db3c update(REQ-2516) - RPC 动作的 event,在不同请求模式下,仍还需要测试 2024-06-03 19:06:17 +08:00
335d8f22eb update(REQ-2324) - 修复自动过审的逻辑 2024-06-03 16:00:58 +08:00
08a1197609 update(REQ-2516) - 补充 RPC 动作中,对 Event 参数的调整 2024-06-03 14:57:15 +08:00
wangli
95bee3c586 update(REQ-2516) - 测试 RPC 动作异步下的行为, 确保只有在网络连接异常,才进行重试 2024-06-01 18:52:36 +08:00
15656554c2 update(REQ-2516) - 新增多个接口,用来测试返回值解析 2024-05-31 18:27:15 +08:00
45094aef32 update(REQ-2516) - 新增自定义的 Decoder, 用来处理所有 API 内部抛出的各类异常 2024-05-31 17:19:25 +08:00
8464cbc9d4 Merge branch 'refs/heads/feature/merged_all_req' into feature/starter 2024-05-31 17:01:29 +08:00
a347cc45fe update(REQ-2516) - 完整测试整个 RPC 同异步模式,且支持通过 Properties 配置调整默认同异步模式。 2024-05-31 14:25:36 +08:00
yangqicheng
8e53c29f45 Merge branch 'refs/heads/REQ-2324' into feature/merged_all_req 2024-05-30 18:14:46 +08:00
yangqicheng
64c8708d9d update - REQ-2324-修复日志输出报错问题 2024-05-30 18:14:31 +08:00
yangqicheng
58b2ed9022 Merge branch 'refs/heads/REQ-2324' into feature/merged_all_req 2024-05-30 17:39:01 +08:00
yangqicheng
7a3efea30d update - REQ-2324-修复日志输出报错问题 2024-05-30 17:38:40 +08:00
yangqicheng
5c7b74be42 Merge branch 'refs/heads/REQ-2324' into feature/merged_all_req 2024-05-30 17:05:12 +08:00
yangqicheng
b1e5e0b798 update - REQ-2325-日志输出请求和返回参数 2024-05-30 17:04:28 +08:00
wangli
1ff83bf679 update(REQ-2516) - 完善接口的同步异步模式 2024-05-30 00:26:33 +08:00
4159671403 Merge branch 'refs/heads/feature/merged_all_req' into feature/starter 2024-05-29 14:34:02 +08:00
0fd965f1d5 update(REQ-2516) - 控制为 Starter 新生成的接口进行 Feign 的代理 2024-05-29 10:43:12 +08:00
056b42da70 Merge branch 'refs/heads/REQ-2324' into feature/merged_all_req 2024-05-28 18:56:34 +08:00
e88a94a512 update(REQ-2324) - 调整判断集合的函数 2024-05-28 18:56:21 +08:00
8ab05b18c9 update(REQ-2516) - 对 Starter 中的门面 API 进行技术推演 2024-05-28 18:11:17 +08:00
yangqicheng
44e8cf9203 Merge branch 'refs/heads/REQ-2324' into feature/merged_all_req 2024-05-28 11:20:43 +08:00
yangqicheng
2db59cc660 update - REQ-2324-修复批量驳回待办未恢复问题 2024-05-28 11:20:08 +08:00
6f4caf6b11 Merge branch 'refs/heads/REQ-2324' into feature/merged_all_req
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java
2024-05-27 19:47:00 +08:00
43e5e1219f update(REQ-2324) - 控制异常3次重试报错信息,仅在最后一次重试仍失败的时候提示 2024-05-27 19:45:41 +08:00
yangqicheng
d23135e06c Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-24 18:43:57 +08:00
yangqicheng
864789a1b1 update - REQ-2324-修复执行异常待办未恢复问题 2024-05-24 18:42:55 +08:00
yangqicheng
0a3942a282 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-24 17:06:18 +08:00
yangqicheng
64fb057efd Merge remote-tracking branch 'origin/REQ-2324' into REQ-2324 2024-05-24 17:05:23 +08:00
yangqicheng
30ed177cdf update - REQ-2324-添加日志,job执行任务重试次数用完再钉钉通知 2024-05-24 17:05:10 +08:00
fe04c9c480 update(REQ-2324) - 通过构造器重载,减少一些现有调用的代码冲突 2024-05-24 17:02:18 +08:00
yangqicheng
7bf63fb167 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-24 16:38:09 +08:00
yangqicheng
cad75b4100 update - REQ-2324-调整获取任务id接口参数 2024-05-24 16:36:19 +08:00
yangqicheng
86eb38eae9 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnTaskRespCode.java
2024-05-24 15:52:10 +08:00
yangqicheng
b0a9b4d6e7 update - REQ-2324-审批任务根据类型判断是否匹配 2024-05-24 15:51:23 +08:00
yangqicheng
f2936c27c4 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req 2024-05-24 13:39:50 +08:00
yangqicheng
5db086f156 update - REQ-2324-修复根据节点类型过滤任务无效问题 2024-05-24 13:39:14 +08:00
6d98417482 Merge branch 'refs/heads/REQ-2324' into feature/merged_all_req 2024-05-24 09:33:45 +08:00
wangli
ae8ef48277 update(REQ-2324) - 解决 MQ 发送方丢消息的问题 2024-05-24 00:12:11 +08:00
ffcdd3b193 Merge branch 'refs/heads/REQ-2324' into feature/starter 2024-05-21 11:41:24 +08:00
2e3c299c70 update(REQ-2324) - 完善日志打印 2024-05-21 11:22:40 +08:00
5a35f37f7f Merge branch 'refs/heads/REQ-2364' into feature/starter
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineAsyncExecutionErrorEventListener.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineNoticeEventListener.java
2024-05-21 10:24:37 +08:00
4af7e2a7a3 update(REQ-2364) - 调整一些代码写法 2024-05-20 20:03:00 +08:00
yangqicheng
06a84d0bcd update - REQ-2364-调整类名 2024-05-20 19:53:01 +08:00
yangqicheng
165dd2e525 update - REQ-2364-增加deadletter-job重试的xxl-job 2024-05-20 18:22:47 +08:00
e087697f15 update(REQ-2364) - 调整一些 viewCode 发现的问题 2024-05-20 18:00:09 +08:00
yangqicheng
e4eb63233d update - REQ-2364-增加deadletter重试接口 2024-05-20 17:10:17 +08:00
yangqicheng
91e3d8653d update - REQ-2364-新增流变量处理代码 2024-05-20 14:51:50 +08:00
3d53acea20 Merge branch 'refs/heads/REQ-2393' into REQ-2324
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
2024-05-20 09:54:22 +08:00
172a4b735c update(REQ-2393) - 优化 Activity 相关操作上下文的使用 2024-05-20 09:49:47 +08:00
a02b6174a8 update(REQ-2393) - 修改基础 API,将获取指定流程的组织关系,调整为获取指定流程的所有变量 2024-05-17 17:10:47 +08:00
yangqicheng
cb0d5c4a9e update - 添加业务节点唤醒/业务节点设置审批人异步处理方法 2024-05-17 15:22:31 +08:00
136a14818e Merge branch 'refs/heads/hotfix-20240513' into REQ-2393 2024-05-17 10:58:08 +08:00
fcab90b664 update(REQ-2324) - 完善客户端调用引擎的记录 2024-05-16 17:17:11 +08:00
94db1548a5 update(REQ-2324) - 完善消息接口一些限制条件的说明 2024-05-16 15:46:21 +08:00
cfc935de7e update(REQ-2324) - 替换使用 TraceId 的常量 2024-05-15 16:17:38 +08:00
yangqicheng
379984dfff update - REQ-2324-调整代码内容 2024-05-14 11:38:41 +08:00
yangqicheng
e21b646b6a Merge remote-tracking branch 'origin/hotfix-20240513' into hotfix-20240513 2024-05-13 21:00:20 +08:00
yangqicheng
1a278a47bc update - 调整日志输出错误问题 2024-05-13 21:00:04 +08:00
6f507c8187 update - 调整一些日志文案 2024-05-13 20:59:47 +08:00
yangqicheng
0eb1952293 update - 日志输出添加流程实例id字段 2024-05-13 20:52:56 +08:00
yangqicheng
0f0929592b update - REQ-2324-查询根据流程实例和人员id查询任务接口增加根据节点类型过滤参数 2024-05-13 16:46:00 +08:00
76492973b7 update(REQ-2324): 调整代码 2024-05-13 14:33:30 +08:00
7bb5172ce1 update(REQ-2324): 调整代码 2024-05-13 13:37:10 +08:00