blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-01-13 17:25:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
832 Commits 34 Branches 141 Tags
Commit Graph

280 Commits

Author SHA1 Message Date
Gordon
a2f16dcf4d fix: remove import C 2023-07-12 18:08:45 +08:00
Gordon
dd4d321108 feat: regenerate pb file 2023-07-12 16:39:59 +08:00
Gordon
2a558e09b1 Revert "feat: regenerate pb file" 
This reverts commit 434f22564a89f816cbe944ab61bd9ff3414f0885.
 2023-07-12 16:32:53 +08:00
Gordon
af5ccc532e feat: regenerate pb file 2023-07-12 16:04:02 +08:00
Gordon
434f22564a feat: regenerate pb file 2023-07-12 16:00:14 +08:00
Gordon
454bf97e3f
merge v3dev into main (#504) 
* 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

---------

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-12 15:31:24 +08:00
pluto
5467887e1c
For "add database retry" add test (#500) 
* Add database retry

* For "add database retry" add test

* For "add database retry" add test

* For 'add database retry' add test

Signed-off-by: plutoyty <2631223275@qq.com>

* Remove .idea directory and add it to .gitignore

---------

Signed-off-by: plutoyty <2631223275@qq.com>
 2023-07-12 15:23:25 +08:00
Gordon
524f63ab35 feat: merge v3dev into main 2023-07-12 15:12:23 +08:00
withchao
2e6ea7b193 Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-12 14:27:20 +08:00
withchao
fe3e17c3ad s3 InitiateMultipartUpload add ExpireTime 2023-07-12 14:27:06 +08:00
wangchuxiao
38912aed76 Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev 2023-07-12 14:22:23 +08:00
wangchuxiao
98215396f1 log 2023-07-12 14:22:16 +08:00
withchao
bdf93565a3 s3 AccessURL 2023-07-12 14:01:48 +08:00
withchao
406a77d5b8 s3 url 2023-07-12 13:58:20 +08:00
withchao
75af5447ae s3 cos copy 2023-07-12 13:45:45 +08:00
withchao
e6d502f0ff Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-12 13:39:54 +08:00
withchao
1f6225db41 s3 cos copy 2023-07-12 13:39:08 +08:00
wangchuxiao
16c2028687 kickuserlog 2023-07-12 13:29:40 +08:00
wangchuxiao
fd87d70b56 Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev 2023-07-12 13:23:22 +08:00
wangchuxiao
5dbeac7dcf kick user log 2023-07-12 13:21:49 +08:00
guangwu
e000236eca
chore: use fmt.Errorf Sprint (#469) 2023-07-12 13:19:44 +08:00
withchao
c32b437821 s3 cos test 2023-07-12 12:34:00 +08:00
withchao
535736bad1 s3 cos test 2023-07-12 12:30:42 +08:00
Xinwei Xiong
dd7e2be74a
feat: add logic to deploy images (#497) 
* feat: add logic to deploy images

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

* feat: add logic to deploy images

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

* fix: add ubuntu

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

* fix: sync quest

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

* feat: add copyright information

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

* feat: add more cicd design

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

* fix: fix sync

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

* feat: test file

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

* feat: test file

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

* feat: build multiarch

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

* feat: build multiarch

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

* feat: add start scripts

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

---------

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-12 12:28:18 +08:00
withchao
22b1403819 s3 cos test 2023-07-12 12:22:18 +08:00
withchao
c411cc4bc8 s3 cos 2023-07-12 12:09:57 +08:00
withchao
5fd464979d Merge remote-tracking branch 'origin/v3dev' into v3dev 2023-07-12 12:02:50 +08:00
withchao
a2fc790cba s3 config 2023-07-12 12:02:40 +08:00
wangchuxiao
20bb77f0f7 cron 2023-07-12 11:49:25 +08:00
wangchuxiao
e92a09ecf5 Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev 2023-07-12 11:33:15 +08:00
wangchuxiao
a23ecb1710 cron add log and fix cron 2023-07-12 11:33:08 +08:00
withchao
d7c66c6f45 s3 debug log 2023-07-12 11:14:06 +08:00
withchao
95b1d09a3c s3 debug log 2023-07-12 11:06:41 +08:00
pluto
531c8a9876
Add database retry (#493) 2023-07-12 10:06:30 +08:00
Xinwei Xiong
0350636960
fix: docker file path (#495) 
* fix: docker file path

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

* fix: docker file path

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

* fix: fix scripts

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

---------

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-11 21:13:06 +08:00
withchao
2f1d9f6265 s3 presigned test 2023-07-10 19:19:33 +08:00
withchao
06a5ef9417 s3 presigned test 2023-07-10 19:13:15 +08:00
withchao
4203705bf5 s3 presigned test 2023-07-10 19:10:12 +08:00
withchao
bfd1df751e s3 presigned test 2023-07-10 19:07:00 +08:00
withchao
6716a92085 s3 presigned test 2023-07-10 19:03:18 +08:00
withchao
d9c7c57343 s3 presigned test 2023-07-10 18:46:45 +08:00
withchao
5a9ecbf295 s3 presigned test 2023-07-10 18:40:30 +08:00
withchao
70b6cd360d s3 presigned put 2023-07-10 18:32:25 +08:00
Xinwei Xiong(cubxxw-openim)
3c73ba03ba feat: fix code 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-10 18:19:25 +08:00
Xinwei Xiong(cubxxw-openim)
859d82fcd1 feat: add makefile bug 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-10 18:13:30 +08:00
Xinwei Xiong(cubxxw-openim)
21789bd7ac feat: add copyright 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-10 18:13:30 +08:00
Xinwei Xiong(cubxxw-openim)
166ddb1e34 style: add format 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-10 18:13:29 +08:00
Xinwei Xiong(cubxxw-openim)
5ec628fccb style: add import formatting 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-10 18:13:29 +08:00
withchao
04474c6747 s3 pb 2023-07-10 17:51:57 +08:00
withchao
f5dcc6c8a3 s3 pb 2023-07-10 17:34:43 +08:00