Commit Graph

747 Commits

Author SHA1 Message Date
yanglin
77205f7c9a REQ-3345: 调整同步群聊天记录 2025-02-05 10:48:11 +08:00
yanglin
78011e50a2 REQ-3345: 将业务信息放到群的custom字段 2025-02-05 10:13:28 +08:00
yanglin
449cc2291a REQ-3345: 同步消息 2025-01-24 15:58:32 +08:00
yanglin
0a0d3d8cd1 REQ-3345: 同步消息 2025-01-24 15:38:32 +08:00
yanglin
152f0ee811 REQ-3345: 同步消息 2025-01-24 15:38:16 +08:00
yanglin
a1e3acdfc3 REQ-3345: 同步消息 2025-01-24 11:47:03 +08:00
yanglin
0bcf17a7c9 REQ-3345: 同步消息 2025-01-24 11:46:41 +08:00
yanglin
1b85984dda REQ-3345: 同步消息 2025-01-24 11:30:42 +08:00
yanglin
2ec4211924 REQ-3345: 同步消息 2025-01-24 11:27:24 +08:00
yanglin
51e87a8db7 REQ-3345: 同步消息 2025-01-24 11:26:26 +08:00
yanglin
7f1caa9274 REQ-3345: 同步消息 2025-01-24 11:07:11 +08:00
yanglin
eb8b5edd68 Merge remote-tracking branch 'origin/feature/REQ-3345' into feature/REQ-3345 2025-01-24 09:41:54 +08:00
yanglin
d35a2e9d84 REQ-3345: 同步消息 2025-01-24 09:41:18 +08:00
yanglin
eb2eb79153 REQ-3345: 同步消息 2025-01-24 09:37:56 +08:00
yanglin
6765ac2806 REQ-3345: 同步消息 2025-01-24 09:37:25 +08:00
yanglin
91e3747f4c REQ-3345: 同步消息 2025-01-24 09:30:42 +08:00
yanglin
68069b1975 REQ-3345: 同步消息 2025-01-23 18:26:38 +08:00
yanglin
e324e65208 REQ-3345: 同步消息 2025-01-23 18:11:07 +08:00
yanglin
a995b7e361 REQ-3345: 同步消息 2025-01-23 18:10:56 +08:00
yanglin
2b594a6b54 REQ-3345: 同步消息 2025-01-23 18:05:16 +08:00
yanglin
cfcb878f28 Revert "REQ-3345: 同步消息"
This reverts commit e6fa8bd5a7.
2025-01-23 17:57:30 +08:00
yanglin
e6fa8bd5a7 REQ-3345: 同步消息 2025-01-23 17:56:25 +08:00
yanglin
ab69f5f59c REQ-3345: 同步消息 2025-01-23 17:41:57 +08:00
yanglin
cd86ae220a REQ-3345: 同步消息 2025-01-23 17:36:02 +08:00
yanglin
752be28a1c REQ-3345: 同步消息 2025-01-23 17:08:26 +08:00
yanglin
dc9fff1876 REQ-3345: 同步消息 2025-01-23 17:07:57 +08:00
yanglin
4d92ce92a3 REQ-3345: 同步消息 2025-01-23 17:06:15 +08:00
yanglin
783bae4805 REQ-3345: 同步消息 2025-01-23 16:52:00 +08:00
yanglin
d22decd259 REQ-3345: 同步消息 2025-01-23 16:51:02 +08:00
yanglin
de8bd2aba4 REQ-3345: 同步消息 2025-01-23 16:44:24 +08:00
yanglin
162689ce65 REQ-3345: 同步消息 2025-01-23 16:43:41 +08:00
yanglin
57f70d435f REQ-3345: 同步消息 2025-01-23 16:38:10 +08:00
yanglin
47bc2b289a REQ-3345: 同步消息 2025-01-23 16:36:57 +08:00
yanglin
81b6db09b2 REQ-3345: 同步消息 2025-01-23 16:32:07 +08:00
yanglin
ed33fecd1e REQ-3345: 同步消息 2025-01-23 16:31:27 +08:00
yanglin
b1ae00c2b2 REQ-3345: 同步消息 2025-01-23 16:20:11 +08:00
yanglin
acf4be4e6a REQ-3345: 同步消息 2025-01-23 16:08:29 +08:00
yanglin
a6945cf35a REQ-3345: 同步消息 2025-01-23 16:05:50 +08:00
yanglin
e9ddb00e80 REQ-3345: 同步消息 2025-01-23 16:01:13 +08:00
yanglin
0ffc88a215 REQ-3345: 同步消息 2025-01-23 15:42:55 +08:00
yanglin
f5e65246bc REQ-3345: 同步消息 2025-01-23 15:41:37 +08:00
yanglin
d4920cb062 REQ-3345: 同步消息 2025-01-23 14:53:45 +08:00
yanglin
5d52e9639d REQ-3345: 同步消息 2025-01-23 14:45:47 +08:00
yanglin
0572e43384 REQ-3345: 同步消息 2025-01-23 14:44:28 +08:00
yanglin
066689954c REQ-3345: 同步消息 2025-01-23 14:43:40 +08:00
yanglin
b383110d0c REQ-3345: 同步消息 2025-01-23 14:42:44 +08:00
yanglin
1804e2e377 REQ-3345: 同步消息 2025-01-23 14:40:28 +08:00
yanglin
6e9a7ba088 REQ-3345: 同步消息 2025-01-23 14:40:05 +08:00
yanglin
050dd7c81b REQ-3345: 同步消息 2025-01-23 14:31:53 +08:00
yanglin
c94e781f51 REQ-3345: 同步消息 2025-01-23 14:26:08 +08:00
yanglin
8fcb284cce REQ-3345: 同步消息 2025-01-23 14:19:21 +08:00
yanglin
598611f004 REQ-3345: 同步消息 2025-01-23 14:19:11 +08:00
yanglin
0cafc5d53f REQ-3345: 同步消息 2025-01-23 13:57:55 +08:00
yanglin
af29f42ff7 REQ-3345: 同步消息 2025-01-23 13:51:26 +08:00
yanglin
cafc969b02 REQ-3345: 同步消息 2025-01-23 13:32:33 +08:00
yanglin
ea0d9e638e REQ-3345: 向群里发卡片消息 2025-01-22 11:28:00 +08:00
yanglin
2a0b772a12 REQ-3345: 群成员 2025-01-21 14:08:46 +08:00
yanglin
9e63599dac REQ-3345: backup 2025-01-20 19:25:16 +08:00
yanglin
a0c3d14d1f 撤销IM 2025-01-10 16:53:50 +08:00
yanglin
9a268f4433 撤销IM 2025-01-10 10:33:09 +08:00
yanglin
af57d09162 Merge branch 'feature/REQ-3282'
# Conflicts:
#	im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java
#	im-center-server/src/main/java/cn/axzo/im/service/impl/MessageTaskServiceImpl.java
2025-01-08 16:21:18 +08:00
yanglin
c0ae46e985 REQ-3201: fix bugs 2025-01-07 15:27:26 +08:00
yanglin
91201d951f REQ-3201: 未指定发送人时才检查机器人 2025-01-03 15:30:22 +08:00
zhanghonghao
5da5901848 feat(REQ-3282): 调整单位请求代码 2024-12-31 18:30:09 +08:00
yanglin
693f7441d5 REQ-3201: 没有管理员账号是如果账号比较少就尝试创建 2024-12-27 14:30:33 +08:00
yanglin
da5b9573f9 REQ-3201: 没有管理员账号是如果账号比较少就尝试创建 2024-12-27 10:24:57 +08:00
yanglin
a289a4a0ed REQ-3201: 保存workspaceId 2024-12-26 16:08:09 +08:00
yanglin
106a42cc9c REQ-3201: 保存workspaceId 2024-12-26 15:32:53 +08:00
yanglin
9be0b55009 REQ-3201: 指定发送人 2024-12-26 12:36:05 +08:00
yanglin
d0578022b9 REQ-3201: fix 发错消息的问题 2024-12-26 11:41:03 +08:00
zhanghonghao
8b316785dc feat(REQ-3282): copy单位代码 2024-12-25 17:20:36 +08:00
xudawei
f8d185f405 feat: (REQ-3282) OrganizationalNodeUserDTO替换成本地的DTO 2024-12-25 16:08:41 +08:00
zhanghonghao
c0db5f8b1e feat(REQ-3282): 修改引入的api名称 2024-12-25 14:09:05 +08:00
yanglin
ce9692e068 REQ-3282: fix 发错消息的问题 2024-12-24 18:18:46 +08:00
yanglin
487fb861f6 REQ-3282: 合并 2024-12-24 18:11:31 +08:00
yanglin
96c892d3e8 REQ-3282: 替换接口 2024-12-23 17:39:39 +08:00
yanglin
9e246b0382 REQ-3282: 替换单位相关接口 2024-12-23 17:36:03 +08:00
yanglin
25b1226d87 REQ-3282: 删除无用job 2024-12-23 15:12:30 +08:00
yanglin
b3bd9de1aa REQ-3201: 重试自定义消息使用更底的优先级 2024-12-23 11:47:32 +08:00
yanglin
6be9482e42 REQ-3201: 查询群信息 2024-12-17 15:52:30 +08:00
yanglin
b193d38369 REQ-3201: 撤回消息 2024-12-17 15:34:35 +08:00
yanglin
f8b48bbc9d REQ-3201: fix npe 2024-12-16 16:00:17 +08:00
yanglin
5342e1be54 REQ-3201: push 2024-12-16 15:11:39 +08:00
yanglin
541202eaa1 REQ-3201: push 2024-12-16 14:55:47 +08:00
yanglin
de49f0ea09 REQ-3201: push 2024-12-16 14:44:10 +08:00
yanglin
4375d6478e REQ-3201: 运营push 2024-12-16 10:03:40 +08:00
yanglin
ad69d3afab REQ-3201: ack 2024-12-16 09:44:19 +08:00
yanglin
1ae80fa3a6 REQ-3201: ack 2024-12-13 17:15:53 +08:00
yanglin
e743164e62 REQ-3201: ack 2024-12-13 10:40:19 +08:00
yanglin
0d081482d4 REQ-3201: ack 2024-12-13 10:39:11 +08:00
yanglin
6c0d70659b REQ-3201: ack 2024-12-13 10:15:29 +08:00
yanglin
b15d95881e REQ-3201: ack 2024-12-13 10:12:15 +08:00
yanglin
2ebb78afe0 REQ-3201: ack 2024-12-13 09:47:02 +08:00
yanglin
7e391133f7 REQ-3201: 调整结构 2024-12-13 09:13:29 +08:00
yanglin
d7d0a70d17 REQ-3201: 调整结构 2024-12-12 18:09:15 +08:00
yanglin
78d74b65c1 REQ-3201: 返回error code 2024-12-12 11:46:30 +08:00
yanglin
39792e6cbe REQ-3201: 返回error code 2024-12-12 11:45:04 +08:00
yanglin
f3efb99ab2 REQ-3201: 存入initMessageId 2024-12-11 18:00:10 +08:00
yanglin
eb2537bad9 REQ-3201: 存入initMessageId 2024-12-11 17:59:23 +08:00
yanglin
20a799353a REQ-3201: 删除无用接口 2024-12-11 17:53:31 +08:00
yanglin
b285cd694c REQ-3201: 查询消息详情 2024-12-11 17:45:12 +08:00
yanglin
70aea293f5 REQ-3284: 普通消息控制push 2024-12-10 16:59:15 +08:00
yanglin
154d44e6af Merge branch 'feature/REQ-3057-3284' into feature/REQ-3201 2024-12-10 16:16:23 +08:00
yanglin
7f838d0b6a REQ-3284: 普通消息控制push 2024-12-10 16:15:51 +08:00
yanglin
e93fca0b82 REQ-3284: 普通消息控制push 2024-12-10 16:11:30 +08:00
yanglin
88aff25242 REQ-3284: 普通消息控制push 2024-12-10 15:54:06 +08:00
yanglin
0cda80e00e REQ-3284: 普通消息控制push 2024-12-10 15:26:51 +08:00
yanglin
f7ec87b869 REQ-3201: 定义entity 2024-12-10 10:25:25 +08:00
yanglin
90b71a3333 REQ-3201: 调整ack的请求字段 2024-12-06 14:59:25 +08:00
yanglin
1eb5980cbb REQ-3201: 调整ack的请求字段 2024-12-06 14:44:33 +08:00
yanglin
cd1e97485e REQ-3201: 调整ack的请求字段 2024-12-06 14:33:04 +08:00
yanglin
664cd7e739 REQ-3201: 调整ack的请求字段 2024-12-06 14:30:50 +08:00
yanglin
8c5f1d05ef REQ-3201: 查询消息 2024-12-06 14:26:39 +08:00
yanglin
2861576d3a REQ-3201: 保留初始消息的messageExtension 2024-12-05 18:45:33 +08:00
yanglin
9f0d482b2f Merge branch 'feature/REQ-3057-card' into feature/REQ-3201
# Conflicts:
#	im-center-api/pom.xml
#	im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/SendTemplateMessageParam.java
#	im-center-server/src/main/java/cn/axzo/im/controller/MessageController.java
#	im-center-server/src/main/java/cn/axzo/im/entity/HistoryRecordExt.java
#	im-center-server/src/main/java/cn/axzo/im/entity/MessageHistory.java
#	im-center-server/src/main/java/cn/axzo/im/entity/MessageTask.java
#	im-center-server/src/main/java/cn/axzo/im/entity/MessageUpdateRetry.java
#	im-center-server/src/main/java/cn/axzo/im/send/handler/CommonSendBatchHandler.java
#	im-center-server/src/main/java/cn/axzo/im/send/handler/CommonSendOneHandler.java
#	im-center-server/src/main/java/cn/axzo/im/send/handler/CustomSendBatchHandler.java
#	im-center-server/src/main/java/cn/axzo/im/send/handler/CustomSendOneHandler.java
#	im-center-server/src/main/java/cn/axzo/im/service/impl/MessageTaskServiceImpl.java
2024-12-05 17:23:50 +08:00
yanglin
2c9d2df5b5 Merge branch 'feature/REQ-3284' into feature/REQ-3057-3284
# Conflicts:
#	im-center-server/src/main/java/cn/axzo/im/service/AccountService.java
2024-12-05 16:52:19 +08:00
yanglin
e545d8cd26 REQ-3284: 通过开关控制是否记录云信请求 2024-12-02 19:53:21 +08:00
yanglin
806b206553 REQ-3284: 通过开关控制是否记录云信请求 2024-12-02 19:52:50 +08:00
xudawei
8c5fd2e68c feat: (REQ-3057) 提示信息中文符号话/创建账号失败后,加上查询逻辑 2024-12-02 17:49:27 +08:00
yanglin
83c3d9362d REQ-3284: 发送IM排除部分人的push 2024-12-02 16:29:42 +08:00
xudawei
8fcab48483 feat: (REQ-3057) owner等于需要踢出群的人员,则不执行踢人 2024-11-29 19:38:30 +08:00
xudawei
ad0abb92f1 feat: (REQ-3057) 带班长->工人,踢出带班长优化 2024-11-29 19:03:38 +08:00
xudawei
24c6fb1921 feat: (REQ-3057) 删除人员时代码优化 2024-11-29 17:13:58 +08:00
xudawei
4bc7c54e4b feat: (REQ-3057) 删除人员时代码优化 2024-11-29 15:37:50 +08:00
yanglin
de403727f8 REQ-3284: 查询最新消息 2024-11-29 14:10:27 +08:00
yanglin
4f461125af REQ-3284: 查询最新消息 2024-11-29 14:10:18 +08:00
xudawei
a82d2beff3 feat: (REQ-3057) 本单位项目更换群主 2024-11-28 15:14:19 +08:00
yanglin
1eef53191c REQ-3284: 自定义消息不计入未读数 2024-11-28 10:04:43 +08:00
xudawei
be27634f22 feat: (REQ-3057) 带班长与工人转换优化 2024-11-27 21:45:25 +08:00
xudawei
0211be7e02 feat: (REQ-3057) 带班长与工人转换优化 2024-11-27 21:42:07 +08:00
xudawei
3a5ed7daec feat: (REQ-3057) 根据Id获取orgNodeUser接口优化 2024-11-27 20:32:05 +08:00
yanglin
3676baef9d REQ-3284: 创建用于发送自定义消息的IM账号 2024-11-27 11:29:03 +08:00
yanglin
a269ecae37 REQ-3284: 创建用于发送自定义消息的IM账号 2024-11-27 11:16:38 +08:00
yanglin
3247dfbd33 REQ-3284: 创建用于发送自定义消息的IM账号 2024-11-27 11:16:28 +08:00
xudawei
e7c282e24d feat: (REQ-3057) 根据Id获取orgNodeUser接口优化 2024-11-27 10:07:28 +08:00
xudawei
0d7e58808c feat: (REQ-3057) 人群列表优化 2024-11-26 18:40:52 +08:00
xudawei
9a1476eff9 feat: (REQ-3057) 人员变动-监控MQ优化 2024-11-26 18:37:48 +08:00
yanglin
907fd6c62a REQ-3284: 查询IM账号 2024-11-26 18:17:47 +08:00
xudawei
5d88527e11 feat: (REQ-3057) 人员变动-监控MQ优化 2024-11-26 18:07:24 +08:00
xudawei
68011e8d1f feat: (REQ-3057) 日志级别调整 2024-11-26 11:10:20 +08:00
xudawei
83400137cb feat: (REQ-3057) 人员变更加上人员去掉判断人员变更逻辑 2024-11-25 20:07:01 +08:00
xudawei
e5c8551e09 feat: (REQ-3057) 人员变更加上人员去掉判断人员变更逻辑 2024-11-25 18:22:25 +08:00
xudawei
3816fb7edc feat: (REQ-3057) 人员变更加上人员去掉判断人员变更逻辑 2024-11-25 17:16:48 +08:00
xudawei
c498dadcd5 feat: (REQ-3057) 所有的告警中都加上日期 2024-11-25 16:35:56 +08:00
xudawei
f0db56f77f feat: (REQ-3057) 人群类型title与desc优化/同步IM账号昵称与头像 2024-11-25 16:13:04 +08:00
xudawei
e970fd92e2 feat: (REQ-3057) 方法入参个数/管理员岗位nacos优化 2024-11-25 11:38:30 +08:00
xudawei
c3894abcb0 feat: (REQ-3057) 人群类型是本单位项目,成员为空时,优化提示 2024-11-22 19:17:38 +08:00
xudawei
224b8960c1 feat: (REQ-3057) 投诉加上时间 2024-11-22 18:35:25 +08:00
xudawei
2e8baa7c6e feat: (REQ-3057) 同步账号获取用户信息失败修复 2024-11-22 18:14:40 +08:00
xudawei
a669dfcb7b feat: (REQ-3057) 同步账号获取用户信息失败修复 2024-11-22 14:11:59 +08:00