Commit Graph

1067 Commits

Author SHA1 Message Date
宋远伦
dd88cac12f Merge branch 'feature/REQ-1405-syl' into 'feature/REQ-1405'
fix: youmeng push add log

See merge request universal/infrastructure/backend/msg-center-plat!232
2023-12-28 02:08:11 +00:00
罗福
a9ca927683 Merge branch 'feature/REQ-1896' into 'master'
Feature/req 1896

See merge request universal/infrastructure/backend/msg-center-plat!230
2023-12-27 12:38:50 +00:00
songyuanlun
7ac213fa8a Merge branch 'master' into feature/REQ-1405 2023-12-25 09:49:47 +08:00
songyuanlun
3fe5d49fdf Merge branch 'master' into feature/REQ-1896 2023-12-25 09:49:05 +08:00
邬宇
f156094f30 Merge branch 'feature/REQ-1896' into 'pre'
Feature/req 1896

See merge request universal/infrastructure/backend/msg-center-plat!227
2023-12-22 10:29:43 +00:00
wuyu
9ac29b356e +发送im 2023-12-22 16:57:09 +08:00
wuyu
3dc5d449cc +发送im 2023-12-22 15:56:45 +08:00
songyuanlun
d171298a33 fix: youmeng push add log 2023-12-22 15:09:52 +08:00
宋远伦
0d82da321b Merge branch 'feature/REQ-1405-syl' into 'feature/REQ-1405'
Feature/req 1405 syl

See merge request universal/infrastructure/backend/msg-center-plat!219
2023-12-22 06:00:50 +00:00
wuyu
d36eadd4cc +分页总数 2023-12-22 11:21:08 +08:00
wuyu
430ad497df +解析逻辑 2023-12-21 18:01:02 +08:00
邬宇
a388fee893 Merge branch 'feature/REQ-1896' into 'pre'
+排序

See merge request universal/infrastructure/backend/msg-center-plat!215
2023-12-21 08:54:00 +00:00
wuyu
4f99e261d8 +排序 2023-12-21 16:53:29 +08:00
宋远伦
1255eeec5e Merge branch 'feature/REQ-1896' into 'pre'
Feature/req 1896

See merge request universal/infrastructure/backend/msg-center-plat!212
2023-12-21 06:34:23 +00:00
宋远伦
6d457a9f79 Merge branch 'feature/REQ-1896-syl' into 'feature/REQ-1896'
fix: 发生im消息打印日志

See merge request universal/infrastructure/backend/msg-center-plat!211
2023-12-21 06:34:00 +00:00
songyuanlun
47bf695445 fix: 发生im消息打印日志 2023-12-21 14:32:58 +08:00
邬宇
3ad9e8ced9 Merge branch 'feature/REQ-1609-biz-code' into 'pre'
+npe判断

See merge request universal/infrastructure/backend/msg-center-plat!208
2023-12-20 10:52:15 +00:00
邬宇
65c015b5c5 Merge branch 'feature/REQ-1609-biz-code' into 'master'
+npe判断

See merge request universal/infrastructure/backend/msg-center-plat!207
2023-12-20 10:50:20 +00:00
wuyu
00d79b5e59 +npe判断 2023-12-20 18:49:49 +08:00
邬宇
fa93db1d25 Merge branch 'feature/REQ-1609-biz-code' into 'pre'
+npe判断

See merge request universal/infrastructure/backend/msg-center-plat!205
2023-12-20 10:30:18 +00:00
邬宇
aaff6bffb9 Merge branch 'feature/REQ-1609-biz-code' into 'master'
+npe判断

See merge request universal/infrastructure/backend/msg-center-plat!204
2023-12-20 10:28:55 +00:00
wuyu
45fdc02e13 +npe判断 2023-12-20 18:28:02 +08:00
songyuanlun
9a7911a467 fix: 推送消息打印日志 2023-12-20 16:29:40 +08:00
王粒
dad7ec7432 Merge branch 'feature/REQ-1609-biz-code' into 'master'
Feature/req 1609 biz code

See merge request universal/infrastructure/backend/msg-center-plat!203
2023-12-20 06:32:11 +00:00
宋远伦
8dbf53dfd2 Merge branch 'feature/REQ-1896-syl' into 'pre'
Feature/req 1896 syl

