Merge branch 'master' of http://gitlab.ctune.cn/DMapServer/DMapServer4.1

@@ -170,6 +170,10 @@ target_link_libraries(dmap_serv
 )
 ########################################################
 # Install
+INSTALL(FILES
+  dmpserver.ini
+  DESTINATION ${DMAP_LIBEXEC_SUBDIR}
+)
 
 INSTALL(TARGETS dmap_server
   RUNTIME DESTINATION ${DMAP_BIN_DIR}

@@ -23,7 +23,7 @@ bool DmpServer::accept(const std::string &url)
 }
 
 //子类实现
-bool DmpServer::publish(const std::string &name, unsigned int capability, const DmpProject &project)
+bool DmpServer::publish(const std::string &serviceName, const std::string &title, unsigned int capability, const DmpProject &project)
 {
    return false;
 }

@@ -28,7 +28,7 @@ public:
     virtual bool accept(const std::string &url);
     virtual void executeRequest(DmpServerRequest &request, DmpServerResponse &response) = 0; 
     
-    virtual bool publish(const std::string &serviceName, unsigned int capability, const DmpProject &project);
+    virtual bool publish(const std::string &serviceName, const std::string &title, unsigned int capability, const DmpProject &project);
     virtual bool remove(const std::string &serviceName);
     virtual bool start(const std::string &serviceName);
     virtual bool stop(const std::string &serviceName);    

+[MetaData]
+pgsqlConnect="hostaddr=localhost port=5432 dbname='dmap_dms' user='postgres' password='chinadci'"
+metaUrl=http://ip:port
+email=zhongpingw@chinadci.com
\ No newline at end of file

@@ -8,10 +8,10 @@
 ***************************************************************************/
 #include "dmpservercontext.h"
                 
-DmpServerContext::DmpServerContext(const DmpServerRequest *request, DmpServerResponse *response, const DmpProject *project):
+DmpServerContext::DmpServerContext(const DmpServerRequest *request, DmpServerResponse *response, const DmpServerProject *serverProject):
   request_(request),
   response_(response),
-  project_(project)
+  serverProject_(serverProject)
 {
 
 }
\ No newline at end of file

@@ -15,18 +15,18 @@
 
 class DmpServerResponse;
 class DmpServerRequest;
-class DmpProject;
+class DmpServerProject;
 class SERVER_EXPORT DmpServerContext
 {
   public:
-    DmpServerContext(const DmpServerRequest *request, DmpServerResponse *response, const DmpProject *project);
+    DmpServerContext(const DmpServerRequest *request, DmpServerResponse *response, const DmpServerProject *serverProject);
     const DmpServerRequest *request() const { return request_;}
     DmpServerResponse *response() const { return response_;}
-    const DmpProject *project() const { return project_;}
+    const DmpServerProject *serverProject() const { return serverProject_;}
  
   private:
     const DmpServerRequest *request_ = nullptr;
     DmpServerResponse *response_ = nullptr;
-    const DmpProject *project_ = nullptr;
+    const DmpServerProject *serverProject_ = nullptr;
 };
 #endif // __dmpservercontext_h__

@@ -9,6 +9,7 @@
 #include "dmpservermanager.h"
 #include "dmpserver.h"
 #include "dmphttputils.h"
+#include "dmpserverConfig.h"
 #include <memory>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
@@ -99,7 +100,7 @@ bool DmpServerManager::removeProject(const std::string &serviceName)
     return true;
 }
 
