网关设置

Signed-off-by: wlxuz <myxuan475@126.com>
Change-Id: I8990c608229548950577ced8c70a4d7ec3780be7

CMakeLists.txt

@@ -1,18 +1,6 @@
 # add_subdirectory(apps)
 # add_subdirectory(http)
 
-# add_subdirectory(web-deamon)
+#add_subdirectory(web-deamon)
 add_subdirectory(settings)
-
-install(FILES dist/index.html
-        DESTINATION webconfig
-)
-install(DIRECTORY dist/static
-        DESTINATION webconfig/
-        FILES_MATCHING PATTERN "*"
-)
-
-install(DIRECTORY config
-        DESTINATION ./
-        FILES_MATCHING PATTERN "*"
-)
+add_subdirectory(dbms)

settings/CMakeLists.txt

@@ -1,13 +1,11 @@
 # 模块名称
 set(MODULE settings)
 
-include_directories(${TINYXML2_INCLUDE_DIR})
-find_library(TYNIXML2_LIBRARY tinyxml2 ${TINYXML2_LIBS_DIR} NO_DEFAULT_PATH)
-message("TINYXML2_LIBS_DIR: ${TINYXML2_LIBS_DIR}, TYNIXML2_LIBRARY: ${TYNIXML2_LIBRARY}")
-
 aux_source_directory(.  DIRSRCS)
 add_library(${MODULE} ${DIRSRCS})
-target_link_libraries(${MODULE} ${TYNIXML2_LIBRARY} utils)
+target_include_directories(${MODULE} PUBLIC ${TINYXML2_INCLUDE_DIR})
+target_link_directories(${MODULE} PUBLIC ${TINYXML2_LIBS_DIR})
+target_link_libraries(${MODULE} tinyxml2  utils)
 
 install(TARGETS ${MODULE}
         DESTINATION lib/

settings/config_parser.cpp

@@ -132,4 +132,15 @@ std::unordered_map<std::string, ConfigParser::Channel> ConfigParser::GetChannels
     }
     return channels;
 }
+ConfigParser::Channel ConfigParser::FindChannel(const std::string &name)
+{
+	std::unordered_map<std::string, ConfigParser::Channel> mapChannels =
+		GetChannels();
+	if (mapChannels.find(name) == mapChannels.end()) {
+		ConfigParser::Channel chn;
+		chn.type = CHN_MAX;
+		return chn;
+	}
+	return mapChannels[name];
+}
 } // namespace settings

settings/config_parser.h

@@ -31,12 +31,13 @@ public:
         std::string devPath;
     };
 
-    enum ChnType { CHN_COM = 0, CHN_TCP, CHN_UDP, CHN_LORA };
-    std::vector<DataCenter> GetDataCenter() const;
+	enum ChnType { CHN_COM = 0, CHN_TCP, CHN_UDP, CHN_LORA, CHN_MAX };
+	std::vector<DataCenter> GetDataCenter() const;
     std::vector<LoginUser> GetLoginUsers() const;
     int16_t GetWWWPort() const;
     int32_t GetRetryTimes();
     std::unordered_map<std::string, Channel> GetChannels() const;
+	Channel FindChannel(const std::string &name);
 
 private:
     XmlConfig *xmlConfig_;