diff --git a/tbm/Api/Request/Common.proto b/tbm/Api/Request/Common.proto index 22836d26f..be202bc3e 100644 --- a/tbm/Api/Request/Common.proto +++ b/tbm/Api/Request/Common.proto @@ -2,5 +2,6 @@ syntax = "proto3"; package tbClient.api.request; message Common { + int32 _client_type = 1; string _client_version = 2; } diff --git a/tbm_cs/Api/Request/Common.g.cs b/tbm_cs/Api/Request/Common.g.cs index df1d40441..c5a8d5361 100644 --- a/tbm_cs/Api/Request/Common.g.cs +++ b/tbm_cs/Api/Request/Common.g.cs @@ -25,12 +25,12 @@ static CommonReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChhBcGkvUmVxdWVzdC9Db21tb24ucHJvdG8SFHRiQ2xpZW50LmFwaS5yZXF1", - "ZXN0IiEKBkNvbW1vbhIXCg9fY2xpZW50X3ZlcnNpb24YAiABKAliBnByb3Rv", - "Mw==")); + "ZXN0IjcKBkNvbW1vbhIUCgxfY2xpZW50X3R5cGUYASABKAUSFwoPX2NsaWVu", + "dF92ZXJzaW9uGAIgASgJYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::TbClient.Api.Request.Common), global::TbClient.Api.Request.Common.Parser, new[]{ "ClientVersion" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::TbClient.Api.Request.Common), global::TbClient.Api.Request.Common.Parser, new[]{ "ClientType", "ClientVersion" }, null, null, null, null) })); } #endregion @@ -71,6 +71,7 @@ public Common() { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public Common(Common other) : this() { + ClientType_ = other.ClientType_; ClientVersion_ = other.ClientVersion_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -81,6 +82,18 @@ public Common Clone() { return new Common(this); } + /// Field number for the "_client_type" field. + public const int ClientTypeFieldNumber = 1; + private int ClientType_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int ClientType { + get { return ClientType_; } + set { + ClientType_ = value; + } + } + /// Field number for the "_client_version" field. public const int ClientVersionFieldNumber = 2; private string ClientVersion_ = ""; @@ -108,6 +121,7 @@ public bool Equals(Common other) { if (ReferenceEquals(other, this)) { return true; } + if (ClientType != other.ClientType) return false; if (ClientVersion != other.ClientVersion) return false; return Equals(_unknownFields, other._unknownFields); } @@ -116,6 +130,7 @@ public bool Equals(Common other) { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; + if (ClientType != 0) hash ^= ClientType.GetHashCode(); if (ClientVersion.Length != 0) hash ^= ClientVersion.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -135,6 +150,10 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else + if (ClientType != 0) { + output.WriteRawTag(8); + output.WriteInt32(ClientType); + } if (ClientVersion.Length != 0) { output.WriteRawTag(18); output.WriteString(ClientVersion); @@ -149,6 +168,10 @@ public void WriteTo(pb::CodedOutputStream output) { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (ClientType != 0) { + output.WriteRawTag(8); + output.WriteInt32(ClientType); + } if (ClientVersion.Length != 0) { output.WriteRawTag(18); output.WriteString(ClientVersion); @@ -163,6 +186,9 @@ public void WriteTo(pb::CodedOutputStream output) { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; + if (ClientType != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(ClientType); + } if (ClientVersion.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(ClientVersion); } @@ -178,6 +204,9 @@ public void MergeFrom(Common other) { if (other == null) { return; } + if (other.ClientType != 0) { + ClientType = other.ClientType; + } if (other.ClientVersion.Length != 0) { ClientVersion = other.ClientVersion; } @@ -196,6 +225,10 @@ public void MergeFrom(pb::CodedInputStream input) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; + case 8: { + ClientType = input.ReadInt32(); + break; + } case 18: { ClientVersion = input.ReadString(); break; @@ -215,6 +248,10 @@ public void MergeFrom(pb::CodedInputStream input) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; + case 8: { + ClientType = input.ReadInt32(); + break; + } case 18: { ClientVersion = input.ReadString(); break; diff --git a/tbm_php/GPBMetadata/Api/Request/Common.php b/tbm_php/GPBMetadata/Api/Request/Common.php index ef228e29b..021060a05 100644 --- a/tbm_php/GPBMetadata/Api/Request/Common.php +++ b/tbm_php/GPBMetadata/Api/Request/Common.php @@ -16,9 +16,10 @@ public static function initOnce() { } $pool->internalAddGeneratedFile( ' -[ -Api/Request/Common.prototbClient.api.request"! -Common +q +Api/Request/Common.prototbClient.api.request"7 +Common + _client_type ( _client_version ( bproto3' , true); diff --git a/tbm_php/TbClient/Api/Request/Common.php b/tbm_php/TbClient/Api/Request/Common.php index 2c4242b12..03d89717a 100644 --- a/tbm_php/TbClient/Api/Request/Common.php +++ b/tbm_php/TbClient/Api/Request/Common.php @@ -13,6 +13,10 @@ */ class Common extends \Google\Protobuf\Internal\Message { + /** + * Generated from protobuf field int32 _client_type = 1; + */ + protected $_client_type = 0; /** * Generated from protobuf field string _client_version = 2; */ @@ -24,6 +28,7 @@ class Common extends \Google\Protobuf\Internal\Message * @param array $data { * Optional. Data for populating the Message object. * + * @type int $_client_type * @type string $_client_version * } */ @@ -32,6 +37,28 @@ public function __construct($data = NULL) { parent::__construct($data); } + /** + * Generated from protobuf field int32 _client_type = 1; + * @return int + */ + public function getClientType() + { + return $this->_client_type; + } + + /** + * Generated from protobuf field int32 _client_type = 1; + * @param int $var + * @return $this + */ + public function setClientType($var) + { + GPBUtil::checkInt32($var); + $this->_client_type = $var; + + return $this; + } + /** * Generated from protobuf field string _client_version = 2; * @return string