更改项目结构， mp独立为一个模块

MC/api/core/Client.cpp

@@ -5,8 +5,8 @@
 #include <cstring>
 #include <thread>
 #include "Client.h"
-#include "Mph.h"
-#include "Response.h"
+#include "../../../MP/Mph.h"
+#include "../../../MP/Response.h"
 
 
 Client::Client(const std::string&& ip, int port) : ip(ip), port(port) {

MC/api/user/UserOperation.h

@@ -8,7 +8,7 @@
 
 #include <string>
 #include <optional>
-#include "Request.h"
+#include "../../../MP/Request.h"
 #include "event2/bufferevent.h"
 #include "../core/Client.h"
 

MP/proto/mp.body.pb.cc

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.body.proto
 
-#include "proto/mp.body.pb.h"
+#include "mp.body.pb.h"
 
 #include <algorithm>
 

MP/proto/mp.cqi.pb.cc

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.cqi.proto
 
-#include "proto/mp.cqi.pb.h"
+#include "mp.cqi.pb.h"
 
 #include <algorithm>
 

MP/proto/mp.mph.pb.cc

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.mph.proto
 
-#include "proto/mp.mph.pb.h"
+#include "mp.mph.pb.h"
 
 #include <algorithm>
 

MP/proto/mp.request.pb.cc

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.request.proto
 
-#include "proto/mp.request.pb.h"
+#include "mp.request.pb.h"
 
 #include <algorithm>
 

MP/proto/mp.response.pb.cc

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.response.proto
 
-#include "proto/mp.response.pb.h"
+#include "mp.response.pb.h"
 
 #include <algorithm>
 

MP/proto/mp.sri.pb.cc

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.sri.proto
 
-#include "proto/mp.sri.pb.h"
+#include "mp.sri.pb.h"
 
 #include <algorithm>
 

MS/CMakeLists.txt

@@ -8,7 +8,6 @@ aux_source_directory(tools DIR_TOOLS)
 aux_source_directory(smtp DIR_EMAIL)
 
 include_directories(${CMAKE_SOURCE_DIR}/include/libevent)
-include_directories(${CMAKE_SOURCE_DIR}/include/mp)
 include_directories(${CMAKE_SOURCE_DIR}/include/ini)
 include_directories(${CMAKE_SOURCE_DIR}/include/cpp_email)
 include_directories(${CMAKE_SOURCE_DIR}/include/rapidjson)
@@ -16,6 +15,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include/mysql++)
 include_directories(${CMAKE_SOURCE_DIR}/include/mysql++/mysql)
 include_directories(${CMAKE_SOURCE_DIR}/include/smtp)
 include_directories(${CMAKE_SOURCE_DIR}/MDB/imm_mysqldb)
+include_directories(${CMAKE_SOURCE_DIR}/MP)
 include_directories(${CMAKE_SOURCE_DIR}/MS/works)
 message("CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/include/libevent")
 

MS/mmm/agreement.cpp

@@ -3,8 +3,6 @@
 //
 
 #include "agreement.h"
-#include "Response.h"
-
 
 agreement_request::agreement_request() : agreement() {}
 agreement_request::~agreement_request()  {}

MS/mmm/management.cpp

@@ -3,7 +3,6 @@
 //
 
 #include "management.h"
-#include "Response.h"
 
 
 management::management() {

MS/smtp/smtp.cpp

@@ -130,7 +130,7 @@ int Smtp::Socket(int family, int type, int protocol) {
 
 ssize_t Smtp::Send(const std::string& str) {
    ssize_t n;
-   std::cout << str;
+//   std::cout << str;
    if((n = send(m_sockfd, str.c_str(), str.length(), 0)) == -1) {
         perror("write error");
         exit(-1);

MS/works/db/UserFriendsDB.h

@@ -8,8 +8,8 @@
 #include <optional>
 
 #include "DB.h"
-#include "proto/mp.sri.pb.h"
-#include "proto/mp.body.pb.h"
+#include "../../../MP/proto/mp.sri.pb.h"
+#include "../../../MP/proto/mp.body.pb.h"
 #include "document.h"
 
 class UserFriendsDB : public DB {

MS/works/service/Service.h

@@ -6,7 +6,7 @@
 #define IM2_SERVICE_H
 
 #include <mysql++/connection.h>
-#include <proto/mp.sri.pb.h>
+#include "proto/mp.sri.pb.h"
 #include "db/UserDB.h"
 
 class Service {