diff --git a/MP/Response.cpp b/MP/Response.cpp
index 134f757..349c8a3 100644
--- a/MP/Response.cpp
+++ b/MP/Response.cpp
@@ -4,9 +4,9 @@
 
 #include "Response.h"
 
-Response::Response(mp::MP_TYPE type, mp::MP_SRI code, const std::string &username, const std::string &msg, const std::string &token) :
+Response::Response(mp::MP_TYPE type, mp::MP_SUB_TYPE subType, const std::string &username, const std::string &msg, const std::string &token) :
     Mph(type),
-    Sri(code, username, msg, token) {
+    Sri(subType, username, msg, token) {
 }
 
 Response::~Response() {
diff --git a/MP/Response.h b/MP/Response.h
index e8e5298..d189619 100644
--- a/MP/Response.h
+++ b/MP/Response.h
@@ -14,7 +14,7 @@
 
 class Response : public Mph, Sri{
 public:
-    Response(mp::MP_TYPE type, mp::MP_SRI code, const std::string &username, const std::string &msg, const std::string &token);
+    Response(mp::MP_TYPE type, mp::MP_SUB_TYPE subType, const std::string &username, const std::string &msg, const std::string &token);
 
     ~Response() override;
 
diff --git a/MP/Sri.h b/MP/Sri.h
index 0fbdc3a..542992c 100644
--- a/MP/Sri.h
+++ b/MP/Sri.h
@@ -10,12 +10,12 @@
 
 class Sri {
 public:
-    Sri(mp::MP_SRI code, const std::string& username,  const std::string& msg, const std::string& token) {
+    Sri(mp::MP_SUB_TYPE code, const std::string& username,  const std::string& msg, const std::string& token) {
         sri = new mp::sri();
-        sri->set_sri_code(code);
-        sri->set_sri_msg(msg);
-        sri->set_sri_token(token);
-        sri->set_sri_username(username);
+        sri->set_subcommand(code);
+        sri->set_msg(msg);
+        sri->set_token(token);
+        sri->set_username(username);
     }
 
     Sri() {}
diff --git a/MP/proto/mp.body.pb.cc b/MP/proto/mp.body.pb.cc
index af1c40a..2b28fa0 100644
--- a/MP/proto/mp.body.pb.cc
+++ b/MP/proto/mp.body.pb.cc
@@ -60,21 +60,21 @@ static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] =
 };
 
 const char descriptor_table_protodef_mp_2ebody_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\rmp.body.proto\022\002mp\032\014mp.mph.proto\"|\n\004bod"
-  "y\022#\n\nsubcommand\030\001 \001(\0162\017.mp.MP_SUB_TYPE\022\017"
-  "\n\007account\030\002 \001(\t\022\020\n\010password\030\003 \001(\t\022\016\n\006tar"
-  "get\030\004 \001(\004\022\016\n\006source\030\005 \001(\004\022\014\n\004data\030\006 \001(\tb"
-  "\006proto3"
+  "\n\rmp.body.proto\022\002mp\032\013mp.mp.proto\"|\n\004body"
+  "\022#\n\nsubcommand\030\001 \001(\0162\017.mp.MP_SUB_TYPE\022\017\n"
+  "\007account\030\002 \001(\t\022\020\n\010password\030\003 \001(\t\022\016\n\006targ"
+  "et\030\004 \001(\004\022\016\n\006source\030\005 \001(\004\022\014\n\004data\030\006 \001(\tb\006"
+  "proto3"
   ;
 static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_mp_2ebody_2eproto_deps[1] = {
-  &::descriptor_table_mp_2emph_2eproto,
+  &::descriptor_table_mp_2emp_2eproto,
 };
 static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mp_2ebody_2eproto_sccs[1] = {
   &scc_info_body_mp_2ebody_2eproto.base,
 };
 static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_mp_2ebody_2eproto_once;
 const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_mp_2ebody_2eproto = {
-  false, false, descriptor_table_protodef_mp_2ebody_2eproto, "mp.body.proto", 167,
+  false, false, descriptor_table_protodef_mp_2ebody_2eproto, "mp.body.proto", 166,
   &descriptor_table_mp_2ebody_2eproto_once, descriptor_table_mp_2ebody_2eproto_sccs, descriptor_table_mp_2ebody_2eproto_deps, 1, 1,
   schemas, file_default_instances, TableStruct_mp_2ebody_2eproto::offsets,
   file_level_metadata_mp_2ebody_2eproto, 1, file_level_enum_descriptors_mp_2ebody_2eproto, file_level_service_descriptors_mp_2ebody_2eproto,
diff --git a/MP/proto/mp.body.pb.h b/MP/proto/mp.body.pb.h
index 6e5b022..86aeb35 100644
--- a/MP/proto/mp.body.pb.h
+++ b/MP/proto/mp.body.pb.h
@@ -32,7 +32,7 @@
 #include <google/protobuf/repeated_field.h>  // IWYU pragma: export
 #include <google/protobuf/extension_set.h>  // IWYU pragma: export
 #include <google/protobuf/unknown_field_set.h>
-#include "mp.mph.pb.h"
+#include "mp.mp.pb.h"
 // @@protoc_insertion_point(includes)
 #include <google/protobuf/port_def.inc>
 #define PROTOBUF_INTERNAL_EXPORT_mp_2ebody_2eproto
diff --git a/MP/proto/mp.mp.pb.cc b/MP/proto/mp.mp.pb.cc
new file mode 100644
index 0000000..7819c0f
--- /dev/null
+++ b/MP/proto/mp.mp.pb.cc
@@ -0,0 +1,150 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: mp.mp.proto
+
+#include "mp.mp.pb.h"
+
+#include <algorithm>
+
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/extension_set.h>
+#include <google/protobuf/wire_format_lite.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/generated_message_reflection.h>
+#include <google/protobuf/reflection_ops.h>
+#include <google/protobuf/wire_format.h>
+// @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
+namespace mp {
+}  // namespace mp
+static constexpr ::PROTOBUF_NAMESPACE_ID::Metadata* file_level_metadata_mp_2emp_2eproto = nullptr;
+static const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* file_level_enum_descriptors_mp_2emp_2eproto[2];
+static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_mp_2emp_2eproto = nullptr;
+const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_mp_2emp_2eproto::offsets[1] = {};
+static constexpr ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema* schemas = nullptr;
+static constexpr ::PROTOBUF_NAMESPACE_ID::Message* const* file_default_instances = nullptr;
+
+const char descriptor_table_protodef_mp_2emp_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
+  "\n\013mp.mp.proto\022\002mp*\243\002\n\007MP_TYPE\022\024\n\020MP_REQU"
+  "EST_LOGIN\020\000\022\025\n\021MP_REQUEST_LOGOUT\020\001\022\027\n\023MP"
+  "_REQUEST_REGISTER\020\002\022\023\n\017MP_REQUEST_CODE\020\003"
+  "\022\026\n\022MP_REQUEST_FRIENDS\020\004\022\025\n\021MP_REQUEST_G"
+  "ROUPS\020\005\022\025\n\021MP_RESPONSE_LOGIN\020\024\022\026\n\022MP_RES"
+  "PONSE_LOGOUT\020\025\022\030\n\024MP_RESPONSE_REGISTER\020\026"
+  "\022\024\n\020MP_RESPONSE_CODE\020\027\022\027\n\023MP_RESPONSE_FR"
+  "IENDS\020\030\022\026\n\022MP_RESPONSE_GROUPS\020\031*\205\006\n\013MP_S"
+  "UB_TYPE\022\022\n\016MP_LOGIN_EMAIL\020\000\022\022\n\016MP_LOGIN_"
+  "PHONE\020\001\022\024\n\020MP_LOGIN_ACCOUNT\020\002\022\025\n\021MP_REGI"
+  "STER_EMAIL\020\003\022\025\n\021MP_REGISTER_PHONE\020\004\022\024\n\020M"
+  "P_LOGIN_SUCCESS\020\005\022\021\n\rMP_LOGIN_FAIL\020\006\022\027\n\023"
+  "MP_REGISTER_SUCCESS\020\007\022\024\n\020MP_REGISTER_FAI"
+  "L\020\010\022\021\n\rMP_CODE_EMAIL\020\017\022\021\n\rMP_CODE_PHONE\020"
+  "\020\022\023\n\017MP_CODE_SUCCESS\020\021\022\020\n\014MP_CODE_FAIL\020\034"
+  "\022\024\n\020MP_ADD_FRIENDS_0\0203\022\024\n\020MP_ADD_FRIENDS"
+  "_1\0204\022\024\n\020MP_ADD_FRIENDS_2\0205\022\032\n\026MP_ADD_FRI"
+  "ENDS_ACCOUNT\0206\022\030\n\024MP_ADD_FRIENDS_EMAIL\0207"
+  "\022\030\n\024MP_ADD_FRIENDS_PHONE\0208\022\025\n\021MP_ADD_BLA"
+  "CK_LIST\020;\022\025\n\021MP_ADD_WHITE_LIST\020<\022\024\n\020MP_R"
+  "EMOVE_FRIEND\020=\022\022\n\016MP_GET_FRIENDS\020>\022\022\n\016MP"
+  "_ADD_GROUP_0\020\?\022\022\n\016MP_ADD_GROUP_1\020@\022\022\n\016MP"
+  "_ADD_GROUP_2\020A\022\020\n\014MP_ADD_GROUP\020B\022\023\n\017MP_R"
+  "EMOVE_GROUP\020C\022\021\n\rMP_GET_GROUPS\020D\022\022\n\016MP_A"
+  "DD_SUCCESS\020E\022\025\n\021MP_REMOVE_SUCCESS\020F\022\022\n\016M"
+  "P_GET_SUCCESS\020G\022\017\n\013MP_ADD_FAIL\020H\022\022\n\016MP_R"
+  "EMOVE_FAIL\020I\022\017\n\013MP_GET_FAIL\020J\022\020\n\014MP_ADD_"
+  "CHECK\020Pb\006proto3"
+  ;
+static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_mp_2emp_2eproto_deps[1] = {
+};
+static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mp_2emp_2eproto_sccs[1] = {
+};
+static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_mp_2emp_2eproto_once;
+const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_mp_2emp_2eproto = {
+  false, false, descriptor_table_protodef_mp_2emp_2eproto, "mp.mp.proto", 1095,
+  &descriptor_table_mp_2emp_2eproto_once, descriptor_table_mp_2emp_2eproto_sccs, descriptor_table_mp_2emp_2eproto_deps, 0, 0,
+  schemas, file_default_instances, TableStruct_mp_2emp_2eproto::offsets,
+  file_level_metadata_mp_2emp_2eproto, 0, file_level_enum_descriptors_mp_2emp_2eproto, file_level_service_descriptors_mp_2emp_2eproto,
+};
+
+// Force running AddDescriptors() at dynamic initialization time.
+static bool dynamic_init_dummy_mp_2emp_2eproto = (static_cast<void>(::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_mp_2emp_2eproto)), true);
+namespace mp {
+const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MP_TYPE_descriptor() {
+  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_mp_2emp_2eproto);
+  return file_level_enum_descriptors_mp_2emp_2eproto[0];
+}
+bool MP_TYPE_IsValid(int value) {
+  switch (value) {
+    case 0:
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 20:
+    case 21:
+    case 22:
+    case 23:
+    case 24:
+    case 25:
+      return true;
+    default:
+      return false;
+  }
+}
+
+const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MP_SUB_TYPE_descriptor() {
+  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_mp_2emp_2eproto);
+  return file_level_enum_descriptors_mp_2emp_2eproto[1];
+}
+bool MP_SUB_TYPE_IsValid(int value) {
+  switch (value) {
+    case 0:
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 15:
+    case 16:
+    case 17:
+    case 28:
+    case 51:
+    case 52:
+    case 53:
+    case 54:
+    case 55:
+    case 56:
+    case 59:
+    case 60:
+    case 61:
+    case 62:
+    case 63:
+    case 64:
+    case 65:
+    case 66:
+    case 67:
+    case 68:
+    case 69:
+    case 70:
+    case 71:
+    case 72:
+    case 73:
+    case 74:
+    case 80:
+      return true;
+    default:
+      return false;
+  }
+}
+
+
+// @@protoc_insertion_point(namespace_scope)
+}  // namespace mp
+PROTOBUF_NAMESPACE_OPEN
+PROTOBUF_NAMESPACE_CLOSE
+
+// @@protoc_insertion_point(global_scope)
+#include <google/protobuf/port_undef.inc>
diff --git a/MP/proto/mp.mp.pb.h b/MP/proto/mp.mp.pb.h
new file mode 100644
index 0000000..a3a275b
--- /dev/null
+++ b/MP/proto/mp.mp.pb.h
@@ -0,0 +1,192 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: mp.mp.proto
+
+#ifndef GOOGLE_PROTOBUF_INCLUDED_mp_2emp_2eproto
+#define GOOGLE_PROTOBUF_INCLUDED_mp_2emp_2eproto
+
+#include <limits>
+#include <string>
+
+#include <google/protobuf/port_def.inc>
+#if PROTOBUF_VERSION < 3012000
+#error This file was generated by a newer version of protoc which is
+#error incompatible with your Protocol Buffer headers. Please update
+#error your headers.
+#endif
+#if 3012004 < PROTOBUF_MIN_PROTOC_VERSION
+#error This file was generated by an older version of protoc which is
+#error incompatible with your Protocol Buffer headers. Please
+#error regenerate this file with a newer version of protoc.
+#endif
+
+#include <google/protobuf/port_undef.inc>
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/arena.h>
+#include <google/protobuf/arenastring.h>
+#include <google/protobuf/generated_message_table_driven.h>
+#include <google/protobuf/generated_message_util.h>
+#include <google/protobuf/inlined_string_field.h>
+#include <google/protobuf/metadata_lite.h>
+#include <google/protobuf/generated_message_reflection.h>
+#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
+#include <google/protobuf/extension_set.h>  // IWYU pragma: export
+#include <google/protobuf/generated_enum_reflection.h>
+// @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_mp_2emp_2eproto
+PROTOBUF_NAMESPACE_OPEN
+namespace internal {
+class AnyMetadata;
+}  // namespace internal
+PROTOBUF_NAMESPACE_CLOSE
+
+// Internal implementation detail -- do not use these members.
+struct TableStruct_mp_2emp_2eproto {
+  static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[1]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[];
+  static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[];
+  static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[];
+};
+extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_mp_2emp_2eproto;
+PROTOBUF_NAMESPACE_OPEN
+PROTOBUF_NAMESPACE_CLOSE
+namespace mp {
+
+enum MP_TYPE : int {
+  MP_REQUEST_LOGIN = 0,
+  MP_REQUEST_LOGOUT = 1,
+  MP_REQUEST_REGISTER = 2,
+  MP_REQUEST_CODE = 3,
+  MP_REQUEST_FRIENDS = 4,
+  MP_REQUEST_GROUPS = 5,
+  MP_RESPONSE_LOGIN = 20,
+  MP_RESPONSE_LOGOUT = 21,
+  MP_RESPONSE_REGISTER = 22,
+  MP_RESPONSE_CODE = 23,
+  MP_RESPONSE_FRIENDS = 24,
+  MP_RESPONSE_GROUPS = 25,
+  MP_TYPE_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::min(),
+  MP_TYPE_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::max()
+};
+bool MP_TYPE_IsValid(int value);
+constexpr MP_TYPE MP_TYPE_MIN = MP_REQUEST_LOGIN;
+constexpr MP_TYPE MP_TYPE_MAX = MP_RESPONSE_GROUPS;
+constexpr int MP_TYPE_ARRAYSIZE = MP_TYPE_MAX + 1;
+
+const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MP_TYPE_descriptor();
+template<typename T>
+inline const std::string& MP_TYPE_Name(T enum_t_value) {
+  static_assert(::std::is_same<T, MP_TYPE>::value ||
+    ::std::is_integral<T>::value,
+    "Incorrect type passed to function MP_TYPE_Name.");
+  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
+    MP_TYPE_descriptor(), enum_t_value);
+}
+inline bool MP_TYPE_Parse(
+    const std::string& name, MP_TYPE* value) {
+  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<MP_TYPE>(
+    MP_TYPE_descriptor(), name, value);
+}
+enum MP_SUB_TYPE : int {
+  MP_LOGIN_EMAIL = 0,
+  MP_LOGIN_PHONE = 1,
+  MP_LOGIN_ACCOUNT = 2,
+  MP_REGISTER_EMAIL = 3,
+  MP_REGISTER_PHONE = 4,
+  MP_LOGIN_SUCCESS = 5,
+  MP_LOGIN_FAIL = 6,
+  MP_REGISTER_SUCCESS = 7,
+  MP_REGISTER_FAIL = 8,
+  MP_CODE_EMAIL = 15,
+  MP_CODE_PHONE = 16,
+  MP_CODE_SUCCESS = 17,
+  MP_CODE_FAIL = 28,
+  MP_ADD_FRIENDS_0 = 51,
+  MP_ADD_FRIENDS_1 = 52,
+  MP_ADD_FRIENDS_2 = 53,
+  MP_ADD_FRIENDS_ACCOUNT = 54,
+  MP_ADD_FRIENDS_EMAIL = 55,
+  MP_ADD_FRIENDS_PHONE = 56,
+  MP_ADD_BLACK_LIST = 59,
+  MP_ADD_WHITE_LIST = 60,
+  MP_REMOVE_FRIEND = 61,
+  MP_GET_FRIENDS = 62,
+  MP_ADD_GROUP_0 = 63,
+  MP_ADD_GROUP_1 = 64,
+  MP_ADD_GROUP_2 = 65,
+  MP_ADD_GROUP = 66,
+  MP_REMOVE_GROUP = 67,
+  MP_GET_GROUPS = 68,
+  MP_ADD_SUCCESS = 69,
+  MP_REMOVE_SUCCESS = 70,
+  MP_GET_SUCCESS = 71,
+  MP_ADD_FAIL = 72,
+  MP_REMOVE_FAIL = 73,
+  MP_GET_FAIL = 74,
+  MP_ADD_CHECK = 80,
+  MP_SUB_TYPE_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::min(),
+  MP_SUB_TYPE_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::max()
+};
+bool MP_SUB_TYPE_IsValid(int value);
+constexpr MP_SUB_TYPE MP_SUB_TYPE_MIN = MP_LOGIN_EMAIL;
+constexpr MP_SUB_TYPE MP_SUB_TYPE_MAX = MP_ADD_CHECK;
+constexpr int MP_SUB_TYPE_ARRAYSIZE = MP_SUB_TYPE_MAX + 1;
+
+const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MP_SUB_TYPE_descriptor();
+template<typename T>
+inline const std::string& MP_SUB_TYPE_Name(T enum_t_value) {
+  static_assert(::std::is_same<T, MP_SUB_TYPE>::value ||
+    ::std::is_integral<T>::value,
+    "Incorrect type passed to function MP_SUB_TYPE_Name.");
+  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
+    MP_SUB_TYPE_descriptor(), enum_t_value);
+}
+inline bool MP_SUB_TYPE_Parse(
+    const std::string& name, MP_SUB_TYPE* value) {
+  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<MP_SUB_TYPE>(
+    MP_SUB_TYPE_descriptor(), name, value);
+}
+// ===================================================================
+
+
+// ===================================================================
+
+
+// ===================================================================
+
+#ifdef __GNUC__
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif  // __GNUC__
+#ifdef __GNUC__
+  #pragma GCC diagnostic pop
+#endif  // __GNUC__
+
+// @@protoc_insertion_point(namespace_scope)
+
+}  // namespace mp
+
+PROTOBUF_NAMESPACE_OPEN
+
+template <> struct is_proto_enum< ::mp::MP_TYPE> : ::std::true_type {};
+template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::mp::MP_TYPE>() {
+  return ::mp::MP_TYPE_descriptor();
+}
+template <> struct is_proto_enum< ::mp::MP_SUB_TYPE> : ::std::true_type {};
+template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::mp::MP_SUB_TYPE>() {
+  return ::mp::MP_SUB_TYPE_descriptor();
+}
+
+PROTOBUF_NAMESPACE_CLOSE
+
+// @@protoc_insertion_point(global_scope)
+
+#include <google/protobuf/port_undef.inc>
+#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_mp_2emp_2eproto
diff --git a/MP/proto/mp.mph.pb.cc b/MP/proto/mp.mph.pb.cc
index b25a7b5..a3b270d 100644
--- a/MP/proto/mp.mph.pb.cc
+++ b/MP/proto/mp.mph.pb.cc
@@ -35,7 +35,7 @@ static void InitDefaultsscc_info_mph_mp_2emph_2eproto() {
     {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_mph_mp_2emph_2eproto}, {}};
 
 static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_mp_2emph_2eproto[1];
