Merge branch 'feature_mac' into dev

Author: tigersk

.gitignore

@@ -35,7 +35,26 @@
 .vscode
 *.dSYM
 .idea
-
+.DS_store
 cmake-build-debug
 build
-
+*-build
+        demo/openapi_cpp_test/Debug/
+        demo/openapi_cpp_test/Release/
+        demo/openapi_cpp_test/myeasylog.log
+        output/Debug/openapi-cpp-sdk.exp
+        output/Debug/openapi-cpp-sdk.ilk
+        output/Debug/openapi-cpp-sdk.pdb
+        output/Debug/openapi_cpp_test.ilk
+        output/Debug/openapi_cpp_test.pdb
+        output/Release/openapi-cpp-sdk.exp
+        output/Release/openapi-cpp-sdk.pdb
+        output/Release/openapi_cpp_test.iobj
+        output/Release/openapi_cpp_test.ipdb
+        output/Release/openapi_cpp_test.pdb
+/output/Release/openapi-cpp-sdk.ipdb
+/output/Release/openapi-cpp-sdk.iobj
+
+Debug/
+Release/
+*.log

CHANGELOG.md

@@ -16,7 +16,7 @@ project(tigerapi VERSION ${PROJECT_VERSION})
 
 # Configure required libraries ...
 if(UNIX) # Darwing or Linux
-    
+
     find_package(Boost REQUIRED COMPONENTS system thread log program_options chrono)
     find_package(Threads REQUIRED)
 
