368 Commits

Author SHA1 Message Date
withchao
c13fb56808 Merge remote-tracking branch 'upstream/mongo' into mongo
# Conflicts:
#	go.sum
#	internal/rpc/group/group.go
2023-12-01 16:22:19 +08:00
withchao
768e6bc758 merge main 2023-11-30 20:46:52 +08:00
withchao
df7bfc67b6 merge main 2023-11-30 20:18:12 +08:00
withchao
775e62b539 Merge remote-tracking branch 'upstream/main' into mongo
# Conflicts:
#	internal/msggateway/n_ws_server.go
#	internal/rpc/group/group.go
#	internal/rpc/third/third.go
#	pkg/common/convert/user.go
#	pkg/common/http/http_client.go
2023-11-30 20:16:38 +08:00
AndrewZuo01
0efc235f45
add webhooks (#1465)
* add callback before join group

* fix bug

* fix deployments/templates/alertmanager.yml

* fix bug

* update callback after join group

* merge callback after join group

* update callback setrgoup info

* test

* test

* test

* update three functions in friend category

* test friend and blacklist

* test

* test

* test

* Update openim.yaml

* merge callback after join group

* merge callback after join group

* merge callback after join group

* fix callbackbeforesetgroupinfo

* fix eventtime

* update api request required

* update api request required

* update api request required

* delete unused code

* delete unused code

* fix

* Update .env

* Update .env

* Update callback.go

* Update callback.go

* Update .env

* Update .env

* fix: merge

* update

* fix: merge

* fix: fix bugs

* update callback enable

* update callback enable

* update callback enable

* update callback enable

* update callback enable

* update callback enable

* Update openim.yaml

* Update environment.sh

* Update environment.md

* Update environment.md

* Update environment.sh

---------

Co-authored-by: Gordon <1432970085@qq.com>
2023-11-30 02:10:48 +00:00
Xinwei Xiong(cubxxw)
3b74ad56d4 feat: add format set
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
2023-11-29 16:27:26 +08:00
fengyun.rui
35bac04f58
fix: grace shutdown for gw (#1478)
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-29 02:44:37 +00:00
healingtjx
4c7e0295bf
feat: OpenIMServer compatible qiniu kodo (#1460)
* build : add aws and kodo dependency

* feat: add qiniu kodo

* Doc : Add Qiniu Cloud Kodo Document and Config
2023-11-29 02:41:47 +00:00
xuexihuang
ceb669dfb8
Feature middleware (#1476)
* fix:fix error values&logs

* modify: add logs

* feature:add redis io retry logic

* feature:add redis error alert rule

* test:for test alert

* fix:fix prometheus rules

* del:del test code

---------

Co-authored-by: lin.huang <lin.huang@apulis.com>
2023-11-29 02:41:11 +00:00
Brabem
02142c55b2
feat: add callback func (#1480)
* feat:add callback func

* fix: fix the error

* fix: fix the error of repalce

* fix: fix the error of repalce
2023-11-28 07:26:46 +00:00
Gordon
f935d36715
fix: wrong single message read state. (#1443)
* fix: wrong single message read state.

* Update as_read.go

* Update as_read.go

* Update as_read.go

---------

Co-authored-by: Xinwei Xiong <3293172751@qq.com>
2023-11-26 12:49:31 +00:00
withchao
92f60d535f all 2023-11-23 17:03:05 +08:00
withchao
7e4b4188b3 index 2023-11-23 10:50:58 +08:00
withchao
57399066c3 convert 2023-11-22 19:33:06 +08:00
fengyun.rui
a9153afc38
perf: control ws write buffer (#1451)
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-22 09:31:37 +00:00
withchao
84bc7f3293 friend 2023-11-22 15:09:34 +08:00
withchao
dbeeb6d2b1 friend 2023-11-22 14:42:02 +08:00
withchao
1dbd824a08 remove mysql 2023-11-22 14:12:53 +08:00
withchao
ce3b4eec08 remove mysql 2023-11-21 18:10:27 +08:00
Xinwei Xiong
c69420e1f4
Merge pull request #1449 from withchao/mongo
Mongo
2023-11-21 09:09:37 +08:00
Xinwei Xiong
6fddaf27e7
Merge branch 'mongo' into feat/mongo 2023-11-21 09:06:13 +08:00
Xinwei Xiong(cubxxw)
ca30a76952 refactor: add openim mysql to mongo refactor
Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
2023-11-21 08:55:10 +08:00
withchao
47680aff3e group 2023-11-20 16:29:38 +08:00
withchao
f3e1969c68 group 2023-11-20 16:02:07 +08:00
withchao
6b990e3567 group 2023-11-20 15:40:00 +08:00
withchao
030fd97bec group 2023-11-20 15:25:53 +08:00
withchao
481d77b7bc group 2023-11-20 15:22:20 +08:00
withchao
f16ead2c06 group 2023-11-20 15:14:16 +08:00
withchao
20158ec3ef tx 2023-11-17 16:16:25 +08:00
withchao
7d3aeceea6 conversation 2023-11-16 17:16:37 +08:00
withchao
55fade28db group 2023-11-16 15:49:25 +08:00
withchao
9e8791a4f4 group 2023-11-16 14:51:43 +08:00
fengyun.rui
eeb16d4116
perf: broadcast msg to all gateway with concurrency (#1411)
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-15 14:24:17 +00:00
withchao
88ca79a0ec group 2023-11-15 17:44:14 +08:00
withchao
b338d666ea group 2023-11-15 15:27:04 +08:00
withchao
d99e3d93e3 group 2023-11-15 11:23:51 +08:00
withchao
358f70895d third 2023-11-14 20:48:14 +08:00
withchao
050ad7fa70 user 2023-11-14 15:52:57 +08:00
withchao
d4677f1a35 interface{} -> any 2023-11-14 14:57:08 +08:00
fengyun.rui
7502b4ac0f
refactor: lower the level of code nesting (#1396)
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-14 06:21:44 +00:00
chao
2ac54e09a6
fix: the original quoted message is withdrawn and the quoted original message is displayed. (#1388)
* fix: GetUserReqApplicationList error when there is a disbanded group chat

* fix: error when querying some information about disbanded group

* fix: GetUserReqApplicationList dismissed group error

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* fix: the original message referenced by the pull message processing is withdrawn

* merge

* cicd: robot automated Change

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>
2023-11-13 12:01:31 +00:00
withchao
5a07e478dc cicd: robot automated Change 2023-11-13 11:31:05 +00:00
fengyun.rui
7153eeb178
refactor: crontask cmd (#1331)
* refactor: cron task

Signed-off-by: rfyiamcool <rfyiamcool@163.com>

* refactor: cron task

Signed-off-by: rfyiamcool <rfyiamcool@163.com>

---------

Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-13 07:21:54 +00:00
fengyun.rui
fd42c6dced
fix: reduce lock msg transfer (#1308)
* fix: reduce lock msg transfer

Signed-off-by: rfyiamcool <rfyiamcool@163.com>

* fix: reduce lock msg transfer

Signed-off-by: rfyiamcool <rfyiamcool@163.com>

---------

Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-13 05:17:50 +00:00
fengyun.rui
69eb24f702
perf: concurrent notify node on register (#1327)
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-13 05:08:48 +00:00
fengyun.rui
a580c15f6a
perf: improve gzip performance with sync.pool (#1321)
Signed-off-by: rfyiamcool <rfyiamcool@163.com>
Co-authored-by: Gordon <46924906+FGadvancer@users.noreply.github.com>
2023-11-10 14:02:02 +00:00
Xinwei Xiong
e2004c1e9d
☀️ feat: Enhancing OpenIM with Integrated E2E Testing and CI/CD Enhancements (#1359)
* cicd: robot automated Change

* feat: add api test

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

* feat: add api test make file

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

* feat: add openim e2e test

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

* feat: add openim e2e test

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

* fix: Fixed some unused scripts and some names

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

* docs: optimize openim docs

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

* feat: add prom address

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

* feat: add openim info test

* feat: add openim images config path

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

* fix: fix tim file rename

* fix: fix tim file rename

* fix: fix tim file rename

* fix: fix tim file rename

* fix: add openim test e2e

* feat: add openim test .keep

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

* feat: add openim test .keep

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

* feat: openim test

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

* feat: openim test

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

* feat: openim test

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

---------

Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
Co-authored-by: cubxxw <cubxxw@users.noreply.github.com>
2023-11-10 11:37:25 +00:00
fengyun.rui
686fa80800
refactor: lower the level of code nesting (#1370)
* refactor: lower the level of code nesting

Signed-off-by: rfyiamcool <rfyiamcool@163.com>

* refactor: lower the level of code nesting

Signed-off-by: rfyiamcool <rfyiamcool@163.com>

---------

Signed-off-by: rfyiamcool <rfyiamcool@163.com>
2023-11-10 09:55:50 +00:00
chao
a32e94b5ae
fix: GetUserReqApplicationList dismissed group error (#1378)
* fix: GetUserReqApplicationList error when there is a disbanded group chat

* fix: error when querying some information about disbanded group

* fix: GetUserReqApplicationList dismissed group error
2023-11-10 08:39:16 +00:00
chao
a285f02631
fix: error when querying some information about disbanded group (#1376)
* fix: GetUserReqApplicationList error when there is a disbanded group chat

* fix: error when querying some information about disbanded group
2023-11-10 07:44:28 +00:00