Commit Graph

3187 Commits

Author SHA1 Message Date
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
wangli
04533576c7 feat(REQ-3845) - 调整替换变量的问题 2026-01-06 09:50:47 +08:00
wangli
82b92719b8 Merge branch 'feature/RDMP-3845' into test 2026-01-05 18:30:15 +08:00
wangli
0bcfc22178 feat(REQ-3845) - 调整替换变量的问题 2026-01-05 18:29:57 +08:00
f62bc62975 Merge branch 'feature/RDMP-3845' into test
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
2026-01-05 16:28:17 +08:00
1a75fc4de3 feat(REQ-3845) - 调整处理wps 变量替换为空串的逻辑 2026-01-05 16:26:11 +08:00
63e85c739c Merge branch 'feature/RDMP-3845' into test 2026-01-05 15:21:19 +08:00
bfbd1a02c3 feat(REQ-3845) - 调整处理wps 变量替换为空串的逻辑 2026-01-05 15:19:55 +08:00
64fdce63e0 Merge branch 'feature/RDMP-3845' into test
# 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:48:53 +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
67deb49e92 Merge branch 'feature/RDMP-3845' into test 2025-12-26 18:41:32 +08:00
81965467d4 feat(REQ-3845) - 处理表单响应转换 2025-12-26 18:40:51 +08:00
7311e2a033 Merge branch 'feature/RDMP-3845' into test 2025-12-26 18:14:21 +08:00
83d7c6df50 feat(REQ-3845) - 处理表单响应转换 2025-12-26 18:14:02 +08:00
a7483fa106 Merge branch 'feature/REQ-5965' into test 2025-12-26 17:13:02 +08:00
9353c76030 feat(REQ-5965) - 调整文档配置文案 2025-12-26 16:47:34 +08:00
fde801f8a8 Merge branch 'feature/REQ-5965' into test 2025-12-26 13:56:24 +08:00
41012e864c feat(REQ-5965) - 升级 axzo-parent 基础包版本 2025-12-26 13:55:05 +08:00
a8f986aab3 Merge branch 'feature/REQ-5965' into test
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
2025-12-25 16:31:00 +08:00
b486ed4927 feat(REQ-5965) - 调整获取用于替换 wps 变量之前的变量逻辑,配合审批业务中的替换为空的配置使用 2025-12-25 16:28:02 +08:00
4073edea3e Merge branch 'feature/REQ-5965' into test 2025-12-25 14:25:04 +08:00
1841d86b18 feat(REQ-5965) - 调整获取用于替换 wps 变量之前的变量逻辑,配合审批业务中的替换为空的配置使用 2025-12-25 14:23:26 +08:00