3317 Commits

Author SHA1 Message Date
skiffer-git
85a52f5d6b get grpc conn from config 2022-08-17 11:42:12 +08:00
skiffer-git
92d7ecdf68 Merge remote-tracking branch 'origin/shichuang' into shichuang
# Conflicts:
#	pkg/grpc-etcdv3/getcdv3/resolver.go
2022-08-17 11:36:12 +08:00
skiffer-git
cdf09aa1bd get grpc conn from config 2022-08-17 11:35:33 +08:00
wangchuxiao
63a830cc95 Merge branch 'shichuang' of github.com:OpenIMSDK/Open-IM-Server into shichuang 2022-08-17 11:29:31 +08:00
wangchuxiao
3b9cc61669 update orgnization after update user 2022-08-17 11:27:56 +08:00
skiffer-git
723e304ed8 set mysql max conn 2022-08-16 23:52:53 +08:00
wangchuxiao
63ac7738bb Merge branch 'shichuang' of https://github.com/OpenIMSDK/Open-IM-Server into shichuang 2022-08-16 23:45:45 +08:00
wangchuxiao
bda96a2175 fix 2022-08-16 23:45:32 +08:00
skiffer-git
5b06791a6c set max PlatformID = 9 2022-08-16 23:26:13 +08:00
wangchuxiao
64e1361ef5 fix signal bug 2022-08-16 23:08:16 +08:00
skiffer-git
2f6eb5969e getui 2022-08-16 21:21:29 +08:00
wangchuxiao
e4bbd57c41 fix log 2022-08-12 15:03:36 +08:00
wangchuxiao
60029fc618 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-11 20:25:48 +08:00
wangchuxiao
f3e71fec91 callback kickoff 2022-08-11 20:25:33 +08:00
Gordon
54cdb24cec user add delete cache 2022-08-11 20:04:15 +08:00
wangchuxiao
c2bd1d0d83 callback kickoff 2022-08-11 19:47:59 +08:00
wangchuxiao
cc3f53d572 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-11 16:51:37 +08:00
wangchuxiao
a2ddf3567c callback kickoff 2022-08-11 16:51:21 +08:00
wangchuxiao
aa7ba6d659 callback kickoff 2022-08-11 16:48:03 +08:00
skiffer-git
c53bcd990d Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-11 16:06:54 +08:00
skiffer-git
78c807a514 add Invitation Code 2022-08-11 16:06:35 +08:00
wangchuxiao
c4084cbcec callback kickoff 2022-08-11 15:55:33 +08:00
skiffer-git
c9d7b63ef7 Multiple gateways 2022-08-11 12:19:03 +08:00
wangchuxiao
06729c4e84 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-11 12:10:00 +08:00
wangchuxiao
5c5f80691a fix delete 2022-08-11 12:09:44 +08:00
skiffer-git
5a0340e927 Multiple gateways 2022-08-11 11:48:22 +08:00
skiffer-git
eb7e6a566b Multiple gateways 2022-08-11 11:44:14 +08:00
skiffer-git
079fe089de Multiple gateways 2022-08-11 11:28:51 +08:00
skiffer-git
5f83acf3ad Multiple gateways 2022-08-11 11:25:01 +08:00
skiffer-git
0d16fbe4ab Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release 2022-08-11 11:17:32 +08:00
skiffer-git
c1184fd7d2 Multiple gateways 2022-08-11 11:14:30 +08:00
wangchuxiao
429bee7e6c
Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
2022-08-11 11:07:56 +08:00
wangchuxiao
56e2df75b9 fix delete 2022-08-11 11:06:10 +08:00
wangchuxiao
e2c75f6836 fix delete 2022-08-10 20:42:26 +08:00
wangchuxiao
ce591227ae fix delete 2022-08-10 20:39:54 +08:00
wangchuxiao
ace424e78a fix delete 2022-08-10 20:34:18 +08:00
wangchuxiao
10223c944c fix delete 2022-08-10 20:23:40 +08:00
wangchuxiao
9e190cb5aa fix delete 2022-08-10 20:16:18 +08:00
wangchuxiao
5d57e93ee1 fix delete 2022-08-10 20:11:04 +08:00
wangchuxiao
75805e3c69 fix delete 2022-08-10 20:04:32 +08:00
wangchuxiao
327ae4ac79 fix delete 2022-08-10 19:50:45 +08:00
wangchuxiao
911614673b fix delete 2022-08-10 19:42:38 +08:00
wangchuxiao
e80d3e7dac fix delete 2022-08-10 19:40:10 +08:00
wangchuxiao
7b820ebb94 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-10 19:32:06 +08:00
wangchuxiao
6bfa8643d6 fix delete 2022-08-10 19:31:57 +08:00
Gordon
25de6b58c3 conversation update 2022-08-10 18:29:49 +08:00
wangchuxiao
cdc60ef5f0 fix delete 2022-08-10 15:35:28 +08:00
wangchuxiao
edeb228315 fix delete 2022-08-10 15:23:44 +08:00
wangchuxiao
f6c6d58045 fix delete 2022-08-10 15:21:59 +08:00
wangchuxiao
b1d0ca76c9 fix delete 2022-08-10 15:19:24 +08:00