Skip to content
This repository was archived by the owner on May 6, 2025. It is now read-only.

Commit 16a9d99

Browse files
chhptchhpt
committed
merge branch
2 parents 68a8801 + ca4b375 commit 16a9d99

10 files changed

Lines changed: 355 additions & 152 deletions

File tree

‎bin/cloudbase.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,12 @@ if (process.argv.length < 3) {
146146
program.outputHelp()
147147
}
148148

149-
program.parse(processArgv)
149+
try {
150+
program.parse(processArgv)
151+
} catch (e) {
152+
const errMsg = `${logSymbols.error} ${e.message || '参数异常，请检查您是否输入了正确的命令！'}`
153+
console.log(errMsg)
154+
}
150155

151156
function errorHandler(err) {
152157
const stackIngoreErrors = ['TencentCloudSDKHttpException', 'CloudBaseError']

‎deps/tencentcloud-sdk-nodejs/tencentcloud/common/exception/tencent_cloud_sdk_exception.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class TencentCloudSDKHttpException extends Error {
88
this.name = 'TencentCloudSDKHttpException'
99
this.code = code
1010
this.message =
11-
'[TencentCloudSDKException]' +
11+
'API 请求异常' +
1212
`\nCode: ${code}` +
1313
'\nMessage: ' +
1414
error +
@@ -26,7 +26,7 @@ class TencentCloudSDKHttpException extends Error {
2626

2727
toString() {
2828
return (
29-
'[TencentCloudSDKException]' +
29+
'API 请求异常' +
3030
`\nCode: ${this.code}` +
3131
'\nMessage: ' +
3232
this.getMessage() +
@@ -37,7 +37,7 @@ class TencentCloudSDKHttpException extends Error {
3737

3838
toLocaleString() {
3939
return (
40-
'[TencentCloudSDKException]' +
40+
'API 请求异常' +
4141
'message:' +
4242
this.getMessage() +
4343
' requestId:' +

‎lib/commands/env/base.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,12 @@ commander_1.default
105105
});
106106
});
107107
commander_1.default
108-
.command('env:rename <name> [envId]')
109-
.description('重命名云开发环境')
110-
.action(function (name, envId, options) {
108+
.command('env:rename <name>')
109+
.option('-e, --envId <envId>', '环境 Id')
110+
.description('修改云开发环境别名')
111+
.action(function (name, options) {
111112
return __awaiter(this, void 0, void 0, function* () {
113+
const { envId } = options;
112114
if (!name) {
113115
throw new error_1.CloudBaseError('环境名称不能为空！');
114116
}

‎lib/commands/env/domain.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ const error_1 = require("../../error");
1919
const logger_1 = require("../../logger");
2020
const env_1 = require("../../env");
2121
commander_1.default
22-
.command('env:domain:list [envId]')
22+
.command('env:domain:list')
23+
.option('-e, --envId <envId>', '环境 Id')
2324
.description('列出环境的安全域名列表')
24-
.action(function (envId, options) {
25+
.action(function (options) {
2526
return __awaiter(this, void 0, void 0, function* () {
26-
const { configFile } = options.parent;
27+
const { envId, parent: { configFile } } = options;
2728
const assignEnvId = yield utils_1.getEnvId(envId, configFile);
2829
const domains = yield env_1.getEnvAuthDomains({
2930
envId: assignEnvId
@@ -43,11 +44,12 @@ commander_1.default
4344
});
4445
});
4546
commander_1.default
46-
.command('env:domain:create <domain> [envId]')
47+
.command('env:domain:create <domain>')
48+
.option('-e, --envId <envId>', '环境 Id')
4749
.description('添加环境安全域名，多个以斜杠 / 分隔')
48-
.action(function (domain, envId, options) {
50+
.action(function (domain, options) {
4951
return __awaiter(this, void 0, void 0, function* () {
50-
const { configFile } = options.parent;
52+
const { envId, parent: { configFile } } = options;
5153
const assignEnvId = yield utils_1.getEnvId(envId, configFile);
5254
const domains = domain.split('/');
5355
const { confirm } = yield inquirer_1.default.prompt({
@@ -80,11 +82,12 @@ commander_1.default
8082
});
8183
});
8284
commander_1.default
83-
.command('env:domain:delete [envId]')
85+
.command('env:domain:delete')
86+
.option('-e, --envId <envId>', '环境 Id')
8487
.description('删除环境的安全域名')
85-
.action(function (envId, options) {
88+
.action(function (options) {
8689
return __awaiter(this, void 0, void 0, function* () {
87-
const { configFile } = options.parent;
90+
const { envId, parent: { configFile } } = options;
8891
const assignEnvId = yield utils_1.getEnvId(envId, configFile);
8992
const loading = utils_1.loadingFactory();
9093
loading.start('拉取环境安全域名中');

‎lib/commands/env/login.js‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,19 @@ const platformMap = {
2323
'WECHAT-PUBLIC': '微信公众平台'
2424
};
2525
commander_1.default
26-
.command('env:login:list [envId]')
26+
.command('env:login:list')
27+
.option('-e, --envId <envId>', '环境 Id')
2728
.description('列出环境登录配置')
28-
.action(function (envId, options) {
29+
.action(function (options) {
2930
return __awaiter(this, void 0, void 0, function* () {
30-
const { configFile } = options.parent;
31+
const { envId, parent: { configFile } } = options;
3132
const assignEnvId = yield utils_1.getEnvId(envId, configFile);
3233
const configList = yield env_1.getLoginConfigList({
3334
envId: assignEnvId
3435
});
3536
const head = ['平台', '平台 Id', '创建时间', '状态'];
3637
const tableData = configList.map(item => [
37-
platformMap[item.Platform]
38-
? platformMap[item.Platform]
39-
: item.Platform,
38+
platformMap[item.Platform] ? platformMap[item.Platform] : item.Platform,
4039
item.PlatformId,
4140
item.CreateTime,
4241
item.Status === 'ENABLE' ? '启用' : '禁用'
@@ -45,11 +44,12 @@ commander_1.default
4544
});
4645
});
4746
commander_1.default
48-
.command('env:login:create [envId]')
47+
.command('env:login:create')
48+
.option('-e, --envId <envId>', '环境 Id')
4949
.description('创建环境登录配置')
50-
.action(function (envId, options) {
50+
.action(function (options) {
5151
return __awaiter(this, void 0, void 0, function* () {
52-
const { configFile } = options.parent;
52+
const { envId, parent: { configFile } } = options;
5353
const assignEnvId = yield utils_1.getEnvId(envId, configFile);
5454
const { platform, status, appId, appSecret } = yield inquirer_1.default.prompt([
5555
{
@@ -109,11 +109,12 @@ commander_1.default
109109
});
110110
});
111111
commander_1.default
112-
.command('env:login:update [envId]')
112+
.command('env:login:update')
113+
.option('-e, --envId <envId>', '环境 Id')
113114
.description('更新环境登录方式配置')
114-
.action(function (envId, options) {
115+
.action(function (options) {
115116
return __awaiter(this, void 0, void 0, function* () {
116-
const { configFile } = options.parent;
117+
const { envId, parent: { configFile } } = options;
117118
const assignEnvId = yield utils_1.getEnvId(envId, configFile);
118119
const configList = yield env_1.getLoginConfigList({
119120
envId: assignEnvId

0 commit comments

Comments
 (0)