From 765ee70641a6ab4297f8475adb45c41a8d4c3c95 Mon Sep 17 00:00:00 2001 From: dongl <2725096176@qq.com> Date: Mon, 8 May 2023 20:58:37 +0800 Subject: [PATCH] =?UTF-8?q?0508=2020:58=20=E8=A1=A5=E5=85=85=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=20=20=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=98=E6=B2=A1=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MDB/imm_mysqldb/template_table/im_user.h | 6 +- MP/proto/mp.sri.pb.cc | 160 +++++++++++++---- MS/mmm/handler.cpp | 13 +- MS/mmm/handler.h | 2 +- MS/works/controller/UserProveController.cpp | 4 +- MS/works/db/UserDB.cpp | 4 +- MS/works/db/po/Po.cpp | 8 +- MS/works/db/po/po.h | 6 +- MS/works/service/UserService.cpp | 3 + include/mp/proto/mp.sri.pb.h | 182 +++++++++++++++++++- include/mp/protohuf/mp.sri.proto | 7 +- 11 files changed, 344 insertions(+), 51 deletions(-) diff --git a/MDB/imm_mysqldb/template_table/im_user.h b/MDB/imm_mysqldb/template_table/im_user.h index 130c529..30bd569 100644 --- a/MDB/imm_mysqldb/template_table/im_user.h +++ b/MDB/imm_mysqldb/template_table/im_user.h @@ -9,9 +9,11 @@ #include #include "sql_table_struct.h" -sql_create_5(im_user, -1, 5, // 1 当主键 第三个参数是 SETCOUNT。如果这为非零值，则添加一个初始化构造函数和一个成员函数，该函数采用给定数量的参数，用于设置结构的前 N 个字段。 +sql_create_7(im_user, +1, 7, // 1 当主键 第三个参数是 SETCOUNT。如果这为非零值，则添加一个初始化构造函数和一个成员函数，该函数采用给定数量的参数，用于设置结构的前 N 个字段。 mysqlpp::sql_bigint , account, +mysqlpp::sql_bigint , phone, +mysqlpp::sql_varchar, email, mysqlpp::sql_varchar,username, mysqlpp::sql_varchar,password, mysqlpp::sql_varchar,password_salt, diff --git a/MP/proto/mp.sri.pb.cc b/MP/proto/mp.sri.pb.cc index af3c006..20d0de9 100644 --- a/MP/proto/mp.sri.pb.cc +++ b/MP/proto/mp.sri.pb.cc @@ -46,6 +46,9 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_mp_2esri_2eproto::offsets[] PR ~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_), }; @@ -58,20 +61,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\"]\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\017\n" - "\007sri_msg\030\003 \001(\t\022\021\n\tsri_token\030\004 \001(\t*\262\003\n\006MP" - "_SRI\022\030\n\024MP_LOGIN_ACCOUNT_NOT\020\000\022\024\n\020MP_LOG" - "IN_SUCCESS\020\001\022\021\n\rMP_LOGIN_FAIL\020\002\022\027\n\023MP_RE" - "GISTER_SUCCESS\020\n\022\025\n\021MP_REGISTER_EXIST\020\013\022" - "\027\n\023MP_REGISTER_SQL_ERR\020\014\022\025\n\021MP_LOGOUT_SU" - "CCESS\020\024\022\022\n\016MP_LOGOUT_FAIL\020\025\022\022\n\016MP_ADD_FR" - "IENDS\020\036\022\024\n\020MP_ADD_FRIENDS_0\020\037\022\024\n\020MP_ADD_" - "FRIENDS_1\020 \022\024\n\020MP_ADD_FRIENDS_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\"\230\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*\262\003\n\006MP_SRI\022\030\n\024MP_LOGIN_ACC" + "OUNT_NOT\020\000\022\024\n\020MP_LOGIN_SUCCESS\020\001\022\021\n\rMP_L" + "OGIN_FAIL\020\002\022\027\n\023MP_REGISTER_SUCCESS\020\n\022\025\n\021" + "MP_REGISTER_EXIST\020\013\022\027\n\023MP_REGISTER_SQL_E" + "RR\020\014\022\025\n\021MP_LOGOUT_SUCCESS\020\024\022\022\n\016MP_LOGOUT" + "_FAIL\020\025\022\022\n\016MP_ADD_FRIENDS\020\036\022\024\n\020MP_ADD_FR" + "IENDS_0\020\037\022\024\n\020MP_ADD_FRIENDS_1\020 \022\024\n\020MP_AD" + "D_FRIENDS_2\020!\022\026\n\022MP_ADD_FRIENDS_ERR\020\"\022\033\n" + "\027MP_ADD_FRIENDS_NOT_TYPE\020#\022\032\n\026MP_ADD_FRI" + "ENDS_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_C" + "ODE_FAIL\0203b\006proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_mp_2esri_2eproto_deps[1] = { }; @@ -80,7 +85,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mp_ }; 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", 558, + false, false, descriptor_table_protodef_mp_2esri_2eproto, "mp.sri.proto", 618, &descriptor_table_mp_2esri_2eproto_once, descriptor_table_mp_2esri_2eproto_sccs, descriptor_table_mp_2esri_2eproto_deps, 1, 0, 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, @@ -142,6 +147,11 @@ sri::sri(const sri& from) sri_username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_sri_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(), + 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(), @@ -152,16 +162,21 @@ sri::sri(const sri& from) sri_token_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_sri_token(), GetArena()); } - sri_code_ = from.sri_code_; + ::memcpy(&sri_account_, &from.sri_account_, + static_cast(reinterpret_cast(&sri_code_) - + reinterpret_cast(&sri_account_)) + sizeof(sri_code_)); // @@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()); - sri_code_ = 0; + ::memset(&sri_account_, 0, static_cast( + reinterpret_cast(&sri_code_) - + reinterpret_cast(&sri_account_)) + sizeof(sri_code_)); } sri::~sri() { @@ -173,6 +188,7 @@ 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()); } @@ -199,9 +215,12 @@ void sri::Clear() { (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()); - sri_code_ = 0; + ::memset(&sri_account_, 0, static_cast( + reinterpret_cast(&sri_code_) - + reinterpret_cast(&sri_account_)) + sizeof(sri_code_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -230,18 +249,41 @@ const char* sri::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::intern CHK_(ptr); } else goto handle_unusual; continue; - // string sri_msg = 3; + // uint64 sri_account = 3; case 3: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) { + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) { + sri_account_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; + // string sri_email = 4; + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { + auto str = _internal_mutable_sri_email(); + ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); + CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.sri_email")); + CHK_(ptr); + } else goto handle_unusual; + continue; + // uint64 sri_phone = 5; + case 5: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) { + sri_phone_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + } else goto handle_unusual; + continue; + // string sri_msg = 6; + case 6: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) { auto str = _internal_mutable_sri_msg(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.sri_msg")); CHK_(ptr); } else goto handle_unusual; continue; - // string sri_token = 4; - case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) { + // string sri_token = 7; + case 7: + if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 58)) { auto str = _internal_mutable_sri_token(); ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx); CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.sri.sri_token")); @@ -293,24 +335,46 @@ failure: 2, this->_internal_sri_username(), target); } - // string sri_msg = 3; + // uint64 sri_account = 3; + if (this->sri_account() != 0) { + target = stream->EnsureSpace(target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(3, this->_internal_sri_account(), target); + } + + // string sri_email = 4; + if (this->sri_email().size() > 0) { + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( + this->_internal_sri_email().data(), static_cast(this->_internal_sri_email().length()), + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, + "mp.sri.sri_email"); + target = stream->WriteStringMaybeAliased( + 4, this->_internal_sri_email(), target); + } + + // uint64 sri_phone = 5; + if (this->sri_phone() != 0) { + target = stream->EnsureSpace(target); + target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(5, this->_internal_sri_phone(), target); + } + + // string sri_msg = 6; if (this->sri_msg().size() > 0) { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_sri_msg().data(), static_cast(this->_internal_sri_msg().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "mp.sri.sri_msg"); target = stream->WriteStringMaybeAliased( - 3, this->_internal_sri_msg(), target); + 6, this->_internal_sri_msg(), target); } - // string sri_token = 4; + // string sri_token = 7; if (this->sri_token().size() > 0) { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( this->_internal_sri_token().data(), static_cast(this->_internal_sri_token().length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, "mp.sri.sri_token"); target = stream->WriteStringMaybeAliased( - 4, this->_internal_sri_token(), target); + 7, this->_internal_sri_token(), target); } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -336,20 +400,41 @@ size_t sri::ByteSizeLong() const { this->_internal_sri_username()); } - // string sri_msg = 3; + // string sri_email = 4; + if (this->sri_email().size() > 0) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( + this->_internal_sri_email()); + } + + // string sri_msg = 6; if (this->sri_msg().size() > 0) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( this->_internal_sri_msg()); } - // string sri_token = 4; + // string sri_token = 7; if (this->sri_token().size() > 0) { total_size += 1 + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( this->_internal_sri_token()); } + // uint64 sri_account = 3; + if (this->sri_account() != 0) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size( + this->_internal_sri_account()); + } + + // uint64 sri_phone = 5; + if (this->sri_phone() != 0) { + total_size += 1 + + ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size( + this->_internal_sri_phone()); + } + // .mp.MP_SRI sri_code = 1; if (this->sri_code() != 0) { total_size += 1 + @@ -390,12 +475,21 @@ void sri::MergeFrom(const sri& from) { if (from.sri_username().size() > 0) { _internal_set_sri_username(from._internal_sri_username()); } + if (from.sri_email().size() > 0) { + _internal_set_sri_email(from._internal_sri_email()); + } if (from.sri_msg().size() > 0) { _internal_set_sri_msg(from._internal_sri_msg()); } if (from.sri_token().size() > 0) { _internal_set_sri_token(from._internal_sri_token()); } + if (from.sri_account() != 0) { + _internal_set_sri_account(from._internal_sri_account()); + } + if (from.sri_phone() != 0) { + _internal_set_sri_phone(from._internal_sri_phone()); + } if (from.sri_code() != 0) { _internal_set_sri_code(from._internal_sri_code()); } @@ -423,9 +517,15 @@ 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()); - swap(sri_code_, other->sri_code_); + ::PROTOBUF_NAMESPACE_ID::internal::memswap< + PROTOBUF_FIELD_OFFSET(sri, sri_code_) + + sizeof(sri::sri_code_) + - PROTOBUF_FIELD_OFFSET(sri, sri_account_)>( + reinterpret_cast(&sri_account_), + reinterpret_cast(&other->sri_account_)); } ::PROTOBUF_NAMESPACE_ID::Metadata sri::GetMetadata() const { diff --git a/MS/mmm/handler.cpp b/MS/mmm/handler.cpp index 1451f8f..39408dd 100644 --- a/MS/mmm/handler.cpp +++ b/MS/mmm/handler.cpp @@ -39,11 +39,14 @@ handler::send(const std::shared_ptr &request, const std::shar } /// curr mem user curd -void handler::add_user(const std::shared_ptr& request) { - auto ele = new userinfo(); - ele->bev = request->m_bev; - sprintf(ele->ip, "%s", inet_ntoa(request->m_addr->sin_addr)); - user_fd.insert({strtol(request->m_body.account().c_str(), nullptr, 0), ele}); +void handler::add_user(mp::sri* sri, std::shared_ptr& request) { + if (sri->sri_code() == mp::MP_LOGIN_SUCCESS) { + auto ele = new userinfo(); + ele->bev = request->m_bev; + sprintf(ele->ip, "%s", inet_ntoa(request->m_addr->sin_addr)); + + user_fd.insert({strtol(request->m_body.account().c_str(), nullptr, 0), ele}); + } } void handler::remove_user(bufferevent *bev) { diff --git a/MS/mmm/handler.h b/MS/mmm/handler.h index c4facce..d6eaa3b 100644 --- a/MS/mmm/handler.h +++ b/MS/mmm/handler.h @@ -19,7 +19,7 @@ public: public: // 用户不在线时应 删除 user fd 映射 - static void add_user(const std::shared_ptr& request); + static void add_user(mp::sri* sri, std::shared_ptr& request); static void remove_user(const std::shared_ptr& request); static void remove_user(bufferevent* bev); static bool is_user(const std::string& account); diff --git a/MS/works/controller/UserProveController.cpp b/MS/works/controller/UserProveController.cpp index 7da261d..8f8cfbe 100644 --- a/MS/works/controller/UserProveController.cpp +++ b/MS/works/controller/UserProveController.cpp @@ -10,7 +10,9 @@ void UserProveController::run(std::shared_ptr request, std::s auto sri = service.login(request->m_body.subcommand(), request->m_body.account(), request->m_body.password()); response->set(sri, request->m_bev); - handler::add_user(request); + + // 登陆的用户 直接在全局 注册 在map中 直接存入服务器内存 + handler::add_user(sri, request); } // 注册 else if (request->m_mph->mp_type() == mp::MP_REQUEST_REGISTER) { diff --git a/MS/works/db/UserDB.cpp b/MS/works/db/UserDB.cpp index e6616ac..cc40db8 100644 --- a/MS/works/db/UserDB.cpp +++ b/MS/works/db/UserDB.cpp @@ -19,7 +19,9 @@ std::tuple UserDB::select_user(uint64_t account, const std::string query.storein(user); return {!user.empty(), user.empty() ? PoUser() : - PoUser(user[0].account, user[0].username, user[0].password, user[0].password_salt, user[0].client_info.c_str())}; + PoUser(user[0].account, + user[0].phone, user[0].email, + user[0].username, user[0].password, user[0].password_salt, user[0].client_info.c_str())}; } // select key account is existed by account diff --git a/MS/works/db/po/Po.cpp b/MS/works/db/po/Po.cpp index f720a24..2c79c73 100644 --- a/MS/works/db/po/Po.cpp +++ b/MS/works/db/po/Po.cpp @@ -9,8 +9,12 @@ PoUser::PoUser() { } -PoUser::PoUser(uint64_t account, const std::string& username, const std::string& password, +PoUser::PoUser(uint64_t account, + uint64_t phone, const std::string& email, + const std::string& username, const std::string& password, const std::string& password_salt,const std::string& client_info) : - account(account), username(username), password(password), password_salt(password_salt), client_info(client_info) { + account(account), + phone(phone), email(email), + username(username), password(password), password_salt(password_salt), client_info(client_info) { } diff --git a/MS/works/db/po/po.h b/MS/works/db/po/po.h index dbb6abc..afebd5a 100644 --- a/MS/works/db/po/po.h +++ b/MS/works/db/po/po.h @@ -10,11 +10,15 @@ class PoUser { public: - PoUser(uint64_t account, const std::string& username, const std::string& password, + PoUser(uint64_t account, + uint64_t phone, const std::string& email, + const std::string& username, const std::string& password, const std::string& password_salt,const std::string& client_info); PoUser(); public: uint64_t account; + uint64_t phone; + std::string email; std::string username; std::string password; std::string password_salt; diff --git a/MS/works/service/UserService.cpp b/MS/works/service/UserService.cpp index 1a0338b..c85f613 100644 --- a/MS/works/service/UserService.cpp +++ b/MS/works/service/UserService.cpp @@ -46,6 +46,9 @@ void UserService::login_fun(const std::string& account, const std::string& passw 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); // 这里redis 更新帐号信息 diff --git a/include/mp/proto/mp.sri.pb.h b/include/mp/proto/mp.sri.pb.h index 1bdeadb..05ae000 100644 --- a/include/mp/proto/mp.sri.pb.h +++ b/include/mp/proto/mp.sri.pb.h @@ -222,8 +222,11 @@ class sri PROTOBUF_FINAL : enum : int { kSriUsernameFieldNumber = 2, - kSriMsgFieldNumber = 3, - kSriTokenFieldNumber = 4, + kSriEmailFieldNumber = 4, + kSriMsgFieldNumber = 6, + kSriTokenFieldNumber = 7, + kSriAccountFieldNumber = 3, + kSriPhoneFieldNumber = 5, kSriCodeFieldNumber = 1, }; // string sri_username = 2; @@ -251,7 +254,32 @@ class sri PROTOBUF_FINAL : std::string* _internal_mutable_sri_username(); public: - // string sri_msg = 3; + // 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); + 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(); + 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); + private: + const std::string& _internal_sri_email() const; + void _internal_set_sri_email(const std::string& value); + std::string* _internal_mutable_sri_email(); + public: + + // string sri_msg = 6; void clear_sri_msg(); const std::string& sri_msg() const; void set_sri_msg(const std::string& value); @@ -276,7 +304,7 @@ class sri PROTOBUF_FINAL : std::string* _internal_mutable_sri_msg(); public: - // string sri_token = 4; + // string sri_token = 7; void clear_sri_token(); const std::string& sri_token() const; void set_sri_token(const std::string& value); @@ -301,6 +329,24 @@ class sri PROTOBUF_FINAL : std::string* _internal_mutable_sri_token(); 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); + private: + ::PROTOBUF_NAMESPACE_ID::uint64 _internal_sri_account() const; + void _internal_set_sri_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); + private: + ::PROTOBUF_NAMESPACE_ID::uint64 _internal_sri_phone() const; + void _internal_set_sri_phone(::PROTOBUF_NAMESPACE_ID::uint64 value); + public: + // .mp.MP_SRI sri_code = 1; void clear_sri_code(); ::mp::MP_SRI sri_code() const; @@ -318,8 +364,11 @@ class sri PROTOBUF_FINAL : 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::uint64 sri_account_; + ::PROTOBUF_NAMESPACE_ID::uint64 sri_phone_; int sri_code_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; friend struct ::TableStruct_mp_2esri_2eproto; @@ -436,7 +485,128 @@ inline void sri::unsafe_arena_set_allocated_sri_username( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.sri.sri_username) } -// string sri_msg = 3; +// uint64 sri_account = 3; +inline void sri::clear_sri_account() { + sri_account_ = PROTOBUF_ULONGLONG(0); +} +inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::_internal_sri_account() const { + return sri_account_; +} +inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::sri_account() const { + // @@protoc_insertion_point(field_get:mp.sri.sri_account) + return _internal_sri_account(); +} +inline void sri::_internal_set_sri_account(::PROTOBUF_NAMESPACE_ID::uint64 value) { + + sri_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) +} + +// string sri_email = 4; +inline void sri::clear_sri_email() { + sri_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 void sri::set_sri_email(const std::string& value) { + _internal_set_sri_email(value); + // @@protoc_insertion_point(field_set:mp.sri.sri_email) +} +inline std::string* sri::mutable_sri_email() { + // @@protoc_insertion_point(field_mutable:mp.sri.sri_email) + return _internal_mutable_sri_email(); +} +inline const std::string& sri::_internal_sri_email() const { + return sri_email_.Get(); +} +inline void sri::_internal_set_sri_email(const std::string& value) { + + sri_email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena()); +} +inline void sri::set_sri_email(std::string&& value) { + + sri_email_.Set( + &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena()); + // @@protoc_insertion_point(field_set_rvalue:mp.sri.sri_email) +} +inline void sri::set_sri_email(const char* value) { + GOOGLE_DCHECK(value != nullptr); + + sri_email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value), + GetArena()); + // @@protoc_insertion_point(field_set_char:mp.sri.sri_email) +} +inline void sri::set_sri_email(const char* value, + size_t size) { + + sri_email_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string( + reinterpret_cast(value), size), GetArena()); + // @@protoc_insertion_point(field_set_pointer:mp.sri.sri_email) +} +inline std::string* sri::_internal_mutable_sri_email() { + + return sri_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 void sri::set_allocated_sri_email(std::string* sri_email) { + if (sri_email != nullptr) { + + } else { + + } + sri_email_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), sri_email, + GetArena()); + // @@protoc_insertion_point(field_set_allocated:mp.sri.sri_email) +} +inline std::string* sri::unsafe_arena_release_sri_email() { + // @@protoc_insertion_point(field_unsafe_arena_release:mp.sri.sri_email) + GOOGLE_DCHECK(GetArena() != nullptr); + + return sri_email_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), + GetArena()); +} +inline void sri::unsafe_arena_set_allocated_sri_email( + std::string* sri_email) { + GOOGLE_DCHECK(GetArena() != nullptr); + if (sri_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) +} + +// uint64 sri_phone = 5; +inline void sri::clear_sri_phone() { + sri_phone_ = PROTOBUF_ULONGLONG(0); +} +inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::_internal_sri_phone() const { + return sri_phone_; +} +inline ::PROTOBUF_NAMESPACE_ID::uint64 sri::sri_phone() const { + // @@protoc_insertion_point(field_get:mp.sri.sri_phone) + return _internal_sri_phone(); +} +inline void sri::_internal_set_sri_phone(::PROTOBUF_NAMESPACE_ID::uint64 value) { + + sri_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) +} + +// string sri_msg = 6; inline void sri::clear_sri_msg() { sri_msg_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena()); } @@ -517,7 +687,7 @@ inline void sri::unsafe_arena_set_allocated_sri_msg( // @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.sri.sri_msg) } -// string sri_token = 4; +// string sri_token = 7; inline void sri::clear_sri_token() { sri_token_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena()); } diff --git a/include/mp/protohuf/mp.sri.proto b/include/mp/protohuf/mp.sri.proto index cc881c4..5b1e389 100644 --- a/include/mp/protohuf/mp.sri.proto +++ b/include/mp/protohuf/mp.sri.proto @@ -29,6 +29,9 @@ enum MP_SRI { message sri { MP_SRI sri_code = 1; string sri_username = 2; - string sri_msg = 3; - string sri_token = 4; + uint64 sri_account = 3; + string sri_email = 4; + uint64 sri_phone = 5; + string sri_msg = 6; + string sri_token = 7; } \ No newline at end of file