-static const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* file_level_enum_descriptors_mp_2emph_2eproto[2];
+static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_mp_2emph_2eproto = nullptr;
 static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_mp_2emph_2eproto = nullptr;
 
 const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_mp_2emph_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
@@ -59,40 +59,21 @@ static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] =
 };
 
 const char descriptor_table_protodef_mp_2emph_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\014mp.mph.proto\022\002mp\"b\n\003mph\022\020\n\010mpb_size\030\001 "
-  "\001(\r\022\r\n\005mp_id\030\002 \001(\004\022\016\n\006mp_sum\030\003 \001(\r\022\034\n\007mp"
-  "_type\030\004 \001(\0162\013.mp.MP_TYPE\022\014\n\004path\030\005 \001(\t*\263"
-  "\002\n\007MP_TYPE\022\024\n\020MP_REQUEST_LOGIN\020\000\022\025\n\021MP_R"
-  "EQUEST_LOGOUT\020\001\022\027\n\023MP_REQUEST_REGISTER\020\002"
-  "\022\033\n\027MP_REQUEST_USER_FRIENDS\020\003\022\025\n\021MP_RESP"
-  "ONSE_LOGIN\020\024\022\026\n\022MP_RESPONSE_LOGOUT\020\025\022\030\n\024"
-  "MP_RESPONSE_REGISTER\020\026\022\034\n\030MP_RESPONSE_US"
-  "ER_FRIENDS\020\027\022\026\n\022MP_REQUEST_PE_CODE\020(\022\027\n\023"
-  "MP_RESPONSE_PE_CODE\020<\022\025\n\021MP_REQUEST_IM_A"
-  "DD\020d\022\026\n\022MP_RESPONSE_IM_ADD\020x*\204\004\n\013MP_SUB_"
-  "TYPE\022\032\n\026MP_REQUEST_LOGIN_EMAIL\020\000\022\032\n\026MP_R"
-  "EQUEST_LOGIN_PHONE\020\001\022\034\n\030MP_REQUEST_LOGIN"
-  "_ACCOUNT\020\002\022\035\n\031MP_REQUEST_REGISTER_EMAIL\020"
-  "\003\022\035\n\031MP_REQUEST_REGISTER_PHONE\020\004\022\034\n\030MP_R"
-  "EQUEST_PE_CODE_EMAIL\020\005\022\035\n\031MP_RESPONSE_PE"
-  "_CODE_EMAIL\020\006\022\034\n\030MP_REQUEST_PE_CODE_PHON"
-  "E\020\007\022\035\n\031MP_RESPONSE_PE_CODE_PHONE\020\010\022!\n\035MP"
-  "_REQUEST_ADD_CONTACT_PERSON\020\024\022$\n MP_REQU"
-  "EST_REMOVE_CONTACT_PERSON\020\025\022(\n$MP_REQUES"
-  "T_BLACK_LIST_CONTACT_PERSON\020\026\022\"\n\036MP_RESP"
-  "ONSE_ADD_CONTACT_PERSON\020(\022%\n!MP_RESPONSE"
-  "_REMOVE_CONTACT_PERSON\020)\022)\n%MP_RESPONSE_"
-  "BLACK_LIST_CONTACT_PERSON\020*b\006proto3"
+  "\n\014mp.mph.proto\022\002mp\032\013mp.mp.proto\"b\n\003mph\022\020"
+  "\n\010mpb_size\030\001 \001(\r\022\r\n\005mp_id\030\002 \001(\004\022\016\n\006mp_su"
+  "m\030\003 \001(\r\022\034\n\007mp_type\030\004 \001(\0162\013.mp.MP_TYPE\022\014\n"
+  "\004path\030\005 \001(\tb\006proto3"
   ;
 static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_mp_2emph_2eproto_deps[1] = {
+  &::descriptor_table_mp_2emp_2eproto,
 };
 static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mp_2emph_2eproto_sccs[1] = {
   &scc_info_mph_mp_2emph_2eproto.base,
 };
 static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_mp_2emph_2eproto_once;
 const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_mp_2emph_2eproto = {
-  false, false, descriptor_table_protodef_mp_2emph_2eproto, "mp.mph.proto", 955,
-  &descriptor_table_mp_2emph_2eproto_once, descriptor_table_mp_2emph_2eproto_sccs, descriptor_table_mp_2emph_2eproto_deps, 1, 0,
+  false, false, descriptor_table_protodef_mp_2emph_2eproto, "mp.mph.proto", 139,
+  &descriptor_table_mp_2emph_2eproto_once, descriptor_table_mp_2emph_2eproto_sccs, descriptor_table_mp_2emph_2eproto_deps, 1, 1,
   schemas, file_default_instances, TableStruct_mp_2emph_2eproto::offsets,
   file_level_metadata_mp_2emph_2eproto, 1, file_level_enum_descriptors_mp_2emph_2eproto, file_level_service_descriptors_mp_2emph_2eproto,
 };
@@ -100,57 +81,6 @@ const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_mp_2em
 // Force running AddDescriptors() at dynamic initialization time.
 static bool dynamic_init_dummy_mp_2emph_2eproto = (static_cast<void>(::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_mp_2emph_2eproto)), true);
 namespace mp {
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MP_TYPE_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_mp_2emph_2eproto);
-  return file_level_enum_descriptors_mp_2emph_2eproto[0];
-}
-bool MP_TYPE_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 20:
-    case 21:
-    case 22:
-    case 23:
-    case 40:
-    case 60:
-    case 100:
-    case 120:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MP_SUB_TYPE_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_mp_2emph_2eproto);
-  return file_level_enum_descriptors_mp_2emph_2eproto[1];
-}
-bool MP_SUB_TYPE_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 20:
-    case 21:
-    case 22:
-    case 40:
-    case 41:
-    case 42:
-      return true;
-    default:
-      return false;
-  }
-}
-
 
 // ===================================================================
 
diff --git a/MP/proto/mp.mph.pb.h b/MP/proto/mp.mph.pb.h
index aafcfd4..48accf3 100644
--- a/MP/proto/mp.mph.pb.h
+++ b/MP/proto/mp.mph.pb.h
@@ -31,8 +31,8 @@
 #include <google/protobuf/message.h>
 #include <google/protobuf/repeated_field.h>  // IWYU pragma: export
 #include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
+#include "mp.mp.pb.h"
 // @@protoc_insertion_point(includes)
 #include <google/protobuf/port_def.inc>
 #define PROTOBUF_INTERNAL_EXPORT_mp_2emph_2eproto
