wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,212 Commits 33 Branches 9 Tags 17 MiB
9258f54c3f
Commit Graph

935 Commits

Author SHA1 Message Date
wangli
352a71f81a Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-22 13:49:04 +08:00
wangli
6b39e276f0 feat - 添加执行 shell 命令的 web api 2024-10-22 13:48:06 +08:00
wangli
ee87f42882 feat - 添加执行 shell 命令的 web api 2024-10-22 13:47:44 +08:00
wangli
9c82a709be feat(REQ-2752) - 优化导入 2024-10-21 17:46:48 +08:00
wangli
f31a3578c5 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-18 18:05:44 +08:00
wangli
06a9f3f6d3 feat(REQ-2752) - 调整运行时的审批，同步 ES 时先删除，再同步之间的代码 NPE 的问题 2024-10-18 18:05:33 +08:00
wangli
7f7a38fb2e Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-18 17:41:18 +08:00
wangli
ca9f63dbdf feat(REQ-2752) - 解决 NPE 2024-10-18 17:40:22 +08:00
wangli
4be268cfe5 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-18 16:43:12 +08:00
wangli
0ef090dca7 feat(REQ-2752) - 调整运行中的实例动作注册事务提交后执行的监听。 2024-10-18 16:42:53 +08:00
wangli
21ff034e83 optimize - 调整 starter 中的日志输出级别，减少不必要的日志打印 2024-10-18 14:32:32 +08:00
wangli
afe5d37b07 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-18 11:17:29 +08:00
wangli
0bd59ecb9a feat(REQ-2752) - 添加流程实例运行结束后，同步最终的状态至 ES 2024-10-18 11:17:11 +08:00
wangli
28d2495c41 feat - 测试一些表单相关功能 2024-10-17 17:09:39 +08:00
wangli
8dd4f2eb55 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-16 17:49:00 +08:00
wangli
49eb9377ec fix(REQ-2752) - 调整同步指定实例的数据 2024-10-16 17:48:48 +08:00
wangli
12b6681e46 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-16 17:17:23 +08:00
wangli
be5d00b55b fix(REQ-2752) - 解决编译问题 2024-10-16 17:16:16 +08:00
wangli
a32279acc4 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-16 17:10:12 +08:00
wangli
56741cabd2 feat(REQ-2752) - 调整运行时的数据同步 ES 的逻辑 2024-10-16 17:09:58 +08:00
wangli
6ad025c642 feat(REQ-2752) - 调整运行时的数据同步 ES 的逻辑 2024-10-16 16:53:12 +08:00
wangli
5fd13a534c Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-16 10:24:05 +08:00
wangli
1073820957 feat(REQ-2752) - 完善一些日志输出 2024-10-16 10:23:54 +08:00
wangli
3d0ee26f23 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-15 21:52:51 +08:00
wangli
7f3d00187e feat(REQ-2752) - 添加同步指定流程实例的任务 2024-10-15 21:52:34 +08:00
wangli
59b4259e8c Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-15 17:43:52 +08:00
wangli
4a171e17e7 feat(REQ-2752) - 处理兼容流程任务的审批人可能没人名的情况 2024-10-15 17:43:36 +08:00
wangli
0a5e939fce feat(REQ-2752) - 调整数据同步的分页大小 2024-10-15 17:01:14 +08:00
wangli
2218710e10 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-14 19:30:07 +08:00
wangli
ae83141701 feat(REQ-2752) - ES 数据同步增加流程实例的发起人信息 2024-10-14 18:17:07 +08:00
wangli
9980807a86 feat(REQ-2752) - 控制日志输出量 2024-10-14 15:42:17 +08:00
yangqicheng
f42da8ddfd REQ-2752-删除管理员接口，返回删除记录数量 2024-10-14 11:40:17 +08:00
yangqicheng
47cc2d4bd0 REQ-2752-新增根据条件删除流程管理员接口 2024-10-14 11:28:52 +08:00
wangli
98140825fe Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-12 22:59:22 +08:00
wangli
3318e09da2 feat(REQ-2752) - 增加任务维度的数据搜索 2024-10-12 22:58:15 +08:00
wangli
10d237bab1 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-12 18:58:25 +08:00
yangqicheng
ec39ba0ef0 REQ-2752-增加流程管理员数量查询逻辑 2024-10-12 18:50:08 +08:00
wangli
76a5d9ea3c Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 18:26:48 +08:00
wangli
2e289303a5 feat(REQ-2924) - 兼容处理 “null” 字符串的问题 2024-10-11 18:23:15 +08:00
wangli
aabf4db951 Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 18:10:45 +08:00
wangli
42f11e17f3 feat(REQ-2924) - 修复查询出来的审批人，需要先补全头像信息，但数据不合规导致异常的问题 2024-10-11 18:09:59 +08:00
wangli
62be14b043 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-11 17:44:14 +08:00
wangli
5b2c3d7385 Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 17:44:01 +08:00
wangli
4dcd907956 feat(REQ-2924) - 修复查询出来的审批人，需要先补全头像信息，但数据不合规导致异常的问题 2024-10-11 17:38:33 +08:00
wangli
1b11d7ce4a feat(REQ-2924) - 修复查询出来的审批人，需要先补全头像信息，但数据不合规导致异常的问题 2024-10-11 17:30:32 +08:00
wangli
2dad84d1b1 feat(REQ-2924) - 调整一些逻辑 2024-10-11 17:18:20 +08:00
wangli
6fc354683f Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 15:11:44 +08:00
wangli
97ac409d00 feat(REQ-2924) - 调整一些 ERROR 级别的日志打印 2024-10-11 15:10:46 +08:00
wangli
ce5b934340 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-11 13:33:22 +08:00
yangqicheng
ce627a6bc8 REQ-2752-增加流程管理员数量校验，修复管理员查询数据问题 2024-10-11 11:53:49 +08:00
wangli
1205047cc8 Merge branch 'feature/REQ-2924' into feature/merge_2924_2752 2024-10-11 11:29:27 +08:00
wangli
d19e63c077 feat(REQ-2752) - 调整开关的逻辑 2024-10-11 11:29:14 +08:00
wangli
e2163bad34 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-11 11:24:55 +08:00
wangli
3e464bf108 feat(REQ-2752) - 优化导入 2024-10-11 11:24:32 +08:00
wangli
dbac78dc18 feat(REQ-2752) - 调整同步 ES 数据的内部逻辑, 增加日志 2024-10-10 10:28:13 +08:00
wangli
c5ed689782 feat(REQ-2752) - 调整同步 ES 数据的内部逻辑, 增加日志 2024-10-10 10:27:52 +08:00
wangli
d6fda1108f Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 18:25:40 +08:00
wangli
56b68e5fe7 feat(REQ-2752) - 新增在途的历史审批，同步 ES 2024-10-09 18:25:04 +08:00
yangqicheng
2c049dde41 REQ-2752-Controller添加注解 2024-10-09 17:41:54 +08:00
yangqicheng
f546f2cd86 REQ-2752-接口入参添加注解 2024-10-09 17:30:20 +08:00
wangli
6cf2df0638 feat(REQ-2752) - 调整同步代码的逻辑 2024-10-09 17:00:40 +08:00
wangli
f38c866031 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 14:36:58 +08:00
wangli
2c6613b473 feat(REQ-2752) - 添加 FeignApi 2024-10-09 14:36:45 +08:00
wangli
031939bf07 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 14:21:15 +08:00
wangli
edb8d781f2 feat(REQ-2752) - 还原 XXL 配置 2024-10-09 14:21:04 +08:00
wangli
250d4d015d Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 13:50:42 +08:00
wangli
9e2ebd0c6f feat(REQ-2752) - 提供 XXL 入口,手动操作索引 2024-10-09 13:50:26 +08:00
wangli
5f589bd28d feat(REQ-2752) - 优化导入 2024-10-09 11:31:22 +08:00
wangli
261a1758f0 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 2024-10-09 11:22:44 +08:00
wangli
139c77c322 feat(REQ-2752) - 调整启动类扫描路径 2024-10-09 11:13:00 +08:00
wangli
0ab3822607 Merge branch 'feature/REQ-2752' into feature/merge_2924_2752 
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/WorkflowEngineApplication.java
 2024-10-09 09:58:47 +08:00
