394 Commits

Author SHA1 Message Date
AndrewZuo01
d941c69770 fix updateUserInfoEx 2023-12-29 15:37:34 +08: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
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
d77b772fb2 update notification 2023-12-27 10:58:02 +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
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
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
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
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
7d5c1ae324 fix callback 2023-12-22 10:24:57 +08:00
AndrewZuo01
37f194cb9f update comments, update go.mod check for register username 2023-12-21 18:32:11 +08:00
AndrewZuo01
49d543133d fix err golangci-lint 2023-12-21 12:14:05 +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
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
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
AndrewZuo01
2cef0f62b3
fix group notification (#1557) 2023-12-15 09:14:43 +00: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
Xinwei Xiong
b054881052
Merge branch 'main' into main 2023-12-12 18:39:31 +08:00
chao
01c3d4725b
feat: optimize tools up35 (#1556)
* upgrade package and rtc convert

* upgrade package and rtc convert

* upgrade package and rtc convert

* upgrade package and rtc convert

* friend user
2023-12-12 10:37:23 +00:00
AndrewZuo01
e9cf46b18c fix group notification 2023-12-12 18:02:02 +08:00
AndrewZuo01
73b8f76185 update user command 2023-12-12 16:59:23 +08:00
AndrewZuo01
3c57baec6b update user command 2023-12-12 16:46:10 +08:00
AndrewZuo01
5eec833c74 update user command 2023-12-12 15:34:44 +08:00
AndrewZuo01
90553530a6 update user command 2023-12-12 14:16:34 +08:00
chao
6b55cfd0b8
feat: optimize tools up35 (#1552)
* upgrade package and rtc convert

* upgrade package and rtc convert

* upgrade package and rtc convert
2023-12-12 02:03:40 +00:00
AndrewZuo01
22e2f26fd3
Update friend.go 2023-12-11 16:38:38 +08:00
Xinwei Xiong
bb6462647a
fix: fix docker compose scripts (#1546)
* fix: fix docker compose scripts

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

* fix: fix scripts and rea

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

---------

Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
2023-12-11 04:18:55 +00:00
AndrewZuo01
d34e2054d5 debug 2023-12-08 15:40:29 +08:00
AndrewZuo01
650587ef39 debug 2023-12-08 14:42:18 +08:00
AndrewZuo01
998ef5e10d debug 2023-12-08 14:31:22 +08:00
AndrewZuo01
f719c81e71 debug 2023-12-08 11:57:46 +08:00