@@ -65,79 +65,6 @@ template<> ::mp::mph* Arena::CreateMaybeMessage<::mp::mph>(Arena*);
 PROTOBUF_NAMESPACE_CLOSE
 namespace mp {
 
-enum MP_TYPE : int {
-  MP_REQUEST_LOGIN = 0,
-  MP_REQUEST_LOGOUT = 1,
-  MP_REQUEST_REGISTER = 2,
-  MP_REQUEST_USER_FRIENDS = 3,
-  MP_RESPONSE_LOGIN = 20,
-  MP_RESPONSE_LOGOUT = 21,
-  MP_RESPONSE_REGISTER = 22,
-  MP_RESPONSE_USER_FRIENDS = 23,
-  MP_REQUEST_PE_CODE = 40,
-  MP_RESPONSE_PE_CODE = 60,
-  MP_REQUEST_IM_ADD = 100,
-  MP_RESPONSE_IM_ADD = 120,
-  MP_TYPE_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::min(),
-  MP_TYPE_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::max()
-};
-bool MP_TYPE_IsValid(int value);
-constexpr MP_TYPE MP_TYPE_MIN = MP_REQUEST_LOGIN;
-constexpr MP_TYPE MP_TYPE_MAX = MP_RESPONSE_IM_ADD;
-constexpr int MP_TYPE_ARRAYSIZE = MP_TYPE_MAX + 1;
-
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MP_TYPE_descriptor();
-template<typename T>
-inline const std::string& MP_TYPE_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, MP_TYPE>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function MP_TYPE_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    MP_TYPE_descriptor(), enum_t_value);
-}
-inline bool MP_TYPE_Parse(
-    const std::string& name, MP_TYPE* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<MP_TYPE>(
-    MP_TYPE_descriptor(), name, value);
-}
-enum MP_SUB_TYPE : int {
-  MP_REQUEST_LOGIN_EMAIL = 0,
-  MP_REQUEST_LOGIN_PHONE = 1,
-  MP_REQUEST_LOGIN_ACCOUNT = 2,
-  MP_REQUEST_REGISTER_EMAIL = 3,
-  MP_REQUEST_REGISTER_PHONE = 4,
-  MP_REQUEST_PE_CODE_EMAIL = 5,
-  MP_RESPONSE_PE_CODE_EMAIL = 6,
-  MP_REQUEST_PE_CODE_PHONE = 7,
-  MP_RESPONSE_PE_CODE_PHONE = 8,
-  MP_REQUEST_ADD_CONTACT_PERSON = 20,
-  MP_REQUEST_REMOVE_CONTACT_PERSON = 21,
-  MP_REQUEST_BLACK_LIST_CONTACT_PERSON = 22,
-  MP_RESPONSE_ADD_CONTACT_PERSON = 40,
-  MP_RESPONSE_REMOVE_CONTACT_PERSON = 41,
-  MP_RESPONSE_BLACK_LIST_CONTACT_PERSON = 42,
-  MP_SUB_TYPE_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::min(),
-  MP_SUB_TYPE_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::max()
-};
-bool MP_SUB_TYPE_IsValid(int value);
-constexpr MP_SUB_TYPE MP_SUB_TYPE_MIN = MP_REQUEST_LOGIN_EMAIL;
-constexpr MP_SUB_TYPE MP_SUB_TYPE_MAX = MP_RESPONSE_BLACK_LIST_CONTACT_PERSON;
-constexpr int MP_SUB_TYPE_ARRAYSIZE = MP_SUB_TYPE_MAX + 1;
-
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MP_SUB_TYPE_descriptor();
-template<typename T>
-inline const std::string& MP_SUB_TYPE_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, MP_SUB_TYPE>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function MP_SUB_TYPE_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    MP_SUB_TYPE_descriptor(), enum_t_value);
-}
-inline bool MP_SUB_TYPE_Parse(
-    const std::string& name, MP_SUB_TYPE* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<MP_SUB_TYPE>(
-    MP_SUB_TYPE_descriptor(), name, value);
-}
 // ===================================================================
 
 class mph PROTOBUF_FINAL :
@@ -515,21 +442,6 @@ inline void mph::unsafe_arena_set_allocated_path(
 
 }  // namespace mp
 
-PROTOBUF_NAMESPACE_OPEN
-
-template <> struct is_proto_enum< ::mp::MP_TYPE> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::mp::MP_TYPE>() {
-  return ::mp::MP_TYPE_descriptor();
-}
-template <> struct is_proto_enum< ::mp::MP_SUB_TYPE> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::mp::MP_SUB_TYPE>() {
-  return ::mp::MP_SUB_TYPE_descriptor();
-}
-
-PROTOBUF_NAMESPACE_CLOSE
-
 // @@protoc_insertion_point(global_scope)
 
 #include <google/protobuf/port_undef.inc>
diff --git a/MP/proto/mp.sri.pb.cc b/MP/proto/mp.sri.pb.cc
index a43f81a..8f30aeb 100644
--- a/MP/proto/mp.sri.pb.cc
+++ b/MP/proto/mp.sri.pb.cc
@@ -35,7 +35,7 @@ static void InitDefaultsscc_info_sri_mp_2esri_2eproto() {
     {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_sri_mp_2esri_2eproto}, {}};
 
 static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_mp_2esri_2eproto[1];
-static const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* file_level_enum_descriptors_mp_2esri_2eproto[1];
+static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_mp_2esri_2eproto = nullptr;
 static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_mp_2esri_2eproto = nullptr;
 
 const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_mp_2esri_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
@@ -44,13 +44,13 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_mp_2esri_2eproto::offsets[] PR
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  PROTOBUF_FIELD_OFFSET(::mp::sri, sri_code_),
-  PROTOBUF_FIELD_OFFSET(::mp::sri, sri_username_),
-  PROTOBUF_FIELD_OFFSET(::mp::sri, sri_account_),
-  PROTOBUF_FIELD_OFFSET(::mp::sri, sri_email_),
-  PROTOBUF_FIELD_OFFSET(::mp::sri, sri_phone_),
-  PROTOBUF_FIELD_OFFSET(::mp::sri, sri_msg_),
-  PROTOBUF_FIELD_OFFSET(::mp::sri, sri_token_),
+  PROTOBUF_FIELD_OFFSET(::mp::sri, subcommand_),
+  PROTOBUF_FIELD_OFFSET(::mp::sri, username_),
+  PROTOBUF_FIELD_OFFSET(::mp::sri, account_),
+  PROTOBUF_FIELD_OFFSET(::mp::sri, email_),
+  PROTOBUF_FIELD_OFFSET(::mp::sri, phone_),
+  PROTOBUF_FIELD_OFFSET(::mp::sri, msg_),
+  PROTOBUF_FIELD_OFFSET(::mp::sri, token_),
   PROTOBUF_FIELD_OFFSET(::mp::sri, data_),
 };
 static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
@@ -62,34 +62,22 @@ static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] =
 };
 
 const char descriptor_table_protodef_mp_2esri_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\014mp.sri.proto\022\002mp\"\246\001\n\003sri\022\034\n\010sri_code\030\001"
-  " \001(\0162\n.mp.MP_SRI\022\024\n\014sri_username\030\002 \001(\t\022\023"
-  "\n\013sri_account\030\003 \001(\004\022\021\n\tsri_email\030\004 \001(\t\022\021"
-  "\n\tsri_phone\030\005 \001(\004\022\017\n\007sri_msg\030\006 \001(\t\022\021\n\tsr"
-  "i_token\030\007 \001(\t\022\014\n\004data\030\010 \001(\t*\360\003\n\006MP_SRI\022\030"
-  "\n\024MP_LOGIN_ACCOUNT_NOT\020\000\022\024\n\020MP_LOGIN_SUC"
-  "CESS\020\001\022\021\n\rMP_LOGIN_FAIL\020\002\022\027\n\023MP_REGISTER"
-  "_SUCCESS\020\n\022\035\n\031MP_REGISTER_SUCCESS_PHONE\020"
-  "\013\022\035\n\031MP_REGISTER_SUCCESS_EMAIL\020\014\022\025\n\021MP_R"
-  "EGISTER_EXIST\020\r\022\027\n\023MP_REGISTER_SQL_ERR\020\016"
-  "\022\025\n\021MP_LOGOUT_SUCCESS\020\024\022\022\n\016MP_LOGOUT_FAI"
-  "L\020\025\022\022\n\016MP_ADD_FRIENDS\020\036\022\024\n\020MP_ADD_FRIEND"
-  "S_0\020\037\022\024\n\020MP_ADD_FRIENDS_1\020 \022\024\n\020MP_ADD_FR"
-  "IENDS_2\020!\022\026\n\022MP_ADD_FRIENDS_ERR\020\"\022\033\n\027MP_"
-  "ADD_FRIENDS_NOT_TYPE\020#\022\032\n\026MP_ADD_FRIENDS"
-  "_SQL_ERR\020$\022\035\n\031MP_ADD_FRIENDS_ANSWER_ERR\020"
-  "%\022\026\n\022MP_PE_CODE_SUCCESS\0202\022\023\n\017MP_PE_CODE_"
-  "FAIL\0203b\006proto3"
+  "\n\014mp.sri.proto\022\002mp\032\013mp.mp.proto\"\225\001\n\003sri\022"
+  "#\n\nsubcommand\030\001 \001(\0162\017.mp.MP_SUB_TYPE\022\020\n\010"
+  "username\030\002 \001(\t\022\017\n\007account\030\003 \001(\004\022\r\n\005email"
+  "\030\004 \001(\t\022\r\n\005phone\030\005 \001(\004\022\013\n\003msg\030\006 \001(\t\022\r\n\005to"
+  "ken\030\007 \001(\t\022\014\n\004data\030\010 \001(\tb\006proto3"
   ;
 static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_mp_2esri_2eproto_deps[1] = {
+  &::descriptor_table_mp_2emp_2eproto,
 };
 static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mp_2esri_2eproto_sccs[1] = {
   &scc_info_sri_mp_2esri_2eproto.base,
 };
 static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_mp_2esri_2eproto_once;
 const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_mp_2esri_2eproto = {
-  false, false, descriptor_table_protodef_mp_2esri_2eproto, "mp.sri.proto", 694,
-  &descriptor_table_mp_2esri_2eproto_once, descriptor_table_mp_2esri_2eproto_sccs, descriptor_table_mp_2esri_2eproto_deps, 1, 0,
+  false, false, descriptor_table_protodef_mp_2esri_2eproto, "mp.sri.proto", 191,
+  &descriptor_table_mp_2esri_2eproto_once, descriptor_table_mp_2esri_2eproto_sccs, descriptor_table_mp_2esri_2eproto_deps, 1, 1,
   schemas, file_default_instances, TableStruct_mp_2esri_2eproto::offsets,
   file_level_metadata_mp_2esri_2eproto, 1, file_level_enum_descriptors_mp_2esri_2eproto, file_level_service_descriptors_mp_2esri_2eproto,
 };
@@ -97,38 +85,6 @@ const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_mp_2es
 // Force running AddDescriptors() at dynamic initialization time.
 static bool dynamic_init_dummy_mp_2esri_2eproto = (static_cast<void>(::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_mp_2esri_2eproto)), true);
 namespace mp {
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MP_SRI_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_mp_2esri_2eproto);
-  return file_level_enum_descriptors_mp_2esri_2eproto[0];
-}
-bool MP_SRI_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 14:
-    case 20:
-    case 21:
-    case 30:
-    case 31:
-    case 32:
-    case 33:
-    case 34:
-    case 35:
-    case 36:
-    case 37:
-    case 50:
-    case 51:
-      return true;
-    default:
-      return false;
-  }
-}
-
 
 // ===================================================================
 
@@ -147,24 +103,24 @@ sri::sri(::PROTOBUF_NAMESPACE_ID::Arena* arena)
 sri::sri(const sri& from)
   : ::PROTOBUF_NAMESPACE_ID::Message() {
   _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  sri_username_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  if (!from._internal_sri_username().empty()) {
-    sri_username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_sri_username(),
+  username_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  if (!from._internal_username().empty()) {
+    username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_username(),
       GetArena());
   }
-  sri_email_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  if (!from._internal_sri_email().empty()) {
-    sri_email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_sri_email(),
+  email_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  if (!from._internal_email().empty()) {
+    email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_email(),
       GetArena());
   }
-  sri_msg_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  if (!from._internal_sri_msg().empty()) {
-    sri_msg_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_sri_msg(),
+  msg_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  if (!from._internal_msg().empty()) {
+    msg_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_msg(),
       GetArena());
   }
-  sri_token_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  if (!from._internal_sri_token().empty()) {
-    sri_token_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_sri_token(),
+  token_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  if (!from._internal_token().empty()) {
+    token_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_token(),
       GetArena());
   }
   data_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
@@ -172,22 +128,22 @@ sri::sri(const sri& from)
     data_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_data(),
       GetArena());
   }
-  ::memcpy(&sri_account_, &from.sri_account_,
-    static_cast<size_t>(reinterpret_cast<char*>(&sri_code_) -
-    reinterpret_cast<char*>(&sri_account_)) + sizeof(sri_code_));
+  ::memcpy(&account_, &from.account_,
+    static_cast<size_t>(reinterpret_cast<char*>(&subcommand_) -
+    reinterpret_cast<char*>(&account_)) + sizeof(subcommand_));
   // @@protoc_insertion_point(copy_constructor:mp.sri)
 }
 
 void sri::SharedCtor() {
   ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_sri_mp_2esri_2eproto.base);
-  sri_username_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  sri_email_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  sri_msg_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  sri_token_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  username_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  email_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  msg_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  token_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
   data_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  ::memset(&sri_account_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&sri_code_) -
-      reinterpret_cast<char*>(&sri_account_)) + sizeof(sri_code_));
+  ::memset(&account_, 0, static_cast<size_t>(
+      reinterpret_cast<char*>(&subcommand_) -
+      reinterpret_cast<char*>(&account_)) + sizeof(subcommand_));
 }
 
 sri::~sri() {
@@ -198,10 +154,10 @@ sri::~sri() {
 
 void sri::SharedDtor() {
   GOOGLE_DCHECK(GetArena() == nullptr);
-  sri_username_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  sri_email_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  sri_msg_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
-  sri_token_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  username_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  email_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  msg_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  token_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
   data_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
 }
 
@@ -226,14 +182,14 @@ void sri::Clear() {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  sri_username_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
-  sri_email_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
-  sri_msg_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
-  sri_token_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  username_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  email_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  msg_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  token_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
   data_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
-  ::memset(&sri_account_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&sri_code_) -
-      reinterpret_cast<char*>(&sri_account_)) + sizeof(sri_code_));
+  ::memset(&account_, 0, static_cast<size_t>(
+      reinterpret_cast<char*>(&subcommand_) -
+      reinterpret_cast<char*>(&account_)) + sizeof(subcommand_));
   _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
 }
 
@@ -245,61 +201,61 @@ const char* sri::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern
     ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
     CHK_(ptr);
     switch (tag >> 3) {
-      // .mp.MP_SRI sri_code = 1;
+      // .mp.MP_SUB_TYPE subcommand = 1;
       case 1:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) {
           ::PROTOBUF_NAMESPACE_ID::uint64 val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
           CHK_(ptr);
-          _internal_set_sri_code(static_cast<::mp::MP_SRI>(val));
+          _internal_set_subcommand(static_cast<::mp::MP_SUB_TYPE>(val));
         } else goto handle_unusual;
         continue;
-      // string sri_username = 2;
+      // string username = 2;
       case 2:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 18)) {
-          auto str = _internal_mutable_sri_username();
+          auto str = _internal_mutable_username();
           ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.sri_username"));
+          CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.username"));
           CHK_(ptr);
         } else goto handle_unusual;
         continue;
-      // uint64 sri_account = 3;
+      // uint64 account = 3;
       case 3:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) {
-          sri_account_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          account_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
           CHK_(ptr);
         } else goto handle_unusual;
         continue;
-      // string sri_email = 4;
+      // string email = 4;
       case 4:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) {
-          auto str = _internal_mutable_sri_email();
+          auto str = _internal_mutable_email();
           ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.sri_email"));
+          CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.email"));
           CHK_(ptr);
         } else goto handle_unusual;
         continue;
