httppost修改

LJH 李佳桓
src/server/dmphttpbase.cpp
src/server/dmphttpbase.h
src/server/dmphttputils.cpp
src/server/dmphttputils.h
--- a/src/server/dmphttpbase.cpp
查看文件 @bf587ec
+++ b/src/server/dmphttpbase.cpp
查看文件 @bf587ec
@@ -54,25 +54,25 @@ if (temp_data.find(http_) == 0) {
 int DmpHttp::DmpHttpBase::buildPostRequest(const std::string& server, const std::string& path,
 	std::ostream& out_request) {
 	// 分割path中的json数据
-	// std::string temp_path(path), temp_json;
-	// int json_pos_begin = temp_path.find(HTTP_JSON_BEGIN) + 1;
-	// int json_pos_end = temp_path.find(HTTP_JSON_END);
-	// if (json_pos_begin != std::string::npos) {
-	// 	// 计算json的长度
-	// 	int temp_json_lenth = std::string::npos;
-	// 	if (json_pos_end != temp_json_lenth) {
-	// 		temp_json_lenth = (json_pos_end - json_pos_begin); 
-	// 	}
-	// 	temp_json = temp_path.substr(json_pos_begin, temp_json_lenth);
-	// 	temp_path = temp_path.substr(0, (json_pos_begin - 1));
-	// }
-	// out_request << "POST " << temp_path.c_str() << " HTTP/1.0\r\n";
-	// out_request << "Host: " << server.c_str() << "\r\n"; 
-	// out_request << "Content-Length: " << temp_json.length() << "\r\n";
-	// out_request << "Content-Type: application/x-www-form-urlencoded\r\n";
-	// out_request << "Accept: */*\r\n";
-	// out_request << "Connection: close\r\n\r\n";
-	// out_request << temp_json.c_str();
+	std::string temp_path(path), temp_json;
+	int json_pos_begin = temp_path.find(HTTP_JSON_BEGIN) + 1;
+	int json_pos_end = temp_path.find(HTTP_JSON_END);
+	if (json_pos_begin != std::string::npos) {
+		// 计算json的长度
+		int temp_json_lenth = std::string::npos;
+		if (json_pos_end != temp_json_lenth) {
+			temp_json_lenth = (json_pos_end - json_pos_begin); 
+		}
+		temp_json = temp_path.substr(json_pos_begin, temp_json_lenth);
+		temp_path = temp_path.substr(0, (json_pos_begin - 1));
+	}
+	out_request << "POST " << temp_path.c_str() << " HTTP/1.0\r\n";
+	out_request << "Host: " << server.c_str() << "\r\n"; 
+	out_request << "Content-Length: " << temp_json.length() << "\r\n";
+	out_request << "Content-Type: application/x-www-form-urlencoded\r\n";
+	out_request << "Accept: */*\r\n";
+	out_request << "Connection: close\r\n\r\n";
+	out_request << temp_json.c_str();
 	return HTTP_SUCCESS;
 }
--- a/src/server/dmphttpbase.h
查看文件 @bf587ec
+++ b/src/server/dmphttpbase.h
查看文件 @bf587ec
@@ -11,8 +11,8 @@
 #include <iostream>
 #include <boost/asio.hpp>
 namespace DmpHttp
-{
-    #define HTTP_SUCCESS            (0)          // 操作成功
+{ 
+    #define HTTP_SUCCESS       (0)          // 操作成功
     #define HTTP_ERROR_UNKNOWN      (-1)         // 未知的错误
     #define HTTP_ERROR_NETWORK      (-2)         // 网络连接失败
     #define HTTP_ERROR_HTTP_HEAD    (-3)         // 未找到协议头 http || https 
@@ -35,6 +35,7 @@ namespace DmpHttp
         virtual ~DmpHttpBase();  
 	    // Post请求
 	    virtual int post(const std::string& url) = 0;
+        virtual int post(const std::string& url, std::string& postData)= 0;
         // get请求
         virtual int get(const std::string& url) = 0;  
 	    virtual std::string getResponse(void) = 0;
--- a/src/server/dmphttputils.cpp
查看文件 @bf587ec
+++ b/src/server/dmphttputils.cpp
查看文件 @bf587ec
@@ -18,6 +18,11 @@ int DmpHttp::DmpHttpUtils::post(const std::string& url)
 	handleRequestResolve(url, DmpHttpBase::buildPostRequest);
 	return HTTP_SUCCESS;
 }
+int DmpHttp::DmpHttpUtils::post(const std::string& url, std::string& postData)
+{
+	handleRequestResolve(url,postData, DmpHttpBase::buildPostRequest);
+	return HTTP_SUCCESS;
+}
 int DmpHttp::DmpHttpUtils::get(const std::string& url) 
 {
 	handleRequestResolve(url, DmpHttpBase::buildGetRequest);
@@ -47,6 +52,32 @@ void DmpHttp::DmpHttpUtils::handleRequestResolve(const std::string& url, pBuildR
 	}	
 	return;
 }
+void DmpHttp::DmpHttpUtils::handleRequestResolve(const std::string& url, std::string& postData,  pBuildRequest func) 
+{
+	try {
+		responseData_.clear();
+		// 解析URL
+		std::string server, port,path;
+		parseUrl(url, server, port, path);
+		path=postData;
+ 
+		std::ostream request_stream(&request_); 
+		// 合成请求
+		func(server, path, request_stream);
+ 
+		// 解析服务地址\端口
+		boost::asio::ip::tcp::resolver::query query(server, port);
+		resolver_.async_resolve(query,
+			boost::bind(&DmpHttpUtils::handleResolve, this,
+			boost::asio::placeholders::error,
+			boost::asio::placeholders::iterator));
+	}
+	catch (std::exception& e) {
+		socket_.close();
+		std::cout << "Exception: " << e.what() << "\n";
+	}	
+	return;
+}
 void DmpHttp::DmpHttpUtils::handleResolve(const boost::system::error_code& err,
 	boost::asio::ip::tcp::resolver::iterator endpoint_iterator) {
 	if (err) {
@@ -173,7 +204,14 @@ std::string DmpHttp::post(const std::string &url) {
 	io.run();
 	return c.getResponse();
 }
-
+std::string DmpHttp::post(const std::string& url, std::string& postData)
+{
+	boost::asio::io_service io;
+	DmpHttp::DmpHttpUtils c(io);
+	c.post(url,postData);
+	io.run();
+	return c.getResponse();
+}
 std::string DmpHttp::get(const std::string &url) {
 	boost::asio::io_service io;
 	DmpHttp::DmpHttpUtils c(io);
--- a/src/server/dmphttputils.h
查看文件 @bf587ec
+++ b/src/server/dmphttputils.h
查看文件 @bf587ec
@@ -20,12 +20,14 @@ namespace DmpHttp
 		DmpHttpUtils(boost::asio::io_service& io_service);
 	    virtual ~DmpHttpUtils();
         virtual int post(const std::string& url);
+		virtual int post(const std::string& url, std::string& postData);
         virtual int get(const std::string& url);
         virtual std::string getResponse(void) {return responseData_;}
         private:
         // 建立请求
 	    void handleRequestResolve(const std::string& url, pBuildRequest func);
+		void handleRequestResolve(const std::string& url, std::string& path, pBuildRequest func);
 	    // 解析后
 	    void handleResolve(const boost::system::error_code& err,
 		    boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
@@ -52,6 +54,7 @@ namespace DmpHttp
 	    std::string responseData_;
     };
     std::string post(const std::string &url);
+	std::string post(const std::string& url, std::string& postData);
     std::string get(const std::string &url);
 }