Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Type: Component
Name: fc-deploy
Provider:
- 阿里云
Version: 0.0.115
Version: 0.0.116
Description: 阿里云函数计算基础组件
HomePage: https://github.com/devsapp/fc-base
Tags:
Expand Down
31 changes: 18 additions & 13 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,20 +128,25 @@ export default class FcDeployComponent {
title: 'Generated auto custom domain...',
id: 'domain',
task: async () => {
for (let i = 0; i < this.fcCustomDomains.length; i++) {
await this.fcCustomDomains[i].initLocal(useLocal, useRemote, _.cloneDeep(inputs));
if (this.fcCustomDomains[i].useRemote) {
continue;
try {
for (let i = 0; i < this.fcCustomDomains.length; i++) {
await this.fcCustomDomains[i].initLocal(useLocal, useRemote, _.cloneDeep(inputs));
if (this.fcCustomDomains[i].useRemote) {
continue;
}
const resolvedCustomDomainConf: CustomDomainConfig = await this.fcCustomDomains[
i
].makeCustomDomain(this.args, this.credentials);
hasAutoCustomDomainNameInDomains =
hasAutoCustomDomainNameInDomains || this.fcCustomDomains[i].isDomainNameAuto;
resolvedCustomDomainConfs.push(resolvedCustomDomainConf);
logger.debug(
`resolved custom domain: \n${JSON.stringify(resolvedCustomDomainConf, null, ' ')}`,
);
}
const resolvedCustomDomainConf: CustomDomainConfig = await this.fcCustomDomains[
i
].makeCustomDomain(this.args, this.credentials);
hasAutoCustomDomainNameInDomains =
hasAutoCustomDomainNameInDomains || this.fcCustomDomains[i].isDomainNameAuto;
resolvedCustomDomainConfs.push(resolvedCustomDomainConf);
logger.debug(
`resolved custom domain: \n${JSON.stringify(resolvedCustomDomainConf, null, ' ')}`,
);
} catch (ex) {
logger.debug(`custom domain error: \n${ex}`);
throw ex;
}
},
}]);
Expand Down