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

1205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Xinwei Xiong
f10528010b
Update check-all.sh (#1591) 2023-12-25 08:26:59 +00:00
xuexihuang
34ed032af1
K8s environment supports multiple msggateway by consistent hash (#1600) 
* feature:support multi msggateway

* feature:support multi msggateway

* feature:support multi msggateway by hash method

* fix:fix log

* change to consistent hash

* change go.mod

* fix:fix go routine values error

* fix:fix push filter logic

* fix:fix push filter logic

---------

Co-authored-by: lin.huang <lin.huang@apulis.com>
 2023-12-25 15:32:07 +08:00
AndrewZuo01
6877a84f6f fix debug 2023-12-25 15:16:05 +08:00
AndrewZuo01
f6bdf1832d fix go.mod 2023-12-25 15:13:49 +08:00
AndrewZuo01
7d5c1ae324 fix callback 2023-12-22 10:24:57 +08:00
AndrewZuo01
51210d65a6 update comments, update go.mod check for register username 2023-12-21 19:04:15 +08:00
AndrewZuo01
1b3834cf2c update comments, update go.mod check for register username 2023-12-21 19:02:13 +08:00
AndrewZuo01
818925c113 update comments, update go.mod check for register username 2023-12-21 18:40:53 +08:00
AndrewZuo01
37f194cb9f update comments, update go.mod check for register username 2023-12-21 18:32:11 +08:00
AndrewZuo01
6bf50e03fa fix UserPb2DBMap 2023-12-21 12:23:24 +08:00
AndrewZuo01
a43479eea3 Merge remote-tracking branch 'origin/add_set_ex_friend' into add_set_ex_friend 2023-12-21 12:14:38 +08:00
AndrewZuo01
49d543133d fix err golangci-lint 2023-12-21 12:14:05 +08:00
AndrewZuo01
9cc6afc2c2
Merge branch 'main' into add_set_ex_friend 2023-12-21 11:58:53 +08:00
AndrewZuo01
e5b09795e4 fix go mod 2023-12-21 11:49:30 +08:00
AndrewZuo01
42a8d7e83c update pin friend to update friend 2023-12-20 16:12:14 +08:00
AndrewZuo01
e8c29272f8 fix dismiss group function 2023-12-20 14:26:51 +08:00
AndrewZuo01
20b839fe49 fix dismiss group function 2023-12-20 14:16:06 +08:00
AndrewZuo01
744c68d60c fix dismiss group function 2023-12-20 12:24:39 +08:00
AndrewZuo01
5ebb813766 fix dismiss group function 2023-12-20 12:17:36 +08:00
Brabem
ed5f012c0d
fix: fix the output format (#1585) 
* fix: update the component output format

* fix: fix the successful tiops

* fix: update the error format
 2023-12-20 02:22:55 +00:00
AndrewZuo01
62e96753c3 update updateUserInfoEx add callback functions 2023-12-19 16:16:57 +08:00
AndrewZuo01
3ea4f921f0 update updateUserInfoEx 2023-12-19 14:10:33 +08:00
AndrewZuo01
d5cce45a53 update updateUserInfoEx 2023-12-19 11:19:50 +08:00
AndrewZuo01
87610568ae
add crud for general function user process, add pinFriend (#1532) 
* 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

---------

Co-authored-by: Xinwei Xiong <3293172751@qq.com>
 2023-12-18 10:39:58 +00:00
AndrewZuo01
9882da62f9 Merge remote-tracking branch 'origin/main' 2023-12-18 18:26:09 +08:00
AndrewZuo01
5ba963711e update go sum 2023-12-18 18:23:51 +08:00
AndrewZuo01
be30ee34a6
Merge branch 'openimsdk:main' into main 2023-12-18 18:16:18 +08:00
AndrewZuo01
7eeb9daf2d update go sum 2023-12-18 18:08:38 +08:00
AndrewZuo01
f129708e24 update user pb2map 2023-12-18 17:19:36 +08:00
Xinwei Xiong
c8463a0a80
Update check-all.sh (#1573) v3.5.0-rc.7 2023-12-18 04:30:38 +00:00
AndrewZuo01
38e626fa9a update join group ex 2023-12-18 12:16:41 +08:00
AndrewZuo01
c7c1111823 update black ex 2023-12-18 11:58:31 +08:00
Xinwei Xiong
f1c9686ada
feat: Add OpenIM server, environment support for Docker Compose, and Kubernetes deployment. (#1559) 
* feat: add openim server code

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

* feat: add openim env

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

* feat: add openim mongo and redis env

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

* feat: add zk and redis mongo env

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

* feat: add kafka and redis mongo env

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

* feat: add openim docker

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

* feat: add openim docker

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

* feat: add openim docker

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

* feat: add openim copyright

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

* fix: docker compose

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

* fix: remove openim chat config file

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

* feat: add openim config set

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

* feat: add openim config set

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

* fix: fix Security vulnerability

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

* fix: fix Security vulnerability

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

* fix: docker compose

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

* Update kubernetes.go

* Update discoveryregister.go

* fix: copyright-add

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

---------

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
 2023-12-18 02:24:12 +00:00
xuexihuang
c5c5b2fd8e
support multipe msggateway services in k8s deployments (#1565) 
* feature:support multi msggateway

* feature:support multi msggateway

---------

Co-authored-by: lin.huang <lin.huang@apulis.com>
 2023-12-17 09:40:04 +00:00
Xinwei Xiong
c2dfc37b0b
feat: support mac deployment and optimization make check (#1570) 
* feat: add openim server code

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

* feat: add openim env

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

* fix: add openim scripts check and mac support ss comment

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

* fix: add mac os

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

---------

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
 2023-12-16 15:01:15 +00:00
AndrewZuo01
2cef0f62b3
fix group notification (#1557) 2023-12-15 09:14:43 +00:00
AndrewZuo01
25fa4da3bc update response of callback response error 2023-12-15 16:43:28 +08:00
AndrewZuo01
7dc8a0d519 update user command get 2023-12-14 12:10:02 +08:00
AndrewZuo01
6b151f0106 update user command get 2023-12-13 09:43:23 +08:00
AndrewZuo01
c014ad173c update openim server remove duplicate code 2023-12-12 19:02:41 +08:00
AndrewZuo01
31e8054cd8 update openim server remove duplicate code 2023-12-12 18:51:51 +08:00
AndrewZuo01
78c874f0e0 Merge remote-tracking branch 'origin/main' 2023-12-12 18:43:03 +08:00
AndrewZuo01
80fc0a97e9 update openimsdk tools 2023-12-12 18:42:50 +08:00
Xinwei Xiong
b054881052
Merge branch 'main' into main 2023-12-12 18:39:31 +08:00