Skip to content

Commit 69bbe77

Browse files
tigersktigersk
committed
Merge branch 'dev_token_chengxin' into 'feat_token'
【ENH】去掉boost filesystem的依赖 See merge request server/openapi/openapi-cpp-sdk!55
2 parents 40577c4 + c7d445b commit 69bbe77

File tree

7 files changed

+35
-115
lines changed

7 files changed

+35
-115
lines changed

‎demo/openapi_cpp_test/openapi_cpp_test.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<ClCompile>
161161
<WarningLevel>Level3</WarningLevel>
162162
<SDLCheck>true</SDLCheck>
163-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
163+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
164164
<ConformanceMode>true</ConformanceMode>
165165
<AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
166166
</ClCompile>
@@ -175,7 +175,7 @@
175175
<ClCompile>
176176
<WarningLevel>Level3</WarningLevel>
177177
<SDLCheck>true</SDLCheck>
178-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
178+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
179179
<ConformanceMode>true</ConformanceMode>
180180
<AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
181181
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -191,7 +191,7 @@
191191
<ClCompile>
192192
<WarningLevel>Level3</WarningLevel>
193193
<SDLCheck>true</SDLCheck>
194-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195195
<ConformanceMode>true</ConformanceMode>
196196
<AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
197197
</ClCompile>
@@ -206,7 +206,7 @@
206206
<ClCompile>
207207
<WarningLevel>Level3</WarningLevel>
208208
<SDLCheck>true</SDLCheck>
209-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
209+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
210210
<ConformanceMode>true</ConformanceMode>
211211
<AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
212212
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -224,7 +224,7 @@
224224
<FunctionLevelLinking>true</FunctionLevelLinking>
225225
<IntrinsicFunctions>true</IntrinsicFunctions>
226226
<SDLCheck>true</SDLCheck>
227-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
227+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
228228
<ConformanceMode>true</ConformanceMode>
229229
<AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
230230
</ClCompile>
@@ -243,7 +243,7 @@
243243
<FunctionLevelLinking>true</FunctionLevelLinking>
244244
<IntrinsicFunctions>true</IntrinsicFunctions>
245245
<SDLCheck>true</SDLCheck>
246-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
246+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
247247
<ConformanceMode>true</ConformanceMode>
248248
<AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
249249
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -263,7 +263,7 @@
263263
<FunctionLevelLinking>true</FunctionLevelLinking>
264264
<IntrinsicFunctions>true</IntrinsicFunctions>
265265
<SDLCheck>true</SDLCheck>
266-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
266+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
267267
<ConformanceMode>true</ConformanceMode>
268268
<AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
269269
</ClCompile>
@@ -282,7 +282,7 @@
282282
<FunctionLevelLinking>true</FunctionLevelLinking>
283283
<IntrinsicFunctions>true</IntrinsicFunctions>
284284
<SDLCheck>true</SDLCheck>
285-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
285+
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
286286
<ConformanceMode>true</ConformanceMode>
287287
<AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories>
288288
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎include/tigerapi/client_config.h‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,13 @@ namespace TIGER_API {
184184
}
185185

186186
utility::string_t get_props_path(const utility::string_t &filename) const {
187-
if (!props_path.empty()) {
187+
if (!props_path.empty())
188+
{
188189
if (Utils::is_directory(props_path)) {
189-
return Utils::path_join(props_path, filename);
190-
} else {
191-
utility::string_t dirname = Utils::path_dirname(props_path);
192-
return Utils::path_join(dirname, filename);
193-
}
190+
return props_path + filename;
191+
}
194192
}
193+
return U("");
195194
}
196195

