Commit Graph

3209 Commits

Author SHA1 Message Date
0c645dcdf0 Merge branch 'feature/high-bug' into test 2026-02-04 18:32:38 +08:00
8624de4fd1 hotfix - 处理高危漏洞 2026-02-04 18:32:15 +08:00
36ff1c0346 Merge branch 'feature/high-bug' into test 2026-02-04 17:39:24 +08:00
5156a4bbe0 hotfix - 处理高危漏洞 2026-02-04 17:33:15 +08:00
e89e5848a2 Merge branch 'feature/dingdingLogin' into test 2026-02-04 16:32:34 +08:00
90af0f50e7 feat(dingdingLogin) - 调整危险操作的页面逻辑 2026-02-04 16:31:28 +08:00
2bece54f66 Merge branch 'feature/dingdingLogin' into test 2026-02-04 15:48:16 +08:00
c60187c563 feat(dingdingLogin) - 调整危险操作的页面逻辑 2026-02-04 15:47:55 +08:00
916912a934 Merge branch 'feature/dingdingLogin' into test 2026-02-04 15:31:17 +08:00
c15d8264bf feat(dingdingLogin) - 调整危险操作的页面逻辑 2026-02-04 15:30:54 +08:00
9ee0333097 Merge branch 'feature/hiddenLogAutoSkip' into test 2026-02-04 15:22:26 +08:00
2964ad625b feat(autoSkip) - 调整自动过审的逻辑 2026-02-04 15:22:07 +08:00
5a9d76960c Merge branch 'feature/hiddenLogAutoSkip' into test 2026-02-04 15:08:55 +08:00
3a08d66550 Merge remote-tracking branch 'origin/feature/hiddenLogAutoSkip' into feature/hiddenLogAutoSkip
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java
2026-02-04 15:08:27 +08:00
5aeec441ca feat(autoSkip) - 添加日志 2026-02-04 15:07:56 +08:00
29db84927a feat(autoSkip) - 添加日志 2026-02-04 15:07:27 +08:00
0fec5634c8 Merge branch 'feature/hiddenLogAutoSkip' into test 2026-02-04 10:20:21 +08:00
da84579a12 Merge branch 'feature/dingdingLogin' into test 2026-02-04 10:20:00 +08:00
2c2f369e2b feat(dingtalk) - 调整 sdk 中发送钉钉消息的入参模型 2026-02-04 10:18:35 +08:00
f716a25a5f feat(autoSkip) - 新增如果某个节点的日志是需要隐藏的,则节点强制自动通过(跳过) 2026-02-03 17:02:43 +08:00
6497954620 Merge branch 'feature/dingdingLogin' into test 2026-02-03 16:22:31 +08:00
5cb563b703 feat(dingtalk) - 调整框架会将 500的 status 强制写入 error 日志 2026-02-03 16:19:59 +08:00
1bbf1650f9 Merge branch 'feature/dingdingLogin' into test
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/SupportRefreshProperties.java
2026-02-02 17:06:08 +08:00
881492f821 feat(dingtalk) - 调整钉钉发送消息的模式 2026-02-02 16:53:02 +08:00
8db036a402 Merge remote-tracking branch 'origin/master' into test 2026-01-20 13:45:57 +08:00
061264fb30 fix - 跳转实例事件抽象类的方法名 2026-01-20 13:44:45 +08:00
feff0ca01b Merge branch 'feature/dingdingLogin' into test 2026-01-19 11:21:12 +08:00
ca47825a2e fix - 测试 chrome 浏览器扫码后不能正确跳转到操作页 2026-01-19 11:08:21 +08:00
8233cf4fc6 Merge branch 'feature/dingdingLogin' into test 2026-01-16 14:40:38 +08:00
17e8230e0b fix - 测试 chrome 浏览器扫码后不能正确跳转到操作页 2026-01-16 14:40:15 +08:00
6bb18d38db Merge branch 'feature/dingdingLogin' into test 2026-01-14 17:09:31 +08:00
84cc69dad3 fix - 调整登陆成功后的页面地址 2026-01-14 17:08:00 +08:00
7812a2020a Merge branch 'feature/dingdingLogin' into test 2026-01-14 16:38:09 +08:00
e9e2c026ad fix - 调整登陆成功后的页面地址 2026-01-14 16:37:24 +08:00
6b7516d28a Merge branch 'feature/dingdingLogin' into test 2026-01-14 16:08:33 +08:00
f577b818bc fix - 调整登陆成功后的页面地址 2026-01-14 16:04:45 +08:00
305ff26918 Merge branch 'feature/dingdingLogin' into test 2026-01-14 15:16:07 +08:00
040e4a3365 fix - 增加登陆安全校验 2026-01-14 15:11:15 +08:00
86dd6f7c7f fix - 增加登陆安全校验 2026-01-14 11:14:15 +08:00
wangli
f6374291a5 Merge branch 'feature/dingdingLogin' into test 2026-01-14 10:18:49 +08:00
wangli
ca2a2aca5c Merge remote-tracking branch 'origin/master' into feature/dingdingLogin 2026-01-14 10:14:05 +08:00
wangli
f0347133ca feat(REQ-3845) - 调整替换变量的问题 2026-01-14 10:08:59 +08:00
wangli
44bb30f4a9 Merge branch 'feature/RDMP-3845'
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/WpsUtil.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java
2026-01-14 10:07:41 +08:00
45957b7a20 fix - 处理生产环境发现的字符串"null"的异常处理问题 2026-01-14 09:48:54 +08:00
e308453482 Merge branch 'feature/dingdingLogin' into test
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/common/util/WpsUtil.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java
2026-01-14 09:47:01 +08:00
d16c45ae50 feature/dingdingLogin: 新增钉钉授权 2026-01-13 18:33:52 +08:00
1fda179385 feature/dingdingLogin: 新增钉钉授权 2026-01-13 18:33:25 +08:00
f87ae7cdbc feature/dingdingLogin: 新增钉钉授权 2026-01-13 18:04:17 +08:00
d8bee2c6a3 fix - 处理生产环境发现的字符串"null"的异常处理问题 2026-01-12 10:51:54 +08:00
wangli
df39669b82 Merge branch 'feature/RDMP-3845' into test 2026-01-06 09:51:12 +08:00