wangli
ba3e681776 Merge branch 'feature/REQ-2752-wl' into feature/REQ-2752 
# Conflicts:
#	workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/impl/ExtAxProcessAdminServiceImpl.java
 2024-10-09 09:46:45 +08:00
wangli
8a41820af4 feat(REQ-2752) - 增加 ES 搜索数据的条件，并测试多条件组合查询 2024-10-08 23:07:22 +08:00
wangli
dff61a6068 feat(REQ-2752) - 实现 ES 中的搜索 2024-10-08 18:51:05 +08:00
yangqicheng
aaa00ee566 REQ-2752-添加管理员操作相关接口 2024-10-08 11:37:51 +08:00
wangli
d79435fed7 feat(REQ-2752) - 还原 XXL 配置 2024-10-08 10:43:11 +08:00
wangli
e88267b883 feat(REQ-2752) - 添加操作ES 的 API 2024-10-07 21:16:43 +08:00
wangli
a9d39e3ec5 feat(REQ-2752) - 通过 Entity 相关事件，处理在途的审批同步数据至 ES 2024-10-06 22:12:57 +08:00
wangli
ff6e991c34 feat(REQ-2752) - 1.调整已结束实例同步 ES 的代码设计. 2.增加记录初始同步时的操作时间. 3.增加新表用于记录操作时除开已完成的实例以外的数据(该功能可能会废弃). 2024-09-30 17:57:33 +08:00
wangli
6a38f65b3c feat(REQ-2752) - 增加任务同步 ES 的逻辑,并优化索引字段 2024-09-29 19:03:10 +08:00
yangqicheng
42792af2ff REQ-2924-调整流程管理员操作接口 2024-09-29 18:28:43 +08:00
wangli
7b81228bdb feat(REQ-2924) - 调用超管接口增加开关控制 2024-09-29 17:13:36 +08:00
wangli
96b34b88eb feat(REQ-2752) - 完善同步任务纬度数据到 ES 的逻辑 2024-09-29 17:02:14 +08:00
wangli
25b0bb16df feat(REQ-2924) - 调佣二方接口增加传入实例 ID 2024-09-29 16:30:22 +08:00
wangli
b2a4c6b57b feat(REQ-2752) - 增加同步纬度数据至 ES 的逻辑 2024-09-29 16:27:36 +08:00
wangli
8daa649642 feat(REQ-2752) - 添加 xxl-job 的日志路径配置 2024-09-29 00:22:54 +08:00
wangli
8bd8effa36 feat(REQ-2752) - 测试 ES 写入 2024-09-29 00:22:12 +08:00
wangli
5d73ad9972 fix(REQ-2752) - 解决项目启动问题 2024-09-28 16:20:59 +08:00
wangli
ea173c092b Merge remote-tracking branch 'origin/feature/REQ-2752' into feature/REQ-2752 2024-09-27 18:49:27 +08:00
wangli
d24e7fd2ae feat(REQ-2752) - 完善流程实例同步 ES 的文档模型 2024-09-27 18:49:17 +08:00
yangqicheng
bcce548998 REQ-2752-审批管理员相关功能接口实现 2024-09-27 18:03:43 +08:00
wangli
7d61d29d95 feat(REQ-2924) - 调整抄送时,处理的虚拟任务的问题 2024-09-26 15:59:15 +08:00
wangli
94851ce665 feat(REQ-2752) - 简单调整 module, 添加 ES 文档模型 2024-09-26 15:29:29 +08:00
wangli
3da94cced2 feat(REQ-2924) - 修复一些测试 BUG 2024-09-26 13:07:32 +08:00
yangqicheng
fc81026ee8 REQ-2924-处理合并master分支代码冲突 2024-09-25 17:59:39 +08:00
yangqicheng
c036742415 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-2924 
# Conflicts:
#	workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessActivityApi.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/FlowableConfiguration.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmnProcessActivityService.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessActivityServiceImpl.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java
#	workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/feign/ext/ComplexInvokeClient.java
 2024-09-25 17:49:37 +08:00
