29 Commits

Author SHA1 Message Date
wangchuxiao
5f42748e1b Merge branch 'tuoyun' into superGroup
# Conflicts:
#	internal/msg_gateway/gate/callback.go
#	internal/msg_transfer/logic/online_history_msg_handler.go
#	internal/push/logic/callback.go
#	internal/push/logic/push_to_client.go
#	pkg/common/db/model.go
#	pkg/common/db/newRedisModel.go
#	pkg/proto/group/group.pb.go
#	pkg/proto/group/group.proto
2022-06-07 17:42:24 +08:00
skiffer-git
4418d031e1 log 2022-06-07 16:18:23 +08:00
skiffer-git
eac137a9a9 ForceLogout 2022-06-07 11:50:37 +08:00
skiffer-git
290ae774e0 ForceLogout 2022-06-07 11:42:15 +08:00
Gordon
4678189ed4 pb file 2022-06-07 10:12:15 +08:00
skiffer-git
064b650fac group administrator access 2022-06-06 23:19:07 +08:00
skiffer-git
797e2fea1e group info set 2022-06-06 20:39:45 +08:00
Gordon
a18dcfce9e ws and push update 2022-06-02 16:44:55 +08:00
wangchuxiao
c0a3bdcf99 k8s 2022-05-29 19:44:22 +08:00
Gordon
9303096430 log change 2022-05-10 09:09:37 +08:00
skiffer-git
dca16e83d3 rpc register ip 2022-05-07 17:05:05 +08:00
skiffer-git
2bdaaa5a33 log 2022-04-20 20:58:51 +08:00
wenxu12345
ecd2f0e2bf Merge log files 2022-03-31 11:15:06 +08:00
Gordon
7790686a84 ws add token platform verify 2022-03-17 15:46:32 +08:00
wangchuxiao
0bed7ee669 merge code 2022-02-28 17:57:03 +08:00
wenxu12345
548c92dc0d Refactor code 2022-01-06 20:17:22 +08:00
wenxu12345
87659b56a4 Refactor code 2021-12-31 10:57:45 +08:00
wenxu12345
da73347231 tidy code 2021-12-28 20:28:01 +08:00
wenxu12345
12ebf232d5 tidy code 2021-12-28 18:37:16 +08:00
wenxu12345
e439ef4ddd tidy code 2021-12-27 16:48:05 +08:00
wenxu12345
75e1e2e678 notification 2021-12-21 21:40:50 +08:00
Gordon
d6614decd1 rpc restore 2021-12-17 15:55:43 +08:00
itltf512116
7a6df3abd3
Tuoyun 新增单容器单进程的部署方式 (#103)
* feat 新增deploy:单容器单进程模型部署

* feat 新增openim内部各组件的host名称配置;
fix 独立容器部署镜像文档;

* feat 新增注释说明
2021-12-17 10:49:01 +08:00
Gordon
e7e3b6dd15 multi terminal kick eachOther 2021-11-25 14:12:52 +08:00
Gordon
8a92326241 merge all branch and change project structure 2021-11-10 15:24:59 +08:00
xmcy0011
a2e204667f Merge branch 'main' into v0926_project_layout
# Conflicts:
#	cmd/open_im_api/main.go
#	internal/rpc/auth/rpcAuth.go
#	internal/rpc/chat/rpcChat.go
#	src/common/log/logrus.go
2021-10-11 22:50:24 +08:00
xmcy0011
737edb985b mv src/common src/utils src/grpc-etcdv3 to pkg 2021-10-11 22:12:01 +08:00
xmcy0011
bc94d4e0b3 mv src/proto to pkg/proto 2021-10-11 22:00:38 +08:00
xmcy0011
585715adbf add cmd/rpc 2021-10-11 21:51:37 +08:00