@@ -31,7 +31,7 @@ if(UNIX) # Darwing or Linux
         # file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl*/*)
         file(GLOB OPENSSL_ROOT_DIR /usr/local/opt/openssl/*)
         # Prefer the latest (make the latest one first)
-	    list(REVERSE OPENSSL_ROOT_DIR)
+        list(REVERSE OPENSSL_ROOT_DIR)
 
         find_package(OpenSSL 1.1 REQUIRED)
         set(OPENSSL_VERSION "1.1.1q")
@@ -42,42 +42,8 @@ if(UNIX) # Darwing or Linux
         set(OPENSSL_VERSION "1.0.1")
     endif()
 
-elseif(WIN32) # Windows systems including Win64.
-    #set(CMAKE_PREFIX_PATH "D:/projects/vcpkg/packages/")
-    SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "D:/projects/boost_1_81_0")
-    SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "D:/projects/boost_1_81_0/lib")
-    FIND_PACKAGE(Boost)
-    IF (Boost_FOUND)
-        INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
-        ADD_DEFINITIONS( "-DHAS_BOOST" )
-    ENDIF()
-
-    #find_package(Boost REQUIRED COMPONENTS system thread log program_options chrono)
-    #find_package(Threads REQUIRED)
-
-
-    file(GLOB OPENSSL_ROOT_DIR D:/projects/vcpkg/packages/openssl_x86-windows/*)
-        # Prefer the latest (make the latest one first)
-	list(REVERSE OPENSSL_ROOT_DIR)
-    find_package(OpenSSL REQUIRED)
-
-    #file(GLOB cpprestsdk_DIR D:/projects/vcpkg/packages/cpprestsdk_x86-windows/share/*)
-    #list(REVERSE cpprestsdk_DIR)
-   # find_package(cpprestsdk CONFIG REQUIRED)
-        # cpprest
-    #find_path(CPPREST_INCLUDE_DIR NAMES cpprest/http_client.h cpprest/http_msg.h)
-    #find_library(CPPREST_LIBRARY NAMES cpprest)
-
-
-
-    #file(GLOB ZLIB_ROOT D:/projects/vcpkg/packages/zlib_x86-windows/*)
-    #(REVERSE ZLIB_ROOT)
-    #find_package(ZLIB REQUIRED)
-
-    #set(CMAKE_PREFIX_PATH "D:/projects/vcpkg/packages/brotli_x86-windows/share/unofficial-brotli")
-    #file(GLOB unofficial-brotli_DIR D:/projects/vcpkg/packages/brotli_x86-windows/*)
-    #list(REVERSE unofficial-brotli_DIR)
-    #find_package(unofficial-brotli CONFIG REQUIRED)
+elseif(WIN32)
+    message(FATAL_ERROR "-- please compile via Visual Studio ")
 else()
     message(FATAL_ERROR "-- Unsupported platform sorry! :( ")
 endif()
@@ -94,15 +60,17 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -DBOOST_LOG_DYN_LINK")
 
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-        add_compile_options(/D BOOST_LOG_DYN_LINK /MT)
 endif()
 
 # Project construction ...
 # src files ...
-add_executable(${PROJECT_NAME} src/main.cpp src/base64.h
+add_library(${PROJECT_NAME} src/common/base64.h
         src/tiger_client.cpp include/tigerapi/tiger_client.h include/tigerapi/constants.h
-        include/tigerapi/utils.h src/utils.cpp include/tigerapi/service_types.h include/tigerapi/quote_client.h src/quote_client.cpp src/trade_client.cpp include/tigerapi/model.h src/order_util.cpp include/tigerapi/order_util.h src/contract_util.cpp include/tigerapi/contract_util.h include/tigerapi/client_config.h include/tigerapi/log.h src/common/sign_util.h)
+        include/tigerapi/utils.h src/utils.cpp include/tigerapi/service_types.h include/tigerapi/quote_client.h
+        src/quote_client.cpp src/trade_client.cpp include/tigerapi/model.h src/order_util.cpp
+        include/tigerapi/order_util.h src/contract_util.cpp include/tigerapi/contract_util.h
+        include/tigerapi/client_config.h src/common/sign_util.h
+        include/common/easylogging++.h src/common/easylogging++.cc)
 
 # headers search paths ...
 #set(HEADER_SEARCH_PATHS ${CPPREST_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
@@ -114,10 +82,6 @@ if(APPLE)
     set(ZIP_LIBRARY "/usr/local/Cellar/zlib/1.2.12/lib/libz.dylib")
 
     set(LIBRARIES_SEARCH_PATHS ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${CPPREST_LIBRARY} ${ZIP_LIBRARY})
-elseif(WIN32)
-    set(ZIP_LIBRARY "D:/projects/vcpkg/packages/zlib_x86-windows/zlib_x86-windows/lib/zlib.lib")
-    set(OPENSSL_LIBS "${OPENSSL_LIBRARIES}")
-    set(LIBRARIES_SEARCH_PATHS  ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${ZIP_LIBRARY})
 else()
     set(OPENSSL_LIBS "${OPENSSL_LIBRARIES}")
     set(LIBRARIES_SEARCH_PATHS ${CPPREST_LIBRARY} ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${ZIP_LIBRARY})
@@ -141,7 +105,8 @@ else()
 
 endif()
 
-#set(CMAKE_INSTALL_PREFIX "./")
+
+
 
 install(DIRECTORY include/
         DESTINATION "include"

CMakeLists.txt

@@ -10,9 +10,9 @@
 brew install boost 
 ```
 
-安装方式二：源码安装 
+安装方式二：源码安装
 1. 下载源码到任意路径： https://www.boost.org/users/history/version_1_81_0.html,  
-    以 /usr/local/ 为例
+   以 /usr/local/ 为例
     ```shell
     cd /usr/local/
     wget https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2
@@ -47,26 +47,42 @@ make install
 [参考文档](https://github.com/Microsoft/cpprestsdk/wiki/Getting-Started-Tutorial)
 直接通过包管理软件安装的 cpprestsdk 可能不是最新版本， 可能会有未知问题
 
-### 编译安装 tigerapi sdk
+### 编译 tigerapi sdk
+若使用编译好的sdk，此步骤可跳过  
+准备工作：根据系统环境调整 CMakeLists.txt 的相关路径
+
+1. 进入源码目录
+2. 创建编译目录
+   ```
+   mkdir build
+   cd build
+   ```
+3. 编译
+```
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug ..
+make -j 6
+make install
+```
+
+### 安装 tigerapi sdk
+将头文件放入头文件路径， 如 /usr/local/include
+将库文件放入库文件路径， 如 /usr/local/lib/
+
+
+### 验证测试
+编译运行demo项目
+
 
 
 ## Windows
 依赖：Visual Stodio C++ 开发环境 https://visualstudio.microsoft.com/zh-hans/
-下载安装Visual Stodio Installer，勾选 "使用C++的桌面开发" 
+下载安装Visual Stodio Installer，勾选 "使用C++的桌面开发"
+
+使用[vcpkg](https://vcpkg.io/en/getting-started.html)
+
 
 ### 安装 boost
 [参考文档](https://www.boost.org/doc/libs/1_81_0/more/getting_started/windows.html)
-
-- 方式一：使用源码安装
-说明，对于Windows使用Cygwin或WSL的，参考Linux的步骤
-1. 下载 https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.zip
-2. 解压到任意目录， 如 D:\boost_1_81_0
-3. 编译
-    ``` 
-    bootstrap.bat
-    .\b2
-    ```
-- 方式二：使用[vcpkg](https://vcpkg.io/en/getting-started.html)
 ``` 
 vcpkg install boost
 ```
@@ -76,30 +92,12 @@ vcpkg install boost
 vcpkg install openssl
 ```
 
-### 编译安装 cpprestsdk
-
-- 方式一：源码安装  
-1. `git clone https://github.com/Microsoft/cpprestsdk.git`
-2. `vcpkg install --triplet x64-windows zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli`
-3. 编译  
-``` 
-cd cpprestsdk
-
-cpprestsdk> mkdir build.x64
-cpprestsdk> cd build.x64
-cpprestsdk/build.x64> cmake ../Release -A x64 -DCMAKE_TOOLCHAIN_FILE=/REPLACE_THIS_WITH_PATH_TO/vcpkg/scripts/buildsystems/vcpkg.cmake
-```
-
-
-- 方式二：使用vcpkg  
-
+### 安装 cpprestsdk
 ```
 PS> vcpkg install cpprestsdk cpprestsdk:x64-windows
 ```
 
-
-### 编译 tigerapi sdk
-
+### 安装 tigerapi sdk
 
 
 
@@ -110,7 +108,7 @@ dyld: Library not loaded: /usr/local/opt/icu4c/lib/libicudata.70.dylib
   Referenced from: /usr/local/opt/boost/lib/libboost_log-mt.dylib
   Reason: image not found
 ```
-Fix: 
+Fix:
 ``` 
 cd /usr/local/opt/icu4c/lib
 ln -s libicudata.dylib libicudata.70.dylib

README.md

@@ -0,0 +1,87 @@
+cmake_minimum_required(VERSION 3.0)
+
+
+project(openapi_cpp_test)
+
+
+# Configure required libraries ...
+if(UNIX) # Darwing or Linux
+
+    find_package(Boost REQUIRED COMPONENTS system thread log program_options chrono)
+    find_package(Threads REQUIRED)
+
+    # cpprest
+    find_path(CPPREST_INCLUDE_DIR NAMES cpprest/http_client.h cpprest/http_msg.h)
+    find_library(CPPREST_LIBRARY NAMES cpprest)
+    message(CPPREST_INCLUDE_DIR " ${CPPREST_INCLUDE_DIR}")
+    message(CPPREST_LIBRARY " ${CPPREST_LIBRARY}")
+
+    # tigerapi
+    find_path(TIGERAPI_INCLUDE_DIR NAMES common/easylogging++.h tigerapi/client_config.h )
+    find_library(TIGERAPI_LIBRARY NAMES libtigerapi.a)
+
+    if(APPLE)
+        # Prefer a homebrew version of OpenSSL over the one in /usr/lib
+        # file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl*/*)
+        file(GLOB OPENSSL_ROOT_DIR /usr/local/opt/openssl/*)
+        # Prefer the latest (make the latest one first)
+        list(REVERSE OPENSSL_ROOT_DIR)
+
+        find_package(OpenSSL 1.1 REQUIRED)
+        set(OPENSSL_VERSION "1.1.1q")
+
+
+    else()
+        find_package(OpenSSL 1.0.1 REQUIRED)
+        set(OPENSSL_VERSION "1.0.1")
+    endif()
+
+elseif(WIN32) # Windows systems including Win64.
+    message(FATAL_ERROR "-- please compile by visual studio")
+else()
+    message(FATAL_ERROR "-- Unsupported platform sorry! :( ")
+endif()
+
+# Configure compiler options ...
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+
+    message("-- configuring clang options")
+    set(CMAKE_CXX_FLAGS "-arch x86_64 -std=c++11 -stdlib=libc++ -DBOOST_LOG_DYN_LINK -Wno-deprecated-declarations")
+
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+
+    message("-- configuring gcc options")
+
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -DBOOST_LOG_DYN_LINK")
+endif()
+
+# Project construction ...
+# src files ...
+add_executable(${PROJECT_NAME} openapi_cpp_test/openapi_cpp_test.cpp)
+
+# headers search paths ...
+set(HEADER_SEARCH_PATHS ${CPPREST_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} ${TIGERAPI_INCLUDE_DIR})
+
+# library search paths ...
+if(APPLE)
+    set(OPENSSL_LIBS "${OPENSSL_LIBRARIES}")
+    set(ZIP_LIBRARY "/usr/local/Cellar/zlib/1.2.12/lib/libz.dylib")
+    set(LIBRARIES_SEARCH_PATHS ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${ZIP_LIBRARY} ${CPPREST_LIBRARY} ${TIGERAPI_LIBRARY})
+else()
+    set(OPENSSL_LIBS "${OPENSSL_LIBRARIES}")
+    set(LIBRARIES_SEARCH_PATHS ${OPENSSL_LIBS} ${Boost_LIBRARIES} ${ZIP_LIBRARY} ${CPPREST_LIBRARY} ${TIGERAPI_LIBRARY})
+endif()
+
+message(LIBRARIES_SEARCH_PATHS " ${LIBRARIES_SEARCH_PATHS}")
+
+include_directories(${HEADER_SEARCH_PATHS})
+if (APPLE)
+    target_link_libraries(${PROJECT_NAME} "-framework CoreFoundation")
+    target_link_libraries(${PROJECT_NAME} "-framework Security")
+    target_link_libraries(${PROJECT_NAME} ${LIBRARIES_SEARCH_PATHS})
+    set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-W1, -F/Library/Frameworks ")
+else()
+    target_link_libraries(${PROJECT_NAME} ${LIBRARIES_SEARCH_PATHS})
+    target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto)
+
+endif()