Commit Graph

480 Commits

Author SHA1 Message Date
zuoqinbo
d8647956c1 Merge remote-tracking branch 'origin/pre' into pre 2024-01-15 14:53:00 +08:00
zuoqinbo
24f607f753 Merge branch 'feature/REQ-1899' into pre 2024-01-15 14:52:22 +08:00
zuoqinbo
7a11efbb66 feat:REQ-1899 2024-01-15 14:50:15 +08:00
zuoqinbo
94be5f0d1c Merge branch 'feature/REQ-1899' into pre 2024-01-15 13:50:23 +08:00
zuoqinbo
4acfe3a097 feat:REQ-1899 2024-01-15 13:49:54 +08:00
zuoqinbo
5c6f49a2db feat:REQ-1899 2024-01-15 13:44:33 +08:00
宋远伦
23b5e3528e Merge branch 'feature/REQ-2012' into 'pre'
Feature/req 2012

See merge request universal/infrastructure/backend/im-center!37
2024-01-15 04:17:48 +00:00
宋远伦
f11250e290 Merge branch 'feature/REQ-2012-syl' into 'feature/REQ-2012'
Feature/req 2012 syl

See merge request universal/infrastructure/backend/im-center!34
2024-01-15 04:16:44 +00:00
songyuanlun
9e12811bc5 fix: 解决标签排序问题 2024-01-15 12:14:58 +08:00
zuoqinbo
be5218d9d9 Merge remote-tracking branch 'origin/pre' into pre 2024-01-15 12:05:16 +08:00
zuoqinbo
0986572fa1 Merge branch 'feature/REQ-1899' into pre 2024-01-15 12:04:14 +08:00
zuoqinbo
6fea7d3813 Merge remote-tracking branch 'origin/feature/REQ-1899' into feature/REQ-1899 2024-01-15 12:03:17 +08:00
zuoqinbo
bf241dec37 feat:REQ-1899 2024-01-15 12:03:07 +08:00
songyuanlun
b970633fd2 fix: 发送者没有im账号报业务异常 2024-01-15 11:29:02 +08:00
songyuanlun
ee2f356f0a fix: 历史问题处理:标签未按照权重和id排序 2024-01-15 11:27:54 +08:00
宋远伦
6b2f0f90f6 Merge branch 'feature/REQ-2012' into 'pre'
Feature/req 2012

See merge request universal/infrastructure/backend/im-center!33
2024-01-12 02:01:41 +00:00
宋远伦
f0ea1ace4d Merge branch 'feature/REQ-1899' into 'pre'
Feature/req 1899

See merge request universal/infrastructure/backend/im-center!32
2024-01-12 02:00:41 +00:00
宋远伦
d2c3486f68 Merge branch 'feature/REQ-2012-syl' into 'feature/REQ-2012'
Feature/req 2012 syl

See merge request universal/infrastructure/backend/im-center!31
2024-01-12 01:58:10 +00:00
songyuanlun
5700df0753 feat: 文本消息接收者也需要更新头像和昵称 2024-01-11 15:24:07 +08:00
songyuanlun
d141187d79 fix: 消息内容限制长度 2024-01-11 14:17:46 +08:00
宋远伦
753b31438f Merge branch 'feature/REQ-2012-syl' into 'feature/REQ-2012'
fix: ServiceException 引用调整

See merge request universal/infrastructure/backend/im-center!26
2024-01-09 07:42:44 +00:00
songyuanlun
7f3990384b fix: ServiceException 引用调整 2024-01-09 15:08:39 +08:00
宋远伦
33bcb59a5b Merge branch 'feature/REQ-2012-syl' into 'feature/REQ-2012'
feat: im-center 支持服务间 feign 调用

See merge request universal/infrastructure/backend/im-center!23
2024-01-09 07:03:23 +00:00
songyuanlun
ac03e210be feat: im-center 支持服务间 feign 调用 2024-01-09 14:56:35 +08:00
宋远伦
4ee59fe571 Merge branch 'feature/REQ-2012-syl' into 'feature/REQ-2012'
Feature/req 2012 syl

