Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
9001b395
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
9001b395
编写于
4月 13, 2023
作者:
sangshuduo
提交者:
GitHub
4月 13, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: improve taos shell user experience for connecting cloud (#20912)
上级
1d48f55e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
8 deletion
+21
-8
compile_flags.txt
compile_flags.txt
+9
-0
tools/shell/src/shellArguments.c
tools/shell/src/shellArguments.c
+11
-7
tools/shell/src/shellWebsocket.c
tools/shell/src/shellWebsocket.c
+1
-1
未找到文件。
compile_flags.txt
0 → 100644
浏览文件 @
9001b395
-DLINUX
-DWEBSOCKET
-I/usr/include
-Iinclude
-Iinclude/os
-Iinclude/common
-Iinclude/util
-Iinclude/libs/transport
-Itools/shell/inc
tools/shell/src/shellArguments.c
浏览文件 @
9001b395
...
...
@@ -243,8 +243,8 @@ int32_t shellParseArgsWithoutArgp(int argc, char *argv[]) {
SShellArgs
*
pArgs
=
&
shell
.
args
;
for
(
int
i
=
1
;
i
<
argc
;
i
++
)
{
if
(
strcmp
(
argv
[
i
],
"--help"
)
==
0
||
strcmp
(
argv
[
i
],
"--usage"
)
==
0
||
strcmp
(
argv
[
i
],
"-?"
)
==
0
||
strcmp
(
argv
[
i
],
"/?"
)
==
0
)
{
if
(
strcmp
(
argv
[
i
],
"--help"
)
==
0
||
strcmp
(
argv
[
i
],
"--usage"
)
==
0
||
strcmp
(
argv
[
i
],
"-?"
)
==
0
||
strcmp
(
argv
[
i
],
"/?"
)
==
0
)
{
shellParseSingleOpt
(
'?'
,
NULL
);
return
0
;
}
...
...
@@ -260,8 +260,10 @@ int32_t shellParseArgsWithoutArgp(int argc, char *argv[]) {
return
-
1
;
}
if
(
key
[
1
]
==
'h'
||
key
[
1
]
==
'P'
||
key
[
1
]
==
'u'
||
key
[
1
]
==
'a'
||
key
[
1
]
==
'c'
||
key
[
1
]
==
's'
||
key
[
1
]
==
'f'
||
key
[
1
]
==
'd'
||
key
[
1
]
==
'w'
||
key
[
1
]
==
'n'
||
key
[
1
]
==
'l'
||
key
[
1
]
==
'N'
if
(
key
[
1
]
==
'h'
||
key
[
1
]
==
'P'
||
key
[
1
]
==
'u'
||
key
[
1
]
==
'a'
||
key
[
1
]
==
'c'
||
key
[
1
]
==
's'
||
key
[
1
]
==
'f'
||
key
[
1
]
==
'd'
||
key
[
1
]
==
'w'
||
key
[
1
]
==
'n'
||
key
[
1
]
==
'l'
||
key
[
1
]
==
'N'
#ifdef WEBSOCKET
||
key
[
1
]
==
'E'
||
key
[
1
]
==
'T'
#endif
...
...
@@ -277,10 +279,12 @@ int32_t shellParseArgsWithoutArgp(int argc, char *argv[]) {
}
shellParseSingleOpt
(
key
[
1
],
val
);
i
++
;
}
else
if
(
key
[
1
]
==
'p'
||
key
[
1
]
==
'A'
||
key
[
1
]
==
'C'
||
key
[
1
]
==
'r'
||
key
[
1
]
==
'k'
||
key
[
1
]
==
't'
||
key
[
1
]
==
'V'
||
key
[
1
]
==
'?'
||
key
[
1
]
==
1
}
else
if
(
key
[
1
]
==
'p'
||
key
[
1
]
==
'A'
||
key
[
1
]
==
'C'
||
key
[
1
]
==
'r'
||
key
[
1
]
==
'k'
||
key
[
1
]
==
't'
||
key
[
1
]
==
'V'
||
key
[
1
]
==
'?'
||
key
[
1
]
==
1
#ifdef WEBSOCKET
||
key
[
1
]
==
'R'
||
key
[
1
]
==
'R'
#endif
)
{
shellParseSingleOpt
(
key
[
1
],
NULL
);
...
...
tools/shell/src/shellWebsocket.c
浏览文件 @
9001b395
...
...
@@ -24,7 +24,7 @@ int shell_conn_ws_server(bool first) {
((
dsnLen
-
SHELL_WS_DSN_MASK
)
>
SHELL_WS_DSN_BUFF
)
?
SHELL_WS_DSN_BUFF:
(
dsnLen
-
SHELL_WS_DSN_MASK
),
"%s"
,
shell
.
args
.
dsn
);
fprintf
(
stdout
,
"trying to connect %s*** "
,
cuttedDsn
);
fprintf
(
stdout
,
"trying to connect %s***
***
"
,
cuttedDsn
);
fflush
(
stdout
);
for
(
int
i
=
0
;
i
<
shell
.
args
.
timeout
;
i
++
)
{
shell
.
ws_conn
=
ws_connect_with_dsn
(
shell
.
args
.
dsn
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录