wzp

@@ -5,8 +5,8 @@ SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type" FORCE)
 
 
 #############################################################
 #############################################################
 # Project and version
 # Project and version
-SET(CPACK_PACKAGE_VERSION_MAJOR "3")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_MAJOR "4")
+SET(CPACK_PACKAGE_VERSION_MINOR "1")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Master")
 SET(RELEASE_NAME "Master")

@@ -41,6 +41,7 @@ class DebugFilter(DmpServerFilter):
         headers_dict = handler.request_headers()
         headers_dict = handler.request_headers()
         handler.clear()
         handler.clear()
         handler.set_response_header('Status', '200 Ok')
         handler.set_response_header('Status', '200 Ok')
+        # handler.set_response_header("Content-Type", "text/html;charset=utf-8");
         handler.append_body(b'<h1>Params</h1>')
         handler.append_body(b'<h1>Params</h1>')
         for param in params:
         for param in params:
             handler.append_body(('<p><b>%s</b> "%s"</p>' % (param.key(), param.data())).encode('utf8'))
             handler.append_body(('<p><b>%s</b> "%s"</p>' % (param.key(), param.data())).encode('utf8'))

@@ -43,7 +43,7 @@ void DmpFilterResponseDecorator::start()
   DmpServerFiltersMap::const_iterator filtersIterator;
   DmpServerFiltersMap::const_iterator filtersIterator;
   for (filtersIterator = filters_.begin(); filtersIterator != filters_.end(); ++filtersIterator)
   for (filtersIterator = filters_.begin(); filtersIterator != filters_.end(); ++filtersIterator)
   {
   {
-      filtersIterator->second->RequestReady();
+      filtersIterator->second->requestReady();
   }
   }
  #endif
  #endif
 }
 }
@@ -54,7 +54,7 @@ void DmpFilterResponseDecorator::flush()
   DmpServerFiltersMap::const_iterator filtersIterator;
   DmpServerFiltersMap::const_iterator filtersIterator;
   for (filtersIterator = filters_.begin(); filtersIterator != filters_.end(); ++filtersIterator)
   for (filtersIterator = filters_.begin(); filtersIterator != filters_.end(); ++filtersIterator)
   {
   {
-    filtersIterator->second->SendResponse();
+    filtersIterator->second->sendResponse();
   }
   }
 #endif
 #endif
   response_.flush();
   response_.flush();
@@ -66,7 +66,7 @@ void DmpFilterResponseDecorator::finish()
   DmpServerFiltersMap::const_iterator filtersIterator;
   DmpServerFiltersMap::const_iterator filtersIterator;
   for (filtersIterator = filters_.begin(); filtersIterator != filters_.end(); ++filtersIterator)
   for (filtersIterator = filters_.begin(); filtersIterator != filters_.end(); ++filtersIterator)
   {
   {
-    filtersIterator->second->ResponseComplete();
+    filtersIterator->second->responseComplete();
   }
   }
 #endif
 #endif
   response_.finish();
   response_.finish();

@@ -17,6 +17,7 @@
 #include "dmpfilterresponsedecorator.h"
 #include "dmpfilterresponsedecorator.h"
 #include "dmpservercontext.h"
 #include "dmpservercontext.h"
 #include "dmpserverapicontext.h"
 #include "dmpserverapicontext.h"
+#include "dmpserverplugins.h"
 
 
 using namespace std;
 using namespace std;
 
 
@@ -128,7 +129,7 @@ void DmpMainServer::HandleRequest(DmpServerRequest &request, DmpServerResponse &
 void DmpMainServer::InitPython()
 void DmpMainServer::InitPython()
 {
 {
     // Init plugins
     // Init plugins
-    if (!DmpServerPlugins::InitPlugins(server_interface_))
+    if (!DmpServerPlugins::InitPlugins(serverInterface_))
     {
     {
         LOGGER_WARN("No server python plugins are available");
         LOGGER_WARN("No server python plugins are available");
     }
     }

 [MetaData]
 [MetaData]
 pgsqlConnect="hostaddr=localhost port=5432 dbname='dmap_dms' user='postgres' password='chinadci'"
 pgsqlConnect="hostaddr=localhost port=5432 dbname='dmap_dms' user='postgres' password='chinadci'"
-metaUrl=http://ip:port
-email=zhongpingw@chinadci.com
+metaUrl=http://172.26.60.100:8841/

@@ -16,7 +16,8 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 #include <sstream>
 #include <sstream>
 #include <fstream>
 #include <fstream>
-
+#include <iostream>
+#include "dmplogger.h"
 
 
 
 
 DmpServerManager::DmpServerManager()
 DmpServerManager::DmpServerManager()
@@ -49,8 +50,11 @@ void DmpServerManager::init(const boost::filesystem::path &modulePath)
 {
 {
     serverRegistry_->init(modulePath);
     serverRegistry_->init(modulePath);
 
 
-    LoadServices();
-    //LoadDmpServices();
+    if(!LoadServices())
+    {
+        std::cout << "加载服务失败！" << std::endl;
+        LOGGER_ERROR("加载服务失败！");
+    }
 }
 }
 
 
 std::string DmpServerManager::getCapabilities()
 std::string DmpServerManager::getCapabilities()

@@ -20,6 +20,7 @@
 #include <map>
 #include <map>
 #include <string>
 #include <string>
 #include "dmpserver.h"
 #include "dmpserver.h"
+#include "dmpconfig.h"
 
 
 using namespace std;
 using namespace std;
 
 
@@ -159,7 +160,7 @@ std::string DmpServerRegistry::getCapabilities()
     boost::property_tree::ptree root;
     boost::property_tree::ptree root;
     boost::property_tree::ptree ptServers;
     boost::property_tree::ptree ptServers;
     root.put("product", "DMap Server");
     root.put("product", "DMap Server");
-    root.put("version", "4.0");
+    root.put("version", VERSION);
 
 
     for (const auto &server : servers_) {
     for (const auto &server : servers_) {
         std::shared_ptr<DmpServer> pserver = server.second;
         std::shared_ptr<DmpServer> pserver = server.second;