ljh

-<<<<<<< HEAD
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -o  -lfcgi++  -lfcgi")
-
-INCLUDE_DIRECTORIES(
-  ${CMAKE_SOURCE_DIR}/src/server/spserver
-)
-
-
-ADD_SUBDIRECTORY(spserver)
-ADD_SUBDIRECTORY(services)
-
-
-
-########################################################
-# Files
-SET (DMAP_SERVER_SRCS
-  dmpfilterresponsedecorator.cpp
-  dmpmainserver.cpp
-  dmprequesthandler.cpp
-  dmpserver.cpp
-  dmpserverapi.cpp
-  dmpserverconfig.cpp
-  dmpservercontext.cpp
-  dmpserverapicontext.cpp
-  dmpserverapihandler.cpp
-  dmpserverfilter.cpp
-  dmpserverinterface.cpp
-  dmpserverinterfaceimpl.cpp
-  dmpservermanager.cpp
-  dmpservermanagerapi.cpp
-  dmpserverresponse.cpp
-  dmpserverrequest.cpp
-  dmpserverparameters.cpp
-  dmpserverplugins.cpp
-  dmpserverutils.cpp
-  dmpserverloader.cpp
-  dmpserverproject.cpp
-  dmpserverregistry.cpp
-  python/dmppythonutils.cpp
-  python/dmpserverwrapper.cpp
-  dmphttpbase.cpp
-  dmphttputils.cpp
- 
-)
-
-SET (DMAP_SERVER_HDRS
-  dmpfilterresponsedecorator.h
-  dmpmainserver.h
-  dmprequesthandler.h
-  dmpserver.h
-  dmpserverapi.h
-  dmpserverapihandler.h
-  dmpserverapicontext.h
-  dmpservercontext.h
-  dmpserverconfig.h
-  dmpserverentity.h
-  dmpserverfilter.h
-  dmpserverinterface.h
-  dmpserverinterfaceimpl.h
-  dmpservermanager.h
-  dmpservermanagerapi.h
-  dmpserverrequest.h
-  dmpserverresponse.h
-  dmpserverparameters.h
-  dmpserverplugins.h
-  dmpserverutils.h
-  dmpservice.h
-  dmpservermodule.h
-  dmpserverloader.h
-  dmpserverproject.h
-  dmpserverregistry.h
-  python/dmppythonutils.h
-  dmphttpbase.h
-  dmphttputils.h
-  
-)
-
-#############################################################
-# dmap_server library
-
-
-
-INCLUDE_DIRECTORIES(
-  ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/geometry
-  ${CMAKE_SOURCE_DIR}/src/core/symbology
-)
-
-INCLUDE_DIRECTORIES(SYSTEM
-  ${PYTHON_INCLUDE_PATH}
-)
-ADD_LIBRARY(dmap_server SHARED ${DMAP_SERVER_SRCS} ${DMAP_SERVER_HDRS})
-
-target_link_libraries(dmap_server 
-  dmap_core
-  ${Boost_LIBRARIES} 
-  Boost::regex
-  ${PYTHON_LIBRARIES}
-  dl)
-
-IF (WITH_BINDINGS)
-  TARGET_LINK_LIBRARIES(dmap_server 
-  Boost::${DMAP_BOOST_PYTHON_FOUND}
-  )
-ENDIF(WITH_BINDINGS)
-
-set_target_properties(dmap_server
-  PROPERTIES
-    POSITION_INDEPENDENT_CODE 1
-    CXX_VISIBILITY_PRESET hidden
-    VISIBILITY_INLINES_HIDDEN 1
-    #VERSION ${COMPLETE_VERSION}
-    #SOVERSION ${COMPLETE_VERSION}
-  )
-  
-generate_export_header(
-  dmap_server
-  BASE_NAME SERVER
-  EXPORT_FILE_NAME "${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}/dmap_server.h"
-)
-
-
-target_include_directories(dmap_server
-  PUBLIC
-    ${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}
-  )
-  MESSAGE(STATUS "dmap_server path: ${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}")
-
-
-add_executable(dmap_spserv 
-  dmap_spserv.cpp 
-  dmpspserverrequest.h
-  dmpspserverresponse.h
-  dmpspserverrequest.cpp
-  dmpspserverresponse.cpp
-)
-
-add_executable(dmap_serv 
-  dmap_serv.cpp 
-  dmpapacheserverrequest.h
-  dmpapacheserverresponse.h
-  dmpapacheserverrequest.cpp
-  dmpapacheserverresponse.cpp
-)
-
-target_link_libraries(dmap_spserv
-  spserver
-  dmap_server
- )
-
-target_link_libraries(dmap_serv
- dmap_server
-)
-
-INCLUDE_DIRECTORIES(
-  ${CMAKE_SOURCE_DIR}/pgsql/include
-)
-LINK_DIRECTORIES(dmap_server  ${CMAKE_SOURCE_DIR}/pgsql/lib) 
-TARGET_LINK_LIBRARIES(dmap_server   ${CMAKE_SOURCE_DIR}/pgsql/lib/libpq.so)
-
-find_package(Fcgi REQUIRED)
-if (NOT FCGI_FOUND)
-  message (SEND_ERROR "Fast CGI dependency was not found!")
-endif()
-
-target_include_directories(dmap_serv SYSTEM PRIVATE
-  ${FCGI_INCLUDE_DIR}
-)
-target_link_libraries(dmap_serv
-  ${FCGI_LIBRARY}
-)
-########################################################
-# Install
-INSTALL(FILES
-  dmpserver.ini
-  DESTINATION ${DMAP_LIBEXEC_SUBDIR}
-)
-
-INSTALL(TARGETS dmap_server
-  RUNTIME DESTINATION ${DMAP_BIN_DIR}
-  LIBRARY DESTINATION ${DMAP_LIB_DIR}
-  ARCHIVE DESTINATION ${DMAP_LIB_DIR}
-  PUBLIC_HEADER DESTINATION ${DMAP_INCLUDE_DIR}
-)
-
-INSTALL(TARGETS dmap_serv
-  DESTINATION ${DMAP_BIN_DIR}
-)
-
-INSTALL(TARGETS dmap_spserv
-  DESTINATION ${DMAP_BIN_DIR}
-=======
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -o  -lfcgi++  -lfcgi")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -o  -lfcgi++  -lfcgi")
 
 
 INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES(
@@ -380,5 +188,4 @@ INSTALL(TARGETS dmap_serv
 
 
 INSTALL(TARGETS dmap_spserv
 INSTALL(TARGETS dmap_spserv
   DESTINATION ${DMAP_BIN_DIR}
   DESTINATION ${DMAP_BIN_DIR}
->>>>>>> 678abfd93ad90c860e277df725c22d74ff408a82
 )
 )

@@ -126,211 +126,6 @@ bool DmpServerManager::publish(const std::string& serverName, const std::string&
         delete project;
         delete project;
         return false;
         return false;
     }
     }
-    projects_[serviceName] = project; 
-    return true;
-}
-
-bool DmpServerManager::deleteService(const std::string &serverName, const std::string &serviceName)
-{
-    if (serverRegistry_->getServer(serverName)->remove(serviceName) && removeProject(serviceName))
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-bool DmpServerManager::startService(const std::string &serverName, const std::string &serviceName)
-{
-    return serverRegistry_->getServer(serverName)->start(serviceName);
-}
-
-bool DmpServerManager::stopService(const std::string &serverName, const std::string &serviceName)
-{
-    return serverRegistry_->getServer(serverName)->stop(serviceName);
-}
-bool DmpServerManager::loadServices()
-{
-    boost::property_tree::ptree pt,ptList;
-    std::string conn = DmpServerConfig::Instance()->getMetaUrl();
-    const std::string url= conn + URI_RELOAD;
-    std::string strContent=DmpHttp::get(url);
-    if(strContent.length()==0)
-    {
-        return false;
-    }
-    std::stringstream ssData;
-    ssData<<strContent.c_str();
-    boost::property_tree::read_json(ssData, pt);
-    int iCount = std::atoi(pt.get<std::string>("data.count").c_str());
-    if(iCount>0)
-    {
-        ptList=pt.get_child("data.list");
-        for (auto& e : ptList) 
-        {
-            std::string name = e.second.get<std::string>("name");
-            std::string title = e.second.get<std::string>("title");
-            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->initServices(type,name,title,capabilities,project);
-        }
-    }
-    return true;
-}
-bool DmpServerManager::initServices(const std::string& serverName, const std::string& serviceName, const std::string& title, int capabilities, const std::string& projectData)
-{
-    //project
-    std::string projData;
-    if (!DmpServerUtils::Base64Decode(projectData, &projData))
-    {
-        return false;
-    }
-    DmpProject *project = new DmpProject();
-    if (!project->Read(projData))
-    {
-        delete project;
-        return false;
-    }
-
-    if (!serverRegistry_->getServer(serverName)->publish(serviceName, title, capabilities, *project))
-    {
-        delete project;
-        return false;
-    }
-    projects_[serviceName] = project;  
-    return true;
-=======
-/**************************************************************************
-* file:              dmpservermanager.cpp
-
-* Author:            wanzhongping
-* Date:              2021-07-27 21:59:46
-* Email:             zhongpingw@chinadci.com
-* copyright:         广州城市信息研究所有限公司
-***************************************************************************/
-#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>
-#include <boost/property_tree/xml_parser.hpp>
-#include <sstream>
-#include <fstream>
-#include <math.h>
-#include "dmptilelayer.h"
-#include <iostream>
-#include "dmplogger.h"
-#include "dmptilelayer.h"
-
-DmpServerManager::DmpServerManager()
-{
-    serverRegistry_ = new DmpServerRegistry();
-}
-
-DmpServerManager::~DmpServerManager()
-{
-    if (serverRegistry_)
-    {
-        delete serverRegistry_;
-        serverRegistry_ = NULL;
-    }
-
-    ProjectMap::iterator iter = projects_.begin();
-    for (; iter != projects_.end(); ++iter)
-    {
-        DmpProject *mapProject = iter->second;
-        if (mapProject)
-        {
-            delete mapProject;
-            mapProject = nullptr;
-        }
-    } 
-    projects_.clear();
-}
-
-void DmpServerManager::init(const boost::filesystem::path &modulePath)
-{
-    serverRegistry_->init(modulePath);
-    if(!loadServices())
-    {
-        std::cout << "加载服务失败!" << std::endl;
-        LOGGER_ERROR("加载服务失败!");
-    }
-    //LoadDmpServices();
-}
-
-std::string DmpServerManager::getCapabilities()
-{
-    return serverRegistry_->getCapabilities();
-}
-
-std::shared_ptr<DmpServer> DmpServerManager::serverForRequest(const DmpServerRequest &request)
-{
-    return serverRegistry_->getServerForRequest(request);
-}
-
-std::shared_ptr<DmpServerApi> DmpServerManager::apiForRequest(const DmpServerRequest &request)
-{
-    return serverRegistry_->getApiForRequest(request);
-}
-
-DmpProject *DmpServerManager::getProject(const std::string &serviceName)
-{
-    std::map<std::string, DmpProject *>::iterator iter = projects_.find(serviceName);
-    if (iter != projects_.end())
-    {
-        return iter->second;
-    }
-    else
-    {
-        return nullptr;
-    }
-}
-
-bool DmpServerManager::removeProject(const std::string &serviceName)
-{
-    try
-    {
-        std::map<std::string, DmpProject *>::iterator iter = projects_.find(serviceName);
-        if (iter != projects_.end())
-        {
-            delete iter->second;
-            projects_.erase(iter);
-        }
-    }
-    catch (const std::exception &e)
-    {
-        std::cerr << e.what() << '\n';
-        return false;
-    }
-    return true;
-}
-
-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;
-    if (!DmpServerUtils::Base64Decode(projectData, &projData))
-    {
-        return false;
-    }
-    DmpProject *project = new DmpProject();
-    if (!project->Read(projData))
-    {
-        delete project;
-        return false;
-    }
-
-    if (!serverRegistry_->getServer(serverName)->publish(serviceName, title, capabilities, *project))
-    {
-        delete project;
-        return false;
-    }
     projects_[serviceName] = project;
     projects_[serviceName] = project;
     
     
     return true;
     return true;