-bool DmpServerManager::publish(const std::string &serverName, const std::string &serviceName, int capabilities, const std::string &projectData)
+bool DmpServerManager::publish(const std::string& serverName, const std::string& serviceName, const std::string& title, int capabilities, const std::string& projectData)
 {
     //project
     std::string projData;
@@ -114,7 +115,7 @@ bool DmpServerManager::publish(const std::string &serverName, const std::string
         return false;
     }
 
-    if (!serverRegistry_->getServer(serverName)->publish(serviceName, capabilities, *project))
+    if (!serverRegistry_->getServer(serverName)->publish(serviceName, title, capabilities, *project))
     {
         delete project;
         return false;
@@ -122,6 +123,7 @@ bool DmpServerManager::publish(const std::string &serverName, const std::string
     projects_[serviceName] = project;
     return true;
 }
+
 bool DmpServerManager::deleteService(const std::string &serverName, const std::string &serviceName)
 {
     if (serverRegistry_->getServer(serverName)->remove(serviceName) && removeProject(serviceName))
@@ -146,8 +148,8 @@ bool DmpServerManager::stopService(const std::string &serverName, const std::str
 bool DmpServerManager::LoadServices()
 {
     boost::property_tree::ptree pt,ptList;
-
-    const std::string url="http://172.26.60.100:8841/API/Service/TileService/Reload";
+    std::string conn = DmpServerConfig::Instance()->getMetaUrl();
+    const std::string url= conn + URI_RELOAD;
     std::string strContent=DmpHttp::get(url);
     if(strContent.length()==0)
     {
@@ -176,7 +178,7 @@ bool DmpServerManager::LoadServices()
             std::string type = e.second.get<std::string>("type");
             int capabilities =e.second.get<int>("capabilities");
             std::string project = e.second.get<std::string>("project");
-            this->publish(type,name,capabilities,project);
+            this->publish(type,name,title,capabilities,project);
         }
     }
     return true;

@@ -19,7 +19,7 @@
 #include "dmpserverrequest.h"
 #include "dmpserverregistry.h"
 
-
+#define URI_RELOAD    ("/API/Service/TileService/Reload")       //加载已注册服务接口     
 class SERVER_EXPORT DmpServerManager
 {
 public:
@@ -30,7 +30,7 @@ public:
     std::shared_ptr<DmpServer> serverForRequest(const DmpServerRequest& request);
     std::shared_ptr<DmpServerApi> apiForRequest(const DmpServerRequest& request);
  
-    bool publish(const std::string& serverName, const std::string& serviceName, int capabilities, const std::string& projectData);
+    bool publish(const std::string& serverName, const std::string& serviceName, const std::string& title, int capabilities, const std::string& projectData);
     bool deleteService(const std::string& serverName, const std::string& serviceName);
     bool startService(const std::string& serverName, const std::string& serviceName);
     bool stopService(const std::string& serverName, const std::string& serviceName);

@@ -9,10 +9,9 @@
 #include "dmpserverproject.h"
 
 
-DmpServerProject::DmpServerProject(const std::string &name, const std::string &title, const std::string &description,const DmpProject *project):
+DmpServerProject::DmpServerProject(const std::string &name, const std::string &title, const DmpProject *project):
   name_(name),
   title_(title),
-  description_(description),
   project_(project)
 {
     status_ = 1;

@@ -18,18 +18,16 @@
 class SERVER_EXPORT DmpServerProject
 {
 public:
-    DmpServerProject(const std::string &name, 
-                     const std::string &title, 
-                     const std::string &description,
-                     const DmpProject *project);
+    DmpServerProject(const std::string &name, const std::string &title, const DmpProject *project);
     std::string createTime() { return time_;}
-    const DmpProject* project()  { return project_;}
+    const DmpProject* project() const { return project_;}
+    std::string name() const { return name_;}
+    std::string title() const { return title_;}
     int status() { return status_;}
     void setStatus(int status) { status_ = status;}
 private:    
     std::string name_;
     std::string title_;
-    std::string description_;
     std::string time_;
     int status_;
     int flag_;

@@ -50,8 +50,6 @@ public:
     void setHeader(const std::string &name, const std::string &value);
     Headers headers() const { return headers_; }
     bool isRestful() const { return isRestful_; }
-    std::string serviceName() const { return serviceName_;}
-    void setServiceName(const std::string &serviceName) { serviceName_ = serviceName;}
 
     DmpServerParameters serverParameters() const { return params_; }
     void setParameter(const std::string &name, const std::string &value);
@@ -70,7 +68,6 @@ protected:
     std::string port_;
     std::string path_;
     std::string query_;
-    std::string serviceName_;
     bool isRestful_;
 
 private:   

@@ -15,6 +15,7 @@
 #include <map>
 #include "dmpservercontext.h"
 #include "dmpserverrequest.h"
+#include "dmpserverproject.h"
 
 typedef enum
 {

@@ -198,7 +198,7 @@ BOOST_PYTHON_MODULE(dmap_server)
       .def("allow_method", pure_virtual(&DmpService::allowMethod))
       .def("execute_request", pure_virtual(&DmpService::executeRequest));
 
-  class_<DmpServerContext>("DmpServerContext",init<DmpServerRequest*, DmpServerResponse*, DmpProject*>());
+  // class_<DmpServerContext>("DmpServerContext",init<DmpServerRequest*, DmpServerResponse*, DmpProject*>());
 
   class_<DmpServerRequest>("DmpServerRequest",init<std::string&>()); 
 

@@ -125,7 +125,7 @@ void DmpManagerApiHandler::regService(const DmpServerApiContext &context) const
                     context.response()->write("{\"status\":\"false\",\"message\":\"服务发布失败\"}");
                     return;
                 }
-                if(context.manager()->publish(serverType, name, capabilities, project)) {
+                if(context.manager()->publish(serverType, name, title, capabilities, project)) {
                     LOGGER_INFO("服务发布成功");
                     context.response()->write("{\"status\":\"true\",\"message\":\"Pulish service successful!\"}");
                     // std::string projData;

@@ -70,7 +70,7 @@ void DmpMapServer::executeRequest(DmpServerRequest &request, DmpServerResponse &
                         response.writeHtml(htmlstr + "服务\"" + serviceName + "\"已经停止。</p></body></html>\n");
                         return;
                     }
-                    DmpServerContext context {&request, &response, serverProj->project()};
+                    DmpServerContext context {&request, &response, serverProj};
                     service->executeRequest(context);
                 }
                 else {
@@ -91,7 +91,7 @@ void DmpMapServer::executeRequest(DmpServerRequest &request, DmpServerResponse &
     }
 }
 
-bool DmpMapServer::publish(const std::string &name, unsigned int capability, const DmpProject &project)
+bool DmpMapServer::publish(const std::string &serviceName, const std::string &title, unsigned int capability, const DmpProject &project)
 {
     if(capability & DmpServiceType::WMTS) {
         DmpService* wmtsservice = getService("WMTSService");
@@ -105,8 +105,8 @@ bool DmpMapServer::publish(const std::string &name, unsigned int capability, con
             return false;
         }
     }
-    DmpServerProject* serverProject = new DmpServerProject(name,"","", &project);
-    serverProjects_[name] = serverProject;
+    DmpServerProject* serverProject = new DmpServerProject(serviceName, title, &project);
+    serverProjects_[serviceName] = serverProject;
 
     return true;
 }

@@ -37,7 +37,7 @@ public:
     std::string path() const override { return std::string("^/DMap/Services/?([\\w./]*)/MapServer/([\\w]+)"); }
     std::string capability() const override;
     void executeRequest(DmpServerRequest &request, DmpServerResponse &response) override;
-    bool publish(const std::string &serviceName, unsigned int capability, const DmpProject &project) override;
+    bool publish(const std::string &serviceName, const std::string &title, unsigned int capability, const DmpProject &project) override;
     bool remove(const std::string &serviceName) override;
     bool start(const std::string &serviceName) override;
     bool stop(const std::string &serviceName) override;

@@ -36,7 +36,7 @@ namespace DmpWms
   void DmpWMSService::executeRequest(const DmpServerContext &context) 
   {
       const DmpWmsParameters params(context.request()->serverParameters());
-      const DmpProject* project = context.project();
+      const DmpProject* project = context.serverProject()->project();
       const std::string request = params.Request();
       if (request.empty())
       {
@@ -44,7 +44,7 @@ namespace DmpWms
       }
       else if(boost::iequals(request, "getcapabilities"))
       {
-         writeGetCapabilities(context,params, project);
+         writeGetCapabilities(context,params, project); 
       }
       else if(boost::iequals(request, "getmap"))
       {

@@ -65,7 +65,6 @@ void DmpTileServer::executeRequest(DmpServerRequest &request, DmpServerResponse
         if(what.size() == 4) {
             std::string serviceName = what[1].str();
             std::string serverType = what[2].str();
-            request.setServiceName(serviceName);
             if(request.isRestful()) {
                 std::string queryString = what[3].str();
                 request.setQuery(queryString);
@@ -79,7 +78,7 @@ void DmpTileServer::executeRequest(DmpServerRequest &request, DmpServerResponse
                         response.writeHtml(htmlstr + "服务\"" + serviceName + "\"已经停止。</p></body></html>\n");
                         return;
                     }
-                    DmpServerContext context {&request, &response, serverProj->project()};
+                    DmpServerContext context {&request, &response, serverProj};
                     service->executeRequest(context);
                 }
                 else {
@@ -99,7 +98,7 @@ void DmpTileServer::executeRequest(DmpServerRequest &request, DmpServerResponse
     }
 }
 
-bool DmpTileServer::publish(const std::string &name, unsigned int capability, const DmpProject &project)
+bool DmpTileServer::publish(const std::string &serviceName, const std::string &title, unsigned int capability, const DmpProject &project)
 {
     if(capability & DmpServiceType::WMTS) {
         DmpService* wmtsservice = getService("WMTSService");
@@ -113,8 +112,8 @@ bool DmpTileServer::publish(const std::string &name, unsigned int capability, co
             return false;
         }
     }
-    DmpServerProject* serverProject = new DmpServerProject(name,"","", &project);
-    serverProjects_[name] = serverProject;
+    DmpServerProject* serverProject = new DmpServerProject(serviceName, title, &project);
+    serverProjects_[serviceName] = serverProject;
 
     return true;
 }

@@ -37,7 +37,7 @@ public:
     std::string path() const override { return std::string("^/DMap/Services/?([\\w./]*)/TileServer/([\\w.]+)([\\w./]*)"); }
     std::string capability() const override;
     void executeRequest(DmpServerRequest &request, DmpServerResponse &response) override;
-    bool publish(const std::string &serviceName, unsigned int capability, const DmpProject &project) override;
+    bool publish(const std::string &serviceName, const std::string &title, unsigned int capability, const DmpProject &project) override;
     bool remove(const std::string &serviceName) override;
     bool start(const std::string &serviceName) override;
     bool stop(const std::string &serviceName) override;

@@ -55,7 +55,7 @@ namespace DmpTms
         int tileCol=atoi(vec0[0].c_str());
         int tileRow=atoi(vec[isize-2].c_str());
         int tileMatrix=atoi(vec[isize-3].c_str());
-        const DmpProject *project = context.project();
+        const DmpProject *project = context.serverProject()->project();
         DmpTileLayer *tileLayer = static_cast<DmpTileLayer *>(project->getLayer());
         std::string format=vec0[1].c_str();
         std::string filePath=tileLayer->getDataSource();

@@ -65,10 +65,9 @@ namespace DmpWmts
       params = nullptr;
     }
     
-    const DmpProject *project = context.project();
+    const DmpServerProject *serverProject = context.serverProject();
+    const DmpProject *project = serverProject->project();
     DmpTileLayer *tileLayer = static_cast<DmpTileLayer *>(project->getLayer(layerName));
-    //context.response()->writeHtml("hello,wmts");
-    //const DmpWmtsParameters params(context.request()->serverParameters());
   
     if (req.empty())
     {
@@ -83,7 +82,7 @@ namespace DmpWmts
     else if (boost::iequals(req, "GetCapabilities"))
     {
       const std::string host=context.request()->domain()+":"+context.request()->port();;
-      const std::string servicename=context.request()->serviceName();
+      const std::string servicename=serverProject->name();
       
       boost::property_tree::ptree pt;
       pt.add("Layer.ows:Title",tileLayer->title());