wzp

@@ -11,4 +11,4 @@ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${DMAP_OUTPUT_DIRECTORY}/${DMAP_SERVER_MODUL
 
 
 ADD_SUBDIRECTORY(tileserver)
 ADD_SUBDIRECTORY(tileserver)
 ADD_SUBDIRECTORY(mapserver)
 ADD_SUBDIRECTORY(mapserver)
-ADD_SUBDIRECTORY(api)
+ADD_SUBDIRECTORY(managerapi)

-
-#include <iostream>
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
-#include <ctype.h>
-#include "dmplogger.h"
-#include "dmpapiparameters.h"
-
-namespace DmpApi
-{
-    DmpApiParameters::DmpApiParameters()
-        : DmpServerParameters()
-    {
-    }
-
-    DmpApiParameters::DmpApiParameters(const DmpServerParameters &params)
-    {
-        params_ = params.Parameters();
-    }
-    std::string DmpApiParameters::GetParameter(std::string& key_) 
-    {
-        std::map<std::string, std::string>::const_iterator iter;
-        iter = params_.find(key_);
-        if (iter != params_.end())
-        {
-            try
-            {
-                std::string service_name = boost::lexical_cast<std::string>(iter->second);
-                return service_name;
-            }
-            catch (boost::bad_lexical_cast &e)
-            {
-               LOGGER_ERROR(e.what());
-            }
-        }
-        return "";
-    }
-    
-
-    std::string DmpApiParameters::service_name() const
-    {   
-        std::map<std::string, std::string>::const_iterator iter;
-        iter = params_.find("SERVICE_NAME");
-        if (iter != params_.end())
-        {
-            try
-            {
-                std::string service_name = boost::lexical_cast<std::string>(iter->second);
-                return service_name;
-            }
-            catch (boost::bad_lexical_cast &e)
-            {
-               LOGGER_ERROR(e.what());
-            }
-        }
-        return "";
-    }
-    std::string DmpApiParameters::version() const
-    {
-        std::map<std::string, std::string>::const_iterator iter;
-        iter = params_.find("VERSION");
-        if (iter != params_.end())
-        {
-            try
-            {
-                std::string service_name = boost::lexical_cast<std::string>(iter->second);
-                return service_name;
-            }
-            catch (boost::bad_lexical_cast &e)
-            {
-               LOGGER_ERROR(e.what());
-            }
-        }
-        return "";
-    }
-    std::string DmpApiParameters::catalog() const
-    {
-        std::map<std::string, std::string>::const_iterator iter;
-        iter = params_.find("CATALOG");
-        if (iter != params_.end())
-        {
-            try
-            {
-                std::string service_name = boost::lexical_cast<std::string>(iter->second);
-                return service_name;
-            }
-            catch (boost::bad_lexical_cast &e)
-            {
-               LOGGER_ERROR(e.what());
-            }
-        }
-        return "";
-    }
-}
-

-#ifndef __dmpapiparameters_h__
-#define __dmpapiparameters_h__
-#include "dmpserverparameters.h"
-
-namespace DmpApi
-{
-    class DmpApiParameters : public DmpServerParameters
-    {
-    public:
-        DmpApiParameters(const DmpServerParameters &parameters);
-        DmpApiParameters();
-        virtual ~DmpApiParameters() = default;
-        std::string GetParameter(std::string& key_) ;
-        std::string service_name() const;
-        std::string version() const;
-        std::string catalog() const;
-    };
-}
-#endif //__dmpapiparameters_h__

-#include"dmpapiutils.h"
-namespace DmpApi
-{
-    void split(const string& strtem,char a,vector<string>& strvec)
-    {
-        string::size_type pos1, pos2;
-        pos2 = strtem.find(a);
-        pos1 = 0;
-        while (string::npos != pos2)
-        {
-                strvec.push_back(strtem.substr(pos1, pos2 - pos1));
-
-                pos1 = pos2 + 1;
-                pos2 = strtem.find(a, pos1);
-        }
-        strvec.push_back(strtem.substr(pos1));        
-    }
-
-    void ptreeToJson(const boost::property_tree::ptree& pt_,std::string& str_ )
-    {
-        std::stringstream ss;
-        boost::property_tree::write_json(ss,pt_);
-        str_=ss.str();
-    }
-    void NowTime(time_t& time_)
-    {
-        time_t t_Now = time(0);
-        struct tm* tm_Now = localtime(&t_Now);
-        tm_Now->tm_hour =0;
-        tm_Now->tm_min = 0;
-        tm_Now->tm_sec = 0;
-        time_ = mktime(tm_Now);  
-    }
-    bool IsValidTime(const time_t& AEndTime, const time_t& ANowTime )
-    {
-        return (AEndTime >= ANowTime);
-    }
-    void str_to_time_t(const string& aTime_, time_t& time_ )
-    {
-        std::string aFormat_="%d-%d-%d";
-        struct tm tm_Temp;  
-        int i = sscanf(aTime_.c_str(), aFormat_.c_str(),// "%d/%d/%d %d:%d:%d" ,       
-                    &(tm_Temp.tm_year),   
-                    &(tm_Temp.tm_mon),   
-                    &(tm_Temp.tm_mday),  
-                    &(tm_Temp.tm_hour),  
-                    &(tm_Temp.tm_min),  
-                    &(tm_Temp.tm_sec),  
-                    &(tm_Temp.tm_wday),  
-                    &(tm_Temp.tm_yday));
-        tm_Temp.tm_year -= 1900;  
-        tm_Temp.tm_mon --;  
-        tm_Temp.tm_hour=0;  
-        tm_Temp.tm_min=0;  
-        tm_Temp.tm_sec=0;  
-        tm_Temp.tm_isdst = 0;
-        time_ = mktime(&tm_Temp);  
-    }
-}
-
-
-
-

-
-#include <iostream>
-#include <boost/json.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/xml_parser.hpp>
-#include <boost/foreach.hpp>
-#include <string>
-#include <vector>
-using namespace std;
-
-namespace DmpApi
-{
-    void split(const string& strtem,char a,vector<string>& strvec);
-    void ptreeToJson(const boost::property_tree::ptree& pt_,std::string& str_ );
-    void NowTime(time_t& time_);
-    bool IsValidTime(const time_t& AEndTime, const time_t& ANowTime );
-    void str_to_time_t(const string& aTime_, time_t& time_ );
-}

@@ -15,7 +15,7 @@ SET (API_HDRS
 ########################################################
 ########################################################
 # Build
 # Build
 
 
-ADD_LIBRARY (webapi MODULE ${API_SRCS} ${API_HDRS})
+ADD_LIBRARY (managerapi MODULE ${API_SRCS} ${API_HDRS})
 
 
 INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core/
   ${CMAKE_SOURCE_DIR}/src/core/
@@ -23,10 +23,10 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core/symbology
   ${CMAKE_SOURCE_DIR}/src/core/symbology
   ${CMAKE_SOURCE_DIR}/src/server/
   ${CMAKE_SOURCE_DIR}/src/server/
   ${CMAKE_SOURCE_DIR}/src/server/services
   ${CMAKE_SOURCE_DIR}/src/server/services
-  ${CMAKE_SOURCE_DIR}/src/server/services/api
+  ${CMAKE_SOURCE_DIR}/src/server/services/managerapi
 )
 )
 
 
