wzp

@@ -13,15 +13,6 @@
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ptree.hpp>
 
 
-// bool DmpApplication::running_from_build_dir_ = false;
-// bool DmpApplication::initialized_ = false;
-// std::string DmpApplication::plugin_path_ = "";
-// std::string DmpApplication::prefix_path_ = "";
-// std::string DmpApplication::libexec_path_ = "";
-// std::string DmpApplication::library_path_ = "";
-// std::string DmpApplication::build_source_path_ = "";
-// std::string DmpApplication::build_output_path_ = "";
-// std::string DmpApplication::pkgDataPath_ = "";
 
 
 DmpApplication::DmpApplication()
 DmpApplication::DmpApplication()
 {
 {
@@ -60,7 +51,6 @@ void DmpApplication::initialize()
             setPrefixPath(prefixPath);
             setPrefixPath(prefixPath);
         }
         }
     }
     }
-    // createIniFile(libexecPath_);
     initialized_ = true;
     initialized_ = true;
 }
 }
 bool DmpApplication::isRunningFromBuildDir()
 bool DmpApplication::isRunningFromBuildDir()
@@ -195,21 +185,4 @@ std::string DmpApplication::buildOutputPath()
 std::string DmpApplication::dmapSettingsDirPath()
 std::string DmpApplication::dmapSettingsDirPath()
 {
 {
     return "";
     return "";
-}
-
-void DmpApplication::createIniFile(const std::string &filePath)
-{
-    std::string fileName = filePath + iniFileName_;
-    if(!boost::filesystem::exists(fileName)) {
-        boost::property_tree::ptree pt; 
-        pt.put<std::string>("Core.Filter","%Severity% >= debug");  
-	    pt.put<std::string>("Sinks.TextFileSettings.Destination","TextFile");
-	    // pt.put<std::string>("Sinks.TextFileSettings.FileName","/var/log/dmap/%Y%m%d.log");
-        // pt.put<bool>("Sinks.TextFileSettings.AutoFlush",true);
-        boost::property_tree::ini_parser::write_ini(fileName,pt);
-    }
-
-    // boost::property_tree::ptree root_node, tag_system;
-    // boost::property_tree::ini_parser::read_ini("config.ini", root_node);
-
-}
+}

@@ -26,10 +26,9 @@ public:
     //static bool CreateDatabase();
     //static bool CreateDatabase();
     std::string resolvePkgPath();
     std::string resolvePkgPath();
     std::string applicationDirPath();
     std::string applicationDirPath();
-    bool searchFile(const boost::filesystem::path &dir, const std::string fileName, boost::filesystem::path &path);
+    std::string dmapSettingsDirPath();
+
     bool isRunningFromBuildDir();
     bool isRunningFromBuildDir();
-    static std::string dmapSettingsDirPath();
-    
     std::string prefixPath();
     std::string prefixPath();
     void setPrefixPath(const std::string &prefixPath);
     void setPrefixPath(const std::string &prefixPath);
     void setPluginPath(const std::string &pluginPath);
     void setPluginPath(const std::string &pluginPath);
@@ -40,12 +39,11 @@ public:
     std::string pkgDataPath();
     std::string pkgDataPath();
     std::string libraryPath();
     std::string libraryPath();
     std::string buildOutputPath();
     std::string buildOutputPath();
-
-    void createIniFile(const std::string &filePath);
-    
+   
 private:
 private:
     DmpApplication();
     DmpApplication();
-
+    bool searchFile(const boost::filesystem::path &dir, const std::string fileName, boost::filesystem::path &path);
+    
     std::string prefixPath_;
     std::string prefixPath_;
     std::string libexecPath_;
     std::string libexecPath_;
     std::string libraryPath_;
     std::string libraryPath_;
@@ -53,9 +51,9 @@ private:
     std::string buildSourcePath_;
     std::string buildSourcePath_;
     std::string buildOutputPath_;
     std::string buildOutputPath_;
     std::string pkgDataPath_;
     std::string pkgDataPath_;
