blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
774 Commits 40 Branches 130 Tags
Commit Graph

51 Commits

Author SHA1 Message Date
wangchuxiao
084a374c62 fix bug: log not in correct position 2023-07-13 20:48:57 +08: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
‘hanzhixiao’
25eabde3f6 fix conflict 
Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
 2023-07-13 18:20:11 +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
058e2eee32
add MongoDB,Redis,Kafka retry mechanism (#518) 2023-07-13 12:26:09 +08:00
Xinwei Xiong
7bf8a898e2
feat: add scripts (#525) 2023-07-13 11:37:23 +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
Xinwei Xiong(cubxxw-openim)
d41ad35b21 feat: add all command 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-07-10 18:19:25 +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
kubbot & kubecub
64bb62d814 feat: ver3 branch 
Signed-off-by: kubbot & kubecub <3293172751ysy@gmail.com>
 2023-06-30 23:04:28 +08:00
kubbot & kubecub
74de8825f6 fix bug 
Signed-off-by: kubbot & kubecub <3293172751ysy@gmail.com>
 2023-06-30 22:32:30 +08:00
Xinwei Xiong(cubxxw-openim)
9394ac658e feat: add copyright permission 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
 2023-06-30 17:59:38 +08:00
kubbot & kubecub
539e0fdfb6 feat: use robot to migrate code 
Signed-off-by: kubbot & kubecub <3293172751ysy@gmail.com>
 2023-06-30 09:45:02 +08:00
skiffer-git
a45e763fef Update config.yaml 2023-06-29 22:44:18 +08:00
skiffer-git
43eb2326d1 nginx config 2023-06-29 22:43:58 +08:00
skiffer-git
8246d0dd9f nginx config 2023-06-29 22:43:58 +08:00
skiffer-git
bc12c74b85 slack 2023-06-29 22:43:58 +08:00
skiffer-git
a047b4c5e6 slack 2023-06-29 22:43:58 +08:00
skiffer-git
a39a3a9c0c slack 2023-06-29 22:43:58 +08:00
wangchuxiao
795f78655f Merge branch 'main' into v2.3.0release 
# Conflicts:
#	.env
#	install_im_server.sh
 2023-06-29 22:43:57 +08:00
skiffer-git
5709238c2b set mysql connection 2023-06-29 22:43:31 +08:00
skiffer-git
ad94857351 set mysql max conn 2023-06-29 22:43:27 +08:00
Gordon
f0a22e6a6c conversation update 2023-06-29 22:43:21 +08:00
Gordon
5e5654f513 add update conversation unread count 2023-06-29 22:43:12 +08:00
wangchuxiao
0edd99825d superGroupMaxSeq 2023-06-29 22:43:11 +08:00
skiffer-git
5ada15a461 rename 2023-06-29 22:43:09 +08:00
skiffer-git
3189937aca new image 2023-06-29 22:43:08 +08:00
Gordon
f3f014c170 jpush add config for ios env mode 2023-06-29 22:42:59 +08:00
Gordon
dec96cd429 jpush add config for ios env mode 2023-06-29 22:42:59 +08:00
wangchuxiao
9d2a2804ab 入职流程 2023-06-29 22:42:58 +08:00
wangchuxiao
fba3b25225 callback 2023-06-29 22:42:40 +08:00
wangchuxiao
4c884ee078 callback 2023-06-29 22:42:39 +08:00
wangchuxiao
d9b5fc8be0 callback 2023-06-29 22:42:39 +08:00
wangchuxiao
5326741b26 k8s deploy 2023-06-29 22:42:35 +08:00
wangchuxiao
a5455feff4 organization 2023-06-29 22:42:29 +08:00
wenxu12345
a090ecb8ac ulimit -n 2023-06-29 22:40:32 +08:00
wenxu12345
1fae6a61d7 Adjust port 2023-06-29 22:40:23 +08:00
Gordon
29d81d5e8f shell update 2023-06-29 22:40:16 +08:00
Gordon
830784463c config 2023-06-29 22:40:15 +08:00
Gordon
102feb0e57 config 2023-06-29 22:40:15 +08:00
Gordon
5572f90319 add rpc conversation 2023-06-29 22:40:15 +08:00
wangchuxiao
f4768df8ee minio config 2023-06-29 22:40:15 +08:00
wangchuxiao
6a1c0960e1 workMoments 2023-06-29 22:40:15 +08:00
skiffer-git
2d57f742e2 Organization 2023-06-29 22:40:11 +08:00
skiffer-git
bf81b7a78b OrganizationChangedNotification 2023-06-29 22:40:11 +08:00
skiffer-git
1ea38e6b20 OrganizationChangedNotification 2023-06-29 22:40:11 +08:00
skiffer-git
ee0a168414 set group member nickname 2023-06-29 22:35:31 +08:00
skiffer-git
e1bb294fdb set group member nickname 2023-06-29 22:35:31 +08:00
skiffer-git
f9d9f794de set groupmember nickname 2023-06-29 22:35:31 +08:00