-set_target_properties(webapi
+set_target_properties(managerapi
   PROPERTIES
   PROPERTIES
     CXX_VISIBILITY_PRESET hidden
     CXX_VISIBILITY_PRESET hidden
     VISIBILITY_INLINES_HIDDEN 1
     VISIBILITY_INLINES_HIDDEN 1
@@ -34,7 +34,7 @@ set_target_properties(webapi
     SOVERSION ${COMPLETE_VERSION}
     SOVERSION ${COMPLETE_VERSION}
   )
   )
 
 
-TARGET_LINK_LIBRARIES(webapi
+TARGET_LINK_LIBRARIES(managerapi
   dmap_server
   dmap_server
 )
 )
 
 
@@ -46,7 +46,7 @@ TARGET_LINK_LIBRARIES(webapi
 
 
 #MESSAGE(STATUS "DMAP_SERVER_MODULE_DIR: ${DMAP_SERVER_MODULE_DIR}")
 #MESSAGE(STATUS "DMAP_SERVER_MODULE_DIR: ${DMAP_SERVER_MODULE_DIR}")
 
 
-INSTALL(TARGETS webapi
+INSTALL(TARGETS managerapi
     RUNTIME DESTINATION ${DMAP_SERVER_MODULE_DIR}
     RUNTIME DESTINATION ${DMAP_SERVER_MODULE_DIR}
     LIBRARY DESTINATION ${DMAP_SERVER_MODULE_DIR}
     LIBRARY DESTINATION ${DMAP_SERVER_MODULE_DIR}
 )
 )

@@ -19,9 +19,7 @@
 #include "dmpmanagerapihandler.h"
 #include "dmpmanagerapihandler.h"
 #include "dmpserverrequest.h"
 #include "dmpserverrequest.h"
 #include "dmpserverresponse.h"
 #include "dmpserverresponse.h"
-#include "dmpapiparameters.h"
 #include "dmplogger.h"
 #include "dmplogger.h"
-#include "dmpapiutils.h"
 #include "dmpservermanager.h"
 #include "dmpservermanager.h"
 #include "dmpserverutils.h"
 #include "dmpserverutils.h"