liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
wh_zcy 2023-01-29 11:03:09 +08:00
commit e06c862ccd
2 changed files with 209 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/gateway/agent.go
View File

@ -150,6 +150,17 @@ func (this *Agent) decodeUserData(msg *pb.UserMessage) (code pb.ErrorCode, err e
this.gateway.Errorf("last timestamp:%v more than 30s", timestamp)
return pb.ErrorCode_TimestampTimeout, fmt.Errorf("sec key expire")
}
if msg.MainType == string(comm.ModuleGate) { //心跳消息
data, _ := anypb.New(&pb.GatewayHeartbeatResp{
Timestamp: configure.Now().Unix(),
})
this.WriteMsg(&pb.UserMessage{
MainType: string(comm.ModuleGate),
SubType: "heartbeat",
Data: data,
})
return
}
//只有login的时候才需要设置Data
if msg.MainType == string(comm.ModuleUser) && msg.SubType == "login" {
@ -279,7 +290,7 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) {
servicePath = fmt.Sprintf("%s/%s", comm.Service_Worker, this.wId)
}
}
stime := configure.Now()
stime := time.Now()
if len(serviceTag) == 0 {
if err = this.gateway.Service().RpcCall(context.Background(), servicePath, string(comm.Rpc_GatewayRoute), req, reply); err != nil {
this.gateway.Error("[UserResponse]",

197
pb/gateway_msg.pb.go Normal file
View File

@ -0,0 +1,197 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.0
// protoc v3.20.0
// source: gateway/gateway_msg.proto
package pb
import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
sync "sync"
)
const (
// Verify that this generated code is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
// Verify that runtime/protoimpl is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
//网关心跳 请求
type GatewayHeartbeatReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *GatewayHeartbeatReq) Reset() {
*x = GatewayHeartbeatReq{}
if protoimpl.UnsafeEnabled {
mi := &file_gateway_gateway_msg_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *GatewayHeartbeatReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*GatewayHeartbeatReq) ProtoMessage() {}
func (x *GatewayHeartbeatReq) ProtoReflect() protoreflect.Message {
mi := &file_gateway_gateway_msg_proto_msgTypes[0]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use GatewayHeartbeatReq.ProtoReflect.Descriptor instead.
func (*GatewayHeartbeatReq) Descriptor() ([]byte, []int) {
return file_gateway_gateway_msg_proto_rawDescGZIP(), []int{0}
}
//网关心跳 请求回应
type GatewayHeartbeatResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp"`
}
func (x *GatewayHeartbeatResp) Reset() {
*x = GatewayHeartbeatResp{}
if protoimpl.UnsafeEnabled {
mi := &file_gateway_gateway_msg_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *GatewayHeartbeatResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*GatewayHeartbeatResp) ProtoMessage() {}
func (x *GatewayHeartbeatResp) ProtoReflect() protoreflect.Message {
mi := &file_gateway_gateway_msg_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use GatewayHeartbeatResp.ProtoReflect.Descriptor instead.
func (*GatewayHeartbeatResp) Descriptor() ([]byte, []int) {
return file_gateway_gateway_msg_proto_rawDescGZIP(), []int{1}
}
func (x *GatewayHeartbeatResp) GetTimestamp() int64 {
if x != nil {
return x.Timestamp
}
return 0
}
var File_gateway_gateway_msg_proto protoreflect.FileDescriptor
var file_gateway_gateway_msg_proto_rawDesc = []byte{
0x0a, 0x19, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x2f, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61,
0x79, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x47,
0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x52,
0x65, 0x71, 0x22, 0x34, 0x0a, 0x14, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x48, 0x65, 0x61,
0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69,
0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74,
0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
file_gateway_gateway_msg_proto_rawDescOnce sync.Once
file_gateway_gateway_msg_proto_rawDescData = file_gateway_gateway_msg_proto_rawDesc
)
func file_gateway_gateway_msg_proto_rawDescGZIP() []byte {
file_gateway_gateway_msg_proto_rawDescOnce.Do(func() {
file_gateway_gateway_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_gateway_gateway_msg_proto_rawDescData)
})
return file_gateway_gateway_msg_proto_rawDescData
}
var file_gateway_gateway_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
var file_gateway_gateway_msg_proto_goTypes = []interface{}{
(*GatewayHeartbeatReq)(nil), // 0: GatewayHeartbeatReq
(*GatewayHeartbeatResp)(nil), // 1: GatewayHeartbeatResp
}
var file_gateway_gateway_msg_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type
0, // [0:0] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension type_name
0, // [0:0] is the sub-list for extension extendee
0, // [0:0] is the sub-list for field type_name
}
func init() { file_gateway_gateway_msg_proto_init() }
func file_gateway_gateway_msg_proto_init() {
if File_gateway_gateway_msg_proto != nil {
return
}
if !protoimpl.UnsafeEnabled {
file_gateway_gateway_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GatewayHeartbeatReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_gateway_gateway_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*GatewayHeartbeatResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_gateway_gateway_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 2,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_gateway_gateway_msg_proto_goTypes,
DependencyIndexes: file_gateway_gateway_msg_proto_depIdxs,
MessageInfos: file_gateway_gateway_msg_proto_msgTypes,
}.Build()
File_gateway_gateway_msg_proto = out.File
file_gateway_gateway_msg_proto_rawDesc = nil
file_gateway_gateway_msg_proto_goTypes = nil
file_gateway_gateway_msg_proto_depIdxs = nil
}