From 04119106139a3f781bba2af041a613a1bb641128 Mon Sep 17 00:00:00 2001 From: NickYang <362148418@qq.com> Date: Mon, 5 Feb 2018 16:55:24 +0800 Subject: [PATCH] proto files, change bytes to string Former-commit-id: 9478e010141a4df9e94a4b9832620452a0f3b07a Former-commit-id: b7213207a4ca16c9a1c682ed0caaa77aa3c3c4db --- .../SDK/Proto/AFMsgBase.pb.cc.REMOVED.git-id | 2 +- Frame/SDK/Proto/AFMsgBase.pb.h.REMOVED.git-id | 2 +- Frame/SDK/Proto/AFMsgBase.proto | 18 +- Frame/SDK/Proto/AFMsgMysql.pb.cc | 234 ++++++++++++------ Frame/SDK/Proto/AFMsgMysql.pb.h | 64 ++--- Frame/SDK/Proto/AFMsgMysql.proto | 16 +- .../Proto/AFMsgPreGame.pb.cc.REMOVED.git-id | 2 +- .../Proto/AFMsgPreGame.pb.h.REMOVED.git-id | 2 +- Frame/SDK/Proto/AFMsgPreGame.proto | 50 ++-- .../SDK/Proto/AFMsgShare.pb.cc.REMOVED.git-id | 2 +- .../SDK/Proto/AFMsgShare.pb.h.REMOVED.git-id | 2 +- Frame/SDK/Proto/AFMsgShare.proto | 54 ++-- Frame/SDK/Proto/AFMsgURl.pb.cc | 146 +++++++---- Frame/SDK/Proto/AFMsgURl.pb.h | 40 +-- Frame/SDK/Proto/AFMsgURl.proto | 10 +- .../SDK/Proto/cs/AFMsgBase.cs.REMOVED.git-id | 2 +- .../Proto/cs/AFMsgPreGame.cs.REMOVED.git-id | 2 +- .../SDK/Proto/cs/AFMsgShare.cs.REMOVED.git-id | 2 +- Frame/SDK/Proto/cs/AFMsgURl.cs | 56 ++--- 19 files changed, 431 insertions(+), 275 deletions(-) diff --git a/Frame/SDK/Proto/AFMsgBase.pb.cc.REMOVED.git-id b/Frame/SDK/Proto/AFMsgBase.pb.cc.REMOVED.git-id index 32c54142..f3e2f59e 100644 --- a/Frame/SDK/Proto/AFMsgBase.pb.cc.REMOVED.git-id +++ b/Frame/SDK/Proto/AFMsgBase.pb.cc.REMOVED.git-id @@ -1 +1 @@ -bbd740d07550e9bab7e69a5db1b96a698fc5287c \ No newline at end of file +bf0d4844690b051add64d655d53643d1780aea07 \ No newline at end of file diff --git a/Frame/SDK/Proto/AFMsgBase.pb.h.REMOVED.git-id b/Frame/SDK/Proto/AFMsgBase.pb.h.REMOVED.git-id index 336f10da..e715daeb 100644 --- a/Frame/SDK/Proto/AFMsgBase.pb.h.REMOVED.git-id +++ b/Frame/SDK/Proto/AFMsgBase.pb.h.REMOVED.git-id @@ -1 +1 @@ -0aea9a1acbb27d931d5ca1dfc631f76f68b58b3b \ No newline at end of file +8b28ff43ba4c3d205f3c24c25af7c9d9d4572f25 \ No newline at end of file diff --git a/Frame/SDK/Proto/AFMsgBase.proto b/Frame/SDK/Proto/AFMsgBase.proto index c51f7184..33c4a7c8 100644 --- a/Frame/SDK/Proto/AFMsgBase.proto +++ b/Frame/SDK/Proto/AFMsgBase.proto @@ -25,7 +25,7 @@ message VariantData int64 int64_value = 3; float float_value = 4; double double_value = 5; - bytes str_value = 6; + string str_value = 6; Ident guid_value = 7; } } @@ -33,7 +33,7 @@ message VariantData ////////////////////////BaseCommon///////////////////////////// message PropertyPBData//基础结构，不直接发送 { - bytes property_name = 1; + string property_name = 1; int32 ndataType = 2; VariantData variant_data = 3; } @@ -65,7 +65,7 @@ message RecordAddRowStruct// message ObjectRecordBase//基础结构，不直接发送 { - bytes record_name = 1; + string record_name = 1; repeated RecordAddRowStruct row_struct = 2; } @@ -101,15 +101,15 @@ message ObjectPropertyPBData// message ObjectRecordPBData//个人玩家单类型属性数据，可直接发送---变化时 { Ident player_id = 1; - bytes record_name = 2; + string record_name = 2; repeated RecordPBData record_list = 3; } message ObjectRecordSwap//个人玩家单类型属性数据，可直接发送---变化时 { Ident player_id = 1; - bytes origin_record_name = 2; - bytes target_record_name = 3; + string origin_record_name = 2; + string target_record_name = 3; int32 row_origin = 4; int32 row_target = 5; } @@ -119,14 +119,14 @@ message ObjectRecordSwap// message ObjectRecordAddRow//个人玩家单类型属性数据，可直接发送---变化时 { Ident player_id = 1; - bytes record_name = 2; + string record_name = 2; repeated RecordAddRowStruct row_data = 3; } message ObjectRecordRemove//个人玩家单类型属性数据，可直接发送---变化时 { Ident player_id = 1; - bytes record_name = 2; + string record_name = 2; repeated int32 remove_row = 3; } @@ -153,7 +153,7 @@ message PlayerRecordList message BrocastMsg { Ident player_id = 1; - bytes msg_data = 2; + string msg_data = 2; int64 nMsgID = 3; repeated Ident player_Client_list = 4; } diff --git a/Frame/SDK/Proto/AFMsgMysql.pb.cc b/Frame/SDK/Proto/AFMsgMysql.pb.cc index ba97337d..45bfcbe0 100644 --- a/Frame/SDK/Proto/AFMsgMysql.pb.cc +++ b/Frame/SDK/Proto/AFMsgMysql.pb.cc @@ -137,14 +137,14 @@ void AddDescriptorsImpl() { InitDefaults(); static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { "\n\020AFMsgMysql.proto\022\005AFMsg\"\237\001\n\016PackMysqlP" - "aram\022\025\n\rstrRecordName\030\001 \001(\014\022\016\n\006strKey\030\002 " - "\001(\014\022\024\n\014fieldVecList\030\003 \001(\014\022\024\n\014valueVecLis" - "t\030\004 \001(\014\022\r\n\005bExit\030\005 \001(\003\022\016\n\006nreqid\030\006 \001(\003\022\014" + "aram\022\025\n\rstrRecordName\030\001 \001(\t\022\016\n\006strKey\030\002 " + "\001(\t\022\024\n\014fieldVecList\030\003 \001(\t\022\024\n\014valueVecLis" + "t\030\004 \001(\t\022\r\n\005bExit\030\005 \001(\003\022\016\n\006nreqid\030\006 \001(\003\022\014" "\n\004nRet\030\007 \001(\003\022\r\n\005eType\030\010 \001(\003\"\256\001\n\023PackMysq" "lServerInfo\022\025\n\rnRconnectTime\030\001 \001(\003\022\024\n\014nR" "conneCount\030\002 \001(\003\022\r\n\005nPort\030\003 \001(\003\022\021\n\tstrDB" - "Name\030\004 \001(\014\022\020\n\010strDnsIp\030\005 \001(\014\022\021\n\tstrDBUse" - "r\030\006 \001(\014\022\020\n\010strDBPwd\030\007 \001(\014\022\021\n\tnServerID\030\010" + "Name\030\004 \001(\t\022\020\n\010strDnsIp\030\005 \001(\t\022\021\n\tstrDBUse" + "r\030\006 \001(\t\022\020\n\010strDBPwd\030\007 \001(\t\022\021\n\tnServerID\030\010" " \001(\003b\006proto3" }; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( @@ -281,48 +281,64 @@ bool PackMysqlParam::MergePartialFromCodedStream( tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // bytes strRecordName = 1; + // string strRecordName = 1; case 1: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strrecordname())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strrecordname().data(), static_cast(this->strrecordname().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackMysqlParam.strRecordName")); } else { goto handle_unusual; } break; } - // bytes strKey = 2; + // string strKey = 2; case 2: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strkey())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strkey().data(), static_cast(this->strkey().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackMysqlParam.strKey")); } else { goto handle_unusual; } break; } - // bytes fieldVecList = 3; + // string fieldVecList = 3; case 3: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_fieldveclist())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->fieldveclist().data(), static_cast(this->fieldveclist().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackMysqlParam.fieldVecList")); } else { goto handle_unusual; } break; } - // bytes valueVecList = 4; + // string valueVecList = 4; case 4: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_valueveclist())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->valueveclist().data(), static_cast(this->valueveclist().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackMysqlParam.valueVecList")); } else { goto handle_unusual; } @@ -411,27 +427,43 @@ void PackMysqlParam::SerializeWithCachedSizes( ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // bytes strRecordName = 1; + // string strRecordName = 1; if (this->strrecordname().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strrecordname().data(), static_cast(this->strrecordname().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlParam.strRecordName"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->strrecordname(), output); } - // bytes strKey = 2; + // string strKey = 2; if (this->strkey().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strkey().data(), static_cast(this->strkey().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlParam.strKey"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 2, this->strkey(), output); } - // bytes fieldVecList = 3; + // string fieldVecList = 3; if (this->fieldveclist().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->fieldveclist().data(), static_cast(this->fieldveclist().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlParam.fieldVecList"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 3, this->fieldveclist(), output); } - // bytes valueVecList = 4; + // string valueVecList = 4; if (this->valueveclist().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->valueveclist().data(), static_cast(this->valueveclist().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlParam.valueVecList"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 4, this->valueveclist(), output); } @@ -469,31 +501,47 @@ ::google::protobuf::uint8* PackMysqlParam::InternalSerializeWithCachedSizesToArr ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // bytes strRecordName = 1; + // string strRecordName = 1; if (this->strrecordname().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strrecordname().data(), static_cast(this->strrecordname().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlParam.strRecordName"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 1, this->strrecordname(), target); } - // bytes strKey = 2; + // string strKey = 2; if (this->strkey().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strkey().data(), static_cast(this->strkey().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlParam.strKey"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 2, this->strkey(), target); } - // bytes fieldVecList = 3; + // string fieldVecList = 3; if (this->fieldveclist().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->fieldveclist().data(), static_cast(this->fieldveclist().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlParam.fieldVecList"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 3, this->fieldveclist(), target); } - // bytes valueVecList = 4; + // string valueVecList = 4; if (this->valueveclist().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->valueveclist().data(), static_cast(this->valueveclist().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlParam.valueVecList"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 4, this->valueveclist(), target); } @@ -534,31 +582,31 @@ size_t PackMysqlParam::ByteSizeLong() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); } - // bytes strRecordName = 1; + // string strRecordName = 1; if (this->strrecordname().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strrecordname()); } - // bytes strKey = 2; + // string strKey = 2; if (this->strkey().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strkey()); } - // bytes fieldVecList = 3; + // string fieldVecList = 3; if (this->fieldveclist().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->fieldveclist()); } - // bytes valueVecList = 4; + // string valueVecList = 4; if (this->valueveclist().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->valueveclist()); } @@ -848,48 +896,64 @@ bool PackMysqlServerInfo::MergePartialFromCodedStream( break; } - // bytes strDBName = 4; + // string strDBName = 4; case 4: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strdbname())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdbname().data(), static_cast(this->strdbname().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackMysqlServerInfo.strDBName")); } else { goto handle_unusual; } break; } - // bytes strDnsIp = 5; + // string strDnsIp = 5; case 5: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strdnsip())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdnsip().data(), static_cast(this->strdnsip().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackMysqlServerInfo.strDnsIp")); } else { goto handle_unusual; } break; } - // bytes strDBUser = 6; + // string strDBUser = 6; case 6: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(50u /* 50 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strdbuser())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdbuser().data(), static_cast(this->strdbuser().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackMysqlServerInfo.strDBUser")); } else { goto handle_unusual; } break; } - // bytes strDBPwd = 7; + // string strDBPwd = 7; case 7: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(58u /* 58 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strdbpwd())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdbpwd().data(), static_cast(this->strdbpwd().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackMysqlServerInfo.strDBPwd")); } else { goto handle_unusual; } @@ -951,27 +1015,43 @@ void PackMysqlServerInfo::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt64(3, this->nport(), output); } - // bytes strDBName = 4; + // string strDBName = 4; if (this->strdbname().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdbname().data(), static_cast(this->strdbname().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlServerInfo.strDBName"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 4, this->strdbname(), output); } - // bytes strDnsIp = 5; + // string strDnsIp = 5; if (this->strdnsip().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdnsip().data(), static_cast(this->strdnsip().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlServerInfo.strDnsIp"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 5, this->strdnsip(), output); } - // bytes strDBUser = 6; + // string strDBUser = 6; if (this->strdbuser().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdbuser().data(), static_cast(this->strdbuser().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlServerInfo.strDBUser"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 6, this->strdbuser(), output); } - // bytes strDBPwd = 7; + // string strDBPwd = 7; if (this->strdbpwd().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdbpwd().data(), static_cast(this->strdbpwd().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlServerInfo.strDBPwd"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 7, this->strdbpwd(), output); } @@ -1009,31 +1089,47 @@ ::google::protobuf::uint8* PackMysqlServerInfo::InternalSerializeWithCachedSizes target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(3, this->nport(), target); } - // bytes strDBName = 4; + // string strDBName = 4; if (this->strdbname().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdbname().data(), static_cast(this->strdbname().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlServerInfo.strDBName"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 4, this->strdbname(), target); } - // bytes strDnsIp = 5; + // string strDnsIp = 5; if (this->strdnsip().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdnsip().data(), static_cast(this->strdnsip().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlServerInfo.strDnsIp"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 5, this->strdnsip(), target); } - // bytes strDBUser = 6; + // string strDBUser = 6; if (this->strdbuser().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdbuser().data(), static_cast(this->strdbuser().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlServerInfo.strDBUser"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 6, this->strdbuser(), target); } - // bytes strDBPwd = 7; + // string strDBPwd = 7; if (this->strdbpwd().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strdbpwd().data(), static_cast(this->strdbpwd().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackMysqlServerInfo.strDBPwd"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 7, this->strdbpwd(), target); } @@ -1059,31 +1155,31 @@ size_t PackMysqlServerInfo::ByteSizeLong() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); } - // bytes strDBName = 4; + // string strDBName = 4; if (this->strdbname().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strdbname()); } - // bytes strDnsIp = 5; + // string strDnsIp = 5; if (this->strdnsip().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strdnsip()); } - // bytes strDBUser = 6; + // string strDBUser = 6; if (this->strdbuser().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strdbuser()); } - // bytes strDBPwd = 7; + // string strDBPwd = 7; if (this->strdbpwd().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strdbpwd()); } diff --git a/Frame/SDK/Proto/AFMsgMysql.pb.h b/Frame/SDK/Proto/AFMsgMysql.pb.h index aaacd819..7c615246 100644 --- a/Frame/SDK/Proto/AFMsgMysql.pb.h +++ b/Frame/SDK/Proto/AFMsgMysql.pb.h @@ -155,7 +155,7 @@ class LIBPROTOC_EXPORT PackMysqlParam : public ::google::protobuf::Message /* @@ // accessors ------------------------------------------------------- - // bytes strRecordName = 1; + // string strRecordName = 1; void clear_strrecordname(); static const int kStrRecordNameFieldNumber = 1; const ::std::string& strrecordname() const; @@ -164,12 +164,12 @@ class LIBPROTOC_EXPORT PackMysqlParam : public ::google::protobuf::Message /* @@ void set_strrecordname(::std::string&& value); #endif void set_strrecordname(const char* value); - void set_strrecordname(const void* value, size_t size); + void set_strrecordname(const char* value, size_t size); ::std::string* mutable_strrecordname(); ::std::string* release_strrecordname(); void set_allocated_strrecordname(::std::string* strrecordname); - // bytes strKey = 2; + // string strKey = 2; void clear_strkey(); static const int kStrKeyFieldNumber = 2; const ::std::string& strkey() const; @@ -178,12 +178,12 @@ class LIBPROTOC_EXPORT PackMysqlParam : public ::google::protobuf::Message /* @@ void set_strkey(::std::string&& value); #endif void set_strkey(const char* value); - void set_strkey(const void* value, size_t size); + void set_strkey(const char* value, size_t size); ::std::string* mutable_strkey(); ::std::string* release_strkey(); void set_allocated_strkey(::std::string* strkey); - // bytes fieldVecList = 3; + // string fieldVecList = 3; void clear_fieldveclist(); static const int kFieldVecListFieldNumber = 3; const ::std::string& fieldveclist() const; @@ -192,12 +192,12 @@ class LIBPROTOC_EXPORT PackMysqlParam : public ::google::protobuf::Message /* @@ void set_fieldveclist(::std::string&& value); #endif void set_fieldveclist(const char* value); - void set_fieldveclist(const void* value, size_t size); + void set_fieldveclist(const char* value, size_t size); ::std::string* mutable_fieldveclist(); ::std::string* release_fieldveclist(); void set_allocated_fieldveclist(::std::string* fieldveclist); - // bytes valueVecList = 4; + // string valueVecList = 4; void clear_valueveclist(); static const int kValueVecListFieldNumber = 4; const ::std::string& valueveclist() const; @@ -206,7 +206,7 @@ class LIBPROTOC_EXPORT PackMysqlParam : public ::google::protobuf::Message /* @@ void set_valueveclist(::std::string&& value); #endif void set_valueveclist(const char* value); - void set_valueveclist(const void* value, size_t size); + void set_valueveclist(const char* value, size_t size); ::std::string* mutable_valueveclist(); ::std::string* release_valueveclist(); void set_allocated_valueveclist(::std::string* valueveclist); @@ -339,7 +339,7 @@ class LIBPROTOC_EXPORT PackMysqlServerInfo : public ::google::protobuf::Message // accessors ------------------------------------------------------- - // bytes strDBName = 4; + // string strDBName = 4; void clear_strdbname(); static const int kStrDBNameFieldNumber = 4; const ::std::string& strdbname() const; @@ -348,12 +348,12 @@ class LIBPROTOC_EXPORT PackMysqlServerInfo : public ::google::protobuf::Message void set_strdbname(::std::string&& value); #endif void set_strdbname(const char* value); - void set_strdbname(const void* value, size_t size); + void set_strdbname(const char* value, size_t size); ::std::string* mutable_strdbname(); ::std::string* release_strdbname(); void set_allocated_strdbname(::std::string* strdbname); - // bytes strDnsIp = 5; + // string strDnsIp = 5; void clear_strdnsip(); static const int kStrDnsIpFieldNumber = 5; const ::std::string& strdnsip() const; @@ -362,12 +362,12 @@ class LIBPROTOC_EXPORT PackMysqlServerInfo : public ::google::protobuf::Message void set_strdnsip(::std::string&& value); #endif void set_strdnsip(const char* value); - void set_strdnsip(const void* value, size_t size); + void set_strdnsip(const char* value, size_t size); ::std::string* mutable_strdnsip(); ::std::string* release_strdnsip(); void set_allocated_strdnsip(::std::string* strdnsip); - // bytes strDBUser = 6; + // string strDBUser = 6; void clear_strdbuser(); static const int kStrDBUserFieldNumber = 6; const ::std::string& strdbuser() const; @@ -376,12 +376,12 @@ class LIBPROTOC_EXPORT PackMysqlServerInfo : public ::google::protobuf::Message void set_strdbuser(::std::string&& value); #endif void set_strdbuser(const char* value); - void set_strdbuser(const void* value, size_t size); + void set_strdbuser(const char* value, size_t size); ::std::string* mutable_strdbuser(); ::std::string* release_strdbuser(); void set_allocated_strdbuser(::std::string* strdbuser); - // bytes strDBPwd = 7; + // string strDBPwd = 7; void clear_strdbpwd(); static const int kStrDBPwdFieldNumber = 7; const ::std::string& strdbpwd() const; @@ -390,7 +390,7 @@ class LIBPROTOC_EXPORT PackMysqlServerInfo : public ::google::protobuf::Message void set_strdbpwd(::std::string&& value); #endif void set_strdbpwd(const char* value); - void set_strdbpwd(const void* value, size_t size); + void set_strdbpwd(const char* value, size_t size); ::std::string* mutable_strdbpwd(); ::std::string* release_strdbpwd(); void set_allocated_strdbpwd(::std::string* strdbpwd); @@ -446,7 +446,7 @@ class LIBPROTOC_EXPORT PackMysqlServerInfo : public ::google::protobuf::Message #endif // __GNUC__ // PackMysqlParam -// bytes strRecordName = 1; +// string strRecordName = 1; inline void PackMysqlParam::clear_strrecordname() { strrecordname_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -473,7 +473,7 @@ inline void PackMysqlParam::set_strrecordname(const char* value) { strrecordname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackMysqlParam.strRecordName) } -inline void PackMysqlParam::set_strrecordname(const void* value, size_t size) { +inline void PackMysqlParam::set_strrecordname(const char* value, size_t size) { strrecordname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -499,7 +499,7 @@ inline void PackMysqlParam::set_allocated_strrecordname(::std::string* strrecord // @@protoc_insertion_point(field_set_allocated:AFMsg.PackMysqlParam.strRecordName) } -// bytes strKey = 2; +// string strKey = 2; inline void PackMysqlParam::clear_strkey() { strkey_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -526,7 +526,7 @@ inline void PackMysqlParam::set_strkey(const char* value) { strkey_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackMysqlParam.strKey) } -inline void PackMysqlParam::set_strkey(const void* value, size_t size) { +inline void PackMysqlParam::set_strkey(const char* value, size_t size) { strkey_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -552,7 +552,7 @@ inline void PackMysqlParam::set_allocated_strkey(::std::string* strkey) { // @@protoc_insertion_point(field_set_allocated:AFMsg.PackMysqlParam.strKey) } -// bytes fieldVecList = 3; +// string fieldVecList = 3; inline void PackMysqlParam::clear_fieldveclist() { fieldveclist_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -579,7 +579,7 @@ inline void PackMysqlParam::set_fieldveclist(const char* value) { fieldveclist_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackMysqlParam.fieldVecList) } -inline void PackMysqlParam::set_fieldveclist(const void* value, size_t size) { +inline void PackMysqlParam::set_fieldveclist(const char* value, size_t size) { fieldveclist_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -605,7 +605,7 @@ inline void PackMysqlParam::set_allocated_fieldveclist(::std::string* fieldvecli // @@protoc_insertion_point(field_set_allocated:AFMsg.PackMysqlParam.fieldVecList) } -// bytes valueVecList = 4; +// string valueVecList = 4; inline void PackMysqlParam::clear_valueveclist() { valueveclist_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -632,7 +632,7 @@ inline void PackMysqlParam::set_valueveclist(const char* value) { valueveclist_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackMysqlParam.valueVecList) } -inline void PackMysqlParam::set_valueveclist(const void* value, size_t size) { +inline void PackMysqlParam::set_valueveclist(const char* value, size_t size) { valueveclist_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -760,7 +760,7 @@ inline void PackMysqlServerInfo::set_nport(::google::protobuf::int64 value) { // @@protoc_insertion_point(field_set:AFMsg.PackMysqlServerInfo.nPort) } -// bytes strDBName = 4; +// string strDBName = 4; inline void PackMysqlServerInfo::clear_strdbname() { strdbname_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -787,7 +787,7 @@ inline void PackMysqlServerInfo::set_strdbname(const char* value) { strdbname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackMysqlServerInfo.strDBName) } -inline void PackMysqlServerInfo::set_strdbname(const void* value, size_t size) { +inline void PackMysqlServerInfo::set_strdbname(const char* value, size_t size) { strdbname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -813,7 +813,7 @@ inline void PackMysqlServerInfo::set_allocated_strdbname(::std::string* strdbnam // @@protoc_insertion_point(field_set_allocated:AFMsg.PackMysqlServerInfo.strDBName) } -// bytes strDnsIp = 5; +// string strDnsIp = 5; inline void PackMysqlServerInfo::clear_strdnsip() { strdnsip_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -840,7 +840,7 @@ inline void PackMysqlServerInfo::set_strdnsip(const char* value) { strdnsip_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackMysqlServerInfo.strDnsIp) } -inline void PackMysqlServerInfo::set_strdnsip(const void* value, size_t size) { +inline void PackMysqlServerInfo::set_strdnsip(const char* value, size_t size) { strdnsip_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -866,7 +866,7 @@ inline void PackMysqlServerInfo::set_allocated_strdnsip(::std::string* strdnsip) // @@protoc_insertion_point(field_set_allocated:AFMsg.PackMysqlServerInfo.strDnsIp) } -// bytes strDBUser = 6; +// string strDBUser = 6; inline void PackMysqlServerInfo::clear_strdbuser() { strdbuser_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -893,7 +893,7 @@ inline void PackMysqlServerInfo::set_strdbuser(const char* value) { strdbuser_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackMysqlServerInfo.strDBUser) } -inline void PackMysqlServerInfo::set_strdbuser(const void* value, size_t size) { +inline void PackMysqlServerInfo::set_strdbuser(const char* value, size_t size) { strdbuser_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -919,7 +919,7 @@ inline void PackMysqlServerInfo::set_allocated_strdbuser(::std::string* strdbuse // @@protoc_insertion_point(field_set_allocated:AFMsg.PackMysqlServerInfo.strDBUser) } -// bytes strDBPwd = 7; +// string strDBPwd = 7; inline void PackMysqlServerInfo::clear_strdbpwd() { strdbpwd_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -946,7 +946,7 @@ inline void PackMysqlServerInfo::set_strdbpwd(const char* value) { strdbpwd_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackMysqlServerInfo.strDBPwd) } -inline void PackMysqlServerInfo::set_strdbpwd(const void* value, size_t size) { +inline void PackMysqlServerInfo::set_strdbpwd(const char* value, size_t size) { strdbpwd_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); diff --git a/Frame/SDK/Proto/AFMsgMysql.proto b/Frame/SDK/Proto/AFMsgMysql.proto index eb953e60..c20218ac 100644 --- a/Frame/SDK/Proto/AFMsgMysql.proto +++ b/Frame/SDK/Proto/AFMsgMysql.proto @@ -4,10 +4,10 @@ package AFMsg; message PackMysqlParam { - bytes strRecordName = 1; - bytes strKey = 2; - bytes fieldVecList = 3; - bytes valueVecList = 4; + string strRecordName = 1; + string strKey = 2; + string fieldVecList = 3; + string valueVecList = 4; int64 bExit = 5; int64 nreqid = 6; int64 nRet = 7; @@ -19,9 +19,9 @@ message PackMysqlServerInfo int64 nRconnectTime = 1; int64 nRconneCount = 2; int64 nPort = 3; - bytes strDBName = 4; - bytes strDnsIp = 5; - bytes strDBUser = 6; - bytes strDBPwd = 7; + string strDBName = 4; + string strDnsIp = 5; + string strDBUser = 6; + string strDBPwd = 7; int64 nServerID = 8; } diff --git a/Frame/SDK/Proto/AFMsgPreGame.pb.cc.REMOVED.git-id b/Frame/SDK/Proto/AFMsgPreGame.pb.cc.REMOVED.git-id index 07b848e7..bbe8476d 100644 --- a/Frame/SDK/Proto/AFMsgPreGame.pb.cc.REMOVED.git-id +++ b/Frame/SDK/Proto/AFMsgPreGame.pb.cc.REMOVED.git-id @@ -1 +1 @@ -d89fa1fcac73d56e549bcb23740ba7d71028a926 \ No newline at end of file +9fb28ab41d12222941b66ae7e46a4bada5ffe99d \ No newline at end of file diff --git a/Frame/SDK/Proto/AFMsgPreGame.pb.h.REMOVED.git-id b/Frame/SDK/Proto/AFMsgPreGame.pb.h.REMOVED.git-id index a2e9f7f0..54decb80 100644 --- a/Frame/SDK/Proto/AFMsgPreGame.pb.h.REMOVED.git-id +++ b/Frame/SDK/Proto/AFMsgPreGame.pb.h.REMOVED.git-id @@ -1 +1 @@ -ae2fc0efd60bb31033dc3e43da4cb2ec34e4e651 \ No newline at end of file +6efff0e8f6c6f15fd89a92eb980df4fd9899b364 \ No newline at end of file diff --git a/Frame/SDK/Proto/AFMsgPreGame.proto b/Frame/SDK/Proto/AFMsgPreGame.proto index a56c43e1..b4feb90e 100644 --- a/Frame/SDK/Proto/AFMsgPreGame.proto +++ b/Frame/SDK/Proto/AFMsgPreGame.proto @@ -20,8 +20,8 @@ enum EServerState message ServerInfoReport//服务器之间报告服务器状态 { int32 server_id = 1; - bytes server_name = 2; - bytes server_ip = 3; + string server_name = 2; + string server_ip = 3; int32 server_port = 4; int32 server_max_online = 5; int32 server_cur_count = 6; @@ -44,29 +44,29 @@ message AckEventResult// //////////////////////////////////////////////////// message ReqAccountLogin//向网关(登录服务器)申请登录 { - bytes account = 2; - bytes password = 3; - bytes security_code = 4; - bytes signBuff = 5; + string account = 2; + string password = 3; + string security_code = 4; + string signBuff = 5; int32 clientVersion = 6; int32 loginMode = 7; int32 clientIP = 8; int64 clientMAC = 9; - bytes device_info = 10; - bytes extra_info = 11; + string device_info = 10; + string extra_info = 11; int32 platform_type = 12; } message ReqAccountLogout//向网关(登录服务器)申请登出 { - bytes account = 2; - bytes extra_info = 3; + string account = 2; + string extra_info = 3; } message ServerInfo//服务器信息---这个是面向玩家的 { int32 server_id = 1; - bytes name = 2; + string name = 2; int32 wait_count = 3; EServerState status = 4; } @@ -92,7 +92,7 @@ message AckServerList// message ReqConnectWorld//玩家想连到世界服务器,进游戏世界--登录通过后选世界 { int32 world_id = 1;//想去的世界ID - bytes account = 2;//玩家帐号--客户度发送时可以不填--转发需填 + string account = 2;//玩家帐号--客户度发送时可以不填--转发需填 Ident sender = 3;//玩家临时ID--客户度发送时可以不填--转发需填 int32 login_id = 4;//登录服务器ID--客户度发送时可以不填--转发需填 } @@ -102,10 +102,10 @@ message AckConnectWorldResult// int32 world_id = 1;//申请者想去的世界ID Ident sender = 2;//申请者临时ID int32 login_id = 3;//申请者所在的登录服务器ID - bytes account = 4;//申请者的帐号 - bytes world_ip = 5;//得到的世界服务器分配的网关IP + string account = 4;//申请者的帐号 + string world_ip = 5;//得到的世界服务器分配的网关IP int32 world_port = 6;//得到的世界服务器分配的端口 - bytes world_key = 7;//得到的握手KEY + string world_key = 7;//得到的握手KEY } message ReqSelectServer//玩家想选择单服务器 @@ -116,7 +116,7 @@ message ReqSelectServer// message ReqKickFromWorld//玩家想退出游戏世界 { int32 world_id = 1; - bytes account = 2;//帐号 + string account = 2;//帐号 } //继续登录进大世界网关 @@ -125,7 +125,7 @@ message ReqKickFromWorld// message ReqRoleList//请求得到角色列表 { int32 game_id = 1; - bytes account = 2; + string account = 2; } message RoleLiteInfo//角色基础信息 @@ -134,14 +134,14 @@ message RoleLiteInfo// int32 career = 2; int32 sex = 3; int32 race = 4; - bytes noob_name = 5; + string noob_name = 5; int32 game_id = 6; int32 role_level = 7; int32 delete_time = 8; int32 reg_time = 9; int32 last_offline_time = 10; int32 last_offline_ip = 11; - bytes view_record = 12; + string view_record = 12; } message AckRoleLiteInfoList//角色基础信息列表 @@ -151,25 +151,25 @@ message AckRoleLiteInfoList// message ReqCreateRole//创建角色 { - bytes account = 1; + string account = 1; int32 career = 2; int32 sex = 3; int32 race = 4; - bytes noob_name = 5; + string noob_name = 5; int32 game_id = 6; } message ReqDeleteRole//删除角色 { - bytes account = 1; - bytes name = 2; + string account = 1; + string name = 2; int32 game_id = 3; } message ReqRecoverRole//恢复角色 { - bytes account = 1; - bytes name = 2; + string account = 1; + string name = 2; int32 game_id = 3; } diff --git a/Frame/SDK/Proto/AFMsgShare.pb.cc.REMOVED.git-id b/Frame/SDK/Proto/AFMsgShare.pb.cc.REMOVED.git-id index 375db2e5..7ba3170c 100644 --- a/Frame/SDK/Proto/AFMsgShare.pb.cc.REMOVED.git-id +++ b/Frame/SDK/Proto/AFMsgShare.pb.cc.REMOVED.git-id @@ -1 +1 @@ -cbf064fc9c4affb2a78f6444454a9aafb576711b \ No newline at end of file +49ba5ea3eee97aa9fba7c96d7ffc6828679e2ad9 \ No newline at end of file diff --git a/Frame/SDK/Proto/AFMsgShare.pb.h.REMOVED.git-id b/Frame/SDK/Proto/AFMsgShare.pb.h.REMOVED.git-id index 6e55f6d9..c57dafc4 100644 --- a/Frame/SDK/Proto/AFMsgShare.pb.h.REMOVED.git-id +++ b/Frame/SDK/Proto/AFMsgShare.pb.h.REMOVED.git-id @@ -1 +1 @@ -69f8d20c837e61998c3997e179c1853f3eac18b4 \ No newline at end of file +32721da22b5e4fead91bf8587d212bd40241ae48 \ No newline at end of file diff --git a/Frame/SDK/Proto/AFMsgShare.proto b/Frame/SDK/Proto/AFMsgShare.proto index 73d06cb8..78a3abf3 100644 --- a/Frame/SDK/Proto/AFMsgShare.proto +++ b/Frame/SDK/Proto/AFMsgShare.proto @@ -11,9 +11,9 @@ import "AFMsgBase.proto"; message ReqEnterGameServer { Ident id = 1; - bytes account = 2; + string account = 2; int32 game_id = 3; - bytes name = 4; + string name = 4; } message ReqHeartBeat @@ -30,9 +30,9 @@ message PlayerEntryInfo//瀵硅薄鍑虹幇鍩烘湰淇℃伅 Point3D pos = 2; int32 career_type = 3; int32 player_state = 4; - bytes config_id = 5; + string config_id = 5; int32 scene_id = 6; - bytes class_id = 7; + string class_id = 7; } message AckPlayerEntryList//瀵硅薄鍑虹幇鍒楄〃 @@ -59,7 +59,7 @@ message ReqAckSynData//瀵硅薄绂诲幓鍒楄〃 } Ident syser = 1; repeated Ident object_list = 2; - bytes data = 3; + string data = 3; SynType syn_type = 4; EGameMsgID msg_id = 5;//鏈夋秷鎭疘D闄愬埗 } @@ -83,7 +83,7 @@ message ChatContainer } int32 ConTainerType = 2; - bytes data_info = 3; + string data_info = 3; } message ReqAckPlayerChat @@ -98,8 +98,8 @@ message ReqAckPlayerChat Ident chat_id = 1; EGameChatType chat_type = 2; - bytes chat_info = 3; - bytes chat_name = 4; + string chat_info = 3; + string chat_name = 4; Ident target_id = 5; repeated ChatContainer Container_data = 6; } @@ -120,7 +120,7 @@ message EffectData message ReqAckUseSkill { Ident user = 1; - bytes skill_id = 2; + string skill_id = 2; Position now_pos = 3; Position tar_pos = 4; int32 use_index = 5;//鍥犱负瀹㈡埛绔鍏堝睍绀 @@ -184,12 +184,12 @@ message ReqPickDropItem//鎷惧彇鐗╁搧 message ReqAcceptTask//鎺ュ彈浠诲姟 { - bytes task_id = 1; + string task_id = 1; } message ReqCompeleteTask//瀹屾垚浠诲姟鍚庣敵璇烽濂 { - bytes task_id = 1; + string task_id = 1; } ///////////////鎴樻枟///////////////////////////////////////////////////////////////////////////////////// @@ -361,21 +361,21 @@ message ChatInfo } EChatType chat_type = 1;//01鏅2涓栫晫 - bytes chat_info = 2; + string chat_info = 2; int64 chat_time = 3;// - bytes addtional_info = 4;//闄勪欢 + string addtional_info = 4;//闄勪欢 Ident send_id = 5;//鍙戦佽呯殑ID - bytes send_name = 6;//鍙戦佽呯殑鍚嶅瓧 + string send_name = 6;//鍙戦佽呯殑鍚嶅瓧 int32 send_level = 7;//鍙戦佽呯殑绛夌骇 repeated Ident recvier_id = 8;//鎺ユ敹鑰呭垪琛 - bytes guid_name = 9;//鍏細鍚 + string guid_name = 9;//鍏細鍚 } message ReqAckCreateChatGroup { - bytes name = 1;//鍚嶅瓧 + string name = 1;//鍚嶅瓧 Ident selfid = 2;//瑙掕壊ID Ident xChatGroupid = 3;//鑱婂ぉ缁勭殑ID int32 chatType = 4;//鑱婂ぉ缁勭殑鑱婂ぉ绫诲瀷 @@ -443,7 +443,7 @@ message ReqInlaystoneToEquip { Ident selfid = 1;//瑙掕壊ID Ident equipid = 2;//瑁呭ID - bytes stoneid = 3;//鐭冲ごID + string stoneid = 3;//鐭冲ごID int32 hole_index = 4;//绌轰綅 } @@ -641,18 +641,18 @@ message GridGuildBaseInfo int32 level = 2; //Level int32 count = 3; //浜烘暟 int32 resource = 4; //璧勬簮 - bytes icon = 5; //Icon + string icon = 5; //Icon } // EGMI_REQ_MAP_GRID_INFO message ReqBigMapGridInfo { - repeated bytes map_title_id = 1; + repeated string map_title_id = 1; } message BigMapGridBaseInfo { - bytes id = 1; //GridID + string id = 1; //GridID GridGuildBaseInfo guild_info = 2; //鎵灞炲崰棰嗗叕浼 //war state @@ -669,8 +669,8 @@ message BigMapGridBaseInfo message BigMapLeaveMsg { Ident owner = 1;//鐣欒█鑰 - bytes owner_name = 2;//鐣欒█鑰 - bytes msg_data = 3;//鐣欒█鍐呭 + string owner_name = 2;//鐣欒█鑰 + string msg_data = 3;//鐣欒█鍐呭 int32 msg_time = 4;//鐣欒█鏃堕棿 int32 owner_level = 5;//鐣欒█鏃秎evel } @@ -713,7 +713,7 @@ message AckBigMapInfo // EGMI_REQ_HOLD_MAP_GRID message ReqHoldMapGrid { - bytes map_title_id = 1; + string map_title_id = 1; Ident guild_id = 2; } // EGMI_ACK_HOLD_MAP_GRID @@ -724,7 +724,7 @@ message AckHoldMapGrid // EGMI_REQ_LEAVE_MSG_MAP_GRID message ReqLeaveMapMsg { - bytes map_title_id = 1; + string map_title_id = 1; BigMapLeaveMsg leave_msg = 2; } // EGMI_ACK_LEAVE_MSG_MAP_GRID @@ -735,7 +735,7 @@ message AckLeaveMapMsg // EGMI_REQ_GET_MAP_GRID_AWARD message ReqGetMapAward { - bytes map_title_id = 1; + string map_title_id = 1; } // EGMI_ACK_GET_MAP_GRID_AWARD message AckGetMapAward @@ -745,7 +745,7 @@ message AckGetMapAward // EGMI_REQ_MAP_GRID_HUNTING message ReqMapHunting { - bytes map_title_id = 1; + string map_title_id = 1; } // EGMI_ACK_MAP_GRID_HUNTING message AckMapHunting @@ -755,7 +755,7 @@ message AckMapHunting // EGMI_REQ_MAP_GRID_KING_WAR message ReqMapKingWar { - bytes map_title_id = 1; + string map_title_id = 1; } // EGMI_ACK_MAP_GRID_KING_WAR message AckMapKingWar diff --git a/Frame/SDK/Proto/AFMsgURl.pb.cc b/Frame/SDK/Proto/AFMsgURl.pb.cc index 2a0986a7..56b6daae 100644 --- a/Frame/SDK/Proto/AFMsgURl.pb.cc +++ b/Frame/SDK/Proto/AFMsgURl.pb.cc @@ -96,9 +96,9 @@ void AddDescriptorsImpl() { InitDefaults(); static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = { "\n\016AFMsgURl.proto\022\005AFMsg\"\241\001\n\rPackSURLPara" - "m\022\016\n\006strUrl\030\001 \001(\014\022\024\n\014strGetParams\030\002 \001(\014\022" - "\023\n\013strBodyData\030\003 \001(\014\022\022\n\nstrCookies\030\004 \001(\014" - "\022\023\n\013fTimeOutSec\030\005 \001(\001\022\016\n\006strRsp\030\006 \001(\014\022\014\n" + "m\022\016\n\006strUrl\030\001 \001(\t\022\024\n\014strGetParams\030\002 \001(\t\022" + "\023\n\013strBodyData\030\003 \001(\t\022\022\n\nstrCookies\030\004 \001(\t" + "\022\023\n\013fTimeOutSec\030\005 \001(\001\022\016\n\006strRsp\030\006 \001(\t\022\014\n" "\004nRet\030\007 \001(\003\022\016\n\006nReqID\030\010 \001(\003b\006proto3" }; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( @@ -242,48 +242,64 @@ bool PackSURLParam::MergePartialFromCodedStream( tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // bytes strUrl = 1; + // string strUrl = 1; case 1: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(10u /* 10 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strurl())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strurl().data(), static_cast(this->strurl().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackSURLParam.strUrl")); } else { goto handle_unusual; } break; } - // bytes strGetParams = 2; + // string strGetParams = 2; case 2: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strgetparams())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strgetparams().data(), static_cast(this->strgetparams().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackSURLParam.strGetParams")); } else { goto handle_unusual; } break; } - // bytes strBodyData = 3; + // string strBodyData = 3; case 3: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strbodydata())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strbodydata().data(), static_cast(this->strbodydata().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackSURLParam.strBodyData")); } else { goto handle_unusual; } break; } - // bytes strCookies = 4; + // string strCookies = 4; case 4: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strcookies())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strcookies().data(), static_cast(this->strcookies().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackSURLParam.strCookies")); } else { goto handle_unusual; } @@ -304,12 +320,16 @@ bool PackSURLParam::MergePartialFromCodedStream( break; } - // bytes strRsp = 6; + // string strRsp = 6; case 6: { if (static_cast< ::google::protobuf::uint8>(tag) == static_cast< ::google::protobuf::uint8>(50u /* 50 & 0xFF */)) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_strrsp())); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strrsp().data(), static_cast(this->strrsp().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "AFMsg.PackSURLParam.strRsp")); } else { goto handle_unusual; } @@ -370,27 +390,43 @@ void PackSURLParam::SerializeWithCachedSizes( ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // bytes strUrl = 1; + // string strUrl = 1; if (this->strurl().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strurl().data(), static_cast(this->strurl().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackSURLParam.strUrl"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 1, this->strurl(), output); } - // bytes strGetParams = 2; + // string strGetParams = 2; if (this->strgetparams().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strgetparams().data(), static_cast(this->strgetparams().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackSURLParam.strGetParams"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 2, this->strgetparams(), output); } - // bytes strBodyData = 3; + // string strBodyData = 3; if (this->strbodydata().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strbodydata().data(), static_cast(this->strbodydata().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackSURLParam.strBodyData"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 3, this->strbodydata(), output); } - // bytes strCookies = 4; + // string strCookies = 4; if (this->strcookies().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strcookies().data(), static_cast(this->strcookies().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackSURLParam.strCookies"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 4, this->strcookies(), output); } @@ -399,9 +435,13 @@ void PackSURLParam::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteDouble(5, this->ftimeoutsec(), output); } - // bytes strRsp = 6; + // string strRsp = 6; if (this->strrsp().size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strrsp().data(), static_cast(this->strrsp().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackSURLParam.strRsp"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( 6, this->strrsp(), output); } @@ -429,31 +469,47 @@ ::google::protobuf::uint8* PackSURLParam::InternalSerializeWithCachedSizesToArra ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; - // bytes strUrl = 1; + // string strUrl = 1; if (this->strurl().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strurl().data(), static_cast(this->strurl().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackSURLParam.strUrl"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 1, this->strurl(), target); } - // bytes strGetParams = 2; + // string strGetParams = 2; if (this->strgetparams().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strgetparams().data(), static_cast(this->strgetparams().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackSURLParam.strGetParams"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 2, this->strgetparams(), target); } - // bytes strBodyData = 3; + // string strBodyData = 3; if (this->strbodydata().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strbodydata().data(), static_cast(this->strbodydata().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackSURLParam.strBodyData"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 3, this->strbodydata(), target); } - // bytes strCookies = 4; + // string strCookies = 4; if (this->strcookies().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strcookies().data(), static_cast(this->strcookies().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackSURLParam.strCookies"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 4, this->strcookies(), target); } @@ -462,10 +518,14 @@ ::google::protobuf::uint8* PackSURLParam::InternalSerializeWithCachedSizesToArra target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(5, this->ftimeoutsec(), target); } - // bytes strRsp = 6; + // string strRsp = 6; if (this->strrsp().size() > 0) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + this->strrsp().data(), static_cast(this->strrsp().length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "AFMsg.PackSURLParam.strRsp"); target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( 6, this->strrsp(), target); } @@ -496,38 +556,38 @@ size_t PackSURLParam::ByteSizeLong() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( (::google::protobuf::internal::GetProto3PreserveUnknownsDefault() ? _internal_metadata_.unknown_fields() : _internal_metadata_.default_instance())); } - // bytes strUrl = 1; + // string strUrl = 1; if (this->strurl().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strurl()); } - // bytes strGetParams = 2; + // string strGetParams = 2; if (this->strgetparams().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strgetparams()); } - // bytes strBodyData = 3; + // string strBodyData = 3; if (this->strbodydata().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strbodydata()); } - // bytes strCookies = 4; + // string strCookies = 4; if (this->strcookies().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strcookies()); } - // bytes strRsp = 6; + // string strRsp = 6; if (this->strrsp().size() > 0) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( + ::google::protobuf::internal::WireFormatLite::StringSize( this->strrsp()); } diff --git a/Frame/SDK/Proto/AFMsgURl.pb.h b/Frame/SDK/Proto/AFMsgURl.pb.h index 461ad2df..cb10731a 100644 --- a/Frame/SDK/Proto/AFMsgURl.pb.h +++ b/Frame/SDK/Proto/AFMsgURl.pb.h @@ -148,7 +148,7 @@ class LIBPROTOC_EXPORT PackSURLParam : public ::google::protobuf::Message /* @@p // accessors ------------------------------------------------------- - // bytes strUrl = 1; + // string strUrl = 1; void clear_strurl(); static const int kStrUrlFieldNumber = 1; const ::std::string& strurl() const; @@ -157,12 +157,12 @@ class LIBPROTOC_EXPORT PackSURLParam : public ::google::protobuf::Message /* @@p void set_strurl(::std::string&& value); #endif void set_strurl(const char* value); - void set_strurl(const void* value, size_t size); + void set_strurl(const char* value, size_t size); ::std::string* mutable_strurl(); ::std::string* release_strurl(); void set_allocated_strurl(::std::string* strurl); - // bytes strGetParams = 2; + // string strGetParams = 2; void clear_strgetparams(); static const int kStrGetParamsFieldNumber = 2; const ::std::string& strgetparams() const; @@ -171,12 +171,12 @@ class LIBPROTOC_EXPORT PackSURLParam : public ::google::protobuf::Message /* @@p void set_strgetparams(::std::string&& value); #endif void set_strgetparams(const char* value); - void set_strgetparams(const void* value, size_t size); + void set_strgetparams(const char* value, size_t size); ::std::string* mutable_strgetparams(); ::std::string* release_strgetparams(); void set_allocated_strgetparams(::std::string* strgetparams); - // bytes strBodyData = 3; + // string strBodyData = 3; void clear_strbodydata(); static const int kStrBodyDataFieldNumber = 3; const ::std::string& strbodydata() const; @@ -185,12 +185,12 @@ class LIBPROTOC_EXPORT PackSURLParam : public ::google::protobuf::Message /* @@p void set_strbodydata(::std::string&& value); #endif void set_strbodydata(const char* value); - void set_strbodydata(const void* value, size_t size); + void set_strbodydata(const char* value, size_t size); ::std::string* mutable_strbodydata(); ::std::string* release_strbodydata(); void set_allocated_strbodydata(::std::string* strbodydata); - // bytes strCookies = 4; + // string strCookies = 4; void clear_strcookies(); static const int kStrCookiesFieldNumber = 4; const ::std::string& strcookies() const; @@ -199,12 +199,12 @@ class LIBPROTOC_EXPORT PackSURLParam : public ::google::protobuf::Message /* @@p void set_strcookies(::std::string&& value); #endif void set_strcookies(const char* value); - void set_strcookies(const void* value, size_t size); + void set_strcookies(const char* value, size_t size); ::std::string* mutable_strcookies(); ::std::string* release_strcookies(); void set_allocated_strcookies(::std::string* strcookies); - // bytes strRsp = 6; + // string strRsp = 6; void clear_strrsp(); static const int kStrRspFieldNumber = 6; const ::std::string& strrsp() const; @@ -213,7 +213,7 @@ class LIBPROTOC_EXPORT PackSURLParam : public ::google::protobuf::Message /* @@p void set_strrsp(::std::string&& value); #endif void set_strrsp(const char* value); - void set_strrsp(const void* value, size_t size); + void set_strrsp(const char* value, size_t size); ::std::string* mutable_strrsp(); ::std::string* release_strrsp(); void set_allocated_strrsp(::std::string* strrsp); @@ -263,7 +263,7 @@ class LIBPROTOC_EXPORT PackSURLParam : public ::google::protobuf::Message /* @@p #endif // __GNUC__ // PackSURLParam -// bytes strUrl = 1; +// string strUrl = 1; inline void PackSURLParam::clear_strurl() { strurl_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -290,7 +290,7 @@ inline void PackSURLParam::set_strurl(const char* value) { strurl_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackSURLParam.strUrl) } -inline void PackSURLParam::set_strurl(const void* value, size_t size) { +inline void PackSURLParam::set_strurl(const char* value, size_t size) { strurl_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -316,7 +316,7 @@ inline void PackSURLParam::set_allocated_strurl(::std::string* strurl) { // @@protoc_insertion_point(field_set_allocated:AFMsg.PackSURLParam.strUrl) } -// bytes strGetParams = 2; +// string strGetParams = 2; inline void PackSURLParam::clear_strgetparams() { strgetparams_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -343,7 +343,7 @@ inline void PackSURLParam::set_strgetparams(const char* value) { strgetparams_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackSURLParam.strGetParams) } -inline void PackSURLParam::set_strgetparams(const void* value, size_t size) { +inline void PackSURLParam::set_strgetparams(const char* value, size_t size) { strgetparams_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -369,7 +369,7 @@ inline void PackSURLParam::set_allocated_strgetparams(::std::string* strgetparam // @@protoc_insertion_point(field_set_allocated:AFMsg.PackSURLParam.strGetParams) } -// bytes strBodyData = 3; +// string strBodyData = 3; inline void PackSURLParam::clear_strbodydata() { strbodydata_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -396,7 +396,7 @@ inline void PackSURLParam::set_strbodydata(const char* value) { strbodydata_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackSURLParam.strBodyData) } -inline void PackSURLParam::set_strbodydata(const void* value, size_t size) { +inline void PackSURLParam::set_strbodydata(const char* value, size_t size) { strbodydata_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -422,7 +422,7 @@ inline void PackSURLParam::set_allocated_strbodydata(::std::string* strbodydata) // @@protoc_insertion_point(field_set_allocated:AFMsg.PackSURLParam.strBodyData) } -// bytes strCookies = 4; +// string strCookies = 4; inline void PackSURLParam::clear_strcookies() { strcookies_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -449,7 +449,7 @@ inline void PackSURLParam::set_strcookies(const char* value) { strcookies_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackSURLParam.strCookies) } -inline void PackSURLParam::set_strcookies(const void* value, size_t size) { +inline void PackSURLParam::set_strcookies(const char* value, size_t size) { strcookies_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); @@ -489,7 +489,7 @@ inline void PackSURLParam::set_ftimeoutsec(double value) { // @@protoc_insertion_point(field_set:AFMsg.PackSURLParam.fTimeOutSec) } -// bytes strRsp = 6; +// string strRsp = 6; inline void PackSURLParam::clear_strrsp() { strrsp_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } @@ -516,7 +516,7 @@ inline void PackSURLParam::set_strrsp(const char* value) { strrsp_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:AFMsg.PackSURLParam.strRsp) } -inline void PackSURLParam::set_strrsp(const void* value, size_t size) { +inline void PackSURLParam::set_strrsp(const char* value, size_t size) { strrsp_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); diff --git a/Frame/SDK/Proto/AFMsgURl.proto b/Frame/SDK/Proto/AFMsgURl.proto index d3f0d947..91fb15b0 100644 --- a/Frame/SDK/Proto/AFMsgURl.proto +++ b/Frame/SDK/Proto/AFMsgURl.proto @@ -6,12 +6,12 @@ package AFMsg; message PackSURLParam { - bytes strUrl = 1; - bytes strGetParams = 2; - bytes strBodyData = 3; - bytes strCookies = 4; + string strUrl = 1; + string strGetParams = 2; + string strBodyData = 3; + string strCookies = 4; double fTimeOutSec = 5; - bytes strRsp = 6; + string strRsp = 6; int64 nRet = 7; int64 nReqID = 8; } diff --git a/Frame/SDK/Proto/cs/AFMsgBase.cs.REMOVED.git-id b/Frame/SDK/Proto/cs/AFMsgBase.cs.REMOVED.git-id index 105c26ab..ccefd7e4 100644 --- a/Frame/SDK/Proto/cs/AFMsgBase.cs.REMOVED.git-id +++ b/Frame/SDK/Proto/cs/AFMsgBase.cs.REMOVED.git-id @@ -1 +1 @@ -f8a3280447cfd84b29e7426591c4e84b8d0f8dce \ No newline at end of file +00f627044f7e94d5f10f25ccef948d428c0d2ee5 \ No newline at end of file diff --git a/Frame/SDK/Proto/cs/AFMsgPreGame.cs.REMOVED.git-id b/Frame/SDK/Proto/cs/AFMsgPreGame.cs.REMOVED.git-id index dd4c6c7b..614a0fcd 100644 --- a/Frame/SDK/Proto/cs/AFMsgPreGame.cs.REMOVED.git-id +++ b/Frame/SDK/Proto/cs/AFMsgPreGame.cs.REMOVED.git-id @@ -1 +1 @@ -895e17accce909f8b491edbb899d125a628ce656 \ No newline at end of file +adc0135bc15cfc9e0a199b1f7343d1d6b0062c96 \ No newline at end of file diff --git a/Frame/SDK/Proto/cs/AFMsgShare.cs.REMOVED.git-id b/Frame/SDK/Proto/cs/AFMsgShare.cs.REMOVED.git-id index ab7fc3c8..3ac8f914 100644 --- a/Frame/SDK/Proto/cs/AFMsgShare.cs.REMOVED.git-id +++ b/Frame/SDK/Proto/cs/AFMsgShare.cs.REMOVED.git-id @@ -1 +1 @@ -681fa8529de8f983064bdc2916bc81c9fdc2566f \ No newline at end of file +f1f8db0f14e447ee1ebb28f729b50669659b557e \ No newline at end of file diff --git a/Frame/SDK/Proto/cs/AFMsgURl.cs b/Frame/SDK/Proto/cs/AFMsgURl.cs index 836f932e..92a4ecec 100644 --- a/Frame/SDK/Proto/cs/AFMsgURl.cs +++ b/Frame/SDK/Proto/cs/AFMsgURl.cs @@ -25,9 +25,9 @@ static AFMsgURlReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Cg5BRk1zZ1VSbC5wcm90bxIFQUZNc2cioQEKDVBhY2tTVVJMUGFyYW0SDgoG", - "c3RyVXJsGAEgASgMEhQKDHN0ckdldFBhcmFtcxgCIAEoDBITCgtzdHJCb2R5", - "RGF0YRgDIAEoDBISCgpzdHJDb29raWVzGAQgASgMEhMKC2ZUaW1lT3V0U2Vj", - "GAUgASgBEg4KBnN0clJzcBgGIAEoDBIMCgRuUmV0GAcgASgDEg4KBm5SZXFJ", + "c3RyVXJsGAEgASgJEhQKDHN0ckdldFBhcmFtcxgCIAEoCRITCgtzdHJCb2R5", + "RGF0YRgDIAEoCRISCgpzdHJDb29raWVzGAQgASgJEhMKC2ZUaW1lT3V0U2Vj", + "GAUgASgBEg4KBnN0clJzcBgGIAEoCRIMCgRuUmV0GAcgASgDEg4KBm5SZXFJ", "RBgIIAEoA2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, @@ -82,9 +82,9 @@ public PackSURLParam Clone() { /// Field number for the "strUrl" field. public const int StrUrlFieldNumber = 1; - private pb::ByteString strUrl_ = pb::ByteString.Empty; + private string strUrl_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pb::ByteString StrUrl { + public string StrUrl { get { return strUrl_; } set { strUrl_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); @@ -93,9 +93,9 @@ public PackSURLParam Clone() { /// Field number for the "strGetParams" field. public const int StrGetParamsFieldNumber = 2; - private pb::ByteString strGetParams_ = pb::ByteString.Empty; + private string strGetParams_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pb::ByteString StrGetParams { + public string StrGetParams { get { return strGetParams_; } set { strGetParams_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); @@ -104,9 +104,9 @@ public PackSURLParam Clone() { /// Field number for the "strBodyData" field. public const int StrBodyDataFieldNumber = 3; - private pb::ByteString strBodyData_ = pb::ByteString.Empty; + private string strBodyData_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pb::ByteString StrBodyData { + public string StrBodyData { get { return strBodyData_; } set { strBodyData_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); @@ -115,9 +115,9 @@ public PackSURLParam Clone() { /// Field number for the "strCookies" field. public const int StrCookiesFieldNumber = 4; - private pb::ByteString strCookies_ = pb::ByteString.Empty; + private string strCookies_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pb::ByteString StrCookies { + public string StrCookies { get { return strCookies_; } set { strCookies_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); @@ -137,9 +137,9 @@ public double FTimeOutSec { /// Field number for the "strRsp" field. public const int StrRspFieldNumber = 6; - private pb::ByteString strRsp_ = pb::ByteString.Empty; + private string strRsp_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public pb::ByteString StrRsp { + public string StrRsp { get { return strRsp_; } set { strRsp_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); @@ -218,19 +218,19 @@ public override string ToString() { public void WriteTo(pb::CodedOutputStream output) { if (StrUrl.Length != 0) { output.WriteRawTag(10); - output.WriteBytes(StrUrl); + output.WriteString(StrUrl); } if (StrGetParams.Length != 0) { output.WriteRawTag(18); - output.WriteBytes(StrGetParams); + output.WriteString(StrGetParams); } if (StrBodyData.Length != 0) { output.WriteRawTag(26); - output.WriteBytes(StrBodyData); + output.WriteString(StrBodyData); } if (StrCookies.Length != 0) { output.WriteRawTag(34); - output.WriteBytes(StrCookies); + output.WriteString(StrCookies); } if (FTimeOutSec != 0D) { output.WriteRawTag(41); @@ -238,7 +238,7 @@ public void WriteTo(pb::CodedOutputStream output) { } if (StrRsp.Length != 0) { output.WriteRawTag(50); - output.WriteBytes(StrRsp); + output.WriteString(StrRsp); } if (NRet != 0L) { output.WriteRawTag(56); @@ -257,22 +257,22 @@ public void WriteTo(pb::CodedOutputStream output) { public int CalculateSize() { int size = 0; if (StrUrl.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeBytesSize(StrUrl); + size += 1 + pb::CodedOutputStream.ComputeStringSize(StrUrl); } if (StrGetParams.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeBytesSize(StrGetParams); + size += 1 + pb::CodedOutputStream.ComputeStringSize(StrGetParams); } if (StrBodyData.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeBytesSize(StrBodyData); + size += 1 + pb::CodedOutputStream.ComputeStringSize(StrBodyData); } if (StrCookies.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeBytesSize(StrCookies); + size += 1 + pb::CodedOutputStream.ComputeStringSize(StrCookies); } if (FTimeOutSec != 0D) { size += 1 + 8; } if (StrRsp.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeBytesSize(StrRsp); + size += 1 + pb::CodedOutputStream.ComputeStringSize(StrRsp); } if (NRet != 0L) { size += 1 + pb::CodedOutputStream.ComputeInt64Size(NRet); @@ -327,19 +327,19 @@ public void MergeFrom(pb::CodedInputStream input) { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 10: { - StrUrl = input.ReadBytes(); + StrUrl = input.ReadString(); break; } case 18: { - StrGetParams = input.ReadBytes(); + StrGetParams = input.ReadString(); break; } case 26: { - StrBodyData = input.ReadBytes(); + StrBodyData = input.ReadString(); break; } case 34: { - StrCookies = input.ReadBytes(); + StrCookies = input.ReadString(); break; } case 41: { @@ -347,7 +347,7 @@ public void MergeFrom(pb::CodedInputStream input) { break; } case 50: { - StrRsp = input.ReadBytes(); + StrRsp = input.ReadString(); break; } case 56: {