-      // uint64 sri_phone = 5;
+      // uint64 phone = 5;
       case 5:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) {
-          sri_phone_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
+          phone_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
           CHK_(ptr);
         } else goto handle_unusual;
         continue;
-      // string sri_msg = 6;
+      // string msg = 6;
       case 6:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) {
-          auto str = _internal_mutable_sri_msg();
+          auto str = _internal_mutable_msg();
           ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.sri_msg"));
+          CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.msg"));
           CHK_(ptr);
         } else goto handle_unusual;
         continue;
-      // string sri_token = 7;
+      // string token = 7;
       case 7:
         if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 58)) {
-          auto str = _internal_mutable_sri_token();
+          auto str = _internal_mutable_token();
           ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.sri_token"));
+          CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.token"));
           CHK_(ptr);
         } else goto handle_unusual;
         continue;
@@ -340,63 +296,63 @@ failure:
   ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  // .mp.MP_SRI sri_code = 1;
-  if (this->sri_code() != 0) {
+  // .mp.MP_SUB_TYPE subcommand = 1;
+  if (this->subcommand() != 0) {
     target = stream->EnsureSpace(target);
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteEnumToArray(
-      1, this->_internal_sri_code(), target);
+      1, this->_internal_subcommand(), target);
   }
 
-  // string sri_username = 2;
-  if (this->sri_username().size() > 0) {
+  // string username = 2;
+  if (this->username().size() > 0) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_sri_username().data(), static_cast<int>(this->_internal_sri_username().length()),
+      this->_internal_username().data(), static_cast<int>(this->_internal_username().length()),
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "mp.sri.sri_username");
+      "mp.sri.username");
     target = stream->WriteStringMaybeAliased(
-        2, this->_internal_sri_username(), target);
+        2, this->_internal_username(), target);
   }
 
-  // uint64 sri_account = 3;
-  if (this->sri_account() != 0) {
+  // uint64 account = 3;
+  if (this->account() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(3, this->_internal_sri_account(), target);
+    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(3, this->_internal_account(), target);
   }
 
-  // string sri_email = 4;
-  if (this->sri_email().size() > 0) {
+  // string email = 4;
+  if (this->email().size() > 0) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_sri_email().data(), static_cast<int>(this->_internal_sri_email().length()),
+      this->_internal_email().data(), static_cast<int>(this->_internal_email().length()),
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "mp.sri.sri_email");
+      "mp.sri.email");
     target = stream->WriteStringMaybeAliased(
-        4, this->_internal_sri_email(), target);
+        4, this->_internal_email(), target);
   }
 
-  // uint64 sri_phone = 5;
-  if (this->sri_phone() != 0) {
+  // uint64 phone = 5;
+  if (this->phone() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(5, this->_internal_sri_phone(), target);
+    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(5, this->_internal_phone(), target);
   }
 
-  // string sri_msg = 6;
-  if (this->sri_msg().size() > 0) {
+  // string msg = 6;
+  if (this->msg().size() > 0) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_sri_msg().data(), static_cast<int>(this->_internal_sri_msg().length()),
+      this->_internal_msg().data(), static_cast<int>(this->_internal_msg().length()),
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "mp.sri.sri_msg");
+      "mp.sri.msg");
     target = stream->WriteStringMaybeAliased(
-        6, this->_internal_sri_msg(), target);
+        6, this->_internal_msg(), target);
   }
 
-  // string sri_token = 7;
-  if (this->sri_token().size() > 0) {
+  // string token = 7;
+  if (this->token().size() > 0) {
     ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_sri_token().data(), static_cast<int>(this->_internal_sri_token().length()),
+      this->_internal_token().data(), static_cast<int>(this->_internal_token().length()),
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "mp.sri.sri_token");
+      "mp.sri.token");
     target = stream->WriteStringMaybeAliased(
-        7, this->_internal_sri_token(), target);
+        7, this->_internal_token(), target);
   }
 
   // string data = 8;
@@ -425,32 +381,32 @@ size_t sri::ByteSizeLong() const {
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
-  // string sri_username = 2;
-  if (this->sri_username().size() > 0) {
+  // string username = 2;
+  if (this->username().size() > 0) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_sri_username());
+        this->_internal_username());
   }
 
-  // string sri_email = 4;
-  if (this->sri_email().size() > 0) {
+  // string email = 4;
+  if (this->email().size() > 0) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_sri_email());
+        this->_internal_email());
   }
 
-  // string sri_msg = 6;
-  if (this->sri_msg().size() > 0) {
+  // string msg = 6;
+  if (this->msg().size() > 0) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_sri_msg());
+        this->_internal_msg());
   }
 
-  // string sri_token = 7;
-  if (this->sri_token().size() > 0) {
+  // string token = 7;
+  if (this->token().size() > 0) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_sri_token());
+        this->_internal_token());
   }
 
   // string data = 8;
@@ -460,24 +416,24 @@ size_t sri::ByteSizeLong() const {
         this->_internal_data());
   }
 
-  // uint64 sri_account = 3;
-  if (this->sri_account() != 0) {
+  // uint64 account = 3;
+  if (this->account() != 0) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size(
-        this->_internal_sri_account());
+        this->_internal_account());
   }
 
-  // uint64 sri_phone = 5;
-  if (this->sri_phone() != 0) {
+  // uint64 phone = 5;
+  if (this->phone() != 0) {
     total_size += 1 +
       ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size(
-        this->_internal_sri_phone());
+        this->_internal_phone());
   }
 