See merge request universal/infrastructure/backend/msg-center-plat!202
2023-12-20 01:43:11 +00:00
songyuanlun
ebc8c13c3b feat: 添加更新语音文件api 2023-12-19 18:21:23 +08:00
展思虎
7d2025b91d Merge branch 'release/20231106' into 'master'
Release/20231106

See merge request universal/infrastructure/backend/msg-center-plat!201
2023-12-19 08:09:59 +00:00
宋远伦
7670fa5ce2 Merge branch 'feature/REQ-1896-syl' into 'feature/REQ-1896'
fix: 解决历史bug,消息列表过滤条件不生效的问题

See merge request universal/infrastructure/backend/msg-center-plat!200
2023-12-19 07:51:12 +00:00
songyuanlun
380797b350 fix: 解决历史bug,消息列表过滤条件不生效的问题 2023-12-19 15:50:20 +08:00
宋远伦
18c01198e0 Merge branch 'feature/REQ-1896-syl' into 'feature/REQ-1896'
fix: 处理查询模板时没返回templateCode的问题

See merge request universal/infrastructure/backend/msg-center-plat!190
2023-12-19 04:07:03 +00:00
songyuanlun
fc630f8250 fix: im消息发送不影响原有消息通道 2023-12-19 12:05:04 +08:00
songyuanlun
093002ee64 feat: 同步relation_template_map 数据脚本到业务事件 2023-12-19 11:37:53 +08:00
wuyu
d3b821780e Merge branch 'feature/REQ-1896-wy' into feature/REQ-1896
# Conflicts:
#	msg-center-api/src/main/java/cn/axzo/msg/center/service/dto/MessageButtonRouteStrategyDTO.java
2023-12-19 10:12:27 +08:00
wuyu
18312f2474 +按钮展示 2023-12-19 09:47:15 +08:00
wuyu
36f904aa3e +btn设置 2023-12-19 09:47:14 +08:00
wuyu
6ddbd526c2 +详情按钮 2023-12-19 09:47:14 +08:00
songyuanlun
3be07a4dd1 feat: relation_template_map 相关逻辑调整到 业务事件映射表并适配 2023-12-18 20:15:23 +08:00
邬宇
a411748063 Merge branch 'feature/REQ-1609-biz-code' into 'pre'
Feature/req 1609 biz code

See merge request universal/infrastructure/backend/msg-center-plat!192
2023-12-18 02:50:04 +00:00
songyuanlun
99e5443483 fix: 处理查询模板时没返回templateCode的问题 2023-12-18 10:00:10 +08:00
宋远伦
da3457d2b2 Merge branch 'feature/REQ-1896-syl' into 'feature/REQ-1896'
Feature/req 1896 syl

See merge request universal/infrastructure/backend/msg-center-plat!185
2023-12-16 07:57:03 +00:00
songyuanlun
239032355d feat: 提供消息模板查询和同步接口 2023-12-16 15:55:56 +08:00
wuyu
bb0bcdae74 +待办终态定义 2023-12-15 18:40:05 +08:00
wuyu
cc094b8703 +待办终态 2023-12-15 17:43:44 +08:00
songyuanlun
f530ed70c7 fix: 业务事件分页按照prd的排序规则 2023-12-15 17:16:36 +08:00
wuyu
3152bd5fa8 +按钮展示权限 2023-12-15 16:02:45 +08:00
宋远伦
f295904c06 Merge branch 'feature/REQ-1896-syl' into 'feature/REQ-1896'
feat: 业务事件管理接口调整

See merge request universal/infrastructure/backend/msg-center-plat!177
2023-12-15 07:37:43 +00:00
songyuanlun
bfad6a44ec feat: 业务事件管理接口调整 2023-12-15 15:34:56 +08:00
宋远伦
60c316de6a Merge branch 'feature/REQ-1896-syl' into 'feature/REQ-1896'
feat: 业务事件管理接口实现

See merge request universal/infrastructure/backend/msg-center-plat!175
2023-12-15 06:35:15 +00:00
songyuanlun
9488b856ff feat: 业务事件管理接口实现 2023-12-15 14:34:39 +08:00
宋远伦
e42b39e917 Merge branch 'feature/REQ-1896-syl' into 'feature/REQ-1896'
Feature/req 1896 syl

See merge request universal/infrastructure/backend/msg-center-plat!174
2023-12-15 06:33:05 +00:00