fqx

+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -o  -lfcgi++  -lfcgi")
 
 
 INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/server/spserver
   ${CMAKE_SOURCE_DIR}/src/server/spserver
 )
 )
 
 
+
 ADD_SUBDIRECTORY(spserver)
 ADD_SUBDIRECTORY(spserver)
 ADD_SUBDIRECTORY(services)
 ADD_SUBDIRECTORY(services)
 
 
+
+
 ########################################################
 ########################################################
 # Files
 # Files
 SET (DMAP_SERVER_SRCS
 SET (DMAP_SERVER_SRCS
@@ -13,8 +17,10 @@ SET (DMAP_SERVER_SRCS
   dmpmainserver.cpp
   dmpmainserver.cpp
   dmprequesthandler.cpp
   dmprequesthandler.cpp
   dmpserver.cpp
   dmpserver.cpp
-  dmpservice.cpp
+  dmpserverapi.cpp
+  dmpserverconfig.cpp
   dmpservercontext.cpp
   dmpservercontext.cpp
+  dmpserverapicontext.cpp
   dmpserverapihandler.cpp
   dmpserverapihandler.cpp
   dmpserverfilter.cpp
   dmpserverfilter.cpp
   dmpserverinterface.cpp
   dmpserverinterface.cpp
@@ -26,9 +32,14 @@ SET (DMAP_SERVER_SRCS
   dmpserverparameters.cpp
   dmpserverparameters.cpp
   dmpserverplugins.cpp
   dmpserverplugins.cpp
   dmpserverutils.cpp
   dmpserverutils.cpp
-  dmpservernativeloader.cpp
+  dmpserverloader.cpp
+  dmpserverproject.cpp
+  dmpserverregistry.cpp
   python/dmppythonutils.cpp
   python/dmppythonutils.cpp
   python/dmpserverwrapper.cpp
   python/dmpserverwrapper.cpp
+  dmphttpbase.cpp
+  dmphttputils.cpp
+ 
 )
 )
 
 
 SET (DMAP_SERVER_HDRS
 SET (DMAP_SERVER_HDRS
@@ -36,8 +47,12 @@ SET (DMAP_SERVER_HDRS
   dmpmainserver.h
   dmpmainserver.h
   dmprequesthandler.h
   dmprequesthandler.h
   dmpserver.h
   dmpserver.h
+  dmpserverapi.h
   dmpserverapihandler.h
   dmpserverapihandler.h
+  dmpserverapicontext.h
   dmpservercontext.h
   dmpservercontext.h
+  dmpserverconfig.h
+  dmpserverentity.h
   dmpserverfilter.h
   dmpserverfilter.h
   dmpserverinterface.h
   dmpserverinterface.h
   dmpserverinterfaceimpl.h
   dmpserverinterfaceimpl.h
@@ -50,15 +65,24 @@ SET (DMAP_SERVER_HDRS
   dmpserverutils.h
   dmpserverutils.h
   dmpservice.h
   dmpservice.h
   dmpservermodule.h
   dmpservermodule.h
-  dmpservernativeloader.h
+  dmpserverloader.h
+  dmpserverproject.h
+  dmpserverregistry.h
   python/dmppythonutils.h
   python/dmppythonutils.h
+  dmphttpbase.h
+  dmphttputils.h
+  
 )
 )
 
 
 #############################################################
 #############################################################
 # dmap_server library
 # dmap_server library
 
 
+
+
 INCLUDE_DIRECTORIES(
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core
   ${CMAKE_SOURCE_DIR}/src/core
+  ${CMAKE_SOURCE_DIR}/src/core/geometry
+  ${CMAKE_SOURCE_DIR}/src/core/symbology
 )
 )
 
 
 INCLUDE_DIRECTORIES(SYSTEM
 INCLUDE_DIRECTORIES(SYSTEM
@@ -101,6 +125,7 @@ target_include_directories(dmap_server
   )
   )
   MESSAGE(STATUS "dmap_server path: ${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}")
   MESSAGE(STATUS "dmap_server path: ${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}")
 
 
+
 add_executable(dmap_spserv 
 add_executable(dmap_spserv 
   dmap_spserv.cpp 
   dmap_spserv.cpp 
   dmpspserverrequest.h
   dmpspserverrequest.h
@@ -109,13 +134,46 @@ add_executable(dmap_spserv
   dmpspserverresponse.cpp
   dmpspserverresponse.cpp
 )
 )
 
 
+add_executable(dmap_serv 
+  dmap_serv.cpp 
+  dmpapacheserverrequest.h
+  dmpapacheserverresponse.h
+  dmpapacheserverrequest.cpp
+  dmpapacheserverresponse.cpp
+)
+
 target_link_libraries(dmap_spserv
 target_link_libraries(dmap_spserv
   spserver
   spserver
   dmap_server
   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
+INSTALL(FILES
+  dmpserver.ini
+  DESTINATION ${DMAP_LIBEXEC_SUBDIR}
+)
 
 
 INSTALL(TARGETS dmap_server
 INSTALL(TARGETS dmap_server
   RUNTIME DESTINATION ${DMAP_BIN_DIR}
   RUNTIME DESTINATION ${DMAP_BIN_DIR}
@@ -124,6 +182,10 @@ INSTALL(TARGETS dmap_server
   PUBLIC_HEADER DESTINATION ${DMAP_INCLUDE_DIR}
   PUBLIC_HEADER DESTINATION ${DMAP_INCLUDE_DIR}
 )
 )
 
 
+INSTALL(TARGETS dmap_serv
+  DESTINATION ${DMAP_BIN_DIR}
+)
+
 INSTALL(TARGETS dmap_spserv
 INSTALL(TARGETS dmap_spserv
   DESTINATION ${DMAP_BIN_DIR}
   DESTINATION ${DMAP_BIN_DIR}
 )
 )

@@ -232,7 +232,7 @@ void DmpManagerApiHandler::reloadServices(const DmpServerApiContext &context) co
     {
     {
         case DmpServerRequest::Method::GET_METHOD:
         case DmpServerRequest::Method::GET_METHOD:
         {
         {
-            if(context.manager()->LoadServices()) {
+            if(context.manager()->loadServices()) {
                 context.response()->write("{\"status\":\"true\",\"message\":\"重载服务成功\"}");
                 context.response()->write("{\"status\":\"true\",\"message\":\"重载服务成功\"}");
             }else{
             }else{
                 context.response()->write("{\"status\":\"false\",\"message\":\"重载服务失败\"}");
                 context.response()->write("{\"status\":\"false\",\"message\":\"重载服务失败\"}");