Commit Graph

142 Commits

Author SHA1 Message Date
xudawei
898ddea091 feat:(REQ-3045) 模版管理V3-优化UrlConfig urlConfig; 2024-10-10 15:20:39 +08:00
xudawei
bc073f5ae7 Merge remote-tracking branch 'origin/feature/REQ-3045' into feature/REQ-3045 2024-10-10 15:08:09 +08:00
xudawei
fa8b276882 feat:(REQ-3045) 模版管理V3-优化UrlConfig urlConfig; 2024-10-10 15:08:04 +08:00
yanglin
af9e6f0940 REQ-3045: 完善属性 2024-10-10 13:41:47 +08:00
yanglin
6f0302d11f REQ-2752: 添加api url字段 2024-10-10 09:42:55 +08:00
xudawei
4daa135c37 feat:(REQ-3045) 模版管理V3-button列表更换类型属性 2024-10-09 13:40:57 +08:00
yanglin
75f373393a REQ-2752: 调整字段类型 2024-10-09 11:39:27 +08:00
xudawei
505a077d4e feat:(REQ-3045) 模版管理V3-优化详情接口 2024-10-09 10:19:05 +08:00
xudawei
8aec950777 feat:(REQ-3045) 模版管理V3-日志优化
feat:(REQ-3045) 模版管理V3-增加templateV3属性填充
2024-10-09 09:21:08 +08:00
yanglin
ceea9c95ca REQ-3045: 设置正确的注解 2024-10-08 17:47:45 +08:00
yanglin
a48e1c97b0 REQ-3045: 添加JSON handler 2024-10-08 15:22:41 +08:00
yanglin
ab02d5f504 REQ-3045: 添加JSON handler 2024-10-08 14:52:04 +08:00
yanglin
501fdaac13 REQ-3045: 添加一些基础类 2024-10-08 11:22:19 +08:00
yanglin
8eb94e5750 REQ-3045: 添加一些基础类 2024-10-08 10:45:04 +08:00
yanglin
fdea50bc17 REQ-3045: 添加一些基础类 2024-10-08 10:27:41 +08:00
yanglin
97d25e45b0 Merge branch 'refs/heads/REQ-2723' 2024-09-18 19:15:35 +08:00
yanglin
965d349669 REQ-2699: 追求workspaceId 2024-08-27 11:09:43 +08:00
yanglin
6d5715d6b8 REQ-2723: 迁移事件中心发送消息和待办的代码 2024-07-24 14:21:06 +08:00
yanglin
1f4540bad7 优化待办分类统计 2024-07-04 09:23:16 +08:00
yanglin
04361a616b Merge branch 'refs/heads/master' into REQ-2318
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoBroadcaster.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoMqBroadcaster.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/broadcast/TodoPullBroadcaster.java
2024-06-24 10:46:49 +08:00
yanglin
a610f7ab74 REQ-2497: backup 2024-06-07 18:56:44 +08:00
yanglin
250d760c8c Merge branch 'refs/heads/master' into REQ-2318
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/person/PersonService.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/enums/PendingMessageStateEnum.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePageRequest.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
2024-06-07 09:12:42 +08:00
yanglin
79f561dfe8 Merge remote-tracking branch 'refs/remotes/origin/feature/merged_all_req'
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateDTO.java
#	msg-notices/msg-notices-integration/src/main/java/cn/axzo/msg/center/notices/integration/client/impl/AliYunSmsClientImpl.java
2024-06-05 18:25:49 +08:00
yanglin
62190cf4f4 REQ-2481: 设置模版中IM的发送优先级 2024-05-27 16:31:01 +08:00
yangqicheng
f24683c368 Merge remote-tracking branch 'refs/remotes/origin/REQ-2324' into feature/merged_all_req
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/PendingMessagePushParam.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePushRequest.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
2024-05-23 09:50:49 +08:00
yanglin
f9a2c4f9ec REQ-2318: 待办交接,端相关 2024-05-21 18:51:25 +08:00
yanglin
134d1db0f3 REQ-2318: 交接 2024-05-21 10:51:40 +08:00
yanglin
7dc22eec53 Merge branch 'refs/heads/master' into REQ-2303
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
2024-05-11 16:51:24 +08:00
yangqicheng
10da6fac15 update - REQ-2324-待办支持批量处理 2024-05-10 17:38:57 +08:00
yanglin
9712bb3ffe REQ-2303: 同步显示流程中的自自定义按钮 2024-05-10 16:33:04 +08:00
yanglin
07a1610ed1 REQ-2303: 返回待办业务和路由扩展参数 2024-04-29 11:00:17 +08:00
yanglin
507aee4112 REQ-2411: 发送短信, 限制发送重复内容 2024-04-28 14:40:31 +08:00
yanglin
f00e59a647 REQ-2303: 支持自定义按钮 2024-04-22 20:24:09 +08:00
yanglin
f988245459 REQ-2303: backup 2024-04-22 18:02:44 +08:00
yanglin
03e8aeaf3a REQ-2135: 只有项目才设置发起人项目部名称, 单位的话不返回, 因为会导致待办详情中显示重复的单位信息 2024-04-09 15:21:23 +08:00
yanglin
3daaa2f391 Merge branch 'refs/heads/REQ-2129' into REQ-2135-2129
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/v3/msg/MessageMappingProcessor.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/MessageTemplateDTO.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateSaveOrUpdateParam.java
#	inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateNewServiceImpl.java
#	inside-notices/src/main/java/cn/axzo/msg/center/mq/RocketMQConfig.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/PresetButtonPressedMessage.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/PersonV3DTO.java
2024-04-07 17:05:36 +08:00
yanglin
6dccf6dc34 REQ-2135: 尝试使用查询到的项目部类型 2024-04-07 16:27:24 +08:00
yanglin
198cc6558f REQ-2135: 清理待办日志 2024-04-07 14:01:30 +08:00
yanglin
bb80e882d9 REQ-2135: ignore empty field when parse and serialize JSON 2024-04-03 11:19:26 +08:00
yanglin
19de5ff2df REQ-2135: ignore empty field when parse and serialize JSON 2024-04-03 11:02:37 +08:00
yanglin
949e547a37 REQ-2135: ignore empty field when parse and serialize JSON 2024-04-03 11:00:23 +08:00
yanglin
8bfdc54d20 REQ-2135: 提供更加强大的模版内容解析 2024-04-01 14:04:35 +08:00
yanglin
02d0b6f003 REQ-2135: 添加日志 2024-03-29 09:43:09 +08:00
yanglin
427e5fe0a2 REQ-2135: 完善日志 2024-03-29 09:22:24 +08:00
lilong
1e3cffc844 feat: REQ-2129 解决使用lambdaUpdate更新json的问题 2024-03-28 10:42:09 +08:00
yanglin
87236c31ca REQ-2135: 在待办业务中保存一个样本待办的编码 2024-03-27 17:29:49 +08:00
lilong
2d68cb5171 feat: REQ-2129 消费消息发送mq进行push操作 2024-03-27 14:34:53 +08:00
yanglin
e16b25bd0a REQ-2135: 支持查询分类及子分类的模版 2024-03-26 18:22:19 +08:00
yanglin
3630d12b3b REQ-2135: backup 2024-03-26 17:19:31 +08:00
yanglin
a4243902fd REQ-2135: 调整日志字段 2024-03-26 11:42:21 +08:00