Commit Graph

3137 Commits

Author SHA1 Message Date
0f85fe6bc4 Merge branch 'feature/dingdingLogin' into pre
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/SupportRefreshProperties.java
2026-02-04 20:39:55 +08:00
a29c3dcd16 Merge branch 'feature/high-bug' into pre 2026-02-04 20:39:02 +08:00
8624de4fd1 hotfix - 处理高危漏洞 2026-02-04 18:32:15 +08:00
91a79ffb8a feat(dingdingLogin) - 调整登录 2026-02-04 18:22:32 +08:00
a1bd855746 feat(dingdingLogin) - 调整登录 2026-02-04 18:03:38 +08:00
9deb345fb1 Merge branch 'feature/high-bug' into pre 2026-02-04 17:39:44 +08:00
5156a4bbe0 hotfix - 处理高危漏洞 2026-02-04 17:33:15 +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
2c2f369e2b feat(dingtalk) - 调整 sdk 中发送钉钉消息的入参模型 2026-02-04 10:18:35 +08:00
5cb563b703 feat(dingtalk) - 调整框架会将 500的 status 强制写入 error 日志 2026-02-03 16:19:59 +08:00
881492f821 feat(dingtalk) - 调整钉钉发送消息的模式 2026-02-02 16:53:02 +08:00
6141b48ee3 Merge remote-tracking branch 'origin/master' into pre 2026-01-20 13:46:17 +08:00
061264fb30 fix - 跳转实例事件抽象类的方法名 2026-01-20 13:44:45 +08:00
8c34bfee0c Merge branch 'feature/dingdingLogin' into pre 2026-01-19 11:21:40 +08:00
ca47825a2e fix - 测试 chrome 浏览器扫码后不能正确跳转到操作页 2026-01-19 11:08:21 +08:00
17e8230e0b fix - 测试 chrome 浏览器扫码后不能正确跳转到操作页 2026-01-16 14:40:15 +08:00
84cc69dad3 fix - 调整登陆成功后的页面地址 2026-01-14 17:08:00 +08:00
e9e2c026ad fix - 调整登陆成功后的页面地址 2026-01-14 16:37:24 +08:00
f577b818bc fix - 调整登陆成功后的页面地址 2026-01-14 16:04:45 +08:00
040e4a3365 fix - 增加登陆安全校验 2026-01-14 15:11:15 +08:00
86dd6f7c7f fix - 增加登陆安全校验 2026-01-14 11:14:15 +08:00
wangli
01b99bea18 Merge branch 'feature/dingdingLogin' into pre 2026-01-14 10:20:03 +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
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
37463bbc14 Merge branch 'feature/RDMP-3845' into pre 2026-01-06 09:51:01 +08:00
wangli
04533576c7 feat(REQ-3845) - 调整替换变量的问题 2026-01-06 09:50:47 +08:00
wangli
0b8f585487 Merge branch 'feature/RDMP-3845' into pre 2026-01-05 18:30:32 +08:00
wangli
0bcfc22178 feat(REQ-3845) - 调整替换变量的问题 2026-01-05 18:29:57 +08:00
83b895d008 Merge branch 'feature/RDMP-3845' into pre 2026-01-05 16:29:51 +08:00
1a75fc4de3 feat(REQ-3845) - 调整处理wps 变量替换为空串的逻辑 2026-01-05 16:26:11 +08:00
f6e56fd436 Merge branch 'feature/RDMP-3845' into pre 2026-01-05 15:21:58 +08:00
bfbd1a02c3 feat(REQ-3845) - 调整处理wps 变量替换为空串的逻辑 2026-01-05 15:19:55 +08:00
efc2636e73 Merge branch 'feature/RDMP-3845' into pre
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
2026-01-05 14:47:56 +08:00
b8aac17b64 feat(REQ-3845) - 调整获取人员信息的接口 2026-01-05 14:46:58 +08:00
8557ceccb8 Merge remote-tracking branch 'origin/master' into feature/RDMP-3845
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
2026-01-05 14:40:36 +08:00
29895e355c Merge branch 'feature/RDMP-3845' into pre
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java
2025-12-30 10:55:25 +08:00
81965467d4 feat(REQ-3845) - 处理表单响应转换 2025-12-26 18:40:51 +08:00
83d7c6df50 feat(REQ-3845) - 处理表单响应转换 2025-12-26 18:14:02 +08:00
09ee88afc7 Merge branch 'feature/REQ-5965' into pre 2025-12-26 17:14:19 +08:00
9353c76030 feat(REQ-5965) - 调整文档配置文案 2025-12-26 16:47:34 +08:00
a8aa4c8a57 Merge branch 'feature/REQ-5965' into pre 2025-12-26 13:57:20 +08:00
41012e864c feat(REQ-5965) - 升级 axzo-parent 基础包版本 2025-12-26 13:55:05 +08:00
e7eca766b6 Merge branch 'feature/REQ-5965' into pre 2025-12-25 16:31:25 +08:00