Sanya compiled.

framework/CMakeLists.txt

@@ -13,6 +13,7 @@ endif()
 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_REENTRANT -fPIC -Wall -Werror")
 
 set(CNSTREAM_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
+# message(STATUS "framework: CNSTREAM_ROOT_DIR = ${CNSTREAM_ROOT_DIR}")
 set(LIBRARY_OUTPUT_PATH ${CNSTREAM_ROOT_DIR}/lib)
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/)
 
@@ -20,6 +21,7 @@ set(CMAKE_MODULE_PATH ${CNSTREAM_ROOT_DIR}/cmake)
 
 # ---[ rapidjson
 include_directories(${CNSTREAM_ROOT_DIR}/3rdparty/)
+include_directories(${CNSTREAM_ROOT_DIR}/3rdparty/httplib)
 
 include_directories(${CNSTREAM_ROOT_DIR}/framework/core/include)
 include_directories(${CNSTREAM_ROOT_DIR}/framework/request/include)

framework/request/include/ExpelDevice.h

@@ -29,7 +29,8 @@ enum DeviceType {
     DevicePlayerV2 = 2,
     DevicePlayerV3 = 3,
     DevicePlayerV4 = 4,
-    DeviceGasV2 = 5
+    DeviceGasV2 = 5,
+    DevicePlayerV5 = 6
 };
 
 class ExpelDevice

modules/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.8.7)
 
 set(GSD_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
+#message(STATUS "MODULES: GSD_ROOT_DIR = ${GSD_ROOT_DIR}")
 
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)

modules/Expel/include/Expel.hpp

@@ -19,6 +19,7 @@
 #include "DevicePlayerV3.hpp"
 #include "DevicePlayerV3.hpp"
 #include "DevicePlayerV4.hpp"
+#include "DevicePlayerV5.hpp"
 
 #include "DeviceGasV1.hpp"
 #include "DeviceGasV2.hpp"

modules/Expel/src/Expel.cpp

@@ -69,9 +69,9 @@ namespace gsd
             //发送阻塞后，缓存清空事件
             DebugL;
         }
