Merge pull request #506 from crypto-chassis/develop

Release

Author: cryptochassis

example/CMakeLists.txt

@@ -14,65 +14,53 @@ endif()
 message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 get_filename_component(CCAPI_PROJECT_DIR ../ ABSOLUTE)
 message(STATUS "CCAPI_PROJECT_DIR: ${CCAPI_PROJECT_DIR}")
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  message(STATUS "use boost beast websocket")
-  if(NOT BOOST_INCLUDE_DIR)
-    include(ExternalProject)
-    ExternalProject_Add(
-      boost
-      URL https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz
-      SOURCE_DIR "${CMAKE_BINARY_DIR}/boost"
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      TEST_COMMAND "")
-    set(BOOST_INCLUDE_DIR "${CMAKE_BINARY_DIR}/boost")
-  else()
-    add_library(boost INTERFACE)
-  endif()
-  if(NOT RAPIDJSON_INCLUDE_DIR)
-    include(ExternalProject)
-    ExternalProject_Add(
-      rapidjson
-      URL https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
-      SOURCE_DIR "${CMAKE_BINARY_DIR}/rapidjson"
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      TEST_COMMAND "")
-    set(RAPIDJSON_INCLUDE_DIR "${CMAKE_BINARY_DIR}/rapidjson/include")
-  else()
-    add_library(rapidjson INTERFACE)
-  endif()
-  if(NOT HFFIX_INCLUDE_DIR)
-    include(ExternalProject)
-    ExternalProject_Add(
-      hffix
-      URL https://github.com/jamesdbrock/hffix/archive/refs/tags/v1.4.1.tar.gz
-      SOURCE_DIR "${CMAKE_BINARY_DIR}/hffix"
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      INSTALL_COMMAND ""
-      TEST_COMMAND "")
-    set(HFFIX_INCLUDE_DIR "${CMAKE_BINARY_DIR}/hffix/include")
-  else()
-    add_library(hffix INTERFACE)
-  endif()
-  include_directories(
-    ${CCAPI_PROJECT_DIR}/include ${BOOST_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR}
-    ${HFFIX_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
+
+if(NOT BOOST_INCLUDE_DIR)
+  include(ExternalProject)
+  ExternalProject_Add(
+    boost
+    URL https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz
+    SOURCE_DIR "${CMAKE_BINARY_DIR}/boost"
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    TEST_COMMAND "")
+  set(BOOST_INCLUDE_DIR "${CMAKE_BINARY_DIR}/boost")
 else()
-  message(STATUS "use websocketpp")
-  add_compile_definitions(CCAPI_LEGACY_USE_WEBSOCKETPP)
-  set(RAPIDJSON_INCLUDE_DIR ${CCAPI_PROJECT_DIR}/dependency/rapidjson/include)
-  set(WEBSOCKETPP_INCLUDE_DIR ${CCAPI_PROJECT_DIR}/dependency/websocketpp)
-  set(BOOST_INCLUDE_DIR ${CCAPI_PROJECT_DIR}/dependency/boost)
-  set(HFFIX_INCLUDE_DIR ${CCAPI_PROJECT_DIR}/dependency/hffix/include)
-  include_directories(
-    ${CCAPI_PROJECT_DIR}/include ${WEBSOCKETPP_INCLUDE_DIR}
-    ${BOOST_INCLUDE_DIR} ${HFFIX_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR}
-    ${OPENSSL_INCLUDE_DIR})
+  add_library(boost INTERFACE)
 endif()
+if(NOT RAPIDJSON_INCLUDE_DIR)
+  include(ExternalProject)
+  ExternalProject_Add(
+    rapidjson
+    URL https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.tar.gz
+    SOURCE_DIR "${CMAKE_BINARY_DIR}/rapidjson"
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    TEST_COMMAND "")
+  set(RAPIDJSON_INCLUDE_DIR "${CMAKE_BINARY_DIR}/rapidjson/include")
+else()
+  add_library(rapidjson INTERFACE)
+endif()
+if(NOT HFFIX_INCLUDE_DIR)
+  include(ExternalProject)
+  ExternalProject_Add(
+    hffix
+    URL https://github.com/jamesdbrock/hffix/archive/refs/tags/v1.4.1.tar.gz
+    SOURCE_DIR "${CMAKE_BINARY_DIR}/hffix"
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    TEST_COMMAND "")
+  set(HFFIX_INCLUDE_DIR "${CMAKE_BINARY_DIR}/hffix/include")
+else()
+  add_library(hffix INTERFACE)
+endif()
+include_directories(
+  ${CCAPI_PROJECT_DIR}/include ${BOOST_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR}
+  ${HFFIX_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
+
 find_package(OpenSSL REQUIRED)
 set(ADDITIONAL_LINK_LIBRARIES "")
 if(WIN32)

example/src/fix_advanced/CMakeLists.txt

@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_FIX)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson hffix)
-endif()
+add_dependencies(${NAME} boost rapidjson hffix)

example/src/fix_simple/CMakeLists.txt

@@ -3,6 +3,4 @@ project(${NAME})
 add_compile_definitions(CCAPI_ENABLE_SERVICE_FIX)
 add_compile_definitions(CCAPI_ENABLE_EXCHANGE_COINBASE)
 add_executable(${NAME} main.cpp)
-if(NOT CCAPI_LEGACY_USE_WEBSOCKETPP)
-  add_dependencies(${NAME} boost rapidjson hffix)
-endif()
+add_dependencies(${NAME} boost rapidjson hffix)

include/ccapi_cpp/ccapi_macro.h

@@ -1213,7 +1213,7 @@
 #define CCAPI_BITGET_API_CHANNEL_API_CODE "95mpa"
 #endif
 #ifndef CCAPI_GATEIO_API_CHANNEL_ID
-#define CCAPI_GATEIO_API_CHANNEL_ID "cryptochassis"
+#define CCAPI_GATEIO_API_CHANNEL_ID "cryptochassis2"
 #endif
 #ifndef CCAPI_MEXC_API_SOURCE
 #define CCAPI_MEXC_API_SOURCE "CHAS"