wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,003 Commits 1 Branch 0 Tags 6.4 MiB
f78d4fc7a0
Commit Graph

654 Commits

Author SHA1 Message Date
杨林
f8f5c6f593 Merge branch 'feature/REQ-1898' into 'pre' 
REQ-1898: 如果im端没有返回msg id也设置为发送成功(im目前处理逻辑不一致)

See merge request universal/infrastructure/backend/msg-center-plat!300
 2024-01-16 09:28:10 +00:00
yanglin
291c8ed86b REQ-1898: 如果im端没有返回msg id也设置为发送成功(im目前处理逻辑不一致) 2024-01-16 17:26:21 +08:00
杨林
93a76229ec Merge branch 'feature/REQ-1898' into 'pre' 
Feature/req 1898

See merge request universal/infrastructure/backend/msg-center-plat!297
 2024-01-16 08:55:53 +00:00
yanglin
956c6b5fa0 REQ-1898: 调整元素名称 2024-01-16 16:52:39 +08:00
yanglin
fd619a7bb2 REQ-1898: 添加日志 2024-01-16 16:05:00 +08:00
yanglin
30ef094572 REQ-1898: 添加日志 2024-01-16 16:04:32 +08:00
yanglin
b29a11cd61 REQ-1898: 重命名元素 2024-01-16 16:03:02 +08:00
杨林
0a84817eab Merge branch 'feature/REQ-1898' into 'pre' 
REQ-1898: 返回请求的批次号

See merge request universal/infrastructure/backend/msg-center-plat!294
 2024-01-16 03:16:19 +00:00
yanglin
9427856bf8 REQ-1898: 返回请求的批次号 2024-01-16 11:15:04 +08:00
杨林
2b45e55b7e Merge branch 'feature/REQ-1898' into 'pre' 
REQ-1898: 更新字段名称

See merge request universal/infrastructure/backend/msg-center-plat!291
 2024-01-16 03:06:58 +00:00
yanglin
63675a63dc REQ-1898: 更新字段名称 2024-01-16 11:05:48 +08:00
杨林
3339d7cb85 Merge branch 'feature/REQ-1898' into 'pre' 
REQ-1898: 调整代码逻辑

See merge request universal/infrastructure/backend/msg-center-plat!288
 2024-01-16 02:23:59 +00:00
yanglin
6756812c75 REQ-1898: 调整代码逻辑 2024-01-16 10:22:12 +08:00
杨林
a8547a0712 Merge branch 'feature/REQ-1898' into 'pre' 
Feature/req 1898

See merge request universal/infrastructure/backend/msg-center-plat!285
 2024-01-16 02:09:57 +00:00
yanglin
29c126454f REQ-1898: 分批发送消息 2024-01-16 10:05:29 +08:00
杨林
c88130035a Merge branch 'feature/REQ-1898' into 'pre' 
Feature/req 1898

See merge request universal/infrastructure/backend/msg-center-plat!281
 2024-01-15 12:22:22 +00:00
yanglin
1e550378a8 REQ-1898: 删除无用代码 2024-01-15 20:16:55 +08:00
yanglin
c2b0cac1cf REQ-1898: 调整重试逻辑 2024-01-15 20:16:19 +08:00
杨林
fe90481dff Merge branch 'feature/REQ-1898' into 'pre' 
REQ-1898: 去掉身份字段

See merge request universal/infrastructure/backend/msg-center-plat!278
 2024-01-15 10:32:43 +00:00
yanglin
a1a386580c REQ-1898: 去掉身份字段 2024-01-15 18:30:23 +08:00
杨林
3faa90bf58 Merge branch 'feature/REQ-1898' into 'pre' 
Feature/req 1898

See merge request universal/infrastructure/backend/msg-center-plat!266
 2024-01-15 07:12:20 +00:00
yanglin
3639dea70b REQ-1898: 更新说明 2024-01-15 09:45:53 +08:00
yanglin
3a42fcc9e7 REQ-1898: 更新日志信息 2024-01-15 09:03:06 +08:00
yanglin
c1ef12d949 REQ-1898: 普通消息没有BizCategory字段 2024-01-14 18:44:18 +08:00
yanglin
08e935c894 REQ-1898: 适当抽象 2024-01-14 18:07:07 +08:00
yanglin
186540128a REQ-1898: 适当抽象 2024-01-14 17:58:49 +08:00
yanglin
9bfca165e2 REQ-1898: 调整接口返回模型 2024-01-14 17:29:29 +08:00
yanglin
4ae7ed98ef REQ-1898: 调整字段和日志 2024-01-14 16:49:08 +08:00
yanglin
95f211be5e REQ-1898: 通过新接口发送消息 2024-01-14 16:14:00 +08:00
yanglin
7d7dde85af REQ-1898: 通过新接口发送消息 2024-01-14 15:49:23 +08:00
yanglin
31f413f7e6 暂存一下 2024-01-12 19:14:38 +08:00
songyuanlun
5ce054cbd3 feat: 完成消息企业隔离表结构、接口设计以及部分实现 2024-01-12 10:23:38 +08:00
宋远伦
d99154cf11 Merge branch 'feature/REQ-1899' into 'pre' 
Feature/req 1899

See merge request universal/infrastructure/backend/msg-center-plat!253
 2024-01-12 02:10:24 +00:00
