IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-01 07:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,460 Commits 35 Branches 142 Tags
a2a71ff8f5b444c19a19faa55879a67f587b4a6e
Commit Graph

641 Commits

Author SHA1 Message Date
wangchuxiao 416f87f4bb tag 2022-03-29 15:50:20 +08:00
wangchuxiao 7eeb67be28 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-29 15:35:18 +08:00
wangchuxiao 7ed6ee5075 tag 2022-03-29 15:35:03 +08:00
Gordon c5828aba91 Merge branch 'tuoyun' 
# Conflicts:
#	cmd/open_im_api/main.go
#	config/config.yaml
#	go.sum
#	pkg/common/config/config.go
#	pkg/common/db/model.go
 2022-03-29 10:58:01 +08:00
skiffer-git 1286f9dcb6 mute group 2022-03-29 09:34:45 +08:00
wangchuxiao 0797181967 tag 2022-03-28 19:18:30 +08:00
wangchuxiao 14c5e631ff tag 2022-03-28 19:15:59 +08:00
wangchuxiao 5cdb039c33 tag 2022-03-28 19:12:31 +08:00
wangchuxiao a11c4fcb58 tag 2022-03-28 19:05:58 +08:00
wangchuxiao e95400988e tag 2022-03-28 18:51:48 +08:00
wangchuxiao d92ac8f588 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-03-28 18:13:08 +08:00
wangchuxiao 169665da32 tag 2022-03-28 18:13:01 +08:00
Gordon c4d80b4844 auto migrate test 2022-03-28 17:52:40 +08:00
wangchuxiao e9ea117985 tag 2022-03-28 17:10:45 +08:00
wangchuxiao b9ddb0140f tag 2022-03-28 17:02:03 +08:00
wangchuxiao 228cbb4082 tag 2022-03-28 16:59:15 +08:00
wangchuxiao c39f5a27b2 tag 2022-03-28 16:49:19 +08:00
wangchuxiao dbdb516f3c tag 2022-03-28 16:42:18 +08:00
wangchuxiao c1a97b7356 tag 2022-03-28 16:20:20 +08:00
wangchuxiao 574c7600e0 tag 2022-03-28 16:02:31 +08:00
wangchuxiao 9d619d520d tag 2022-03-28 12:17:07 +08:00
wangchuxiao 46605479e9 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into office_tag 2022-03-25 18:48:30 +08:00
wangchuxiao 6d20eddd43 mongo 2022-03-25 18:46:27 +08:00
skiffer-git 9d29d49ada group dismissed 2022-03-24 15:33:30 +08:00
wangchuxiao 8a38646bc5 mongo 2022-03-21 16:56:52 +08:00
马守越 1ab3e04cba 新增mongo.dbUrl配置 (#174) 
* 当dbUri值不为空则直接使用该值

* 新增支持ali oss

Co-authored-by: mashouyue's m1max <mashouyue@toowow.cn>
 2022-03-21 11:13:17 +08:00
wangchuxiao 366f7621fa rtc add 2022-03-17 19:00:05 +08:00
Gordon cb8f7e0ddb mongo single node 2022-03-17 12:08:39 +08:00
Gordon 2fc2801ad4 mongo single node 2022-03-17 11:55:35 +08:00
wangchuxiao b0aa168c9a rtc add 2022-03-16 18:02:26 +08:00
wangchuxiao 51c2f845d8 opt 2022-03-11 17:37:01 +08:00
Gordon e734b000de log 2022-03-04 19:01:32 +08:00
skiffer-git 04f8a7247d replace find with take 2022-02-28 17:28:00 +08:00
skiffer-git 7b6ef76d54 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-28 17:24:21 +08:00
skiffer-git ed65ad842f Replace find with take 2022-02-28 17:20:40 +08:00
Gordon b30da3eea4 database judge modify 2022-02-28 17:03:29 +08:00
Gordon 2c26efb5a9 log remove 2022-02-25 15:02:02 +08:00
Gordon e31da8bbd0 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-23 15:27:31 +08:00
Gordon 1e602975f3 test 2022-02-23 15:27:23 +08:00
wangchuxiao 541ccda754 test mongo driver 2022-02-23 14:30:21 +08:00
wangchuxiao 1b68363b80 test mongo driver 2022-02-23 12:30:47 +08:00
wangchuxiao fc11b3c463 test mongo driver 2022-02-23 12:30:18 +08:00
wangchuxiao f9f36cd1d6 test mongo driver 2022-02-23 12:27:01 +08:00
wangchuxiao 566c05bcef mongodriver test 2022-02-23 12:00:02 +08:00
Gordon b751156b5c redis ttl 2022-02-21 21:19:06 +08:00
wangchuxiao 55d7c6e672 add log 2022-02-21 21:02:37 +08:00
wangchuxiao dfdb952e2b fix reset password api 2022-02-21 19:12:51 +08:00
wangchuxiao 079efe5de6 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-02-21 16:25:36 +08:00
wangchuxiao 4d28ccebad add reset pwd 2022-02-21 16:24:25 +08:00
wenxu12345 2171acc909 replace mongo driver 2022-02-21 15:23:04 +08:00