withchao
|
5a1d1005cb
|
Merge remote-tracking branch 'origin/main' into allmerge
# Conflicts:
# config/prometheus.yml
# go.mod
# go.sum
|
2024-07-17 15:21:50 +08:00 |
|
chao
|
904c66958a
|
Merge branch 'openimsdk:main' into main
|
2024-07-17 15:20:06 +08:00 |
|
icey-yu
|
dcc0b57382
|
Feature domain (#2414)
* Revert "fix:log (#2396)"
This reverts commit cc2f993e
* feat: prometheus config and log
|
2024-07-17 02:31:02 +00:00 |
|
withchao
|
059902020d
|
group member sort
|
2024-07-17 10:27:59 +08:00 |
|
chao
|
4aaf496086
|
feat: new features merged (#2409)
* fix: GroupApplicationAcceptedNotification
* fix: GroupApplicationAcceptedNotification
* fix: NotificationUserInfoUpdate
* cicd: robot automated Change
* fix: component
* fix: getConversationInfo
* feat: cron task
* feat: cron task
* feat: cron task
* feat: cron task
* feat: cron task
* fix: minio config url recognition error
* new mongo
* new mongo
* new mongo
* new mongo
* new mongo
* new mongo
* new mongo
* new mongo
* friend incr sync
* friend incr sync
* friend incr sync
* friend incr sync
* friend incr sync
* mage
* optimization version log
* optimization version log
* sync
* sync
* sync
* group sync
* sync option
* sync option
* refactor: replace `friend` package with `realtion`.
* refactor: update lastest commit to relation.
* sync option
* sync option
* sync option
* sync
* sync
* go.mod
* seq
* update: go mod
* refactor: change incremental to full
* feat: get full friend user ids
* feat: api and config
* seq
* group version
* merge
* seq
* seq
* seq
* fix: sort by id avoid unstable sort friends.
* group
* group
* group
* fix: sort by id avoid unstable sort friends.
* fix: sort by id avoid unstable sort friends.
* fix: sort by id avoid unstable sort friends.
* user version
* seq
* seq
* seq user
* user online
* implement minio expire delete.
* user online
* config
* fix
* fix
* implement minio expire delete logic.
* online cache
* online cache
* online cache
* online cache
* online cache
* online cache
* online cache
* online cache
* online cache
* online cache
* online cache
* online cache
* feat: implement scheduled delete outdated object in minio.
* update gomake version
* update gomake version
* implement FindExpires pagination.
* remove unnesseary incr.
* fix uncorrect args call.
* online push
* online push
* online push
* resolving conflicts
* resolving conflicts
* test
* api prommetrics
* api prommetrics
* api prommetrics
* api prommetrics
* api prommetrics
* rpc prommetrics
* rpc prommetrics
* online status
* online status
* online status
* online status
* sub
* conversation version incremental
* merge seq
* merge online
* merge online
* merge online
* merge seq
* GetOwnerConversation
* fix: change incremental syncer router name.
* rockscache batch get
* rockscache seq batch get
* fix: GetMsgDocModelByIndex bug
* update go.mod
* update go.mod
* merge
* feat: prometheus
* feat: prometheus
---------
Co-authored-by: withchao <withchao@users.noreply.github.com>
Co-authored-by: Monet Lee <monet_lee@163.com>
Co-authored-by: OpenIM-Gordon <46924906+FGadvancer@users.noreply.github.com>
Co-authored-by: icey-yu <1186114839@qq.com>
|
2024-07-16 02:46:21 +00:00 |
|
chao
|
14c486b1dd
|
Merge pull request #9 from icey-yu/prometheus
feat: prometheus
|
2024-07-15 18:56:25 +08:00 |
|
icey-yu
|
4738d1729c
|
feat: prometheus
|
2024-07-15 18:26:58 +08:00 |
|
icey-yu
|
7f4d6def53
|
feat: prometheus
|
2024-07-15 18:04:54 +08:00 |
|
withchao
|
6a6c712f52
|
merge
|
2024-07-15 16:12:44 +08:00 |
|
withchao
|
4ca7d2f7ed
|
Merge remote-tracking branch 'origin/main' into allmerge
# Conflicts:
# go.mod
# go.sum
# internal/api/router.go
# pkg/common/storage/database/name.go
|
2024-07-15 16:10:14 +08:00 |
|
chao
|
71ba69b6ee
|
Merge branch 'openimsdk:main' into main
|
2024-07-15 16:07:55 +08:00 |
|
chao
|
5f52fa19bd
|
feat: incremental synchronization of session list (#2408)
* fix: GroupApplicationAcceptedNotification
* fix: GroupApplicationAcceptedNotification
* fix: NotificationUserInfoUpdate
* cicd: robot automated Change
* fix: component
* fix: getConversationInfo
* feat: cron task
* feat: cron task
* feat: cron task
* feat: cron task
* feat: cron task
* fix: minio config url recognition error
* update gomake version
* update gomake version
* conversation version incremental
* GetOwnerConversation
* fix: change incremental syncer router name.
* fix: GetMsgDocModelByIndex bug
* update go.mod
---------
Co-authored-by: withchao <withchao@users.noreply.github.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
|
2024-07-15 07:35:27 +00:00 |
|
withchao
|
68c41ba432
|
update go.mod
|
2024-07-15 15:04:03 +08:00 |
|
withchao
|
0e7687c4a4
|
Merge remote-tracking branch 'origin/convincr' into allmerge
# Conflicts:
# internal/api/router.go
# internal/msggateway/client.go
|
2024-07-15 14:45:02 +08:00 |
|
withchao
|
e4fb5baf44
|
update go.mod
|
2024-07-15 11:20:34 +08:00 |
|
withchao
|
1e5e87b7e3
|
Merge remote-tracking branch 'origin/main' into convincr
|
2024-07-15 11:11:37 +08:00 |
|
chao
|
33de30b97a
|
Merge branch 'openimsdk:main' into main
|
2024-07-15 11:11:12 +08:00 |
|
printlin
|
ea7e505269
|
feature: support for Kodo (#2363)
* support for Kodo
* fix mod bug
|
2024-07-15 03:10:04 +00:00 |
|
withchao
|
aca631f0d1
|
Merge remote-tracking branch 'origin/convincr' into convincr
|
2024-07-15 11:05:50 +08:00 |
|
withchao
|
3d7090e2f6
|
fix: GetMsgDocModelByIndex bug
|
2024-07-15 11:05:34 +08:00 |
|
withchao
|
a7d1a5351c
|
rockscache seq batch get
|
2024-07-12 18:44:20 +08:00 |
|
withchao
|
326dc3836c
|
rockscache batch get
|
2024-07-11 18:47:25 +08:00 |
|
Gordon
|
29837c95a1
|
fix: change incremental syncer router name.
|
2024-07-11 18:17:50 +08:00 |
|
withchao
|
ec7bebfb86
|
GetOwnerConversation
|
2024-07-11 10:52:18 +08:00 |
|
chao
|
18cc83cab8
|
Merge branch 'openimsdk:main' into main
|
2024-07-11 10:31:23 +08:00 |
|
Monet Lee
|
28898f5b79
|
feat: implement server-initiated heartbeat in msgGateway module (#2404)
* feat: implement send ping msg when platform is web in gateway.
* add context life cycle control.
* feat: implement heartbeat logic in msggateway.
* update heartbeat logic.
* update to correct method name and comment.
* update initiate heartbeat logic.
* rename ws_server
* update writePingMsg logic
* update log level to warn.
|
2024-07-10 07:48:12 +00:00 |
|
withchao
|
1d54c61b8c
|
merge seq
|
2024-07-10 15:42:52 +08:00 |
|
withchao
|
4875a34ff4
|
Merge branch 'convincr' into allmerge
# Conflicts:
# pkg/common/storage/database/name.go
|
2024-07-10 15:41:55 +08:00 |
|
withchao
|
e1e3bb8248
|
merge online
|
2024-07-10 15:40:41 +08:00 |
|
withchao
|
98b3846d38
|
Merge remote-tracking branch 'origin/count' into allmerge
# Conflicts:
# go.mod
# go.sum
|
2024-07-10 15:40:02 +08:00 |
|
withchao
|
c3729d1e99
|
merge online
|
2024-07-10 15:38:54 +08:00 |
|
withchao
|
c5519ed6c9
|
merge online
|
2024-07-10 15:31:57 +08:00 |
|
withchao
|
65d4fc7f81
|
Merge branch 'online' into allmerge
# Conflicts:
# go.mod
# go.sum
|
2024-07-10 15:20:41 +08:00 |
|
withchao
|
92d70ece32
|
merge seq
|
2024-07-10 15:18:39 +08:00 |
|
withchao
|
df808658b2
|
Merge branch 'seq38' into allmerge
# Conflicts:
# go.mod
# go.sum
|
2024-07-10 15:18:02 +08:00 |
|
chao
|
fdb6ea7a47
|
Merge branch 'openimsdk:main' into main
|
2024-07-10 15:07:42 +08:00 |
|
withchao
|
e17f0c95aa
|
conversation version incremental
|
2024-07-10 14:44:26 +08:00 |
|
icey-yu
|
213613cf54
|
Fix token (#2403)
* fix:log config
* fix: token update expire time
|
2024-07-09 10:17:44 +00:00 |
|
chao
|
df9bbeb313
|
Merge branch 'openimsdk:main' into main
|
2024-07-09 14:39:22 +08:00 |
|
withchao
|
9a4f5f78cb
|
sub
|
2024-07-09 14:26:55 +08:00 |
|
Monet Lee
|
407a117a05
|
fix: remove repeat append logic. (#2400)
|
2024-07-08 04:34:46 +00:00 |
|
withchao
|
67d17c82d5
|
online status
|
2024-07-08 11:09:03 +08:00 |
|
withchao
|
fd2b0b3284
|
online status
|
2024-07-08 10:11:40 +08:00 |
|
withchao
|
daaf993d1c
|
Merge remote-tracking branch 'upstream/main' into online
# Conflicts:
# go.mod
# go.sum
|
2024-07-08 10:11:30 +08:00 |
|
withchao
|
b53a26d2ca
|
online status
|
2024-07-08 10:04:31 +08:00 |
|
withchao
|
c1967a63ca
|
online status
|
2024-07-05 18:47:48 +08:00 |
|
withchao
|
2052e1c7d5
|
rpc prommetrics
|
2024-07-05 14:59:41 +08:00 |
|
withchao
|
181107d1d3
|
Merge branch 'main' into count
# Conflicts:
# go.mod
# go.sum
|
2024-07-05 14:59:09 +08:00 |
|
chao
|
ab84d77b38
|
Merge branch 'openimsdk:main' into main
|
2024-07-05 14:55:56 +08:00 |
|
withchao
|
0a9b53bbe3
|
rpc prommetrics
|
2024-07-05 14:19:34 +08:00 |
|