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

1608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangchuxiao
99de4f8a7e fix bug: init conn once 2023-07-13 20:05:39 +08:00
wangchuxiao
e1b1fc705b Merge remote-tracking branch 'upstream/main' 2023-07-13 20:02:26 +08:00
wangchuxiao
38a191e5d1 fix bug: init conn once 2023-07-13 19:57:52 +08:00
wangchuxiao
7cf48c89f3 fix bug: init conn once 2023-07-13 19:57:40 +08:00
withchao
7624821f5f
Merge pull request #546 from withchao/main 
fix: rpc mw mismatch key
 2023-07-13 11:53:19 +00:00
wangchuxiao
dbe58fac04 Merge remote-tracking branch 'upstream/main' 2023-07-13 19:49:09 +08:00
withchao
3163f42597 fix: rpc mw mismatch key 2023-07-13 19:26:17 +08:00
Xinwei Xiong
ab406bea3d
Merge pull request #543 from hanzhixiao/fix/v3-error2 
fix conflict
v3.0.0-alpha.1 		2023-07-13 10:39:35 +00:00
‘hanzhixiao’
4bd97149c3 fix conflict 
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
 2023-07-13 18:37:59 +08:00
‘hanzhixiao’
fda6cd5354 fix conflict 
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
 2023-07-13 18:30:18 +08:00
Xinwei Xiong
c6203c825f
Merge pull request #542 from hanzhixiao/fix/v3-error 
Fix/v3 error
 2023-07-13 10:26:27 +00:00
‘hanzhixiao’
90d226c290 fix conflict 
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
 2023-07-13 18:21:42 +08:00
‘hanzhixiao’
25eabde3f6 fix conflict 
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
 2023-07-13 18:20:11 +08:00
‘hanzhixiao’
02e6b7ec18 fix conflict 
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
 2023-07-13 18:20:03 +08:00
‘hanzhixiao’
be7d785f1d fix conflict 
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
 2023-07-13 18:17:27 +08:00
Xinwei Xiong
ccf2cdaab2
Merge pull request #540 from cubxxw/fix/copy 
feat: add test file
 2023-07-13 10:09:16 +00:00
Xinwei Xiong(cubxxw-openim)
99dc701ff6 feat: script and make build 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-13 17:37:51 +08:00
Xinwei Xiong
8fbc7e8116
Merge pull request #539 from plutoyty/main 
url to uri
 2023-07-13 09:33:37 +00:00
pluto
4066726221
Merge branch 'OpenIMSDK:main' into main 2023-07-13 17:22:39 +08:00
withchao
53048951ec
Merge pull request #538 from withchao/main 
fix: minio auto make bucket
 2023-07-13 09:19:30 +00:00