197196
utility::string_t get_token_path() const {
@@ -203,11 +202,6 @@ namespace TIGER_API {
203202
if (full_path.empty()) {
204203
return;
205204
}
206-
// if not exist, return
207-
if (!Utils::is_file(full_path)) {
208-
LOG(DEBUG) << U("Token file not found: ") << full_path << endl;
209-
return;
210-
}
211205
try {
212206
std::ifstream file(Utils::str16to8(full_path));
213207
if (!file.is_open()) {

‎include/tigerapi/sign_util.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ namespace TIGER_API {
7070

7171
RSA *rsa = create_rsa((utility::char_t *) key.c_str(), true);
7272
if (rsa == nullptr) {
73-
throw std::runtime_error(Utils::str16to8("RSA creation failed, please check your private key"));
73+
throw std::runtime_error("RSA creation failed, please check your private key");
7474
}
7575

7676
int ret = RSA_sign(NID_sha1, hash, SHA_DIGEST_LENGTH,
7777
encrypted, &encrypted_length, rsa);
7878

7979
if (ret != 1) {
80-
throw std::runtime_error(Utils::str16to8("RSA_sign failed"));
80+
throw std::runtime_error("RSA_sign failed");
8181
}
8282

8383
utility::string_t s(encrypted, encrypted + encrypted_length);
@@ -99,7 +99,7 @@ namespace TIGER_API {
9999

100100
RSA *rsa = create_rsa((utility::char_t *) key.c_str(), false);
101101
if (rsa == nullptr) {
102-
throw std::runtime_error(Utils::str16to8("RSA creation failed, please check your private key"));
102+
throw std::runtime_error("RSA creation failed, please check your private key");
103103
}
104104
int ret = -1;
105105
if (vec_base64_decode.size() > 0) {

‎include/tigerapi/utils.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ namespace TIGER_API {
4545
static utility::string_t double_to_string(double num, int precision = 1);
4646

4747
static bool is_directory(const utility::string_t& path);
48-
49-
static bool is_file(const utility::string_t& path);
50-
51-
static utility::string_t path_dirname(const utility::string_t& path);
52-
53-
static utility::string_t path_join(const utility::string_t& path1, const utility::string_t& path2);
5448
};
5549
}
5650
#endif //CPPSDK_UTILS_H

‎openapi-cpp-sdk.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<ClCompile>
161161
<WarningLevel>Level3</WarningLevel>
162162
<SDLCheck>true</SDLCheck>
163-
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;INSIDE_OPENAPI;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
163+
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;_CRT_SECURE_NO_WARNINGS;INSIDE_OPENAPI;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
164164
<ConformanceMode>true</ConformanceMode>
165165
<PrecompiledHeader>NotUsing</PrecompiledHeader>
166166
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -180,7 +180,7 @@
180180
<ClCompile>
181181
<WarningLevel>Level3</WarningLevel>
182182
<SDLCheck>true</SDLCheck>
183-
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;INSIDE_OPENAPI;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
183+
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;_CRT_SECURE_NO_WARNINGS;INSIDE_OPENAPI;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
184184
<ConformanceMode>true</ConformanceMode>
185185
<PrecompiledHeader>NotUsing</PrecompiledHeader>
186186
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -200,7 +200,7 @@
200200
<ClCompile>
201201
<WarningLevel>Level3</WarningLevel>
202202
<SDLCheck>true</SDLCheck>
203-
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;INSIDE_OPENAPI;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
203+
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;_CRT_SECURE_NO_WARNINGS;INSIDE_OPENAPI;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
204204
<ConformanceMode>true</ConformanceMode>
205205
<PrecompiledHeader>NotUsing</PrecompiledHeader>
206206
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -220,7 +220,7 @@
220220
<ClCompile>
221221
<WarningLevel>Level3</WarningLevel>
222222
<SDLCheck>true</SDLCheck>
223-
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;INSIDE_OPENAPI;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
223+
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;_CRT_SECURE_NO_WARNINGS;INSIDE_OPENAPI;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
224224
<ConformanceMode>true</ConformanceMode>
225225
<PrecompiledHeader>NotUsing</PrecompiledHeader>
226226
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -242,7 +242,7 @@
242242
<FunctionLevelLinking>true</FunctionLevelLinking>
243243
<IntrinsicFunctions>true</IntrinsicFunctions>
244244
<SDLCheck>true</SDLCheck>
245-
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;INSIDE_OPENAPI;NDEBUG;OPENAPICPPSDK_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
245+
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;_CRT_SECURE_NO_WARNINGS;INSIDE_OPENAPI;NDEBUG;OPENAPICPPSDK_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
246246
<ConformanceMode>true</ConformanceMode>
247247
<PrecompiledHeader>NotUsing</PrecompiledHeader>
248248
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -266,7 +266,7 @@
266266
<FunctionLevelLinking>true</FunctionLevelLinking>
267267
<IntrinsicFunctions>true</IntrinsicFunctions>
268268
<SDLCheck>true</SDLCheck>
269-
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;INSIDE_OPENAPI;NDEBUG;OPENAPICPPSDK_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
269+
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;_CRT_SECURE_NO_WARNINGS;INSIDE_OPENAPI;NDEBUG;OPENAPICPPSDK_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
270270
<ConformanceMode>true</ConformanceMode>
271271
<PrecompiledHeader>NotUsing</PrecompiledHeader>
272272
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -291,7 +291,7 @@
291291
<FunctionLevelLinking>true</FunctionLevelLinking>
292292
<IntrinsicFunctions>true</IntrinsicFunctions>
293293
<SDLCheck>true</SDLCheck>
294-
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;INSIDE_OPENAPI;NDEBUG;OPENAPICPPSDK_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
294+
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;_CRT_SECURE_NO_WARNINGS;INSIDE_OPENAPI;NDEBUG;OPENAPICPPSDK_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
295295
<ConformanceMode>true</ConformanceMode>
296296
<PrecompiledHeader>NotUsing</PrecompiledHeader>
297297
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -315,7 +315,7 @@
315315
<FunctionLevelLinking>true</FunctionLevelLinking>
316316
<IntrinsicFunctions>true</IntrinsicFunctions>
317317
<SDLCheck>true</SDLCheck>
318-
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;INSIDE_OPENAPI;NDEBUG;OPENAPICPPSDK_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
318+
<PreprocessorDefinitions>WIN32;OPEN_API_BUILD_DLL;_CRT_SECURE_NO_WARNINGS;INSIDE_OPENAPI;NDEBUG;OPENAPICPPSDK_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
319319
<ConformanceMode>true</ConformanceMode>
320320
<PrecompiledHeader>NotUsing</PrecompiledHeader>
321321
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>

‎src/tiger_client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ namespace TIGER_API {
125125
bool is_sign_ok = Utils::verify_sign(client_config.get_server_pub_key(), params[P_TIMESTAMP].as_string(), res_sign);
126126
if (!is_sign_ok) {
127127
LOG(ERROR) << U("Exception: response sign verify failed. ");
128-
throw std::runtime_error(Utils::str16to8("Exception: response sign verify failed").c_str());
128+
throw std::runtime_error("Exception: response sign verify failed");
129129
}
130130
result_data = result[P_DATA];
131131
}

‎src/utils.cpp‎

Lines changed: 10 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,9 @@
55
#include <algorithm>
66
#include <regex>
77
#include "../include/tigerapi/sign_util.h"
8-
#include <boost/filesystem.hpp>
9-
10-
#ifdef _WIN32
11-
#include <direct.h>
12-
#include <io.h>
13-
#define ACCESS _access
14-
#define STAT _stat
15-
struct stat {
16-
unsigned short st_mode;
17-
};
18-
#define S_ISDIR(mode) ((mode) & _S_IFDIR)
19-
#else
20-
#include <unistd.h>
21-
#include <sys/stat.h>
22-
#define ACCESS access
23-
#endif
248

259
using namespace std;
2610
using namespace web;
27-
namespace fs = boost::filesystem;
2811

2912
namespace TIGER_API {
3013
utility::string_t Utils::str8to16(std::string s) {
@@ -211,66 +194,15 @@ namespace TIGER_API {
211194
return Utils::str8to16(result);
212195
}
213196

214-
bool Utils::is_directory(const utility::string_t& path) {
215-
try {
216-
#ifdef _WIN32
217-
fs::path fs_path(path);
218-
#else
219-
fs::path fs_path(utility::conversions::to_utf8string(path));
220-
#endif
221-
return fs::is_directory(fs_path);
222-
} catch (const std::exception&) {
223-
return false;
224-
}
225-
}
197+
bool Utils::is_directory(const utility::string_t& path) {
198+
if (path.empty()) {
199+
return false;
200+
}
226201

227-
bool Utils::is_file(const utility::string_t& path) {
228-
try {
229-
#ifdef _WIN32
230-
fs::path fs_path(path);
231-
#else
232-
fs::path fs_path(utility::conversions::to_utf8string(path));
233-
#endif
234-
return fs::is_regular_file(fs_path);
235-
} catch (const std::exception&) {
236-
return false;
237-
}
238-
}
239-
240-
utility::string_t Utils::path_dirname(const utility::string_t& path) {
241-
try {
242-
#ifdef _WIN32
243-
fs::path fs_path(path);
244-
#else
245-
fs::path fs_path(utility::conversions::to_utf8string(path));
246-
#endif
247-
248-
auto parent_path = fs_path.parent_path();
249-
250-
#ifdef _WIN32
251-
return parent_path.wstring();
252-
#else
253-
return utility::conversions::to_string_t(parent_path.string());
254-
#endif
255-
} catch (const std::exception&) {
256-
return utility::string_t();
257-
}
258-
}
259-
260-
utility::string_t Utils::path_join(const utility::string_t& path1, const utility::string_t& path2) {
261-
try {
262-
#ifdef _WIN32
263-
fs::path p1(path1);
264-
fs::path p2(path2);
265-
auto result = (p1 / p2).wstring();
266-
#else
267-
fs::path p1(utility::conversions::to_utf8string(path1));
268-
fs::path p2(utility::conversions::to_utf8string(path2));
269-
auto result = utility::conversions::to_string_t((p1 / p2).string());
270-
#endif
271-
return result;
272-
} catch (const std::exception&) {
273-
return utility::string_t();
274-
}
275-
}
202+
#ifdef _WIN32
203+
return path.back() == U('\\') || path.back() == U('/');
204+
#else
205+
return path.back() == U('/');
206+
#endif
207+
}
276208
}

0 commit comments

Comments
 (0)