+    std::string iniFilePath_;
     bool runningFromBuildDir_;
     bool runningFromBuildDir_;
     bool initialized_;
     bool initialized_;
-    const std::string iniFileName_ = "dmap.ini";
 };
 };
 
 
 #endif //__dmpapplication_h__
 #endif //__dmpapplication_h__

@@ -18,6 +18,7 @@ SET (DMAP_SERVER_SRCS
   dmprequesthandler.cpp
   dmprequesthandler.cpp
   dmpserver.cpp
   dmpserver.cpp
   dmpserverapi.cpp
   dmpserverapi.cpp
+  dmpserverconfig.cpp
   dmpservercontext.cpp
   dmpservercontext.cpp
   dmpserverapicontext.cpp
   dmpserverapicontext.cpp
   dmpserverapihandler.cpp
   dmpserverapihandler.cpp
@@ -48,8 +49,9 @@ SET (DMAP_SERVER_HDRS
   dmpserver.h
   dmpserver.h
   dmpserverapi.h
   dmpserverapi.h
   dmpserverapihandler.h
   dmpserverapihandler.h
-  dmpservercontext.h
   dmpserverapicontext.h
   dmpserverapicontext.h
+  dmpservercontext.h
+  dmpserverconfig.h
   dmpserverentity.h
   dmpserverentity.h
   dmpserverfilter.h
   dmpserverfilter.h
   dmpserverinterface.h
   dmpserverinterface.h

@@ -20,6 +20,7 @@
 #include "dmpspserverrequest.h"
 #include "dmpspserverrequest.h"
 #include "dmpspserverresponse.h"
 #include "dmpspserverresponse.h"
 #include "dmpapplication.h"
 #include "dmpapplication.h"
+#include "dmpserverconfig.h"
 
 
 DmpMainServer *pDmpServer = nullptr;
 DmpMainServer *pDmpServer = nullptr;
 class SP_HttpEchoHandler : public SP_HttpHandler
 class SP_HttpEchoHandler : public SP_HttpHandler
@@ -113,6 +114,8 @@ int main(int argc, char *argv[])
 	int c;
 	int c;
     DmpApplication::Instance()->initialize();
     DmpApplication::Instance()->initialize();
 	pDmpServer = new DmpMainServer();
 	pDmpServer = new DmpMainServer();
+	// std::string conn = DmpServerConfig::Instance()->getPqsqlConnect();
+	// std::string email = DmpServerConfig::Instance()->getValue("MetaData","email");
 	while ((c = getopt(argc, argv, "p:t:s:v")) != EOF)
 	while ((c = getopt(argc, argv, "p:t:s:v")) != EOF)
 	{
 	{
 		switch (c)
 		switch (c)

@@ -162,13 +162,11 @@ void DmpHttp::DmpHttpUtils::handle_read_content(const boost::system::error_code&
 	else {
 	else {
 		socket_.close();
 		socket_.close();
 		resolver_.cancel();
 		resolver_.cancel();
-		std::cout << "读取响应数据完毕." << std::endl;
-		//std::cout << responseData_;
 	}
 	}
 }
 }
  
  
  
  
-std::string DmpHttp::post(std::string url) {
+std::string DmpHttp::post(const std::string &url) {
 	boost::asio::io_service io;
 	boost::asio::io_service io;
 	DmpHttp::DmpHttpUtils c(io);
 	DmpHttp::DmpHttpUtils c(io);
 	c.post(url);
 	c.post(url);
@@ -176,7 +174,7 @@ std::string DmpHttp::post(std::string url) {
 	return c.getResponse();
 	return c.getResponse();
 }
 }
 
 
-std::string DmpHttp::get(std::string url) {
+std::string DmpHttp::get(const std::string &url) {
 	boost::asio::io_service io;
 	boost::asio::io_service io;
 	DmpHttp::DmpHttpUtils c(io);
 	DmpHttp::DmpHttpUtils c(io);
 	c.get(url);
 	c.get(url);

@@ -51,8 +51,8 @@ namespace DmpHttp
 	    // 响应数据
 	    // 响应数据
 	    std::string responseData_;
 	    std::string responseData_;
     };
     };
-    std::string post(std::string url);
-    std::string get(std::string url);
+    std::string post(const std::string &url);
+    std::string get(const std::string &url);
 }
 }
 
 
 #endif //__dmphttpsutils_h__
 #endif //__dmphttpsutils_h__

+/**************************************************************************
+* file:              dmpserverconfig.cpp
+
+* Author:            wanzhongping
+* Date:              2021-12-16 16:55:51
+* Email:             zhongpingw@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+
+#include <iostream>
+#include "dmpserverconfig.h"
+#include "dmpapplication.h"
+
+DmpServerConfig::DmpServerConfig()
+{
+    std::string iniFile = DmpApplication::Instance()->libexecPath() + iniFileName_;
+    if (boost::filesystem::exists(iniFile))
+    {
+        boost::property_tree::ini_parser::read_ini(iniFile, ptIni_);
+    }
+    else
+    {
+        ptIni_.put<std::string>("MetaData.pgsqlConnect", "\"hostaddr=localhost port=5432 dbname='dmap_dms' user='postgres' password='chinadci'\"");
+        ptIni_.put<std::string>("MetaData.metaUrl", "http://ip:port");
+        boost::property_tree::ini_parser::write_ini(iniFile, ptIni_);
+    }
+}
+
+DmpServerConfig::~DmpServerConfig()
+{
+}
+
+DmpServerConfig *DmpServerConfig::Instance()
+{
+    static DmpServerConfig instance;
+    return &instance;
+}
+
+std::string DmpServerConfig::getPqsqlConnect()
+{
+    std::string conn = "";
+    try
+    {
+        boost::property_tree::ptree ptMeta;
+        ptMeta = ptIni_.get_child("MetaData");
+        conn = ptMeta.get<std::string>("pgsqlConnect");
+    }
+    catch (std::exception &e)
+    {
+        std::cerr << "Exception: " << e.what() << "\n";
+    }
+    return conn;
+}
+
+std::string DmpServerConfig::getMetaUrl()
+{
+    std::string url = "";
+    try
+    {
+        boost::property_tree::ptree ptMeta;
+        ptMeta = ptIni_.get_child("MetaData");
+        url = ptMeta.get<std::string>("metaUrl");
+    }
+    catch (std::exception &e)
+    {
+        std::cerr << "Exception: " << e.what() << "\n";
+    }
+    return url;
+}
+
+std::string DmpServerConfig::getValue(const std::string &section,const std::string &key)
+{
+    std::string value = "";
+    try
+    {
+        boost::property_tree::ptree ptMeta;
+        ptMeta = ptIni_.get_child(section);
+        value = ptMeta.get<std::string>(key);
+    }
+    catch (std::exception &e)
+    {
+        std::cerr << "Exception: " << e.what() << "\n";
+    }
+    return value;
+}

+/**************************************************************************
+* file:              dmpserverconfig.h
+
+* Author:            wanzhongping
+* Date:              2021-12-16 16:55:44
+* Email:             zhongpingw@chinadci.com
+* copyright:         广州城市信息研究所有限公司
+***************************************************************************/
+
+#ifndef __dmpserverconfig_h__
+#define __dmpserverconfig_h__
+
+#include "dmap_server.h"
+#include <boost/property_tree/ini_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+class SERVER_EXPORT DmpServerConfig
+{
+public:
+    ~DmpServerConfig();
+    static DmpServerConfig* Instance();
+    std::string getPqsqlConnect();
+    std::string getMetaUrl();
+    std::string getValue(const std::string &section,const std::string &key);
+private:
+    DmpServerConfig();
+    boost::property_tree::ptree ptIni_;
+    const std::string iniFileName_ = "dmpserver.ini";
+};
+
+#endif // __dmpserverconfig_h__