songyuanlun
24aa5471cb fix: 解决历史问题：消息模板编辑后无法清除之前的详情按钮 2024-01-10 17:00:26 +08:00
songyuanlun
e11ea69828 fix: 解决历史问题：消息卡片信息需要过滤掉值为空和null的情况 2024-01-10 16:07:18 +08:00
songyuanlun
50010571fb feat: 按钮操作区域过滤掉不显示在卡片的按钮 2024-01-05 11:29:13 +08:00
songyuanlun
e1983dc811 Merge branch 'master' into feature/REQ-1899-syl 2024-01-04 18:35:24 +08:00
songyuanlun
4e39770e5e feat: 按钮操作区域调整高亮逻辑和新增是否显示在卡片上 2024-01-04 18:33:23 +08:00
宋远伦
544b76f5ff Merge branch 'hotfix-20240104' into 'master' 
feat: treeNode 移除 local cache

See merge request universal/infrastructure/backend/msg-center-plat!241
 2024-01-04 07:06:50 +00:00
宋远伦
95e51a7dc9 Merge branch 'hotfix-20240104' into 'pre' 
Hotfix 20240104

See merge request universal/infrastructure/backend/msg-center-plat!240
 2024-01-03 09:17:24 +00:00
songyuanlun
a8675f9c52 feat: treeNode 移除 local cache 2024-01-02 16:02:26 +08:00
songyuanlun
d30db29015 Merge branch 'master' into feature/REQ-1405 2023-12-28 14:20:35 +08:00
邬宇
4ea9d5506d Merge branch 'feature/REQ-1405' into 'pre' 
Feature/req 1405

See merge request universal/infrastructure/backend/msg-center-plat!236
 2023-12-28 05:27:55 +00:00
邬宇
ccba39454b Merge branch 'feature/REQ-1405-wy' into 'feature/REQ-1405' 
Feature/req 1405 wy

See merge request universal/infrastructure/backend/msg-center-plat!235
 2023-12-28 05:27:38 +00:00
songyuanlun
54936ce8f4 Merge branch 'feature/REQ-1405' into pre 
# Conflicts:
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/MessageRecordService.java
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/InsideMessageRecordApiImpl.java
#	inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
#	integration-test/src/test/resources/message.http
#	msg-center-api/src/main/java/cn/axzo/msg/center/api/InsideMessageRecordApi.java
#	msg-center-api/src/main/java/cn/axzo/msg/center/api/fallback/InsideMessageRecordApiFallBack.java
 2023-12-28 10:15:09 +08:00
宋远伦
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
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
wuyu
d36eadd4cc +分页总数 2023-12-22 11:21:08 +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
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
songyuanlun
380797b350 fix: 解决历史bug，消息列表过滤条件不生效的问题 2023-12-19 15:50:20 +08: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
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
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
songyuanlun
bfad6a44ec feat: 业务事件管理接口调整 2023-12-15 15:34:56 +08:00
songyuanlun
9488b856ff feat: 业务事件管理接口实现 2023-12-15 14:34:39 +08:00
wuyu
94b588a3dc +按钮展示 2023-12-15 11:31:39 +08:00
wuyu
dd809bbafc +btn设置 2023-12-14 16:17:01 +08:00
wuyu
811e02d3c3 Merge remote-tracking branch 'origin/feature/REQ-1896' into feature/REQ-1896 2023-12-14 09:54:16 +08:00
wuyu
fb07deee6c +详情按钮 2023-12-14 09:54:00 +08:00
邬宇
740decd75b Merge branch 'feature/REQ-1609-wy' into 'pre' 
Feature/req 1609 wy

See merge request universal/infrastructure/backend/msg-center-plat!169
 2023-12-13 08:27:07 +00:00
wuyu
4024e26332 +待办数量 2023-12-13 16:26:02 +08:00
wuyu
75440ff20f +引入包 2023-12-13 15:02:58 +08:00
wuyu
093ae3df7e +修改入参 2023-12-13 15:00:52 +08:00
邬宇
2e09476055 Merge branch 'feature/REQ-1609-wy' into 'pre' 
+ouId处理

See merge request universal/infrastructure/backend/msg-center-plat!164
 2023-12-13 03:26:45 +00:00
wuyu
3c22bd1f1c +ouId处理 2023-12-13 11:26:06 +08:00
邬宇
617e1b177f Merge branch 'feature/REQ-1609-wy' into 'pre' 
+分组条件

See merge request universal/infrastructure/backend/msg-center-plat!163
 2023-12-12 10:51:46 +00:00
wuyu
51406eec06 +分组条件 2023-12-12 18:36:51 +08:00
邬宇
f30213f725 Merge branch 'feature/REQ-1609-wy' into 'pre' 
+流程实例中过滤操作人

See merge request universal/infrastructure/backend/msg-center-plat!157
 2023-12-12 06:23:14 +00:00
wuyu
6aa9ca2d32 +流程实例中过滤操作人 2023-12-12 10:48:54 +08:00
邬宇
d39bd2efce Merge branch 'feature/REQ-1609-wy' into 'pre' 
+添加操作人

See merge request universal/infrastructure/backend/msg-center-plat!153
 2023-12-12 01:55:49 +00:00
wuyu
022723d832 +添加操作人 2023-12-12 09:54:36 +08:00
邬宇
04c3c5fb45 Merge branch 'feature/REQ-1609-wy' into 'pre' 
+添加分页

See merge request universal/infrastructure/backend/msg-center-plat!151
 2023-12-11 09:45:48 +00:00
wuyu
eff9616fde +添加分页 2023-12-11 17:44:43 +08:00
wuyu
5e26189f32 +相同发起人整合 2023-12-11 14:05:51 +08:00
luofu
3536a764f8 feat(REQ-1609): 待办路由按钮数据模型调整 
背景：
  https://jira.axzo.cn/browse/REQ-1609?goToView=1

影响：
  无
 2023-12-11 14:05:50 +08:00
wuyu
26d623e8ec +流程待办处理 2023-12-11 14:05:50 +08:00
wuyu
f36787cc71 +子业务编码完成待办 2023-12-11 14:05:49 +08:00