Merge branch 'dev' into 'master'

Dev

See merge request server/openapi/openapi-cpp-sdk!53

Author: tigersk

.gitignore

@@ -62,3 +62,21 @@ output/Release/openapi_cpp_test.pdb
 Debug/
 Release/
 *.log
+
+output/Windows/Win32/Debug-MD/*.lib
+output/Windows/Win32/Debug-MT/*.lib
+output/Windows/Win32/Release-MD/*.lib
+output/Windows/Win32/Release-MT/*.lib
+
+output/Windows/x64/Debug-MD/*.lib
+output/Windows/x64/Debug-MT/*.lib
+output/Windows/x64/Release-MD/*.lib
+output/Windows/x64/Release-MT/*.lib
+
+output/Mac/Debug/*.dylib
+output/Mac/Debug/*.a
+output/Mac/Release/*.dylib
+output/Mac/Release/*.a
+
+output/Linux/Debug/
+output/Linux/Release/

CMakeLists.txt

@@ -32,7 +32,7 @@ if(UNIX) # Darwing or Linux
     set(Protobuf_PROTOC_LIBRARY "/usr/local/opt/protobuf/lib/libprotoc.dylib")
     set(Protobuf_PROTOC_EXECUTABLE "/usr/local/opt/protobuf/bin/protoc")
 
-    # 查找 Protobuf 包
+    # find Protobuf package
     find_package(Protobuf REQUIRED)
     message(STATUS "Protobuf version: ${Protobuf_VERSION}")
     message(STATUS "Protobuf include dir: ${Protobuf_INCLUDE_DIR}")
@@ -85,7 +85,7 @@ file(GLOB MY_SOURCE_FILES "include/cpprest/*.h" "include/cpprest/details/*.h" "i
 "include/tigerapi/push_socket/*.h" "include/tigerapi/*.h" "src/*.cpp" "src/push_socket/*.cpp")
 add_library(${PROJECT_NAME} cpprest/ ${MY_SOURCE_FILES})
 message(MY_SOURCE_FILES " ${MY_SOURCE_FILES}")
-# 确保生成动态库
+
 set_target_properties(${PROJECT_NAME} PROPERTIES
     SOVERSION ${PROJECT_VERSION}
     VERSION ${PROJECT_VERSION}

README.md

@@ -21,7 +21,7 @@ if(UNIX) # Darwing or Linux
     message(TIGERAPI_INCLUDE_DIR " ${TIGERAPI_INCLUDE_DIR}")
     find_library(TIGERAPI_LIBRARY NAMES libtigerapi.a)
 
-    # 可使用系统库或sdk output中的库
+    # Use system library or sdk output library
     set(Protobuf_INCLUDE_DIR "/usr/local/opt/protobuf/include")
     set(Protobuf_LIBRARY "/usr/local/opt/protobuf/lib/libprotobuf.dylib")
     # find_path(Protobuf_INCLUDE_DIR NAMES google/protobuf/service.h)

changlog.md

@@ -1,4 +1,4 @@
-// openapi_cpp_test.cpp : 此文件包含 "main" 函数。程序执行将在此处开始并结束。
+// openapi_cpp_test.cpp
 #include <functional>
 #include "tigerapi/push_client.h"
 #include "tigerapi/tiger_client.h"

demo/CMakeLists.txt

@@ -39,7 +39,7 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{a0427c13-8778-450a-a8f1-9e4984b882a5}</ProjectGuid>
     <RootNamespace>openapicpptest</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-MD|Win32'" Label="Configuration">

demo/openapi_cpp_test/openapi_cpp_test.cpp

@@ -1,4 +1,4 @@
-/***
+/***
  * Copyright (C) Microsoft. All rights reserved.
  * Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
  *

demo/openapi_cpp_test/openapi_cpp_test.vcxproj

@@ -1,4 +1,4 @@
-/***
+/***
  * Copyright (C) Microsoft. All rights reserved.
  * Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
  *

include/cpprest/astreambuf.h

@@ -1,4 +1,4 @@
-/***
+/***
  * Copyright (C) Microsoft. All rights reserved.
  * Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
  *