Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
2f985c1f
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
2f985c1f
编写于
6月 13, 2022
作者:
wafwerar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
os: fix develop win32 compile error
上级
d6a1149b
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
11 addition
and
5 deletion
+11
-5
cmake/define.inc
cmake/define.inc
+7
-1
src/mnode/src/mnodeUser.c
src/mnode/src/mnodeUser.c
+1
-1
src/plugins/http/src/httpAuth.c
src/plugins/http/src/httpAuth.c
+1
-1
src/util/inc/tkey.h
src/util/inc/tkey.h
+1
-1
src/util/src/tbase64.c
src/util/src/tbase64.c
+1
-1
未找到文件。
cmake/define.inc
浏览文件 @
2f985c1f
...
@@ -242,8 +242,14 @@ IF (TD_WINDOWS)
...
@@ -242,8 +242,14 @@ IF (TD_WINDOWS)
ADD_DEFINITIONS
(
-
DPTW32_BUILD
)
ADD_DEFINITIONS
(
-
DPTW32_BUILD
)
ADD_DEFINITIONS
(
-
D_MBCS
-
D_CRT_SECURE_NO_DEPRECATE
-
D_CRT_NONSTDC_NO_DEPRECATE
)
ADD_DEFINITIONS
(
-
D_MBCS
-
D_CRT_SECURE_NO_DEPRECATE
-
D_CRT_NONSTDC_NO_DEPRECATE
)
SET
(
CMAKE_GENERATOR
"NMake Makefiles"
CACHE
INTERNAL
""
FORCE
)
SET
(
CMAKE_GENERATOR
"NMake Makefiles"
CACHE
INTERNAL
""
FORCE
)
IF
(
CMAKE_DEPFILE_FLAGS_C
)
SET
(
CMAKE_DEPFILE_FLAGS_C
""
)
ENDIF
()
IF
(
CMAKE_DEPFILE_FLAGS_CXX
)
SET
(
CMAKE_DEPFILE_FLAGS_CXX
""
)
ENDIF
()
IF
(
NOT
TD_GODLL
)
IF
(
NOT
TD_GODLL
)
SET
(
COMMON_FLAGS
"/nologo /
WX /
wd4018 /wd4999 /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-"
)
SET
(
COMMON_FLAGS
"/nologo /wd4018 /wd4999 /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-"
)
IF
(
MSVC
AND
(
MSVC_VERSION
GREATER_EQUAL
1900
))
IF
(
MSVC
AND
(
MSVC_VERSION
GREATER_EQUAL
1900
))
SET
(
COMMON_FLAGS
"${COMMON_FLAGS} /Wv:18"
)
SET
(
COMMON_FLAGS
"${COMMON_FLAGS} /Wv:18"
)
ENDIF
()
ENDIF
()
...
...
src/mnode/src/mnodeUser.c
浏览文件 @
2f985c1f
...
@@ -116,7 +116,7 @@ static void mnodePrintUserAuth() {
...
@@ -116,7 +116,7 @@ static void mnodePrintUserAuth() {
pIter
=
mnodeGetNextUser
(
pIter
,
&
pUser
);
pIter
=
mnodeGetNextUser
(
pIter
,
&
pUser
);
if
(
pUser
==
NULL
)
break
;
if
(
pUser
==
NULL
)
break
;
char
*
base64
=
base64_encode
((
const
unsigned
char
*
)
pUser
->
pass
,
TSDB_KEY_LEN
*
2
);
char
*
base64
=
taos_
base64_encode
((
const
unsigned
char
*
)
pUser
->
pass
,
TSDB_KEY_LEN
*
2
);
fprintf
(
fp
,
"user:%24s auth:%s
\n
"
,
pUser
->
user
,
base64
);
fprintf
(
fp
,
"user:%24s auth:%s
\n
"
,
pUser
->
user
,
base64
);
free
(
base64
);
free
(
base64
);
...
...
src/plugins/http/src/httpAuth.c
浏览文件 @
2f985c1f
...
@@ -104,7 +104,7 @@ int32_t httpGenTaosdAuthToken(HttpContext *pContext, char *token, int32_t maxLen
...
@@ -104,7 +104,7 @@ int32_t httpGenTaosdAuthToken(HttpContext *pContext, char *token, int32_t maxLen
tstrncpy
(
buffer
+
sizeof
(
pContext
->
user
),
pContext
->
pass
,
size
);
tstrncpy
(
buffer
+
sizeof
(
pContext
->
user
),
pContext
->
pass
,
size
);
char
*
encrypt
=
taosDesEncode
(
KEY_DES_4
,
buffer
,
TSDB_USER_LEN
+
HTTP_PASSWORD_LEN
);
char
*
encrypt
=
taosDesEncode
(
KEY_DES_4
,
buffer
,
TSDB_USER_LEN
+
HTTP_PASSWORD_LEN
);
char
*
base64
=
base64_encode
((
const
unsigned
char
*
)
encrypt
,
TSDB_USER_LEN
+
HTTP_PASSWORD_LEN
);
char
*
base64
=
taos_
base64_encode
((
const
unsigned
char
*
)
encrypt
,
TSDB_USER_LEN
+
HTTP_PASSWORD_LEN
);
size_t
len
=
strlen
(
base64
);
size_t
len
=
strlen
(
base64
);
tstrncpy
(
token
,
base64
,
len
+
1
);
tstrncpy
(
token
,
base64
,
len
+
1
);
...
...
src/util/inc/tkey.h
浏览文件 @
2f985c1f
...
@@ -25,7 +25,7 @@ extern "C" {
...
@@ -25,7 +25,7 @@ extern "C" {
#include "tutil.h"
#include "tutil.h"
unsigned
char
*
base64_decode
(
const
char
*
value
,
int
inlen
,
int
*
outlen
);
unsigned
char
*
base64_decode
(
const
char
*
value
,
int
inlen
,
int
*
outlen
);
char
*
base64_encode
(
const
unsigned
char
*
value
,
int
vlen
);
char
*
taos_
base64_encode
(
const
unsigned
char
*
value
,
int
vlen
);
char
*
taosDesEncode
(
int64_t
key
,
char
*
src
,
int
len
);
char
*
taosDesEncode
(
int64_t
key
,
char
*
src
,
int
len
);
char
*
taosDesDecode
(
int64_t
key
,
char
*
src
,
int
len
);
char
*
taosDesDecode
(
int64_t
key
,
char
*
src
,
int
len
);
...
...
src/util/src/tbase64.c
浏览文件 @
2f985c1f
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
// deprecated this file for bug prone
// deprecated this file for bug prone
// base64 encode
// base64 encode
static
char
basis_64
[]
=
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
;
static
char
basis_64
[]
=
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
;
char
*
base64_encode
(
const
unsigned
char
*
value
,
int
vlen
)
{
char
*
taos_
base64_encode
(
const
unsigned
char
*
value
,
int
vlen
)
{
unsigned
char
oval
=
0
;
unsigned
char
oval
=
0
;
char
*
result
=
(
char
*
)
malloc
((
size_t
)(
vlen
*
4
)
/
3
+
10
);
char
*
result
=
(
char
*
)
malloc
((
size_t
)(
vlen
*
4
)
/
3
+
10
);
char
*
out
=
result
;
char
*
out
=
result
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录