plutoyty
772cb859fa url to uri 2023-07-13 17:18:14 +08:00
withchao
81bcd86304 fix: minio auto make bucket 2023-07-13 17:10:48 +08:00
pluto
b0b7d6fe7f
Merge branch 'OpenIMSDK:main' into main 2023-07-13 17:08:00 +08:00
Xinwei Xiong(cubxxw-openim)
6ecf253ef6 feat: add copy 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-13 17:07:45 +08:00
Xinwei Xiong(cubxxw-openim)
fd3c19d6a5 feat: add test file 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-13 17:07:45 +08:00
Gordon
ce33b79915
fix: conflict resolve main (#537) 
* statistics user register

* refactor: router change

* minio init

* UserRegisterCount

* push use local conn

* refactor: user pb update

* remove online push close grpc conn

* refactor: user pb update

* refactor:pb file

* msgs statistics

* msgs statistics

* revoke userID

* refactor: errcode update

* active user

* active user

* active user

* refactor: errcode update

* feat: conn update token

* active user

* active user

* feat: conn update token

* active user

* feat: conn update token

* feat: conn update token

* feat: conn update token

* add tx_oss cos

* active user

* active user

* group create

* group create

* feat: group notification show to conversation

* feat: group notification show to conversation

* group active

* user active

* sendNotificationWithName

* withname

* privateChat

* a2r call option

* grpc with detail return error

* change log error

* chain unary interceptor

* api nil slice map

* fix sync has read

* fix: text update

* fix: update add model

* set conversations update

* set privateChat

* fix: content update

* remove unuse rpc

* msgDestruct

* cron use rpc mw

* set IsMsgDestruct

* msg destruct

* msgDestruct

* s3 minio, cos, oss support

* feat: add implement of GetUsersOnlineStatus, #472 (#477)

* s3 minio, cos, oss support

* s3 route

* remove extendMsg code

* s3 route

* remove unuse code

* s3 pb

* s3 pb

* s3 pb

* s3 presigned put

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* Update .gitignore (#482)

* s3 debug log

* s3 debug log

* cron add log and fix cron

* add log

* cron

* s3 config

* fix kick user bug

* s3 cos

* add kick log

* s3 cos test

* s3 cos test

* s3 cos test

* kick user log

* kickuserlog

* s3 cos copy

* s3 cos copy

* s3 url

* s3 url

* s3 AccessURL

* log

* s3 InitiateMultipartUpload add ExpireTime

* feat: regenerate pb file

* feat: regenerate pb file

* Revert "feat: regenerate pb file"

This reverts commit 434f22564a89f816cbe944ab61bd9ff3414f0885.

* Delete .idea directory

* feat: regenerate pb file

* fix: remove import C

* fix: add msg transfer main file

* fix: get user online status fix

---------

Co-authored-by: withchao <993506633@qq.com>
Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com>
Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com>
Co-authored-by: withchao <48119764+withchao@users.noreply.github.com>
Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com>
 2023-07-13 16:51:52 +08:00
pluto
2388f93cfb
Merge branch 'OpenIMSDK:main' into main 2023-07-13 15:46:37 +08:00
WangchuXiao
4cacc3f621
fix bug: friend, args error (#534) 
* fix bug: args error

* fix bug: args error

* fix bug: add friend need update both request

* fix bug: add friend need update both request
 2023-07-13 15:26:25 +08:00
wangchuxiao
2607862544 Merge remote-tracking branch 'upstream/main' 2023-07-13 15:22:59 +08:00
Gordon
e5ab278be5
fix: get user online status #472 (#527) 
* statistics user register

* refactor: router change

* minio init

* UserRegisterCount

* push use local conn

* refactor: user pb update

* remove online push close grpc conn

* refactor: user pb update

* refactor:pb file

* msgs statistics

* msgs statistics

* revoke userID

* refactor: errcode update

* active user

* active user

* active user

* refactor: errcode update

* feat: conn update token

* active user

* active user

* feat: conn update token

* active user

* feat: conn update token

* feat: conn update token

* feat: conn update token

* add tx_oss cos

* active user

* active user

* group create

* group create

* feat: group notification show to conversation

* feat: group notification show to conversation

* group active

* user active

* sendNotificationWithName

* withname

* privateChat

* a2r call option

* grpc with detail return error

* change log error

* chain unary interceptor

* api nil slice map

* fix sync has read

* fix: text update

* fix: update add model

* set conversations update

* set privateChat

* fix: content update

* remove unuse rpc

* msgDestruct

* cron use rpc mw

* set IsMsgDestruct

* msg destruct

* msgDestruct

* s3 minio, cos, oss support

* feat: add implement of GetUsersOnlineStatus, #472 (#477)

* s3 minio, cos, oss support

* s3 route

* remove extendMsg code

* s3 route

* remove unuse code

* s3 pb

* s3 pb

* s3 pb

* s3 presigned put

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* s3 presigned test

* Update .gitignore (#482)

* s3 debug log

* s3 debug log

* cron add log and fix cron

* add log

* cron

* s3 config

* fix kick user bug

* s3 cos

* add kick log

* s3 cos test

* s3 cos test

* s3 cos test

* kick user log

* kickuserlog

* s3 cos copy

* s3 cos copy

* s3 url

* s3 url

* s3 AccessURL

* log

* s3 InitiateMultipartUpload add ExpireTime

* feat: regenerate pb file

* feat: regenerate pb file

* Revert "feat: regenerate pb file"

This reverts commit 434f22564a89f816cbe944ab61bd9ff3414f0885.

* Delete .idea directory

* feat: regenerate pb file

* fix: remove import C

* fix: add msg transfer main file

* fix: get user online status fix

---------

Co-authored-by: withchao <993506633@qq.com>
Co-authored-by: wangchuxiao <wangchuxiao97@outlook.com>
Co-authored-by: BanTanger <88583317+BanTanger@users.noreply.github.com>
Co-authored-by: withchao <48119764+withchao@users.noreply.github.com>
Co-authored-by: Alan <68671759+hanzhixiao@users.noreply.github.com>
 2023-07-13 15:17:05 +08:00
Alan
0b306d996d
all back-office api (#533) 
* fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>

* all Back-office management api

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>

---------

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
Co-authored-by: ‘hanzhixiao’ <‘709674996@qq.com’>
 2023-07-13 15:11:33 +08:00
wangchuxiao
643de8c7ec fix bug: add friend need update both request 2023-07-13 14:41:49 +08:00
wangchuxiao
4c365701d4 fix bug: add friend need update both request 2023-07-13 13:09:46 +08:00
pluto
5e92c76136
Merge branch 'OpenIMSDK:main' into main 2023-07-13 12:27:20 +08:00
pluto
058e2eee32
add MongoDB,Redis,Kafka retry mechanism (#518) 2023-07-13 12:26:09 +08:00
wangchuxiao
9d6f46b7f9 fix bug: args error 2023-07-13 11:49:51 +08:00
Xinwei Xiong
7bf8a898e2
feat: add scripts (#525) 2023-07-13 11:37:23 +08:00
wangchuxiao
549721ec8e Merge remote-tracking branch 'upstream/main' 2023-07-13 11:33:25 +08:00
wangchuxiao
4d89d7c618 fix bug: args error 2023-07-13 11:03:22 +08:00
pluto
eb7953cacb
cicd: update openim-ci.yml (#528) 2023-07-13 10:30:25 +08:00
pluto
59f948bde2
Merge branch 'OpenIMSDK:main' into main 2023-07-13 10:14:40 +08:00
skiffer-git
b46f3410ad Add feature: Replace apiURL (in config.yaml) with an external IP address 2023-07-12 22:07:25 +08:00
skiffer-git
62cd1dace0 Merge remote-tracking branch 'origin/main' 2023-07-12 21:33:25 +08:00
skiffer-git
95ec99daf0 fix bug ContentType is wrong range for Check 2023-07-12 21:33:11 +08:00
pluto
df38875d88
Merge branch 'OpenIMSDK:main' into main 2023-07-12 20:58:37 +08:00
Xinwei Xiong
135dc7b359
feat: add scripts (#515) 
* feat: add scripts

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

* build: Infrastructure, openimv3.0.0

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

* feat: add code (#519)

---------

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-12 20:46:34 +08:00
plutoyty
d41f2a7aef Add retry mechanism to mongoDB, Redis, Kafka 2023-07-12 20:21:52 +08:00
plutoyty
40b26f9a2f Merge remote-tracking branch 'origin/main' into add-new-feature-#484 2023-07-12 19:29:12 +08:00
pluto
2cca8b8927
Merge branch 'OpenIMSDK:main' into main 2023-07-12 19:27:50 +08:00
Xinwei Xiong
1b5eb4a5c0
feat: add scripts (#514) 2023-07-12 19:21:55 +08:00