wangli
450fa726b4 feat(REQ-2924) - 增加查询超管异常的提示 2024-09-25 14:34:48 +08:00
wangli
f5a4479b57 feat(REQ-2924) - 优化调用二方接口的日志告警 2024-09-25 13:51:56 +08:00
wangli
8db08de5fe feat(REQ-2924) - 完善转交管理时的解析 outype 的 NPE 问题 2024-09-25 11:33:19 +08:00
wangli
1c5acfd728 feat(REQ-2924) - 完善离职的判断逻辑 2024-09-24 21:06:19 +08:00
wangli
c80f57a0fe feat(REQ-2924) - 完善离职的判断逻辑 2024-09-24 20:33:56 +08:00
wangli
3fcc1e5bbb feat(REQ-2924) - 完善发起人主管的找超管的入参 2024-09-24 17:52:17 +08:00
wangli
3af8822bba feat(REQ-2924) - 指定审批人，会调用二方接口查询人员是否在职 2024-09-24 17:02:15 +08:00
wangli
fb09025440 feat(REQ-2924) - 指定审批人，会调用二方接口查询人员是否在职 2024-09-24 16:55:26 +08:00
wangli
333abc1cb4 feat(REQ-2924) - 调整岗位、角色后，查询转交的超管后的逻辑优化 2024-09-24 14:04:01 +08:00
yangqicheng
27d1efaa34 REQ-2924-修改字段名 2024-09-23 17:29:17 +08:00
yangqicheng
3e37d35986 REQ-2924-任务事件消息增加评论内容 2024-09-23 17:26:59 +08:00
yangqicheng
4174e4f451 REQ-2924-修复task事件消息没有附件问题 2024-09-20 15:39:38 +08:00
yangqicheng
1cc46a40cf REQ-2924-去掉多余依赖 2024-09-19 18:58:22 +08:00
yangqicheng
e85cf6cde5 REQ-2924-修复NPE问题 2024-09-19 17:52:36 +08:00
yangqicheng
9ea952ca8d REQ-2924-修复查询人员报错问题 2024-09-19 17:23:12 +08:00
yangqicheng
fa66b6f4ec REQ-2924-调整角色，管理员查询api 2024-09-19 11:53:51 +08:00
yangqicheng
2b98fc5311 REQ-2924-修复自动审批节点审批任务计算错误问题 2024-09-18 15:38:46 +08:00
yangqicheng
09fae758a0 添加配置 2024-09-18 11:49:54 +08:00
yangqicheng
e235952257 REQ-2924-事件消息增加附件信息和businessKey 2024-09-18 11:18:57 +08:00
wangli
9ccfa13340 feat(REQ-2924) - 优化异常告警的内容 2024-09-14 15:23:50 +08:00
wangli
e221cb1d6b feat(REQ-2924) - 优化异常告警的内容 2024-09-14 14:56:40 +08:00
wangli
e9c189c589 feat(REQ-2924) - 恢复注释的代码 2024-09-14 14:17:04 +08:00
wangli
e7b26a1d04 feat(REQ-2924) - 新版日志表脚本添加索引 2024-09-14 14:16:16 +08:00
wangli
4ab77e7a4f feat(REQ-2924) - 解决回退的目标节点，有转交的情况下，日志展示不正常 2024-09-14 12:49:17 +08:00
yangqicheng
fc36c31bfd REQ-2924-退回节点查询接口去掉重复提交注解 2024-09-14 10:53:45 +08:00
wangli
41a9baebaf feat(REQ-2924) - 测试业务节点卡住的告警逻辑 2024-09-13 17:33:23 +08:00
yangqicheng
73275141b4 REQ-2924-钉钉构造堆栈信息异常，不再钉钉消息提示 2024-09-13 11:39:17 +08:00
wangli
0c7c70eb43 feat(REQ-2924) - 测试新版日志，完善日志中的人名和头像 2024-09-12 21:04:22 +08:00
yangqicheng
801b2f0f5a REQ-2924-调整钉钉提示查询堆栈信息地址 2024-09-12 19:10:51 +08:00
yangqicheng
e74cb7180c Merge remote-tracking branch 'origin/feature/REQ-2924' into feature/REQ-2924 2024-09-12 19:03:57 +08:00
yangqicheng
0ddbaad244 REQ-2924-调整钉钉提示查询堆栈信息地址 2024-09-12 19:03:19 +08:00
wangli
7c9e9f387e feat(REQ-2924) - 新版日志处理 2024-09-12 19:03:12 +08:00
yangqicheng
faa9409b4a REQ-2924-调整钉钉打印堆栈信息逻辑 2024-09-12 18:42:24 +08:00
yangqicheng
c2cb856bde REQ-2924-增加钉钉提醒异常堆栈信息打印 2024-09-12 18:12:06 +08:00
wangli
eb809a6157 feat(REQ-2924) - 新版日志处理 2024-09-12 17:42:24 +08:00
wangli
9f11bd21ab feat(REQ-2924) - 新版日志处理 2024-09-12 17:11:43 +08:00
wangli
3c36040c29 feat(REQ-2924) - 记录重试失败后的异常信息 2024-09-12 16:00:20 +08:00
wangli
f20ba76d49 feat(REQ-2924) - 调整所有 Assignee 的人名和头像，确保一定有值 2024-09-12 14:48:03 +08:00
wangli
638a8178e2 feat(REQ-2924) - 添加节点长时间卡住的告警逻辑 2024-09-11 14:00:32 +08:00
wangli
e082b9d0cc feat(REQ-2924) - 过滤 /error 2024-09-11 10:53:16 +08:00
wangli
3d213a9cab feat(REQ-2924) - 修改“退回”的文案 2024-09-10 16:00:04 +08:00
wangli
f221b53c3d feat(REQ-2924) - 完整测试单条分支路线各种节点的日志生成数据 2024-09-09 18:10:07 +08:00
wangli
7d6561cb9f feat(REQ-2924) - 调整 Activity Service 的实现，保持风格统一 2024-09-09 15:06:20 +08:00
wangli
89e33fb766 feat(REQ-2924) - 测试新版日志，并提供外部查询日志的聚合接口 2024-09-08 14:57:12 +08:00
wangli
f30d891f82 feat(REQ-2924) - 新增新版日志查询逻辑 2024-09-07 23:00:07 +08:00
yangqicheng
b6ab7db0ed REQ-2924-调整获取退回节点列表接口 2024-09-06 14:10:04 +08:00
yangqicheng
879e1a8caf REQ-2924-处理修改错误问题 2024-09-06 12:08:06 +08:00
yangqicheng
1dfa364282 REQ-2924-调整回退到指定节点逻辑 2024-09-05 11:53:59 +08:00
wangli
47f3861d7b feat(REQ-2616) - 移除引擎自动加载实例变量 2024-09-03 20:51:10 +08:00
wangli
280e8f0de2 feat(REQ-2616) - 完善Activity 节点的回调,以及定时触发功能逻辑 2024-09-03 18:35:53 +08:00
wangli
f2593e5330 feat(REQ-2616) - 完善Activity 节点的回调,以及定时触发功能逻辑 2024-09-03 17:20:32 +08:00
yangqicheng
19e75f3a65 REQ-2924-调整回退代码逻辑 2024-09-03 17:17:20 +08:00
yangqicheng
ae173d789b REQ-2924-增加回退到指定节点，回退节点选项接口 2024-09-03 16:47:30 +08:00
yangqicheng
d6aa18dea0 REQ-2924-调整回退到指定节点代码 2024-09-02 11:14:39 +08:00