Merge branch 'tuoyun' into superGroup

Browse Source

# Conflicts:
#	config/config.yaml
#	internal/msg_gateway/gate/logic.go
#	internal/msg_gateway/gate/ws_server.go
#	internal/push/logic/push_to_client.go
#	internal/rpc/group/group.go
#	internal/rpc/msg/send_msg.go
#	pkg/common/config/config.go
#	pkg/proto/sdk_ws/ws.pb.go

...

This commit is contained in:

wangchuxiao

2022-06-15 10:31:58 +08:00

parent 926de3fa94 f324bb603d

commit a0581618a4

16 changed files with 2335 additions and 2875 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

pkg/proto/sdk_ws/ws.pb.go

+287 -278

File diff suppressed because it is too large Load Diff