Commit Graph

3231 Commits

Author SHA1 Message Date
6ed5dc6b6a Merge branch 'feature/dingdingLogin' into dev 2026-02-05 10:48:16 +08:00
5b3c996e52 feat(dingdingLogin) - 调整登录 2026-02-05 10:47:50 +08:00
5d71c91cdc Merge branch 'feature/dingdingLogin' into dev 2026-02-04 18:23:37 +08:00
91a79ffb8a feat(dingdingLogin) - 调整登录 2026-02-04 18:22:32 +08:00
0ba3fcf6d8 Merge branch 'feature/dingdingLogin' into dev 2026-02-04 18:03:58 +08:00
a1bd855746 feat(dingdingLogin) - 调整登录 2026-02-04 18:03:38 +08:00
4e14d5e674 Merge branch 'feature/high-bug' into dev 2026-02-04 17:37:06 +08:00
5156a4bbe0 hotfix - 处理高危漏洞 2026-02-04 17:33:15 +08:00
e4c430b6ba Merge branch 'feature/hiddenLogAutoSkip' into dev 2026-02-04 16:32:03 +08:00
51fc660bda Merge branch 'feature/dingdingLogin' into dev 2026-02-04 16:31:55 +08:00
90af0f50e7 feat(dingdingLogin) - 调整危险操作的页面逻辑 2026-02-04 16:31:28 +08:00
c60187c563 feat(dingdingLogin) - 调整危险操作的页面逻辑 2026-02-04 15:47:55 +08:00
c15d8264bf feat(dingdingLogin) - 调整危险操作的页面逻辑 2026-02-04 15:30:54 +08:00
2964ad625b feat(autoSkip) - 调整自动过审的逻辑 2026-02-04 15:22:07 +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
38aa0c3db1 Merge branch 'feature/hiddenLogAutoSkip' into dev 2026-02-04 10:20:46 +08:00
804692bf88 Merge branch 'feature/dingdingLogin' into dev 2026-02-04 10:19:37 +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
ff69b7745a Merge branch 'feature/dingdingLogin' into dev 2026-02-03 16:21:13 +08:00
5cb563b703 feat(dingtalk) - 调整框架会将 500的 status 强制写入 error 日志 2026-02-03 16:19:59 +08:00
8f7a19664e Merge branch 'feature/dingdingLogin' into dev
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/SupportRefreshProperties.java
2026-02-02 16:54:39 +08:00
881492f821 feat(dingtalk) - 调整钉钉发送消息的模式 2026-02-02 16:53:02 +08:00
e8e784df8e Merge remote-tracking branch 'origin/master' into dev 2026-01-20 13:45:36 +08:00
061264fb30 fix - 跳转实例事件抽象类的方法名 2026-01-20 13:44:45 +08:00
a90ea1950e Merge branch 'feature/dingdingLogin' into dev 2026-01-19 11:08:54 +08:00
ca47825a2e fix - 测试 chrome 浏览器扫码后不能正确跳转到操作页 2026-01-19 11:08:21 +08:00
17e8230e0b fix - 测试 chrome 浏览器扫码后不能正确跳转到操作页 2026-01-16 14:40:15 +08:00
4a0db17950 Merge branch 'feature/dingdingLogin' into dev 2026-01-14 17:08:35 +08:00
84cc69dad3 fix - 调整登陆成功后的页面地址 2026-01-14 17:08:00 +08:00
84a2eabeb3 Merge branch 'feature/dingdingLogin' into dev 2026-01-14 16:37:43 +08:00
e9e2c026ad fix - 调整登陆成功后的页面地址 2026-01-14 16:37:24 +08:00
d01291624d Merge branch 'feature/dingdingLogin' into dev 2026-01-14 16:05:26 +08:00
f577b818bc fix - 调整登陆成功后的页面地址 2026-01-14 16:04:45 +08:00
3620bf6f60 Merge branch 'feature/dingdingLogin' into dev 2026-01-14 15:43:58 +08:00
040e4a3365 fix - 增加登陆安全校验 2026-01-14 15:11:15 +08:00
86dd6f7c7f fix - 增加登陆安全校验 2026-01-14 11:14:15 +08:00
wangli
6178656710 Merge branch 'feature/dingdingLogin' into dev
# 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:17:32 +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
ba7aa98c02 Merge branch 'feature/dingdingLogin' into dev
# 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-13 18:38:30 +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
384017d1ab Merge branch 'feature/RDMP-3845' into dev 2026-01-06 09:51:24 +08:00
wangli
04533576c7 feat(REQ-3845) - 调整替换变量的问题 2026-01-06 09:50:47 +08:00