Commit Graph

824 Commits (5f25e605d3a593a2c66bd78c059fac4ad32d9d68)

Author SHA1 Message Date
wangchuxiao 1bd8154ac4 tag
3 years ago
wangchuxiao d2fa0e7852 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao f2b324abc2 tag
3 years ago
skiffer-git d2225dd841 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
skiffer-git 8d26aa86b9 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wangchuxiao 7e937d7d29 tag
3 years ago
skiffer-git fe4b534b78 mute group
3 years ago
wangchuxiao d0a65c7c68 tag
3 years ago
wangchuxiao 416f87f4bb tag
3 years ago
wangchuxiao 7eeb67be28 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao 7ed6ee5075 tag
3 years ago
wenxu12345 d3c8215e15 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 30bc6c274e mute group
3 years ago
skiffer-git ecb1068f0b mute group
3 years ago
wenxu12345 f6eef21b45 mute group
3 years ago
skiffer-git 1aeff25316 mute group
3 years ago
skiffer-git 6de569537f Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
skiffer-git 764bc3fead mute group
3 years ago
Gordon c5828aba91 Merge branch 'tuoyun'
3 years ago
skiffer-git 1286f9dcb6 mute group
3 years ago
skiffer-git 391e525fc5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
skiffer-git afc32b1cfa mute group
3 years ago
wangchuxiao 0797181967 tag
3 years ago
wangchuxiao 14c5e631ff tag
3 years ago
wangchuxiao 5cdb039c33 tag
3 years ago
wangchuxiao a11c4fcb58 tag
3 years ago
wangchuxiao e95400988e tag
3 years ago
wangchuxiao d92ac8f588 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao 169665da32 tag
3 years ago
Gordon c4d80b4844 auto migrate test
3 years ago
Gordon 7827749453 tag notification
3 years ago
wangchuxiao e9ea117985 tag
3 years ago
wangchuxiao b9ddb0140f tag
3 years ago
wangchuxiao 228cbb4082 tag
3 years ago
wangchuxiao c39f5a27b2 tag
3 years ago
wangchuxiao dbdb516f3c tag
3 years ago
wangchuxiao c1a97b7356 tag
3 years ago
wangchuxiao a6d8f7ea24 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao 574c7600e0 tag
3 years ago
Gordon d1c0205d77 add oa notification
3 years ago
wangchuxiao dc1a0f050e tag
3 years ago
wangchuxiao 9d619d520d tag
3 years ago
wangchuxiao 46605479e9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into office_tag
3 years ago
wangchuxiao 6d20eddd43 mongo
3 years ago
skiffer-git 9d29d49ada group dismissed
3 years ago
wangchuxiao e7b95892ff minio upload api
3 years ago
wangchuxiao df4a75f4b0 mongo
3 years ago
wangchuxiao 4bdb4cbbb5 mongo
3 years ago
wangchuxiao e6c36411cb mongo
3 years ago
wangchuxiao cc1ad41e94 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao 8a38646bc5 mongo
3 years ago
hxnets 6c43f75f9f
新增阿里云OSS文件上传参数获取接口 (#115)
3 years ago
马守越 1ab3e04cba
新增mongo.dbUrl配置 (#174)
3 years ago
Arthur 1b8f664c8a
fix: json tag value of UserIDResult.UserID (#178)
3 years ago
Gordon f93d22ae22 log update
3 years ago
wangchuxiao d77894c8fe rtc add
3 years ago
wangchuxiao 366f7621fa rtc add
3 years ago
wangchuxiao 604de144b9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
Gordon 5dddaeb6e5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon 7790686a84 ws add token platform verify
3 years ago
wenxu12345 60950f056b fix bug : etcd Put failed etcdserver: requested lease not found
3 years ago
wangchuxiao ef07634e09 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao f70a20f740 rtc add
3 years ago
wenxu12345 c1cda2d536 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 2b03e7aea8 add log
3 years ago
wangchuxiao 58cea3e947 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao f02fb7ba15 rtc add
3 years ago
Gordon bf09c88e6e Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon cb8f7e0ddb mongo single node
3 years ago
wenxu12345 f63aa33082 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 7bdf6717e1 add log
3 years ago
Gordon 2fc2801ad4 mongo single node
3 years ago
wangchuxiao a0e3488af0 rtc proto modify
3 years ago
wangchuxiao 8fef1f975a rtc add
3 years ago
wangchuxiao 17fad47ca1 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao b0aa168c9a rtc add
3 years ago
wenxu12345 11c65e6b90 signaling add participant
3 years ago
wenxu12345 e9699ed8cc Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 812362338e signaling add participant
3 years ago
wangchuxiao fa21ae6161 rtc add
3 years ago
wenxu12345 27c6a187a2 signaling
3 years ago
wenxu12345 5f37414fee delete msg from server
3 years ago
wenxu12345 e95644ada2 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 ab4aee93c1 delete msg from server
3 years ago
Gordon 5df94a03fe Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon ab9f3a1635 add friend and blacklist judge
3 years ago
wenxu12345 e0a86a8016 delete msg from server
3 years ago
wenxu12345 204b27ca5d pb platformID
3 years ago
Gordon dde8f427af pb modify
3 years ago
wenxu12345 b4c16002ff signaling
3 years ago
Gordon ca23c76426 pb modify
3 years ago
wenxu12345 185f3c05fb signaling
3 years ago
Gordon bde88ecc79 server modify
3 years ago
wenxu12345 83fffe717e signaling
3 years ago
Gordon 9b61fb1f85 ws modify
3 years ago
wenxu12345 fa53530055 signaling
3 years ago
Gordon 02d0b4c99b ws.proto
3 years ago
wangchuxiao 347b1dd31c livekit
3 years ago
wangchuxiao d90b31c5df Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
Gordon 965dac5ff9 constant
3 years ago
wenxu12345 564f77bcdc signaling
3 years ago
Gordon 6136ac4116 ws proto modify
3 years ago
Gordon bba84b4d11 ws proto modify
3 years ago
wenxu12345 b52317f56b signaling
3 years ago
wenxu12345 98f2806be6 signaling
3 years ago
wangchuxiao 3693d2e93d conversation table
3 years ago
wenxu12345 9ab9ae0408 signal
3 years ago
wenxu12345 0abb4a82b1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 94a579e7d3 signal
3 years ago
Gordon 24e04f1303 utils modify
3 years ago
wangchuxiao 51c2f845d8 opt
3 years ago
Gordon edc81534c4 ws modify
3 years ago
wenxu12345 b10ba999cd join time
3 years ago
wenxu12345 c4554cb4e9 1.statistics log
3 years ago
wenxu12345 0e575a9366 keepalive ttl * 3
3 years ago
Gordon 15aabb3859 log
3 years ago
Gordon e734b000de log
3 years ago
Gordon a7c8eda290 log
3 years ago
Gordon 1bcd2d4531 log
3 years ago
Gordon 7e9234e712 log
3 years ago
Gordon af2917adb9 log
3 years ago
Gordon 8dc04667b0 test recover
3 years ago
wangchuxiao bcae7720e1 add callback
3 years ago
wangchuxiao a5712e1216 msg callback
3 years ago
wangchuxiao 3805db1263 msg callback
3 years ago
wangchuxiao 4d4520226d msg callback
3 years ago
wangchuxiao 2ed3fd3cba alter callback fg
3 years ago
wangchuxiao 9cec4b0c8e alter callback fg
3 years ago
wangchuxiao 48f03f306a Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao f1c11ac114 add callback
3 years ago
FG 25f24801d6 log
3 years ago
skiffer-git e6b302abf9 log
3 years ago
wangchuxiao 60e29cc894 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao dcfd802757 callback add
3 years ago
skiffer-git c4ec54f6e4 Statistics
3 years ago
skiffer-git de7dae4455 statistics
3 years ago
skiffer-git 6362500741 Statistics
3 years ago
skiffer-git 123aad2707 statistics log
3 years ago
wangchuxiao 0bed7ee669 merge code
3 years ago
skiffer-git 04f8a7247d replace find with take
3 years ago
skiffer-git 7b6ef76d54 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
skiffer-git ed65ad842f Replace find with take
3 years ago
Gordon a33fe330f7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon b30da3eea4 database judge modify
3 years ago
skiffer-git 05fbbfcf39 grpc-etcd log
3 years ago
wenxu12345 e1f58f07fe 2.0.1
3 years ago
Gordon 4f01b0b2ad remove mysql for test
3 years ago
wenxu12345 8c9d1b7dec statistics
3 years ago
Gordon 2c26efb5a9 log remove
3 years ago
Gordon 2585014ace Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon 0410003ceb api update
3 years ago
wangchuxiao e1a0c2fc48 fix bug
3 years ago
Gordon e31da8bbd0 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon 1e602975f3 test
3 years ago
wangchuxiao 541ccda754 test mongo driver
3 years ago
wangchuxiao 1b68363b80 test mongo driver
3 years ago
wangchuxiao fc11b3c463 test mongo driver
3 years ago
wangchuxiao f9f36cd1d6 test mongo driver
3 years ago
wangchuxiao 566c05bcef mongodriver test
3 years ago
wenxu12345 dcacd88f11 UserNotificationBegin = 1301
3 years ago
wangchuxiao cae88e7946 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao 952ad0e162 fix deploy
3 years ago
Gordon b751156b5c redis ttl
3 years ago
wangchuxiao 55d7c6e672 add log
3 years ago
wangchuxiao dfdb952e2b fix reset password api
3 years ago
wangchuxiao 079efe5de6 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao 4d28ccebad add reset pwd
3 years ago
wenxu12345 2171acc909 replace mongo driver
3 years ago
wenxu12345 1e05811c13 replace mongo driver
3 years ago
wenxu12345 ec023ec13e replace mongo driver
3 years ago
wenxu12345 996570cc57 replace mongo driver
3 years ago
wenxu12345 7cf712daff replace mongo driver
3 years ago
wenxu12345 ede3b07963 replace mongo driver
3 years ago
wenxu12345 53a4b90d96 replace mongo driver
3 years ago
wenxu12345 db116f39fd Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 571c83314a Refactoring code
3 years ago
Gordon d906d49930 model modify
3 years ago
wangchuxiao a2cd7c8007 add minio
3 years ago
wangchuxiao 6e9b9341d4 mini cr
3 years ago
Gordon e90d8a87ee config
3 years ago
Gordon 45c43888e7 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon 68e7dfb1cc conversation add
3 years ago
wangchuxiao f086f33097 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao 737ce2c2e7 fix bug
3 years ago
Gordon 3c7c7cde3c close console log
3 years ago
Gordon 84d4645efa close console log
3 years ago
wenxu12345 17954dfdc9 Refactoring code
3 years ago
wenxu12345 3aadf61fde Refactoring code
3 years ago
wangchuxiao 65be1263b9 make file
3 years ago
wangchuxiao 648a852ba7 conversation opt
3 years ago
wangchuxiao 8cdea2bfeb cms dev
3 years ago
wangchuxiao 22bfb6be4b merge code
3 years ago
wangchuxiao 7797e47561 add
3 years ago
wangchuxiao 52579c5fab add
3 years ago
wenxu12345 a5ed6d897c Refactor code
3 years ago
wenxu12345 439605bafc Refactor code
3 years ago
wenxu12345 109e8b53a1 Refactor code
3 years ago
wenxu12345 77bb88ed59 Refactor code
3 years ago
wenxu12345 45816fa84f Refactor code
3 years ago
wenxu12345 18babef78b Refactor code
3 years ago
wenxu12345 a9fa7ee26a Refactor code
3 years ago
wenxu12345 e605560e5c Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 af330d7f8a Refactor code
3 years ago
Gordon 563d466374 demo modify
3 years ago
Gordon fd59cc6226 demo modify
3 years ago
Gordon 6a8a0f2249 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon a885d7f003 demo modify
3 years ago
wenxu12345 63af591938 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 bf6efc3530 Refactor code
3 years ago
Gordon 609ec24c6a Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon c99cbec3df db
3 years ago
Gordon 6eb44cb9d8 db
3 years ago
wenxu12345 f67f2a31ee Refactor code
3 years ago
Gordon e02ca2f7e3 db
3 years ago
Gordon 84a2197027 db
3 years ago
Gordon 41dd808c9a db
3 years ago
Gordon b7a8f6c2a1 db
3 years ago
Gordon f574017b66 db
3 years ago
wangchuxiao 375b400b1e Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun
3 years ago
wangchuxiao 192ac0e013 api
3 years ago
Gordon e91f2b89df Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon 93706c94af mysql coding
3 years ago
wangchuxiao 6de61cb214 cms dev
3 years ago
wenxu12345 ee3490a520 Refactor code
3 years ago
wenxu12345 3a2cd0276a Refactor code
3 years ago
wenxu12345 02b95b16f9 Refactor code
3 years ago
wenxu12345 3e16519793 Refactor code
3 years ago
wenxu12345 a4b6cb3232 Refactor code
3 years ago
wenxu12345 8883701297 Refactor code
3 years ago
wenxu12345 225c0a9b03 Refactor code
3 years ago
wangchuxiao 43a9bba96f msg cms
3 years ago
wenxu12345 2c670b3b21 Refactor code
3 years ago
wangchuxiao 02aad295f9 group
3 years ago
wenxu12345 163da78bc6 Refactor code
3 years ago
wenxu12345 a549f86624 Refactor code
3 years ago
wenxu12345 27262436d1 Refactor code
3 years ago
Gordon e157bc195b push msg specify receiver
3 years ago
Gordon ac09da9efc push msg specify receiver
3 years ago
Gordon dc1ad8fb2d push msg specify receiver
3 years ago
Gordon ba5d178ba0 push msg specify receiver
3 years ago
wenxu12345 70fb869852 Refactor code
3 years ago
wenxu12345 14cf30cd98 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wangchuxiao e94dbe4965 cms dev
3 years ago
wangchuxiao a7f9faf868 statistics
3 years ago
wangchuxiao fb396d9cf0 add
3 years ago
wangchuxiao 0ed393b1a5 group
3 years ago
wangchuxiao b992faa468 group rpc
3 years ago
wangchuxiao f952f715c8 group pb
3 years ago
wangchuxiao 79d097c903 group pb
3 years ago
wangchuxiao cdc2428aca cms
3 years ago
wangchuxiao 82c8ace8df cms dev
3 years ago
wangchuxiao 1607853393 cms
3 years ago
wangchuxiao d58bcd136a pb api
3 years ago
Gordon 8e10533681 msg test
3 years ago
Gordon 5a9f3f1f5e msg test
3 years ago
Gordon 64f2fb9e73 msg test
3 years ago
Gordon cbed698a1c msg test
3 years ago
Gordon cd7efee49c msg test
3 years ago
Gordon aa7b891150 chat log model update
3 years ago
Gordon 911100923f chat log model update
3 years ago
Gordon e7c7784fec protocol modify
3 years ago
Gordon 184f0900fb protocol modify
3 years ago
wenxu12345 9ca83b7349 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon 8b3df83e7e ws proto
3 years ago
Gordon da24249850 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon 04e509fc49 update user
3 years ago
wenxu12345 99a8eaea91 Refactor code
3 years ago
wenxu12345 14841a44ad Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon d2b411ecbb nil modify
3 years ago
wenxu12345 db80d8f56f Refactor code
3 years ago
wenxu12345 ae09d73257 Refactor code
3 years ago
Gordon ca0f095d6b db charset set utf-8
3 years ago
Gordon 1a0f626a80 model length add
3 years ago
Gordon c23426425e Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon de52439276 model length add
3 years ago
Gordon 757b296fd0 model length add
3 years ago
wenxu12345 7f00a3075f Refactor code
3 years ago
wenxu12345 28d9304ec6 Refactor code
3 years ago
Gordon b6380a17ce ws send msg modify
3 years ago
wenxu12345 f4ceef485b Refactor code
3 years ago
wenxu12345 f3507569b5 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
wenxu12345 da5e60a009 Refactor code
3 years ago
Gordon 896a69086b ws send msg modify
3 years ago
Gordon 0ed5f8081a Merge remote-tracking branch 'origin/tuoyun' into tuoyun
3 years ago
Gordon 7416fa3a4c ws send msg modify
3 years ago
wenxu12345 bf208485f8 Refactor code
3 years ago
wenxu12345 d12d571c2b Refactor code
3 years ago
wenxu12345 a456936853 Refactor code
3 years ago
wenxu12345 655f7ff7d0 Refactor code
3 years ago
wenxu12345 5d8e972ac7 Refactor code
3 years ago
wenxu12345 31a6797fc3 Refactor code
3 years ago
wenxu12345 b9b0e9cf43 Refactor code
3 years ago
wenxu12345 7f4eb5624b Refactor code
3 years ago
wenxu12345 766a05236a Refactor code
3 years ago
wenxu12345 92a6c7b89e Refactor code
3 years ago
wenxu12345 a583a31220 Refactor code
3 years ago
wenxu12345 87f14be30c Refactor code
3 years ago
wenxu12345 7e13cc84c8 Refactor code
3 years ago
wenxu12345 17b96dd7c1 Refactor code
3 years ago
wenxu12345 b2c2c1247b Refactor code
3 years ago