See merge request universal/infrastructure/backend/im-center!21
2024-01-09 05:27:25 +00:00
songyuanlun
986c0c8ca0 fix: 更新文本消息路由 2024-01-09 13:26:32 +08:00
songyuanlun
245dd00b9b feat: 通过personId查询用户头像和昵称 2024-01-09 13:15:23 +08:00
宋远伦
e27095679b Merge branch 'feature/REQ-2012-syl' into 'feature/REQ-2012'
feat: 提供客户端模拟机器人文本消息、普通用户文本消息的接口

See merge request universal/infrastructure/backend/im-center!18
2024-01-08 10:26:44 +00:00
songyuanlun
60b650ecd6 feat: 提供客户端模拟机器人文本消息、普通用户文本消息的接口 2024-01-08 18:24:51 +08:00
宋远伦
72706b91f5 Merge branch 'feature/REQ-1899-syl' into 'feature/REQ-1899'
Feature/req 1899 syl

See merge request universal/infrastructure/backend/im-center!17
2024-01-05 08:42:38 +00:00
songyuanlun
b06c9f6a47 feat: 调整机器人标签字段 2024-01-05 16:41:25 +08:00
songyuanlun
84d185ea38 feat: 机器人标签新增标签文字颜色字段和相关逻辑 2024-01-05 16:41:25 +08:00
zuoqinbo
cc9142fb24 feat:REQ-1899 2024-01-05 15:34:35 +08:00
zuoqinbo
ff8f65bf6c feat:REQ-1899 2024-01-05 14:34:40 +08:00
zuoqinbo
ce4312df63 Merge remote-tracking branch 'origin/pre' into pre 2024-01-04 16:29:02 +08:00
zuoqinbo
b91606655a feat:REQ-1899 2024-01-04 16:26:36 +08:00
zuoqinbo
22a3238708 feat:REQ-1899 2024-01-04 16:17:33 +08:00
zuoqinbo
50afb72f42 feat:REQ-1899 2024-01-04 16:06:43 +08:00
zuoqinbo
3292b34490 Merge branch 'master' of https://axzsource.com/zuoqinbo/im-center into feature/REQ-1899 2024-01-04 15:52:56 +08:00
zuoqinbo
212fcd4d83 feat:REQ-1899 2024-01-04 15:52:39 +08:00
songyuanlun
1d24adfb06 Merge branch 'feature/REQ-1405'
# Conflicts:
#	im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/UserAccountResp.java
2024-01-04 15:10:41 +08:00
songyuanlun
8443e78eb3 Merge branch 'feature/REQ-1405' into pre
# Conflicts:
#	im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/UserAccountResp.java
2023-12-28 11:09:12 +08:00
songyuanlun
2e8d7c297d fix: 解决pre环境无法启动的问题 2023-12-28 10:59:42 +08:00
宋远伦
db1ff6466c Merge branch 'feature/REQ-1405' into 'pre'
Feature/req 1405

See merge request universal/infrastructure/backend/im-center!10
2023-12-28 02:05:46 +00:00
左钦菠
82888d2202 Merge branch 'feature/REQ-1869' into 'master'
Feature/req 1869

See merge request universal/infrastructure/backend/im-center!9
2023-12-26 08:49:44 +00:00
左钦菠
95dce71409 Merge branch 'feature/REQ-1405-syl' into 'feature/REQ-1405'
Feature/req 1405 syl

See merge request universal/infrastructure/backend/im-center!8
2023-12-26 06:17:23 +00:00
songyuanlun
18dcbaadc5 fix: 处理通过appkey未查询到im账号的问题 2023-12-26 14:10:55 +08:00
zuoqinbo
5ff51fdec6 hotfix: 模板只能关联一个机器人 2023-12-25 14:44:47 +08:00
zuoqinbo
ceb50efa04 hotfix: 模板只能关联一个机器人 2023-12-25 11:32:05 +08:00
zuoqinbo
c3bd6127e3 hotfix: 模板只能关联一个机器人 2023-12-21 18:42:36 +08:00