wan

@@ -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);    

@@ -99,7 +99,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 +114,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 +122,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))
@@ -176,7 +177,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;

@@ -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,21 +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() const { return project_;}
     std::string name() const { return name_;}
     std::string title() const { return title_;}
-    std::string description() const { return description_;}
     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_;

@@ -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;

@@ -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;

@@ -98,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");
@@ -112,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;