-        virtual void onErr(const SockException &ex) override{
+        virtual void onError(const SockException &err) override{
             //断开连接事件，一般是EOF
-            WarnL << ex.what();
+            WarnL << err.what();
             flag = false;
         }
         virtual void onManager() override{
@@ -244,6 +244,10 @@ namespace gsd
         case DeviceType::DeviceGasV2:
             deviceControl = std::make_shared<gsd::DeviceGasV2>();
             break;
+
+        case DeviceType::DevicePlayerV5:
+            deviceControl = std::make_shared<gsd::DevicePlayerV5>();
+            break;
         }
         deviceControl->setTypeId(expelDevice.deviceType);
         return deviceControl;

modules/Monitor/src/kafka_comsumer.cpp

@@ -35,31 +35,31 @@ bool kafka_consumer_client::initClient(){
     RdKafka::Conf *conf = nullptr;
     conf = RdKafka::Conf::create(RdKafka::Conf::CONF_GLOBAL);
     if(!conf){
-        ErrorL << "RdKafka create global conf failed" << endl;
+        ErrorL << "RdKafka create global conf failed" << std::endl;
         return false;
     }
  
     std::string errstr;
     /*设置broker list*/
     if (conf->set("bootstrap.servers", brokers_, errstr) != RdKafka::Conf::CONF_OK){
-        ErrorL << "RdKafka conf set brokerlist failed :" << errstr.c_str() << endl;
+        ErrorL << "RdKafka conf set brokerlist failed :" << errstr.c_str() << std::endl;
     }
  
     /*设置consumer group*/
     if (conf->set("group.id", groupid_, errstr) != RdKafka::Conf::CONF_OK){
-        ErrorL << "RdKafka conf set group.id failed : " << errstr.c_str() << endl;
+        ErrorL << "RdKafka conf set group.id failed : " << errstr.c_str() << std::endl;
     }
  
     std::string strfetch_num = "10240000";
     /*每次从单个分区中拉取消息的最大尺寸*/
     if(conf->set("max.partition.fetch.bytes", strfetch_num, errstr) != RdKafka::Conf::CONF_OK){
-        ErrorL << "RdKafka conf set max.partition failed : " << errstr.c_str() << endl;
+        ErrorL << "RdKafka conf set max.partition failed : " << errstr.c_str() << std::endl;
     }
  
     /*创建kafka consumer实例*/
     kafka_consumer_ = RdKafka::Consumer::create(conf, errstr);
     if(!kafka_consumer_){
-        ErrorL << "failed to ceate consumer"  << endl;
+        ErrorL << "failed to ceate consumer"  << std::endl;
     }
     delete conf;
  
@@ -67,7 +67,7 @@ bool kafka_consumer_client::initClient(){
     /*创建kafka topic的配置*/
     tconf = RdKafka::Conf::create(RdKafka::Conf::CONF_TOPIC);
     if(!tconf){
-        ErrorL << "RdKafka create topic conf failed" << endl;
+        ErrorL << "RdKafka create topic conf failed" << std::endl;
         return false;
     }
  
@@ -79,18 +79,18 @@ bool kafka_consumer_client::initClient(){
     消费.largest表示接受接收最大的offset(即最新消息),smallest表示最小offset,即从topic的
     开始位置消费所有消息.*/
     if(tconf->set("auto.offset.reset", "largest", errstr) != RdKafka::Conf::CONF_OK){
-        ErrorL << "RdKafka conf set auto.offset.reset failed : " << errstr.c_str() << endl;
+        ErrorL << "RdKafka conf set auto.offset.reset failed : " << errstr.c_str() << std::endl;
     }
  
     topic_ = RdKafka::Topic::create(kafka_consumer_, topics_, tconf, errstr);
     if(!topic_){
-        ErrorL << "RdKafka create topic failed : " << errstr.c_str() << endl;
+        ErrorL << "RdKafka create topic failed : " << errstr.c_str() << std::endl;
     }
     delete tconf;
  
     RdKafka::ErrorCode resp = kafka_consumer_->start(topic_, partition_, offset_);
     if (resp != RdKafka::ERR_NO_ERROR){
-        ErrorL << "failed to start consumer : " << RdKafka::err2str(resp).c_str() << endl;
+        ErrorL << "failed to start consumer : " << RdKafka::err2str(resp).c_str() << std::endl;
     }
     
     return true;

modules/TCPClient/include/TCPClient.hpp

@@ -95,7 +95,7 @@ namespace gsd
          * @return {*}
          * @author: lishengyin
          */   
-        virtual void onErr(const SockException &ex) override;
+        virtual void onError(const SockException &err) override;
             /**
          * @description: 心跳 2S触发一次
          * @param {*}

modules/TCPClient/src/TCPClient.cpp

@@ -125,10 +125,10 @@ namespace gsd{
      * @return {*}
      * @author: lishengyin
      */    
-    void TCPClient::onErr(const SockException &ex){
+    void TCPClient::onError(const SockException &err){
         //断开连接事件，一般是EOF
         _nTick = 0;
-        ErrorL << ex.what();
+        ErrorL << err.what();
         // 广播数据
         NoticeCenter::Instance().emitEvent(NOTICE_DISCONNECT);
     }

plugins/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.8.7)
 
 set(GSD_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
+#message(STATUS "PLUGIN: GSD_ROOT_DIR = ${GSD_ROOT_DIR}")
 
 include(CheckCXXCompilerFlag)
 CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
@@ -29,6 +30,7 @@ set(CMAKE_MODULE_PATH ${GSD_ROOT_DIR}/cmake)
 
 # ---[ rapidjson
 include_directories(${GSD_ROOT_DIR}/3rdparty/)
+include_directories(${GSD_ROOT_DIR}/3rdparty/httplib/)
 include_directories(${GSD_ROOT_DIR}/framework/core/include)
 include_directories(${GSD_ROOT_DIR}/framework/request/include)
 include_directories(${GSD_ROOT_DIR}/modules/Expel/include)

plugins/HttpPlugin/src/HttpPlugin.cpp

@@ -140,6 +140,11 @@ namespace gsd
                         // 西安为开煤气炮
                         expelDevice.deviceType = DeviceType::DeviceGasV2;
                         break;
+
+                    case 8:
+                        //sanya
+                        expelDevice.deviceType = DeviceType::DevicePlayerV5;
+                        break;
                     default:
                         // 协议不存在
                         return;

source/CMakeLists.txt

@@ -13,7 +13,8 @@ endif()
 
 set(CNSTREAM_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../)
 set(SOURCE_ROOT_DIR ${CNSTREAM_ROOT_DIR}/source)
-
+#message(STATUS "SOURCE: CNSTREAM_ROOT_DIR = ${CNSTREAM_ROOT_DIR}")
+#message(STATUS "SOURCE: SOURCE_ROOT_DIR = ${SOURCE_ROOT_DIR}")
 # # compile flags
 # set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -O2")
 # set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -g")
@@ -39,6 +40,9 @@ set(CMAKE_MODULE_PATH ${CNSTREAM_ROOT_DIR}/cmake/sanitizers ${CNSTREAM_ROOT_DIR}
 # ---[ rapidjson
 include_directories(${CNSTREAM_ROOT_DIR}/3rdparty/)
 
+# ---[ httplib
+include_directories(${CNSTREAM_ROOT_DIR}/3rdparty/httplib/)
+
 # ---[ modules include dirs
 include_directories(${CNSTREAM_ROOT_DIR}/modules/Expel/include)
 include_directories(${CNSTREAM_ROOT_DIR}/modules/HttpClient/include)