-  // .mp.MP_SRI sri_code = 1;
-  if (this->sri_code() != 0) {
+  // .mp.MP_SUB_TYPE subcommand = 1;
+  if (this->subcommand() != 0) {
     total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_sri_code());
+      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_subcommand());
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -511,29 +467,29 @@ void sri::MergeFrom(const sri& from) {
   ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
-  if (from.sri_username().size() > 0) {
-    _internal_set_sri_username(from._internal_sri_username());
+  if (from.username().size() > 0) {
+    _internal_set_username(from._internal_username());
   }
-  if (from.sri_email().size() > 0) {
-    _internal_set_sri_email(from._internal_sri_email());
+  if (from.email().size() > 0) {
+    _internal_set_email(from._internal_email());
   }
-  if (from.sri_msg().size() > 0) {
-    _internal_set_sri_msg(from._internal_sri_msg());
+  if (from.msg().size() > 0) {
+    _internal_set_msg(from._internal_msg());
   }
-  if (from.sri_token().size() > 0) {
-    _internal_set_sri_token(from._internal_sri_token());
+  if (from.token().size() > 0) {
+    _internal_set_token(from._internal_token());
   }
   if (from.data().size() > 0) {
     _internal_set_data(from._internal_data());
   }
-  if (from.sri_account() != 0) {
-    _internal_set_sri_account(from._internal_sri_account());
+  if (from.account() != 0) {
+    _internal_set_account(from._internal_account());
   }
-  if (from.sri_phone() != 0) {
-    _internal_set_sri_phone(from._internal_sri_phone());
+  if (from.phone() != 0) {
+    _internal_set_phone(from._internal_phone());
   }
-  if (from.sri_code() != 0) {
-    _internal_set_sri_code(from._internal_sri_code());
+  if (from.subcommand() != 0) {
+    _internal_set_subcommand(from._internal_subcommand());
   }
 }
 
@@ -558,17 +514,17 @@ bool sri::IsInitialized() const {
 void sri::InternalSwap(sri* other) {
   using std::swap;
   _internal_metadata_.Swap<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(&other->_internal_metadata_);
-  sri_username_.Swap(&other->sri_username_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
-  sri_email_.Swap(&other->sri_email_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
-  sri_msg_.Swap(&other->sri_msg_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
-  sri_token_.Swap(&other->sri_token_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  username_.Swap(&other->username_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  email_.Swap(&other->email_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  msg_.Swap(&other->msg_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  token_.Swap(&other->token_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
   data_.Swap(&other->data_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
   ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(sri, sri_code_)
-      + sizeof(sri::sri_code_)
-      - PROTOBUF_FIELD_OFFSET(sri, sri_account_)>(
-          reinterpret_cast<char*>(&sri_account_),
-          reinterpret_cast<char*>(&other->sri_account_));
+      PROTOBUF_FIELD_OFFSET(sri, subcommand_)
+      + sizeof(sri::subcommand_)
+      - PROTOBUF_FIELD_OFFSET(sri, account_)>(
+          reinterpret_cast<char*>(&account_),
+          reinterpret_cast<char*>(&other->account_));
 }
 
 ::PROTOBUF_NAMESPACE_ID::Metadata sri::GetMetadata() const {
diff --git a/MP/proto/mp.sri.pb.h b/MP/proto/mp.sri.pb.h
index 74c8701..bcbfab3 100644
--- a/MP/proto/mp.sri.pb.h
+++ b/MP/proto/mp.sri.pb.h
@@ -31,8 +31,8 @@
 #include <google/protobuf/message.h>
 #include <google/protobuf/repeated_field.h>  // IWYU pragma: export
 #include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
+#include "mp.mp.pb.h"
 // @@protoc_insertion_point(includes)
 #include <google/protobuf/port_def.inc>
 #define PROTOBUF_INTERNAL_EXPORT_mp_2esri_2eproto
@@ -65,49 +65,6 @@ template<> ::mp::sri* Arena::CreateMaybeMessage<::mp::sri>(Arena*);
 PROTOBUF_NAMESPACE_CLOSE
 namespace mp {
 
-enum MP_SRI : int {
-  MP_LOGIN_ACCOUNT_NOT = 0,
-  MP_LOGIN_SUCCESS = 1,
-  MP_LOGIN_FAIL = 2,
-  MP_REGISTER_SUCCESS = 10,
-  MP_REGISTER_SUCCESS_PHONE = 11,
-  MP_REGISTER_SUCCESS_EMAIL = 12,
-  MP_REGISTER_EXIST = 13,
-  MP_REGISTER_SQL_ERR = 14,
-  MP_LOGOUT_SUCCESS = 20,
-  MP_LOGOUT_FAIL = 21,
-  MP_ADD_FRIENDS = 30,
-  MP_ADD_FRIENDS_0 = 31,
-  MP_ADD_FRIENDS_1 = 32,
-  MP_ADD_FRIENDS_2 = 33,
-  MP_ADD_FRIENDS_ERR = 34,
-  MP_ADD_FRIENDS_NOT_TYPE = 35,
-  MP_ADD_FRIENDS_SQL_ERR = 36,
-  MP_ADD_FRIENDS_ANSWER_ERR = 37,
-  MP_PE_CODE_SUCCESS = 50,
-  MP_PE_CODE_FAIL = 51,
-  MP_SRI_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::min(),
-  MP_SRI_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<::PROTOBUF_NAMESPACE_ID::int32>::max()
-};
-bool MP_SRI_IsValid(int value);
-constexpr MP_SRI MP_SRI_MIN = MP_LOGIN_ACCOUNT_NOT;
-constexpr MP_SRI MP_SRI_MAX = MP_PE_CODE_FAIL;
-constexpr int MP_SRI_ARRAYSIZE = MP_SRI_MAX + 1;
-
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MP_SRI_descriptor();
-template<typename T>
-inline const std::string& MP_SRI_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, MP_SRI>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function MP_SRI_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    MP_SRI_descriptor(), enum_t_value);
-}
-inline bool MP_SRI_Parse(
-    const std::string& name, MP_SRI* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<MP_SRI>(
-    MP_SRI_descriptor(), name, value);
-}
 // ===================================================================
 
 class sri PROTOBUF_FINAL :
@@ -223,113 +180,113 @@ class sri PROTOBUF_FINAL :
   // accessors -------------------------------------------------------
 
   enum : int {
-    kSriUsernameFieldNumber = 2,
-    kSriEmailFieldNumber = 4,
-    kSriMsgFieldNumber = 6,
-    kSriTokenFieldNumber = 7,
+    kUsernameFieldNumber = 2,
+    kEmailFieldNumber = 4,
+    kMsgFieldNumber = 6,
+    kTokenFieldNumber = 7,
     kDataFieldNumber = 8,
-    kSriAccountFieldNumber = 3,
-    kSriPhoneFieldNumber = 5,
-    kSriCodeFieldNumber = 1,
+    kAccountFieldNumber = 3,
+    kPhoneFieldNumber = 5,
+    kSubcommandFieldNumber = 1,
   };
-  // string sri_username = 2;
-  void clear_sri_username();
-  const std::string& sri_username() const;
-  void set_sri_username(const std::string& value);
-  void set_sri_username(std::string&& value);
-  void set_sri_username(const char* value);
-  void set_sri_username(const char* value, size_t size);
-  std::string* mutable_sri_username();
-  std::string* release_sri_username();
-  void set_allocated_sri_username(std::string* sri_username);
+  // string username = 2;
+  void clear_username();
+  const std::string& username() const;
+  void set_username(const std::string& value);
+  void set_username(std::string&& value);
+  void set_username(const char* value);
+  void set_username(const char* value, size_t size);
+  std::string* mutable_username();
+  std::string* release_username();
+  void set_allocated_username(std::string* username);
   GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
   "    string fields are deprecated and will be removed in a"
   "    future release.")
-  std::string* unsafe_arena_release_sri_username();
+  std::string* unsafe_arena_release_username();
   GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
   "    string fields are deprecated and will be removed in a"
   "    future release.")
-  void unsafe_arena_set_allocated_sri_username(
-      std::string* sri_username);
+  void unsafe_arena_set_allocated_username(
+      std::string* username);
   private:
-  const std::string& _internal_sri_username() const;
-  void _internal_set_sri_username(const std::string& value);
-  std::string* _internal_mutable_sri_username();
+  const std::string& _internal_username() const;
+  void _internal_set_username(const std::string& value);
+  std::string* _internal_mutable_username();
   public:
 
-  // string sri_email = 4;
-  void clear_sri_email();
-  const std::string& sri_email() const;
-  void set_sri_email(const std::string& value);
-  void set_sri_email(std::string&& value);
-  void set_sri_email(const char* value);
-  void set_sri_email(const char* value, size_t size);
-  std::string* mutable_sri_email();
-  std::string* release_sri_email();
-  void set_allocated_sri_email(std::string* sri_email);
+  // string email = 4;
+  void clear_email();
+  const std::string& email() const;
+  void set_email(const std::string& value);
+  void set_email(std::string&& value);
+  void set_email(const char* value);
+  void set_email(const char* value, size_t size);
+  std::string* mutable_email();
+  std::string* release_email();
+  void set_allocated_email(std::string* email);
   GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
   "    string fields are deprecated and will be removed in a"
   "    future release.")
-  std::string* unsafe_arena_release_sri_email();
+  std::string* unsafe_arena_release_email();
   GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
   "    string fields are deprecated and will be removed in a"
   "    future release.")
-  void unsafe_arena_set_allocated_sri_email(
-      std::string* sri_email);
+  void unsafe_arena_set_allocated_email(
+      std::string* email);
   private:
-  const std::string& _internal_sri_email() const;
-  void _internal_set_sri_email(const std::string& value);
-  std::string* _internal_mutable_sri_email();
+  const std::string& _internal_email() const;
+  void _internal_set_email(const std::string& value);
+  std::string* _internal_mutable_email();
   public:
 
-  // string sri_msg = 6;
-  void clear_sri_msg();
-  const std::string& sri_msg() const;
-  void set_sri_msg(const std::string& value);
-  void set_sri_msg(std::string&& value);
-  void set_sri_msg(const char* value);
-  void set_sri_msg(const char* value, size_t size);
-  std::string* mutable_sri_msg();
-  std::string* release_sri_msg();
-  void set_allocated_sri_msg(std::string* sri_msg);
+  // string msg = 6;
+  void clear_msg();
+  const std::string& msg() const;
+  void set_msg(const std::string& value);
+  void set_msg(std::string&& value);
+  void set_msg(const char* value);
+  void set_msg(const char* value, size_t size);
+  std::string* mutable_msg();
+  std::string* release_msg();
+  void set_allocated_msg(std::string* msg);
   GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
   "    string fields are deprecated and will be removed in a"
   "    future release.")
-  std::string* unsafe_arena_release_sri_msg();
+  std::string* unsafe_arena_release_msg();
   GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
   "    string fields are deprecated and will be removed in a"
   "    future release.")
-  void unsafe_arena_set_allocated_sri_msg(
-      std::string* sri_msg);
+  void unsafe_arena_set_allocated_msg(
+      std::string* msg);
   private:
-  const std::string& _internal_sri_msg() const;
-  void _internal_set_sri_msg(const std::string& value);
-  std::string* _internal_mutable_sri_msg();
+  const std::string& _internal_msg() const;
+  void _internal_set_msg(const std::string& value);
+  std::string* _internal_mutable_msg();
   public:
 
-  // string sri_token = 7;
-  void clear_sri_token();
-  const std::string& sri_token() const;
-  void set_sri_token(const std::string& value);
-  void set_sri_token(std::string&& value);
-  void set_sri_token(const char* value);
-  void set_sri_token(const char* value, size_t size);
-  std::string* mutable_sri_token();
-  std::string* release_sri_token();
-  void set_allocated_sri_token(std::string* sri_token);
+  // string token = 7;
+  void clear_token();
+  const std::string& token() const;
+  void set_token(const std::string& value);
+  void set_token(std::string&& value);
+  void set_token(const char* value);
+  void set_token(const char* value, size_t size);
+  std::string* mutable_token();
+  std::string* release_token();
+  void set_allocated_token(std::string* token);
   GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
   "    string fields are deprecated and will be removed in a"
   "    future release.")
-  std::string* unsafe_arena_release_sri_token();
+  std::string* unsafe_arena_release_token();
   GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
   "    string fields are deprecated and will be removed in a"
   "    future release.")
-  void unsafe_arena_set_allocated_sri_token(
-      std::string* sri_token);
+  void unsafe_arena_set_allocated_token(
+      std::string* token);
   private:
-  const std::string& _internal_sri_token() const;
-  void _internal_set_sri_token(const std::string& value);
-  std::string* _internal_mutable_sri_token();
+  const std::string& _internal_token() const;
+  void _internal_set_token(const std::string& value);
+  std::string* _internal_mutable_token();
   public:
 
   // string data = 8;
@@ -357,31 +314,31 @@ class sri PROTOBUF_FINAL :
   std::string* _internal_mutable_data();
   public:
 
-  // uint64 sri_account = 3;
-  void clear_sri_account();
-  ::PROTOBUF_NAMESPACE_ID::uint64 sri_account() const;
-  void set_sri_account(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  // uint64 account = 3;
+  void clear_account();
+  ::PROTOBUF_NAMESPACE_ID::uint64 account() const;
+  void set_account(::PROTOBUF_NAMESPACE_ID::uint64 value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_sri_account() const;
-  void _internal_set_sri_account(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_account() const;
+  void _internal_set_account(::PROTOBUF_NAMESPACE_ID::uint64 value);
   public:
 
-  // uint64 sri_phone = 5;
-  void clear_sri_phone();
-  ::PROTOBUF_NAMESPACE_ID::uint64 sri_phone() const;
-  void set_sri_phone(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  // uint64 phone = 5;
+  void clear_phone();
+  ::PROTOBUF_NAMESPACE_ID::uint64 phone() const;
+  void set_phone(::PROTOBUF_NAMESPACE_ID::uint64 value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_sri_phone() const;
-  void _internal_set_sri_phone(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_phone() const;
+  void _internal_set_phone(::PROTOBUF_NAMESPACE_ID::uint64 value);
   public:
 
-  // .mp.MP_SRI sri_code = 1;
-  void clear_sri_code();
-  ::mp::MP_SRI sri_code() const;
-  void set_sri_code(::mp::MP_SRI value);
+  // .mp.MP_SUB_TYPE subcommand = 1;
+  void clear_subcommand();
+  ::mp::MP_SUB_TYPE subcommand() const;
+  void set_subcommand(::mp::MP_SUB_TYPE value);
   private:
-  ::mp::MP_SRI _internal_sri_code() const;
-  void _internal_set_sri_code(::mp::MP_SRI value);
+  ::mp::MP_SUB_TYPE _internal_subcommand() const;
+  void _internal_set_subcommand(::mp::MP_SUB_TYPE value);
   public:
 
   // @@protoc_insertion_point(class_scope:mp.sri)
@@ -391,14 +348,14 @@ class sri PROTOBUF_FINAL :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sri_username_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sri_email_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sri_msg_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sri_token_;
+  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr username_;
+  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr email_;
+  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr msg_;
+  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr token_;
   ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr data_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 sri_account_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 sri_phone_;
-  int sri_code_;
+  ::PROTOBUF_NAMESPACE_ID::uint64 account_;
+  ::PROTOBUF_NAMESPACE_ID::uint64 phone_;
+  int subcommand_;
   mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   friend struct ::TableStruct_mp_2esri_2eproto;
 };
@@ -413,388 +370,388 @@ class sri PROTOBUF_FINAL :
 #endif  // __GNUC__
 // sri
 
-// .mp.MP_SRI sri_code = 1;
-inline void sri::clear_sri_code() {
-  sri_code_ = 0;
+// .mp.MP_SUB_TYPE subcommand = 1;
+inline void sri::clear_subcommand() {
+  subcommand_ = 0;
 }
-inline ::mp::MP_SRI sri::_internal_sri_code() const {
-  return static_cast< ::mp::MP_SRI >(sri_code_);
+inline ::mp::MP_SUB_TYPE sri::_internal_subcommand() const {
+  return static_cast< ::mp::MP_SUB_TYPE >(subcommand_);
 }
-inline ::mp::MP_SRI sri::sri_code() const {
-  // @@protoc_insertion_point(field_get:mp.sri.sri_code)
-  return _internal_sri_code();
+inline ::mp::MP_SUB_TYPE sri::subcommand() const {
+  // @@protoc_insertion_point(field_get:mp.sri.subcommand)
+  return _internal_subcommand();
 }
-inline void sri::_internal_set_sri_code(::mp::MP_SRI value) {
+inline void sri::_internal_set_subcommand(::mp::MP_SUB_TYPE value) {
   
-  sri_code_ = value;
+  subcommand_ = value;
 }
-inline void sri::set_sri_code(::mp::MP_SRI value) {
-  _internal_set_sri_code(value);
-  // @@protoc_insertion_point(field_set:mp.sri.sri_code)
+inline void sri::set_subcommand(::mp::MP_SUB_TYPE value) {
+  _internal_set_subcommand(value);
+  // @@protoc_insertion_point(field_set:mp.sri.subcommand)
 }
 
-// string sri_username = 2;
-inline void sri::clear_sri_username() {
-  sri_username_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+// string username = 2;
+inline void sri::clear_username() {
+  username_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline const std::string& sri::sri_username() const {
-  // @@protoc_insertion_point(field_get:mp.sri.sri_username)
-  return _internal_sri_username();
+inline const std::string& sri::username() const {
+  // @@protoc_insertion_point(field_get:mp.sri.username)
+  return _internal_username();
 }
-inline void sri::set_sri_username(const std::string& value) {
-  _internal_set_sri_username(value);
-  // @@protoc_insertion_point(field_set:mp.sri.sri_username)
+inline void sri::set_username(const std::string& value) {
+  _internal_set_username(value);
+  // @@protoc_insertion_point(field_set:mp.sri.username)
 }
-inline std::string* sri::mutable_sri_username() {
-  // @@protoc_insertion_point(field_mutable:mp.sri.sri_username)
-  return _internal_mutable_sri_username();
+inline std::string* sri::mutable_username() {
+  // @@protoc_insertion_point(field_mutable:mp.sri.username)
+  return _internal_mutable_username();
 }
-inline const std::string& sri::_internal_sri_username() const {
-  return sri_username_.Get();
+inline const std::string& sri::_internal_username() const {
+  return username_.Get();
 }
-inline void sri::_internal_set_sri_username(const std::string& value) {
+inline void sri::_internal_set_username(const std::string& value) {
   
-  sri_username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+  username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
 }
-inline void sri::set_sri_username(std::string&& value) {
+inline void sri::set_username(std::string&& value) {
   
-  sri_username_.Set(
+  username_.Set(
     &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
-  // @@protoc_insertion_point(field_set_rvalue:mp.sri.sri_username)
+  // @@protoc_insertion_point(field_set_rvalue:mp.sri.username)
 }
-inline void sri::set_sri_username(const char* value) {
+inline void sri::set_username(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
   
-  sri_username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
+  username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
               GetArena());
-  // @@protoc_insertion_point(field_set_char:mp.sri.sri_username)
+  // @@protoc_insertion_point(field_set_char:mp.sri.username)
 }
-inline void sri::set_sri_username(const char* value,
+inline void sri::set_username(const char* value,
     size_t size) {
   
-  sri_username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+  username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
       reinterpret_cast<const char*>(value), size), GetArena());
-  // @@protoc_insertion_point(field_set_pointer:mp.sri.sri_username)
+  // @@protoc_insertion_point(field_set_pointer:mp.sri.username)
 }
-inline std::string* sri::_internal_mutable_sri_username() {
+inline std::string* sri::_internal_mutable_username() {
   
-  return sri_username_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  return username_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline std::string* sri::release_sri_username() {
-  // @@protoc_insertion_point(field_release:mp.sri.sri_username)
-  return sri_username_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+inline std::string* sri::release_username() {
+  // @@protoc_insertion_point(field_release:mp.sri.username)
+  return username_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline void sri::set_allocated_sri_username(std::string* sri_username) {
-  if (sri_username != nullptr) {
+inline void sri::set_allocated_username(std::string* username) {
+  if (username != nullptr) {
     
   } else {
     
   }
-  sri_username_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), sri_username,
+  username_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), username,
       GetArena());
-  // @@protoc_insertion_point(field_set_allocated:mp.sri.sri_username)
+  // @@protoc_insertion_point(field_set_allocated:mp.sri.username)
 }
-inline std::string* sri::unsafe_arena_release_sri_username() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:mp.sri.sri_username)
+inline std::string* sri::unsafe_arena_release_username() {
+  // @@protoc_insertion_point(field_unsafe_arena_release:mp.sri.username)
   GOOGLE_DCHECK(GetArena() != nullptr);
   
-  return sri_username_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+  return username_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
       GetArena());
 }
-inline void sri::unsafe_arena_set_allocated_sri_username(
-    std::string* sri_username) {
+inline void sri::unsafe_arena_set_allocated_username(
+    std::string* username) {
   GOOGLE_DCHECK(GetArena() != nullptr);
-  if (sri_username != nullptr) {
+  if (username != nullptr) {
     
   } else {
     
   }
-  sri_username_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
-      sri_username, GetArena());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.sri.sri_username)
+  username_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      username, GetArena());
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.sri.username)
 }
 
-// uint64 sri_account = 3;
-inline void sri::clear_sri_account() {
-  sri_account_ = PROTOBUF_ULONGLONG(0);
+// uint64 account = 3;
+inline void sri::clear_account() {
+  account_ = PROTOBUF_ULONGLONG(0);
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::_internal_sri_account() const {
-  return sri_account_;
+inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::_internal_account() const {
+  return account_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::sri_account() const {
-  // @@protoc_insertion_point(field_get:mp.sri.sri_account)
-  return _internal_sri_account();
+inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::account() const {
+  // @@protoc_insertion_point(field_get:mp.sri.account)
+  return _internal_account();
 }
-inline void sri::_internal_set_sri_account(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void sri::_internal_set_account(::PROTOBUF_NAMESPACE_ID::uint64 value) {
   
-  sri_account_ = value;
+  account_ = value;
 }
-inline void sri::set_sri_account(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _internal_set_sri_account(value);
-  // @@protoc_insertion_point(field_set:mp.sri.sri_account)
+inline void sri::set_account(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+  _internal_set_account(value);
+  // @@protoc_insertion_point(field_set:mp.sri.account)
 }
 
-// string sri_email = 4;
-inline void sri::clear_sri_email() {
-  sri_email_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+// string email = 4;
+inline void sri::clear_email() {
+  email_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline const std::string& sri::sri_email() const {
-  // @@protoc_insertion_point(field_get:mp.sri.sri_email)
-  return _internal_sri_email();
+inline const std::string& sri::email() const {
+  // @@protoc_insertion_point(field_get:mp.sri.email)
+  return _internal_email();
 }
-inline void sri::set_sri_email(const std::string& value) {
-  _internal_set_sri_email(value);
-  // @@protoc_insertion_point(field_set:mp.sri.sri_email)
+inline void sri::set_email(const std::string& value) {
+  _internal_set_email(value);
+  // @@protoc_insertion_point(field_set:mp.sri.email)
 }
-inline std::string* sri::mutable_sri_email() {
-  // @@protoc_insertion_point(field_mutable:mp.sri.sri_email)
-  return _internal_mutable_sri_email();
+inline std::string* sri::mutable_email() {
+  // @@protoc_insertion_point(field_mutable:mp.sri.email)
+  return _internal_mutable_email();
 }
-inline const std::string& sri::_internal_sri_email() const {
-  return sri_email_.Get();
+inline const std::string& sri::_internal_email() const {
+  return email_.Get();
 }
-inline void sri::_internal_set_sri_email(const std::string& value) {
+inline void sri::_internal_set_email(const std::string& value) {
   
-  sri_email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+  email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
 }
-inline void sri::set_sri_email(std::string&& value) {
+inline void sri::set_email(std::string&& value) {
   
-  sri_email_.Set(
+  email_.Set(
     &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
-  // @@protoc_insertion_point(field_set_rvalue:mp.sri.sri_email)
+  // @@protoc_insertion_point(field_set_rvalue:mp.sri.email)
 }
-inline void sri::set_sri_email(const char* value) {
+inline void sri::set_email(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
   
-  sri_email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
+  email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
               GetArena());
-  // @@protoc_insertion_point(field_set_char:mp.sri.sri_email)
+  // @@protoc_insertion_point(field_set_char:mp.sri.email)
 }
-inline void sri::set_sri_email(const char* value,
+inline void sri::set_email(const char* value,
     size_t size) {
   
-  sri_email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+  email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
       reinterpret_cast<const char*>(value), size), GetArena());
-  // @@protoc_insertion_point(field_set_pointer:mp.sri.sri_email)
+  // @@protoc_insertion_point(field_set_pointer:mp.sri.email)
 }
-inline std::string* sri::_internal_mutable_sri_email() {
+inline std::string* sri::_internal_mutable_email() {
   
-  return sri_email_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  return email_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline std::string* sri::release_sri_email() {
-  // @@protoc_insertion_point(field_release:mp.sri.sri_email)
-  return sri_email_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+inline std::string* sri::release_email() {
+  // @@protoc_insertion_point(field_release:mp.sri.email)
+  return email_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline void sri::set_allocated_sri_email(std::string* sri_email) {
-  if (sri_email != nullptr) {
+inline void sri::set_allocated_email(std::string* email) {
+  if (email != nullptr) {
     
   } else {
     
   }
-  sri_email_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), sri_email,
+  email_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), email,
       GetArena());
-  // @@protoc_insertion_point(field_set_allocated:mp.sri.sri_email)
+  // @@protoc_insertion_point(field_set_allocated:mp.sri.email)
 }
-inline std::string* sri::unsafe_arena_release_sri_email() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:mp.sri.sri_email)
+inline std::string* sri::unsafe_arena_release_email() {
+  // @@protoc_insertion_point(field_unsafe_arena_release:mp.sri.email)
   GOOGLE_DCHECK(GetArena() != nullptr);
   
-  return sri_email_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+  return email_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
       GetArena());
 }
-inline void sri::unsafe_arena_set_allocated_sri_email(
-    std::string* sri_email) {
+inline void sri::unsafe_arena_set_allocated_email(
+    std::string* email) {
   GOOGLE_DCHECK(GetArena() != nullptr);
-  if (sri_email != nullptr) {
+  if (email != nullptr) {
     
   } else {
     
   }
-  sri_email_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
-      sri_email, GetArena());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.sri.sri_email)
+  email_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      email, GetArena());
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.sri.email)
 }
 
-// uint64 sri_phone = 5;
-inline void sri::clear_sri_phone() {
-  sri_phone_ = PROTOBUF_ULONGLONG(0);
+// uint64 phone = 5;
+inline void sri::clear_phone() {
+  phone_ = PROTOBUF_ULONGLONG(0);
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::_internal_sri_phone() const {
-  return sri_phone_;
+inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::_internal_phone() const {
+  return phone_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::sri_phone() const {
-  // @@protoc_insertion_point(field_get:mp.sri.sri_phone)
-  return _internal_sri_phone();
+inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::phone() const {
+  // @@protoc_insertion_point(field_get:mp.sri.phone)
+  return _internal_phone();
 }
-inline void sri::_internal_set_sri_phone(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void sri::_internal_set_phone(::PROTOBUF_NAMESPACE_ID::uint64 value) {
   
-  sri_phone_ = value;
+  phone_ = value;
 }
-inline void sri::set_sri_phone(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _internal_set_sri_phone(value);
-  // @@protoc_insertion_point(field_set:mp.sri.sri_phone)
+inline void sri::set_phone(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+  _internal_set_phone(value);
+  // @@protoc_insertion_point(field_set:mp.sri.phone)
 }
 
-// string sri_msg = 6;
-inline void sri::clear_sri_msg() {
-  sri_msg_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+// string msg = 6;
+inline void sri::clear_msg() {
+  msg_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline const std::string& sri::sri_msg() const {
-  // @@protoc_insertion_point(field_get:mp.sri.sri_msg)
-  return _internal_sri_msg();
+inline const std::string& sri::msg() const {
+  // @@protoc_insertion_point(field_get:mp.sri.msg)
+  return _internal_msg();
 }
-inline void sri::set_sri_msg(const std::string& value) {
-  _internal_set_sri_msg(value);
-  // @@protoc_insertion_point(field_set:mp.sri.sri_msg)
+inline void sri::set_msg(const std::string& value) {
+  _internal_set_msg(value);
+  // @@protoc_insertion_point(field_set:mp.sri.msg)
 }
-inline std::string* sri::mutable_sri_msg() {
-  // @@protoc_insertion_point(field_mutable:mp.sri.sri_msg)
-  return _internal_mutable_sri_msg();
+inline std::string* sri::mutable_msg() {
+  // @@protoc_insertion_point(field_mutable:mp.sri.msg)
+  return _internal_mutable_msg();
 }
-inline const std::string& sri::_internal_sri_msg() const {
-  return sri_msg_.Get();
+inline const std::string& sri::_internal_msg() const {
+  return msg_.Get();
 }
-inline void sri::_internal_set_sri_msg(const std::string& value) {
+inline void sri::_internal_set_msg(const std::string& value) {
   
-  sri_msg_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+  msg_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
 }
-inline void sri::set_sri_msg(std::string&& value) {
+inline void sri::set_msg(std::string&& value) {
   
-  sri_msg_.Set(
+  msg_.Set(
     &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
-  // @@protoc_insertion_point(field_set_rvalue:mp.sri.sri_msg)
+  // @@protoc_insertion_point(field_set_rvalue:mp.sri.msg)
 }
-inline void sri::set_sri_msg(const char* value) {
+inline void sri::set_msg(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
   
-  sri_msg_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
+  msg_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
               GetArena());
-  // @@protoc_insertion_point(field_set_char:mp.sri.sri_msg)
+  // @@protoc_insertion_point(field_set_char:mp.sri.msg)
 }
-inline void sri::set_sri_msg(const char* value,
+inline void sri::set_msg(const char* value,
     size_t size) {
   
-  sri_msg_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+  msg_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
       reinterpret_cast<const char*>(value), size), GetArena());
-  // @@protoc_insertion_point(field_set_pointer:mp.sri.sri_msg)
+  // @@protoc_insertion_point(field_set_pointer:mp.sri.msg)
 }
-inline std::string* sri::_internal_mutable_sri_msg() {
+inline std::string* sri::_internal_mutable_msg() {
   
-  return sri_msg_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  return msg_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline std::string* sri::release_sri_msg() {
-  // @@protoc_insertion_point(field_release:mp.sri.sri_msg)
-  return sri_msg_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+inline std::string* sri::release_msg() {
+  // @@protoc_insertion_point(field_release:mp.sri.msg)
+  return msg_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline void sri::set_allocated_sri_msg(std::string* sri_msg) {
-  if (sri_msg != nullptr) {
+inline void sri::set_allocated_msg(std::string* msg) {
+  if (msg != nullptr) {
     
   } else {
     
   }
-  sri_msg_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), sri_msg,
+  msg_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), msg,
       GetArena());
-  // @@protoc_insertion_point(field_set_allocated:mp.sri.sri_msg)
+  // @@protoc_insertion_point(field_set_allocated:mp.sri.msg)
 }
-inline std::string* sri::unsafe_arena_release_sri_msg() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:mp.sri.sri_msg)
+inline std::string* sri::unsafe_arena_release_msg() {
+  // @@protoc_insertion_point(field_unsafe_arena_release:mp.sri.msg)
   GOOGLE_DCHECK(GetArena() != nullptr);
   
-  return sri_msg_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+  return msg_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
       GetArena());
 }
-inline void sri::unsafe_arena_set_allocated_sri_msg(
-    std::string* sri_msg) {
+inline void sri::unsafe_arena_set_allocated_msg(
+    std::string* msg) {
   GOOGLE_DCHECK(GetArena() != nullptr);
-  if (sri_msg != nullptr) {
+  if (msg != nullptr) {
     
   } else {
     
   }
-  sri_msg_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
-      sri_msg, GetArena());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.sri.sri_msg)
+  msg_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      msg, GetArena());
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.sri.msg)
 }
 
-// string sri_token = 7;
-inline void sri::clear_sri_token() {
-  sri_token_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+// string token = 7;
+inline void sri::clear_token() {
+  token_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline const std::string& sri::sri_token() const {
-  // @@protoc_insertion_point(field_get:mp.sri.sri_token)
-  return _internal_sri_token();
+inline const std::string& sri::token() const {
+  // @@protoc_insertion_point(field_get:mp.sri.token)
+  return _internal_token();
 }
-inline void sri::set_sri_token(const std::string& value) {
-  _internal_set_sri_token(value);
-  // @@protoc_insertion_point(field_set:mp.sri.sri_token)
+inline void sri::set_token(const std::string& value) {
+  _internal_set_token(value);
+  // @@protoc_insertion_point(field_set:mp.sri.token)
 }
-inline std::string* sri::mutable_sri_token() {
-  // @@protoc_insertion_point(field_mutable:mp.sri.sri_token)
-  return _internal_mutable_sri_token();
+inline std::string* sri::mutable_token() {
+  // @@protoc_insertion_point(field_mutable:mp.sri.token)
+  return _internal_mutable_token();
 }
-inline const std::string& sri::_internal_sri_token() const {
-  return sri_token_.Get();
+inline const std::string& sri::_internal_token() const {
+  return token_.Get();
 }
-inline void sri::_internal_set_sri_token(const std::string& value) {
+inline void sri::_internal_set_token(const std::string& value) {
   
-  sri_token_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+  token_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
 }
-inline void sri::set_sri_token(std::string&& value) {
+inline void sri::set_token(std::string&& value) {
   
-  sri_token_.Set(
+  token_.Set(
     &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
-  // @@protoc_insertion_point(field_set_rvalue:mp.sri.sri_token)
+  // @@protoc_insertion_point(field_set_rvalue:mp.sri.token)
 }
-inline void sri::set_sri_token(const char* value) {
+inline void sri::set_token(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
   
-  sri_token_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
+  token_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
               GetArena());
-  // @@protoc_insertion_point(field_set_char:mp.sri.sri_token)
+  // @@protoc_insertion_point(field_set_char:mp.sri.token)
 }
-inline void sri::set_sri_token(const char* value,
+inline void sri::set_token(const char* value,
     size_t size) {
   
-  sri_token_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+  token_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
       reinterpret_cast<const char*>(value), size), GetArena());
-  // @@protoc_insertion_point(field_set_pointer:mp.sri.sri_token)
+  // @@protoc_insertion_point(field_set_pointer:mp.sri.token)
 }
-inline std::string* sri::_internal_mutable_sri_token() {
+inline std::string* sri::_internal_mutable_token() {
   
-  return sri_token_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  return token_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline std::string* sri::release_sri_token() {
-  // @@protoc_insertion_point(field_release:mp.sri.sri_token)
-  return sri_token_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+inline std::string* sri::release_token() {
+  // @@protoc_insertion_point(field_release:mp.sri.token)
+  return token_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
 }
-inline void sri::set_allocated_sri_token(std::string* sri_token) {
-  if (sri_token != nullptr) {
+inline void sri::set_allocated_token(std::string* token) {
+  if (token != nullptr) {
     
   } else {
     
   }
-  sri_token_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), sri_token,
+  token_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), token,
       GetArena());
-  // @@protoc_insertion_point(field_set_allocated:mp.sri.sri_token)
+  // @@protoc_insertion_point(field_set_allocated:mp.sri.token)
 }
-inline std::string* sri::unsafe_arena_release_sri_token() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:mp.sri.sri_token)
+inline std::string* sri::unsafe_arena_release_token() {
+  // @@protoc_insertion_point(field_unsafe_arena_release:mp.sri.token)
   GOOGLE_DCHECK(GetArena() != nullptr);
   
-  return sri_token_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+  return token_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
       GetArena());
 }
-inline void sri::unsafe_arena_set_allocated_sri_token(
-    std::string* sri_token) {
+inline void sri::unsafe_arena_set_allocated_token(
+    std::string* token) {
   GOOGLE_DCHECK(GetArena() != nullptr);
-  if (sri_token != nullptr) {
+  if (token != nullptr) {
     
   } else {
     
   }
-  sri_token_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
-      sri_token, GetArena());
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.sri.sri_token)
+  token_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      token, GetArena());
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.sri.token)
 }
 
 // string data = 8;
@@ -886,16 +843,6 @@ inline void sri::unsafe_arena_set_allocated_data(
 
 }  // namespace mp
 
-PROTOBUF_NAMESPACE_OPEN
-
-template <> struct is_proto_enum< ::mp::MP_SRI> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::mp::MP_SRI>() {
-  return ::mp::MP_SRI_descriptor();
-}
-
-PROTOBUF_NAMESPACE_CLOSE
-
 // @@protoc_insertion_point(global_scope)
 
 #include <google/protobuf/port_undef.inc>
diff --git a/MP/protohuf/mp.body.proto b/MP/protohuf/mp.body.proto
index 6d7c103..22d8d45 100644
--- a/MP/protohuf/mp.body.proto
+++ b/MP/protohuf/mp.body.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package mp;
 
-import "mp.mph.proto";
+import "mp.mp.proto";
 
 message body {
   MP_SUB_TYPE subcommand = 1;
diff --git a/MP/protohuf/mp.mp.proto b/MP/protohuf/mp.mp.proto
new file mode 100644
index 0000000..c6c8cf6
--- /dev/null
+++ b/MP/protohuf/mp.mp.proto
@@ -0,0 +1,82 @@
+syntax = "proto3";
+package mp;
+
+enum MP_TYPE {
+  // 0 - 19
+  MP_REQUEST_LOGIN          = 0;      // 登陆
+  MP_REQUEST_LOGOUT         = 1;      // 注销
+  MP_REQUEST_REGISTER       = 2;      // 注册
+  MP_REQUEST_CODE           = 3;      // 请求验证码
+  MP_REQUEST_FRIENDS        = 4;      // 好友相关操作
+  MP_REQUEST_GROUPS         = 5;     // 群相关操作
+
+
+  // 20 - 39
+  MP_RESPONSE_LOGIN           = 20;      // 登陆
+  MP_RESPONSE_LOGOUT          = 21;      // 注销
+  MP_RESPONSE_REGISTER        = 22;      // 注册
+  MP_RESPONSE_CODE            = 23;      // 请求验证码
+  MP_RESPONSE_FRIENDS         = 24;      // 添加相关操作
+  MP_RESPONSE_GROUPS          = 25;      // 群相关操作
+
+
+  // 200 以后为 聊天消息包
+}
+
+enum MP_SUB_TYPE {
+  /// 登陆注册 ***********************************************************************************///
+  // login/register request
+  MP_LOGIN_EMAIL      = 0;          // 邮箱登陆
+  MP_LOGIN_PHONE      = 1;          // 手机登陆
+  MP_LOGIN_ACCOUNT    = 2;          // 帐号登陆
+  MP_REGISTER_EMAIL   = 3;          // 邮箱注册
+  MP_REGISTER_PHONE   = 4;          // 手机注册
+
+  // login/register response
+  MP_LOGIN_SUCCESS      = 5;        // 登陆成功
+  MP_LOGIN_FAIL         = 6;        // 登陆失败
+  MP_REGISTER_SUCCESS   = 7;        // 注册成功
+  MP_REGISTER_FAIL      = 8;        // 注册失败
+  ///***********************************************************************************///
+
+
+  /// 验证码  ***********************************************************************************///
+  // email/phone get code request
+  MP_CODE_EMAIL     = 15;           // 获取邮箱验证码
+  MP_CODE_PHONE     = 16;           // 获取手机验证码
+  // email/phone get code response
+  MP_CODE_SUCCESS   = 17;           // 验证码获取
+  MP_CODE_FAIL      = 28;           // 验证码获取失败
+  ///***********************************************************************************///
+
+
+  /// 添加用户/群组  ***********************************************************************************///
+  MP_ADD_FRIENDS_0          = 51;      // 添加权限 0  直接添加
+  MP_ADD_FRIENDS_1          = 52;      // 添加权限 1  回答问题
+  MP_ADD_FRIENDS_2          = 53;      // 添加权限 2  账户审核
+  MP_ADD_FRIENDS_ACCOUNT    = 54;      // 按账户添加
+  MP_ADD_FRIENDS_EMAIL      = 55;      // 按邮箱添加
+  MP_ADD_FRIENDS_PHONE      = 56;      // 按手机添加
+  MP_ADD_BLACK_LIST         = 59;      // 添加黑名单
+  MP_ADD_WHITE_LIST         = 60;      // 添加白名单
+  MP_REMOVE_FRIEND          = 61;      // 删除好友
+  MP_GET_FRIENDS            = 62;      // 取账户好友列表
+
+  MP_ADD_GROUP_0      = 63;       // 添加权限 0  直接添加
+  MP_ADD_GROUP_1      = 64;       // 添加权限 1  回答问题
+  MP_ADD_GROUP_2      = 65;       // 添加权限 2  账户审核
+  MP_ADD_GROUP        = 66;       // 添加群组
+  MP_REMOVE_GROUP     = 67;       // 删除群组
+  MP_GET_GROUPS        = 68;      // 取账户群组列表
+
+  MP_ADD_SUCCESS      = 69;     // 添加成功
+  MP_REMOVE_SUCCESS   = 70;     // 删除成功
+  MP_GET_SUCCESS      = 71;     // 获取成功
+  MP_ADD_FAIL         = 72;     // 添加失败
+  MP_REMOVE_FAIL      = 73;     // 删除失败
+  MP_GET_FAIL         = 74;     // 获取失败
+
+  MP_ADD_CHECK  = 80;    // 需要回答问题的好友/群组 验证问题
+
+  ///***********************************************************************************///
+}
\ No newline at end of file
diff --git a/MP/protohuf/mp.mph.proto b/MP/protohuf/mp.mph.proto
index 876a730..dda0f61 100644
--- a/MP/protohuf/mp.mph.proto
+++ b/MP/protohuf/mp.mph.proto
@@ -1,53 +1,7 @@
 syntax = "proto3";
 package mp;
 
-enum MP_TYPE {
-  // 0 - 19
-  MP_REQUEST_LOGIN = 0;
-  MP_REQUEST_LOGOUT = 1;
-  MP_REQUEST_REGISTER = 2;
-  MP_REQUEST_USER_FRIENDS = 3;
-
-  // 20 - 39
-  MP_RESPONSE_LOGIN = 20;
-  MP_RESPONSE_LOGOUT = 21;
-  MP_RESPONSE_REGISTER = 22;
-  MP_RESPONSE_USER_FRIENDS = 23;
-
-  // 40 - 59
-  MP_REQUEST_PE_CODE = 40;  // 请求验证码
-
-  // 60 - 79
-  MP_RESPONSE_PE_CODE = 60;
-
-
-  MP_REQUEST_IM_ADD = 100;
-  MP_RESPONSE_IM_ADD = 120;
-
-  // 200 以后为 聊天消息包
-}
-
-enum MP_SUB_TYPE {
-  MP_REQUEST_LOGIN_EMAIL = 0;
-  MP_REQUEST_LOGIN_PHONE = 1;
-  MP_REQUEST_LOGIN_ACCOUNT = 2;
-  MP_REQUEST_REGISTER_EMAIL = 3;
-  MP_REQUEST_REGISTER_PHONE = 4;
-
-  MP_REQUEST_PE_CODE_EMAIL = 5;
-  MP_RESPONSE_PE_CODE_EMAIL = 6;
-  MP_REQUEST_PE_CODE_PHONE = 7;
-  MP_RESPONSE_PE_CODE_PHONE = 8;
-
-  MP_REQUEST_ADD_CONTACT_PERSON = 20;
-  MP_REQUEST_REMOVE_CONTACT_PERSON = 21;
-  MP_REQUEST_BLACK_LIST_CONTACT_PERSON = 22;
-
-  MP_RESPONSE_ADD_CONTACT_PERSON = 40;
-  MP_RESPONSE_REMOVE_CONTACT_PERSON = 41;
-  MP_RESPONSE_BLACK_LIST_CONTACT_PERSON = 42;
-}
-
+import "mp.mp.proto";
 
 message mph {
   uint32 mpb_size = 1;  // 包体大小
diff --git a/MP/protohuf/mp.sri.proto b/MP/protohuf/mp.sri.proto
index 1aef78e..5d7d49b 100644
--- a/MP/protohuf/mp.sri.proto
+++ b/MP/protohuf/mp.sri.proto
@@ -1,40 +1,15 @@
 syntax = "proto3";
 package mp;
 
-enum MP_SRI {
-    MP_LOGIN_ACCOUNT_NOT = 0;
-    MP_LOGIN_SUCCESS = 1;
-    MP_LOGIN_FAIL = 2;
-
-    MP_REGISTER_SUCCESS = 10;
-    MP_REGISTER_SUCCESS_PHONE = 11;
-    MP_REGISTER_SUCCESS_EMAIL = 12;
-    MP_REGISTER_EXIST = 13;
-    MP_REGISTER_SQL_ERR = 14;
-
-    MP_LOGOUT_SUCCESS = 20;
-    MP_LOGOUT_FAIL = 21;
-
-    MP_ADD_FRIENDS = 30;
-    MP_ADD_FRIENDS_0 = 31;
-    MP_ADD_FRIENDS_1 = 32;
-    MP_ADD_FRIENDS_2 = 33;
-    MP_ADD_FRIENDS_ERR = 34;
-    MP_ADD_FRIENDS_NOT_TYPE = 35;
-    MP_ADD_FRIENDS_SQL_ERR = 36;
-    MP_ADD_FRIENDS_ANSWER_ERR = 37;
-
-    MP_PE_CODE_SUCCESS = 50;
-    MP_PE_CODE_FAIL = 51;
-}
+import "mp.mp.proto";
 
 message sri {
-  MP_SRI sri_code = 1;
-  string sri_username = 2;
-  uint64 sri_account = 3;
-  string sri_email = 4;
-  uint64 sri_phone = 5;
-  string sri_msg = 6;
-  string sri_token = 7;
+  MP_SUB_TYPE subcommand = 1;
+  string username = 2;
+  uint64 account = 3;
+  string email = 4;
+  uint64 phone = 5;
+  string msg = 6;
+  string token = 7;
   string data = 8;
 }
\ No newline at end of file
diff --git a/MS/mmm/agreement.cpp b/MS/mmm/agreement.cpp
index d55a53a..342889c 100644
--- a/MS/mmm/agreement.cpp
+++ b/MS/mmm/agreement.cpp
@@ -23,10 +23,10 @@ void agreement_response::set(mp::sri* sri, bufferevent* bev) {
     auto resp = std::make_shared<mp::response>(mp::response());
 
     m_sri = resp->sri();
-    m_sri.set_sri_username(sri->sri_username());
-    m_sri.set_sri_msg(sri->sri_msg());
-    m_sri.set_sri_code(sri->sri_code());
-    m_sri.set_sri_token(sri->sri_token());
+    m_sri.set_username(sri->username());
+    m_sri.set_msg(sri->msg());
+    m_sri.set_subcommand(sri->subcommand());
+    m_sri.set_token(sri->token());
 
     m_bev = bev;
 }
diff --git a/MS/mmm/analysis.h b/MS/mmm/analysis.h
index 115896b..20a2e99 100644
--- a/MS/mmm/analysis.h
+++ b/MS/mmm/analysis.h
@@ -5,7 +5,6 @@
 #ifndef IM2_ANALYSIS_H
 #define IM2_ANALYSIS_H
 
-#include <any>
 #include <variant>
 #include "proto/mp.request.pb.h"
 #include "agreement.h"
diff --git a/MS/mmm/handler.cpp b/MS/mmm/handler.cpp
index 3ee2b36..a780520 100644
--- a/MS/mmm/handler.cpp
+++ b/MS/mmm/handler.cpp
@@ -12,13 +12,13 @@ session* handler::session = new class session();
 void handler::resp(const std::shared_ptr<agreement_request>& request,
                    const std::shared_ptr<agreement_response>& response) {
     /// 用户操作逻辑包
-    // 定义100序号一下的为操作逻辑业务逻辑  请求与响应 +20 就能一一对应
+    // 定义200序号一下的为操作逻辑业务逻辑  请求与响应 +20 就能一一对应
     // 例如 login包类型为 request login==0  那么响应这个登陆信息就是 response login==0+20
     // 200 以上 为im msg 通讯的包类型序号
     if (request->m_mph->mp_type() < 200) {
         auto resp = new Response((mp::MP_TYPE) (request->m_mph->mp_type() + 20),
-                                 response->m_sri.sri_code(), response->m_sri.sri_username(),
-                                 response->m_sri.sri_msg(), response->m_sri.sri_token());
+                                 response->m_sri.subcommand(), response->m_sri.username(),
+                                 response->m_sri.msg(), response->m_sri.token());
         auto ret = resp->packet();
 
         bufferevent_write(request->m_bev, ret.c_str(), ret.size());
diff --git a/MS/mmm/mapping.cpp b/MS/mmm/mapping.cpp
index e43e218..185a292 100644
--- a/MS/mmm/mapping.cpp
+++ b/MS/mmm/mapping.cpp
@@ -23,12 +23,12 @@ mapping::mapping() {
 
         // 获取邮件验证码
         auto peVerifCode = new PEVerifCodeController();
-        map.insert( std::pair<mp::MP_TYPE, handler*>(mp::MP_REQUEST_PE_CODE, peVerifCode));
+        map.insert( std::pair<mp::MP_TYPE, handler*>(mp::MP_REQUEST_CODE, peVerifCode));
 
         // 用户添加好友群组类操作
         auto improve = new IMProveController();
-        map.insert({mp::MP_REQUEST_IM_ADD, improve});
-        map.insert({mp::MP_REQUEST_USER_FRIENDS, improve});
+        map.insert({mp::MP_TYPE::MP_REQUEST_FRIENDS, improve});
+        map.insert({mp::MP_TYPE::MP_REQUEST_GROUPS, improve});
     }
 }
 
diff --git a/MS/mmm/session.cpp b/MS/mmm/session.cpp
index c1b6344..e8f9818 100644
--- a/MS/mmm/session.cpp
+++ b/MS/mmm/session.cpp
@@ -11,7 +11,7 @@
 
 ///  curr mem user curd  user session
 void session::add_user(mp::sri* sri, std::shared_ptr<agreement_request>& request) {
-    if (sri->sri_code() == mp::MP_LOGIN_SUCCESS) {
+    if (sri->subcommand() == mp::MP_LOGIN_SUCCESS) {
         auto ele = new userinfo();
         ele->bev = request->m_bev;
         sprintf(ele->ip, "%s", inet_ntoa(request->m_addr->sin_addr));
diff --git a/MS/works/controller/IMProveController.cpp b/MS/works/controller/IMProveController.cpp
index 0be25c1..bc6225e 100644
--- a/MS/works/controller/IMProveController.cpp
+++ b/MS/works/controller/IMProveController.cpp
@@ -5,13 +5,13 @@
 #include "IMProveController.h"
 
 void IMProveController::run(std::shared_ptr<agreement_request> request, std::shared_ptr<agreement_response> response) {
-    // 添加好友
-    if (request->m_mph->mp_type() == mp::MP_REQUEST_IM_ADD) {
-        auto sri = service.addFriendImProve(&request->m_body);
+    // 好友 相关操作
+    if (request->m_mph->mp_type() == mp::MP_TYPE::MP_REQUEST_FRIENDS) {
+        auto sri = service.friendImProve(&request->m_body);
         response->set(sri, request->m_bev);
     }
-    // 取用户好友列表
-    else if(request->m_mph->mp_type() == mp::MP_REQUEST_USER_FRIENDS) {
+    // 群 相关操作
+    else if(request->m_mph->mp_type() == mp::MP_TYPE::MP_REQUEST_GROUPS) {
 
     }
 }
diff --git a/MS/works/controller/PEVerifCodeController.cpp b/MS/works/controller/PEVerifCodeController.cpp
index 72c2fa7..1b55628 100644
--- a/MS/works/controller/PEVerifCodeController.cpp
+++ b/MS/works/controller/PEVerifCodeController.cpp
@@ -7,7 +7,7 @@
 void PEVerifCodeController::run(std::shared_ptr<agreement_request> request, std::shared_ptr<agreement_response> response) {
     auto sri = new mp::sri();
     // 请求验证码
-    if (request->m_body.subcommand() == mp::MP_REQUEST_PE_CODE_EMAIL) {
+    if (request->m_body.subcommand() == mp::MP_SUB_TYPE::MP_CODE_EMAIL) {
         // 生成验证码
         std::string code = peVerifCodeService.gen_code();
         // 发送验证码至邮
@@ -17,11 +17,11 @@ void PEVerifCodeController::run(std::shared_ptr<agreement_request> request, std:
         session->set_session(request->m_bev, "code", code);
 
         if (state) {
-            sri->set_sri_code(mp::MP_PE_CODE_SUCCESS);
-            sri->set_sri_msg("验证码已发送");
+            sri->set_subcommand(mp::MP_SUB_TYPE::MP_CODE_SUCCESS);
+            sri->set_msg("验证码已发送");
         } else {
-            sri->set_sri_code(mp::MP_PE_CODE_FAIL);
-            sri->set_sri_msg("未知问题，验证码获取失败");
+            sri->set_subcommand(mp::MP_SUB_TYPE::MP_CODE_FAIL);
+            sri->set_msg("未知问题，验证码获取失败");
         }
     }
 
diff --git a/MS/works/service/Service.h b/MS/works/service/Service.h
index 4957ae0..8059a7b 100644
--- a/MS/works/service/Service.h
+++ b/MS/works/service/Service.h
@@ -25,18 +25,10 @@ protected:
 
 protected:
     virtual void sri_clear(){
-        sri->clear_sri_code();
-        sri->clear_sri_msg();
-        sri->clear_sri_token();
-        sri->clear_sri_username();
-    }
-
-
-    std::string SerializationVector(rapidjson::Document* document) {
-        uint64_t account;
-        for (auto mem = document->MemberBegin(); mem != document->MemberEnd(); ++mem) {
-            mem->name;
-        }
+        sri->clear_subcommand();
+        sri->clear_msg();
+        sri->clear_token();
+        sri->clear_username();
     }
 };
 
diff --git a/MS/works/service/UserFriendsService.cpp b/MS/works/service/UserFriendsService.cpp
index 4476211..8eb34f1 100644
--- a/MS/works/service/UserFriendsService.cpp
+++ b/MS/works/service/UserFriendsService.cpp
@@ -7,41 +7,42 @@
 UserFriendsService::~UserFriendsService() {}
 
 // 好友群组 添加删除 任务组 决策接口
-mp::sri *UserFriendsService::addFriendImProve(mp::body* body) {
+mp::sri *UserFriendsService::friendImProve(mp::body* body) {
     sri_clear();
     if (body->target() == 0 || body->source() == 0) {
         printf("请求数据有缺\n");
-        sri->set_sri_msg("请求数据有缺");
+        sri->set_msg("请求数据有缺");
         return sri;
     }
 
     auto subcommand = body->subcommand();
 
     // 添加
-    if (subcommand == mp::MP_SUB_TYPE::MP_REQUEST_ADD_CONTACT_PERSON) {
+    if (subcommand == mp::MP_SUB_TYPE::MP_ADD_FRIENDS_ACCOUNT) {
         add_contact_person(body);
     }
     // 拉黑
-    else if (subcommand == mp::MP_SUB_TYPE::MP_REQUEST_BLACK_LIST_CONTACT_PERSON) {
+    else if (subcommand == mp::MP_SUB_TYPE::MP_ADD_BLACK_LIST) {
 
     }
     // 删除
-    else if (subcommand == mp::MP_SUB_TYPE::MP_REQUEST_REMOVE_CONTACT_PERSON) {
+    else if (subcommand == mp::MP_SUB_TYPE::MP_REMOVE_FRIEND) {
 
     }
 
     return sri;
 }
 
+
 void UserFriendsService::add_friends(mp::body *body) {
     auto [state1, msg1] = userFriendsDb.add_friends(body->source(), body->target());
     auto [state2, msg2] = userFriendsDb.add_friends(body->target(), body->source());
     if (state1 && state2) {
-        sri->set_sri_code((mp::MP_SRI)(mp::MP_ADD_FRIENDS | mp::MP_ADD_FRIENDS_0));
-        sri->set_sri_msg("添加成功");
+        sri->set_subcommand(mp::MP_SUB_TYPE::MP_ADD_SUCCESS);
+        sri->set_msg("添加成功");
     } else {
-        sri->set_sri_code((mp::MP_SRI)(mp::MP_ADD_FRIENDS_ERR | mp::MP_ADD_FRIENDS_SQL_ERR));
-        sri->set_sri_msg("添加失败，请重试");
+        sri->set_subcommand(mp::MP_SUB_TYPE::MP_ADD_FAIL);
+        sri->set_msg("添加失败，请重试");
     }
 }
 
@@ -59,8 +60,8 @@ mp::sri* UserFriendsService::add_contact_person(mp::body *body) {
         if ("") {
             add_friends(body);
         } else {
-            sri->set_sri_code((mp::MP_SRI)(mp::MP_ADD_FRIENDS_ERR | mp::MP_ADD_FRIENDS_ANSWER_ERR));
-            sri->set_sri_msg("答案错误");
+            sri->set_subcommand(mp::MP_SUB_TYPE::MP_ADD_FAIL);
+            sri->set_msg("答案错误");
         }
     }
     // 账户审核
@@ -79,8 +80,8 @@ mp::sri *UserFriendsService::FetchUserFriend(uint64_t account, const std::string
     auto friends = userFriendsDb.select_friends_all(account);
     if (friends.has_value())
         sri->set_data(friends.value());
-        sri->set_sri_msg("好友获取成功");
-        sri->set_sri_code(mp::);
+        sri->set_msg("好友获取成功");
+        sri->set_subcommand(mp::MP_SUB_TYPE::MP_ADD_SUCCESS);
 
     return sri;
 }
diff --git a/MS/works/service/UserFriendsService.h b/MS/works/service/UserFriendsService.h
index ef88d43..eb7d5bd 100644
--- a/MS/works/service/UserFriendsService.h
+++ b/MS/works/service/UserFriendsService.h
@@ -15,7 +15,7 @@ public:
 
 public:
     // 唯一对开接口
-    mp::sri* addFriendImProve(mp::body* body);
+    mp::sri* friendImProve(mp::body* body);
     mp::sri* FetchUserFriend(uint64_t account, const std::string& data);
 
 private:
diff --git a/MS/works/service/UserService.cpp b/MS/works/service/UserService.cpp
index cf05dad..f4cb32b 100644
--- a/MS/works/service/UserService.cpp
+++ b/MS/works/service/UserService.cpp
@@ -12,13 +12,13 @@
 mp::sri*  UserService::login(mp::MP_SUB_TYPE subType, const std::string& account, const std::string& password) {
     sri_clear();
 
-    if (subType == mp::MP_REQUEST_LOGIN_EMAIL) {
+    if (subType == mp::MP_SUB_TYPE::MP_LOGIN_EMAIL) {
         login_fun(account, password, "email");
     }
-    else if (subType == mp::MP_REQUEST_LOGIN_PHONE) {
+    else if (subType == mp::MP_SUB_TYPE::MP_LOGIN_PHONE) {
         login_fun(account, password, "phone");
     }
-    else if (subType == mp::MP_REQUEST_LOGIN_ACCOUNT) {
+    else if (subType == mp::MP_SUB_TYPE::MP_LOGIN_ACCOUNT) {
         login_fun(account, password, "account");
     }
 
@@ -33,8 +33,8 @@ void UserService::login_fun(const std::string& account, const std::string& passw
 
     // 无账户
     if (!exist) {
-        sri->set_sri_msg("无此账户");
-        sri->set_sri_code(mp::MP_LOGIN_ACCOUNT_NOT);
+        sri->set_msg("无此账户");
+        sri->set_subcommand(mp::MP_LOGIN_FAIL);
         return;
     }
 
@@ -43,21 +43,21 @@ void UserService::login_fun(const std::string& account, const std::string& passw
 
     if (user.password == std::to_string(password_hash)) {
         printf("登陆成功\n");
-        sri->set_sri_msg("登陆成功!");
-        sri->set_sri_code(mp::MP_LOGIN_SUCCESS);
-        sri->set_sri_token("token");
-        sri->set_sri_username(user.username);
-        sri->set_sri_email(user.email);
-        sri->set_sri_phone(user.phone);
-        sri->set_sri_account(user.account);
+        sri->set_msg("登陆成功!");
+        sri->set_subcommand(mp::MP_LOGIN_SUCCESS);
+        sri->set_token("token");
+        sri->set_username(user.username);
+        sri->set_email(user.email);
+        sri->set_phone(user.phone);
+        sri->set_account(user.account);
 
         // 这里redis 更新帐号信息
 
 
     } else {
         printf("登陆失败\n");
-        sri->set_sri_msg("登陆失败!");
-        sri->set_sri_code(mp::MP_LOGIN_FAIL);
+        sri->set_subcommand(mp::MP_LOGIN_FAIL);
+        sri->set_msg("登陆失败!");
     }
 }
 
@@ -72,13 +72,13 @@ mp::sri *UserService::register_(mp::MP_SUB_TYPE subType, const std::string &phon
 
     if (session_code.has_value()) {
         if (session_code.value() != code) {
-            sri->set_sri_code(mp::MP_PE_CODE_FAIL);
-            sri->set_sri_msg("验证码不正确");
+            sri->set_subcommand(mp::MP_SUB_TYPE::MP_CODE_FAIL);
+            sri->set_msg("验证码不正确");
             return sri;
         }
     } else {
-        sri->set_sri_code(mp::MP_PE_CODE_FAIL);
-        sri->set_sri_msg("验证码失效");
+        sri->set_subcommand(mp::MP_SUB_TYPE::MP_CODE_FAIL);
+        sri->set_msg("验证码失效");
         return sri;
     }
 
@@ -93,34 +93,31 @@ mp::sri *UserService::register_(mp::MP_SUB_TYPE subType, const std::string &phon
             bool state1;
             /// 判断什么方式注册
             // 邮箱方式
-            if (subType == mp::MP_REQUEST_REGISTER_EMAIL) {
+            if (subType == mp::MP_SUB_TYPE::MP_REGISTER_EMAIL) {
                 // 将邮箱绑定到帐号上
                 state1 = userDb.bind_email(account.value(), phone_email);
-                sri->set_sri_code(mp::MP_REGISTER_SUCCESS_EMAIL);
             }
             // 手机号方式
             else {
                 // 将手机绑定到帐号上
                 state1 = userDb.bind_phone(account.value(), phone_email);
-                sri->set_sri_code(mp::MP_REGISTER_SUCCESS_PHONE);
             }
 
             if (!state1) {
-                sri->set_sri_msg("sql:生成的帐号为绑定上本邮箱, 请重新注册");
-                sri->set_sri_code(mp::MP_REGISTER_SQL_ERR);
+                sri->set_subcommand(mp::MP_SUB_TYPE::MP_REGISTER_FAIL);
+                sri->set_msg("sql:生成的帐号为绑定上本邮箱, 请重新注册");
             } else {
                 // 注册成功就将取出的号在号池内删除
                 userDb.remove_pool_account(account.value());
-            }
-
-            sri->set_sri_account(account.value());
-        }
-
-    }
+                sri->set_subcommand(mp::MP_SUB_TYPE::MP_REGISTER_SUCCESS);
+                sri->set_account(account.value());
+            }       //  if (!state1) {
+        }       //  if (state) {
+    }       //  if (account.has_value()) {
     // 号池无号
     else {
-        sri->set_sri_msg("暂无帐号可提供");
-        sri->set_sri_code(mp::MP_REGISTER_SQL_ERR);
+        sri->set_msg("暂无帐号可提供");
+        sri->set_subcommand(mp::MP_SUB_TYPE::MP_REGISTER_FAIL);
     }
 
     return sri;
@@ -132,8 +129,8 @@ bool  UserService::register_(uint64_t account, const std::string &password) {
     // 查看账户是否存在
     auto exist = userDb.select_user_exist(account);
     if (!exist) {
-        sri->set_sri_msg("账户已经存在");
-        sri->set_sri_code(mp::MP_REGISTER_EXIST);
+        sri->set_msg("账户已经存在");
+        sri->set_subcommand(mp::MP_SUB_TYPE::MP_REGISTER_FAIL);
         return false;
     }
 
@@ -150,26 +147,26 @@ bool  UserService::register_(uint64_t account, const std::string &password) {
     // 注册 插入用户
     auto add_user = userDb.insert_user(account, std::to_string(password_hash), password_salt);
     if (!add_user) {
-        sri->set_sri_msg("注册失败, 用户表, sql");
-        sri->set_sri_code(mp::MP_REGISTER_SQL_ERR);
+        sri->set_msg("注册失败, 用户表, sql");
+        sri->set_subcommand(mp::MP_REGISTER_FAIL);
         return false;
     }
 
     auto add_friends_table = userDb.insert_user_friends(account);
     if (!add_friends_table) {
         if (!userDb.remove_user(account)) {
-            sri->set_sri_msg("注册失败, 用户已添加, 但附属好友表生成失败, sql");
-            sri->set_sri_code(mp::MP_REGISTER_SQL_ERR);
+            sri->set_msg("注册失败, 用户已添加, 但附属好友表生成失败, sql");
+            sri->set_subcommand(mp::MP_SUB_TYPE::MP_REGISTER_FAIL);
             return false;
         }
 
-        sri->set_sri_msg("注册失败, 附属好友表, sql");
-        sri->set_sri_code(mp::MP_REGISTER_SQL_ERR);
+        sri->set_msg("注册失败, 附属好友表, sql");
+        sri->set_subcommand(mp::MP_REGISTER_FAIL);
         return false;
     }
 
-    sri->set_sri_msg("注册成功");
-    sri->set_sri_code(mp::MP_REGISTER_SUCCESS);
+    sri->set_msg("注册成功");
+    sri->set_subcommand(mp::MP_REGISTER_SUCCESS);
 
     return true;
 }