blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-03 10:52:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,249 Commits 34 Branches 138 Tags
Commit Graph

1249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AndrewZuo01
c8a7231081 fix type = 0 2024-01-05 11:04:18 +08:00
AndrewZuo01
274c63eb5e fix type = 0 2024-01-05 11:00:24 +08:00
AndrewZuo01
ae0cd784d3 fix type = 0 2024-01-05 10:59:22 +08:00
AndrewZuo01
906db0818b fix type = 0 2024-01-05 10:54:20 +08:00
AndrewZuo01
cad2b1bd51 update user command get all notification 2024-01-05 10:41:29 +08:00
AndrewZuo01
4f2800052f update user command get all notification 2024-01-05 10:25:35 +08:00
AndrewZuo01
623f66687e update user command notification 2024-01-04 17:46:56 +08:00
AndrewZuo01
debd43303e fix updateUserInfoEx 2024-01-04 12:14:08 +08:00
AndrewZuo01
369c2d5539
Merge branch 'openimsdk:main' into add_set_ex_friend 2024-01-02 09:29:06 +08:00
Xinwei Xiong
49f4e3f0de
fix: fix Security vulnerability (#1646) 
Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
 2024-01-01 13:11:57 +00:00
Xinwei Xiong
bed112d037
Update check-all.sh (#1643) v3.5.1-rc.0 2023-12-30 03:12:19 +00:00
xuexihuang
a7138cb3b7
feature:grafana web inside (#1636) 
* feature:grafana web inside

* fix: using protocal v0.0.42

* fix: review values(but not use)
 2023-12-30 02:40:42 +00:00
Xinwei Xiong
959c5a7ae1
feat: add openim scripts fix and optimize config about openim source code deployment for this PR? openim ci and scripts (#1641) 
* fix: fix openim zk env set

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* fix: fix openim zk env set

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* feat: add openim docker prom

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* feat: add openim docker prom

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

---------

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
 2023-12-29 22:29:52 +08:00
Xinwei Xiong
1e52376d7b
fix: fix openim scripts and ci add openim check (#1632) 
* fix: fix openim zk env set

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* fix: fix openim zk env set

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* feat: add openim docker prom

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

---------

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
 2023-12-29 12:43:58 +00:00
AndrewZuo01
c68a61d8c2
fix setUserInfoEx (#1635) 
* update set pin friends

* update set pin friends

* update set pin friends

* update set pin friends

* update set pin friends

* update set pin friends

* fix bugs

* fix bugs

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* Update go.mod

* Update friend.go

* debug

* debug

* debug

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* I cannot solve todo in test.sh

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* Update go.mod

* fix group notification

* fix group notification

* update openimsdk tools

* update openim server remove duplicate code

* update openim server remove duplicate code

* update user command get

* update user command get

* update response of callback response error

* update black ex

* update join group ex

* update user pb2map

* update go sum

* update go sum

* update updateUserInfoEx

* update updateUserInfoEx

* update updateUserInfoEx add callback functions

* fix dismiss group function

* fix dismiss group function

* fix dismiss group function

* fix dismiss group function

* update pin friend to update friend

* fix go mod

* fix err golangci-lint

* fix UserPb2DBMap

* update comments, update go.mod check for register username

* update comments, update go.mod check for register username

* update comments, update go.mod check for register username

* update comments, update go.mod check for register username

* fix callback

* fix go.mod

* fix debug

* fix bugs

* update notification

* update notification

* update notification

* update notification

* update notification

* update notification

* update notification

* update notification

* fix updateUserInfoEx

* fix updateUserInfoEx

* modify go.mod

* fix updateUserInfoEx

* fix updateUserInfoEx

---------

Co-authored-by: Xinwei Xiong <3293172751@qq.com>
 2023-12-29 20:38:43 +08:00
AndrewZuo01
97911fd049 fix updateUserInfoEx 2023-12-29 18:46:22 +08:00
AndrewZuo01
aa0cb48ffc fix updateUserInfoEx 2023-12-29 18:37:09 +08:00
AndrewZuo01
39b2c3b795 modify go.mod 2023-12-29 18:34:09 +08:00
AndrewZuo01
f039d53a7d Merge branch 'main' into add_set_ex_friend 2023-12-29 18:34:00 +08:00
AndrewZuo01
4735751e62 Merge branch 'main' of https://github.com/AndrewZuo01/open-im-server 2023-12-29 18:32:00 +08:00
Brabem
7ddb84f7fc
fix: add the GetconversationAPI 1542 (#1604) 
* feat: add GetConversationsUnreadSeqAndMaxSeq func

* feat: add GetConversationsUnreadSeqAndMaxSeq func

* feat: add GetConversationsUnreadSeqAndMaxSeq func

* fix: fix the conflect

* feat: add GetConversationList Api

* fix: fix the error

* fix: move the GetConversationList to conversation folder

* fix: fix the go.mod

* fix: add InitiateFormData and CompleteFormData

* fix: fix the error

* fix: find error

* fix: test

* feat: add notification API

* fix: find error

* fix: fix the error

* fix: fix the PinFriend error

* fix: fix the Ex error

* fix: find the error

* fix: fix the rpc error

* fix: fix the error

* fix: fix the log error

* fix: fix the error1

* fix: fix the error

* fix: fix the script

* fix: fix the error

* fix: fix the error

* fix: fix the error of tag

* fix: fix the protocol

* fix: fix the error

* fix: fix the error

* fix: fix the err not wrap

* fix: fix the error

* fix: fix GetGroupMembers by nickname

* fix: fix the error

* fix: fix the FindOneByDocIDs

* fix: fix the protocol version

* fix: fit the protocol version
 2023-12-29 18:14:15 +08:00
AndrewZuo01
e7fbd804b0 Merge remote-tracking branch 'origin/add_set_ex_friend' into add_set_ex_friend 2023-12-29 15:51:56 +08:00
AndrewZuo01
4b111474f5 fix updateUserInfoEx 2023-12-29 15:51:46 +08:00
AndrewZuo01
5fae34fa82
Merge branch 'main' into add_set_ex_friend 2023-12-29 15:44:25 +08:00
AndrewZuo01
d941c69770 fix updateUserInfoEx 2023-12-29 15:37:34 +08:00
a3d21
cfde7bb0ff
fix: mongo uri connect (#1611) 2023-12-29 02:25:03 +00:00
AndrewZuo01
998d4a3504
Add updates friend, set user ex (#1592) 
* update set pin friends

* update set pin friends

* update set pin friends

* update set pin friends

* update set pin friends

* update set pin friends

* fix bugs

* fix bugs

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* Update go.mod

* Update friend.go

* debug

* debug

* debug

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* add pin friend test

* I cannot solve todo in test.sh

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* update user command

* Update go.mod

* fix group notification

* fix group notification

* update openimsdk tools

* update openim server remove duplicate code

* update openim server remove duplicate code

* update user command get

* update user command get

* update response of callback response error

* update black ex

* update join group ex

* update user pb2map

* update go sum

* update go sum

* update updateUserInfoEx

* update updateUserInfoEx

* update updateUserInfoEx add callback functions

* fix dismiss group function

* fix dismiss group function

* fix dismiss group function

* fix dismiss group function

* update pin friend to update friend

* fix go mod

* fix err golangci-lint

* fix UserPb2DBMap

* update comments, update go.mod check for register username

* update comments, update go.mod check for register username

* update comments, update go.mod check for register username

* update comments, update go.mod check for register username

* fix callback

* fix go.mod

* fix debug

* fix bugs

* update notification

* update notification

* update notification

* update notification

* update notification

* update notification

* update notification

* update notification

---------

Co-authored-by: Xinwei Xiong <3293172751@qq.com>
 2023-12-28 06:45:27 +00:00
Xinwei Xiong
b90b8a1a55
fix: fix openim zk env set (#1623) 
* fix: fix openim zk env set

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

* fix: fix openim zk env set

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>

---------

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
 2023-12-28 06:17:27 +00:00
AndrewZuo01
b39d12aacf update notification 2023-12-28 10:53:27 +08:00
AndrewZuo01
5d0db64017 update notification 2023-12-28 10:44:57 +08:00
AndrewZuo01
d62dd027dd
Merge branch 'main' into add_set_ex_friend 2023-12-28 10:19:47 +08:00
AndrewZuo01
44001062e6 update notification 2023-12-28 09:55:36 +08:00
Gordon
53a3f475f3
fix: add notifications for some notifications. (#1609) 2023-12-27 16:41:51 +00:00
Brabem
cff90a3099
fix: fix the searchNotificationAccout by userID or nickname (#1617) 
* feat: add notification API

* fix: fix the script

* fix: fix the error

* fix: fix the searchNotificationAccount

* fix: fix the protocol version

* fix: fix the proto version
 2023-12-27 16:29:44 +00:00
AndrewZuo01
2db205a4b9 update notification 2023-12-27 11:12:03 +08:00
AndrewZuo01
d3722ddf56 update notification 2023-12-27 11:06:35 +08:00
AndrewZuo01
d77b772fb2 update notification 2023-12-27 10:58:02 +08:00
AndrewZuo01
e41268de0f Merge remote-tracking branch 'origin/add_set_ex_friend' into add_set_ex_friend 2023-12-27 10:43:36 +08:00
AndrewZuo01
dc54dba66c update notification 2023-12-27 10:43:26 +08:00
AndrewZuo01
b9801004bc
Merge branch 'main' into add_set_ex_friend 2023-12-27 10:14:29 +08:00
AndrewZuo01
778a30d726 Merge remote-tracking branch 'origin/add_set_ex_friend' into add_set_ex_friend 
# Conflicts:
#	go.mod
 2023-12-27 10:00:10 +08:00
AndrewZuo01
6481cd59b0 update notification 2023-12-27 09:58:56 +08:00
Xinwei Xiong
2220645429
Update README.md (#1615) 2023-12-26 10:03:07 +00:00
chao
cd1235fb32
feat: s3 FormData upload (#1614) 
* upgrade package and rtc convert

* upgrade package and rtc convert

* upgrade package and rtc convert

* upgrade package and rtc convert

* friend user

* s3 form data

* s3 form data

* s3 form data

* s3 form data

* s3 form data

* s3 form data

* s3 form data

* s3 form data

* s3 form data
 2023-12-26 09:29:42 +00:00
Xinwei Xiong
47dd6b17f6
Update openimci.yml (#1610) 
* Update openimci.yml

* Update Makefile
 2023-12-26 04:16:55 +00:00
Brabem
7389639f17
feat: add the notificationAccount (#1602) 
* feat: add notification API

* fix: fix the script

* fix: fix the error
 2023-12-26 02:15:15 +00:00
AndrewZuo01
a1c93884ec
Merge branch 'main' into add_set_ex_friend 2023-12-25 17:12:51 +08:00
AndrewZuo01
d022ba0c78 fix bugs 2023-12-25 16:34:31 +08:00
Gordon
de451d4cea
fix: online notifications do not push to herself. (#1534) 
* fix: online notifications do not push to herself.

* fix: online notifications do not push to herself.

* fix: online notifications do not push to herself.
 2023-12-25 08:30:18 +00:00
Xinwei Xiong
11a147792d
Update prometheus.yml (#1586) 2023-12-25 08:28:42 +00:00