ljh

@@ -39,7 +39,6 @@ SET (DMAP_SERVER_SRCS
   python/dmpserverwrapper.cpp
   dmphttpbase.cpp
   dmphttputils.cpp
- 
 )
 
 SET (DMAP_SERVER_HDRS
@@ -71,7 +70,6 @@ SET (DMAP_SERVER_HDRS
   python/dmppythonutils.h
   dmphttpbase.h
   dmphttputils.h
-  
 )
 
 #############################################################

@@ -49,7 +49,8 @@ public:
 		{
 			return;
 		}
-
+        
+		
 		DmpSpServerRequest dmpRequest(request);
 		DmpSpServerResponse dmpResponse(response);
 		pDmpServer->HandleRequest(dmpRequest, dmpResponse);

@@ -20,7 +20,7 @@
 #include "dmpserverregistry.h"
 
 
-#define URI_RELOAD    ("/API/Service/TileService/Reload")       //加载已注册服务接口     
+#define URI_RELOAD    ("/API/Service/Reload")       //加载已注册服务接口     
 class SERVER_EXPORT DmpServerManager
 {
 public:

@@ -16,6 +16,8 @@
 // #include <boost/algorithm/string.hpp>
 #include "dmplogger.h"
 
+
+
 DmpServerRequest::DmpServerRequest()
 { 
   isRestful_ = false;

@@ -39,19 +39,21 @@ DmpSpServerRequest::DmpSpServerRequest(SP_HttpRequest* request)
     }
     
     //获取querystring
-    std::string url(request->getURL());
-    //std::string  deurl=Percent::decode( url);
-    std::string::size_type pos = url.find("?");
+    std::string url(request->getURL());   
+    std::string deurl;
+    this->UrlDecode(url,deurl);
+
+    std::string::size_type pos = deurl.find("?");
     if (pos != std::string::npos) {
-        std::string path = url.substr(0, pos);
+        std::string path = deurl.substr(0, pos);
         setPath(path);
         std::string queryString;
-        queryString = url.substr(pos+1,url.length());
+        queryString = deurl.substr(pos+1,deurl.length());
         setQuery(queryString);
     }
     else {
         isRestful_ = true;
-        setPath(url);
+        setPath(deurl);
     }
     
     // for(int i=0; i< request->getParamCount(); i++) {
@@ -71,4 +73,50 @@ const void * DmpSpServerRequest::GetData() const
 int DmpSpServerRequest::GetDataLength() const
 {
    return dataLen_;
+}
+bool DmpSpServerRequest::UrlDecode(const std::string& src, std::string& dst)
+{
+	if(src.size() == 0)
+		return false;
+	int hex = 0;
+	for (size_t i = 0; i < src.length(); ++i)
+	{
+		switch (src[i])
+		{
+			case '+':
+				dst += ' ';
+				break;
+			case '%':
+				{
+					if (isxdigit(src[i + 1]) && isxdigit(src[i + 2]))
+					{
+						std::string hexStr = src.substr(i + 1, 2);
+						hex = strtol(hexStr.c_str(), 0, 16);
+						//字母和数字[0-9a-zA-Z]、一些特殊符号[$-_.+!*'(),] 、以及某些保留字[$&+,/:;=?@]
+						//可以不经过编码直接用于URL
+						if (!((hex >= 48 && hex <= 57) || //0-9
+						(hex >=97 && hex <= 122) ||   //a-z
+						(hex >=65 && hex <= 90) ||    //A-Z
+						//一些特殊符号及保留字[$-_.+!*'(),]  [$&+,/:;=?@]
+						hex == 0x21 || hex == 0x24 || hex == 0x26 || hex == 0x27 || hex == 0x28 || hex == 0x29
+						|| hex == 0x2a || hex == 0x2b|| hex == 0x2c || hex == 0x2d || hex == 0x2e || hex == 0x2f
+						|| hex == 0x3A || hex == 0x3B|| hex == 0x3D || hex == 0x3f || hex == 0x40 || hex == 0x5f
+						))
+						{
+							dst += char(hex);
+							i += 2;
+						}
+						else
+							dst += '%';
+					}
+					else
+						dst += '%';
+				}
+				break;
+			default:
+				dst += src[i];
+				break;
+		}
+	}
+	return true;
 }
\ No newline at end of file

@@ -23,6 +23,7 @@ public:
     DmpSpServerRequest(SP_HttpRequest* request);
     const void * GetData() const override;
 	int GetDataLength() const override;
+    bool UrlDecode(const std::string& src, std::string& dst);
 private:
     const void* data_;
     int dataLen_;

@@ -134,16 +134,12 @@ void DmpManagerApiHandler::regService(const DmpServerApiContext &context) const
                         break;
                     }
                     
-                    context.response()->write("{\"status\":\""+std::to_string(flag)+"\",\"url\":\""+url+"\",\"message\":\"Pulish service successful!\"}");
                     // std::string projData;
                     // DmpServerUtils::Base64Decode(project, &projData);
-                    // context.response()->removeHeader("Content-Type");
-                    // context.response()->setHeader("Content-Type", "text/xml;charset=utf-8");
-                    // context.response()->write(projData);
-
-
-
-                    
+                     context.response()->removeHeader("Content-Type");
+                     context.response()->setHeader("Content-Type", "text/xml;charset=utf-8");
+                    // context.response()->write(projData); 
+                     context.response()->write("{\"status\":\""+std::to_string(flag)+"\",\"url\":\""+url+"\",\"message\":\"Pulish service successful!\"}");                   
                 }
                 else
                 {

@@ -34,7 +34,8 @@ public:
     ~DmpMapServer();
     std::string name() const override { return std::string("MapServer");}
     std::string alias() const override { return std::string("矢量地图服务");}
-    std::string path() const override { return std::string("^/DMap/Services/?([\\w./]*)/MapServer/([\\w]+)"); }
+    //std::string path() const override { return std::string("^/DMap/Services/?([\\w./]*)/MapServer/([\\w]+)"); }
+    std::string path() const override { return std::string("^/DMap/Services/?([\\w\\W./]*)/MapServer/([\\w]+)"); }
     std::string capability() const override;
     void executeRequest(DmpServerRequest &request, DmpServerResponse &response) override;
     bool publish(const std::string &serviceName, const std::string &title, unsigned int capability, const DmpProject &project) override;

@@ -35,7 +35,8 @@ public:
     ~DmpTileServer();
     std::string name() const override { return std::string("TileServer");}
     std::string alias() const override { return std::string("瓦片服务");}
-    std::string path() const override { return std::string("^/DMap/Services/?([\\w./]*)/TileServer/([\\w.]+)([\\w./]*)"); }
+    //std::string path() const override { return std::string("^/DMap/Services/?([\\w./]*)/TileServer/([\\w.]+)([\\w./]*)"); }
+    std::string path() const override { return std::string("^/DMap/Services/?([\\w\\W./]*)/TileServer/([\\w.]+)([\\w./]*)"); }
     std::string capability() const override;
     void executeRequest(DmpServerRequest &request, DmpServerResponse &response) override;
     bool publish(const std::string &serviceName, const std::string &title, unsigned int capability, const DmpProject &project) override;