diff --git a/documents/solution/internet-application-development/rapidly-deployment-applets.yml b/documents/solution/internet-application-development/rapidly-deployment-applets.yml index 2a68715c..45edb27a 100644 --- a/documents/solution/internet-application-development/rapidly-deployment-applets.yml +++ b/documents/solution/internet-application-development/rapidly-deployment-applets.yml @@ -26,10 +26,9 @@ Parameters: en: Instance Type zh-cn: 实例规格 Description: - zh-cn: 本方案会创建一个抢占式实例,并且自动部署uwsgi服务。 + zh-cn: 本方案会创建一个抢占式实例。 en: >- - This solution will create a spot instance and automatically deploy a - uwsgi service. + This solution will create a spot instance. Default: ecs.c7.large InstancePassword: NoEcho: true @@ -57,7 +56,7 @@ Parameters: Label: en: Website domain name zh-cn: 网站域名 - AssociationProperty: 'ALIYUN::Domain::DomainName' + AssociationProperty: 'ALIYUN::DomainName' Description: en: >- Please enter the subdomain name under the current account, such as example.aliyun.com. @@ -186,7 +185,7 @@ Resources: SpotStrategy: SpotAsPriceGo Password: Ref: InstancePassword - InstallUwsgi: + InstallJava: Type: 'ALIYUN::ECS::RunCommand' Properties: InstanceIds: @@ -352,41 +351,26 @@ Resources: Ref: RdsInstance DBName: applets Outputs: - WebUrl: + DatabaseName: Description: - zh-cn: Web 访问地址(Ip)。 - en: The Addresses of Web(Ip). + zh-cn: 数据库名称。 + en: The name of database. Value: - 'Fn::Sub': - - 'http://${ServerAddress}' - - ServerAddress: - 'Fn::Select': - - 0 - - 'Fn::GetAtt': - - EcsInstance - - PublicIps - WebDomain: - Condition: DnsRecord + Ref: RdsDatabase + DatabaseUserName: + Description: + zh-cn: 数据库用户名。 + en: The name of database user. + Value: + Ref: DBUserName + DatabaseEndpoint: Description: - zh-cn: Web 访问地址(域名)。 - en: The Addresses of Web(Domain). + zh-cn: 数据库链接地址。 + en: The connection address of database. Value: - Fn::Sub: - - 'http://${DomainName}' - - DomainName: - Fn::If: - - DomainPrefixIsNull - - Fn::GetJsonValue: - - DomainName - - Ref: DomainName - - Fn::Join: - - '.' - - - Fn::GetJsonValue: - - DomainPrefix - - Ref: DomainName - - Fn::GetJsonValue: - - DomainName - - Ref: DomainName + Fn::GetAtt: + - RdsInstance + - InnerConnectionString EcsLoginAddress: Description: zh-cn: ECS登录地址。 diff --git a/documents/solution/internet-application-development/rapidly-enterprise-portal.yml b/documents/solution/internet-application-development/rapidly-enterprise-portal.yml index a4cb3567..e033e153 100644 --- a/documents/solution/internet-application-development/rapidly-enterprise-portal.yml +++ b/documents/solution/internet-application-development/rapidly-enterprise-portal.yml @@ -57,7 +57,7 @@ Parameters: Label: en: Website domain name zh-cn: 网站域名 - AssociationProperty: 'ALIYUN::Domain::DomainName' + AssociationProperty: 'ALIYUN::DomainName' Description: en: >- Please enter the subdomain name under the current account, such as example.aliyun.com. diff --git a/documents/solution/internet-application-development/websites-from-HTTP-to-HTTPS.yml b/documents/solution/internet-application-development/websites-from-HTTP-to-HTTPS.yml index 45ed5775..1e8fd620 100644 --- a/documents/solution/internet-application-development/websites-from-HTTP-to-HTTPS.yml +++ b/documents/solution/internet-application-development/websites-from-HTTP-to-HTTPS.yml @@ -60,7 +60,7 @@ Parameters: Label: en: Website domain name zh-cn: 网站域名 - AssociationProperty: 'ALIYUN::Domain::DomainName' + AssociationProperty: 'ALIYUN::DomainName' Description: en: >- Please enter the subdomain name under the current account, such as example.aliyun.com.