162 Commits

Author SHA1 Message Date
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
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
e6c36411cb mongo 2022-03-23 15:44:34 +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
wangchuxiao
f02fb7ba15 rtc add 2022-03-17 12:48:54 +08:00
wangchuxiao
8fef1f975a rtc add 2022-03-16 20:37:37 +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
wangchuxiao
bcae7720e1 add callback 2022-03-04 14:27:54 +08:00
wangchuxiao
6e9b9341d4 mini cr 2022-02-18 17:06:27 +08:00
wangchuxiao
b80c8013c0 add user req group reqlist api 2022-02-09 19:19:22 +08:00
Gordon
e4f87b53b4 protocol modify 2022-01-20 11:53:57 +08:00
wenxu12345
14ccbf335d Refactor code 2022-01-19 17:17:51 +08:00
wenxu12345
a2440a2e80 Refactor code 2022-01-15 15:30:48 +08:00
wenxu12345
17b96dd7c1 Refactor code 2022-01-15 15:25:12 +08:00
Gordon
0db2c271a0 proto json tag modify 2022-01-14 09:51:43 +08:00
wenxu12345
89eb39ca3e Refactor code 2022-01-13 11:10:29 +08:00
wenxu12345
eb417c7e22 Refactor code 2021-12-30 21:03:52 +08:00
Gordon
627419aa5f add null value handle 2021-12-30 17:56:12 +08:00
Gordon
aa99e710d1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	cmd/open_im_api/main.go
#	internal/api/group/group.go
2021-12-30 17:55:32 +08:00
Gordon
fdf1c0448b add null value handle 2021-12-30 17:48:20 +08:00
wenxu12345
0c02afa54e Refactor code 2021-12-30 17:34:54 +08:00
Gordon
7301bc30b1 add null value handle 2021-12-30 16:53:06 +08:00
wenxu12345
93e669d7d3 Refactor code 2021-12-30 16:27:57 +08:00
wenxu12345
bd14e5019f Refactor code 2021-12-30 16:19:06 +08:00
wenxu12345
6d0f454e6a Refactor code 2021-12-30 14:17:29 +08:00
wenxu12345
a031311ab5 Refactor code 2021-12-30 14:03:55 +08:00
wenxu12345
2f62339f0c Refactor code 2021-12-30 13:39:36 +08:00
wenxu12345
cc5125d51d Refactor code 2021-12-30 11:28:24 +08:00
wenxu12345
2936f886a9 Refactor code 2021-12-30 10:35:09 +08:00
wenxu12345
5ae6e98572 Refactor code 2021-12-30 09:34:19 +08:00
wenxu12345
f2c0a3994a Refactor code 2021-12-30 09:23:18 +08:00
wenxu12345
ca92bc899b Refactor code 2021-12-29 21:26:56 +08:00
wenxu12345
6c137d9098 Refactor code 2021-12-29 17:26:06 +08:00
wenxu12345
4e4bab2bf0 Refactor code 2021-12-29 15:50:50 +08:00
wenxu12345
667ceb2115 Refactor code 2021-12-29 15:08:27 +08:00
wenxu12345
fb7c4114c1 Refactor code 2021-12-29 14:57:36 +08:00
wenxu12345
5b32e0db6f Refactor code 2021-12-29 14:36:13 +08:00
wenxu12345
20aa2bdc6e Refactor code 2021-12-29 14:25:39 +08:00
wenxu12345
e75e36e999 Refactor code 2021-12-29 13:40:26 +08:00
wenxu12345
447ccdf042 Refactor code 2021-12-29 12:02:55 +08:00
Gordon
bd1af2223d Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2021-12-29 11:40:06 +08:00
Gordon
6a37072b9a conversation update 2021-12-29 11:31:51 +08:00
wenxu12345
740dd0e0a6 Refactor code 2021-12-29 11:15:20 +08:00
Gordon
8cfc5925da management modify 2021-12-28 20:44:19 +08:00
wenxu12345
b6944c4308 tidy code 2021-12-28 15:33:47 +08:00