Merge branch 'aliyun:master' into master

aliyun · Oct 19, 2023 · ce61c6f · ce61c6f
2 parents 627bdbc + b15fe48
commit ce61c6f
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 47 deletions.
diff --git a/README-CN.md b/README-CN.md
@@ -428,17 +428,17 @@ ROS 模板的示例和最佳实践。模板分类如下：
 
 - ai
 
-| 模板                                                                                                                                                               | 说明                                                                          |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
-| [use-function-compute-to-deploy-stable-diffusion-for-AI-painting.yml](documents/solution/ai/use-function-compute-to-deploy-stable-diffusion-for-ai-painting.yml) | 使用函数计算部署Stable Diffusion进行AI绘画。支持自定义模型。                                     |
-| [aigc-text-generation-3d-model-with-ecs.yml](documents/solution/ai/aigc-text-generation-3d-model-with-ecs.yml)                                                   | AIGC文本生成3D模型。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/tg3dm) |
-| [use-pai-to-deploy-stable-diffusion-for-AI-painting.yml](documents/solution/ai/use-pai-to-deploy-stable-diffusion-for-AI-painting.yml)                           | 如何在阿里云快速启动Stable Diffusion轻松玩转AI绘画。                                         |
+| 模板                                                                                                                                                               | 说明                                                                                |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------|
+| [use-function-compute-to-deploy-stable-diffusion-for-AI-painting.yml](documents/solution/ai/use-function-compute-to-deploy-stable-diffusion-for-ai-painting.yml) | 使用函数计算部署Stable Diffusion进行AI绘画。支持自定义模型。                                           |
+| [aigc-text-generation-3d-model-with-ecs.yml](documents/solution/ai/aigc-text-generation-3d-model-with-ecs.yml)                                                   | AIGC文本生成3D模型。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/tg3dm)           |
+| [use-pai-to-deploy-stable-diffusion-for-AI-painting.yml](documents/solution/ai/use-pai-to-deploy-stable-diffusion-for-AI-painting.yml)                           | 如何在阿里云快速启动Stable Diffusion轻松玩转AI绘画。                                               |
 | [lingjun-LLAMA-2-best-practice.yml](documents/solution/ai/lingjun-LLAMA-2-best-practice.yml)                                                                     | LLAMA-2全托管灵骏最佳实践。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/pai_lingjun) |
-| [pai-ai-painting-solution.yml](documents/solution/ai/pai-ai-painting-solution.yml)                                                                     | PAI AI绘画解决方案。                                                               |
-| [pai-lingjun-serverless-LLM-best-practice.yml](documents/solution/ai/upai-lingjun-serverless-LLM-best-practice.yml)                                              | PAI灵骏智算资源（Serverless版）大模型最佳实践。                                              |
-| [use-gpu-ecs-to-deploy-chatGLM.yaml](documents/solution/ai/use-gpu-ecs-to-deploy-chatGLM.yaml)                                                                   | 向量数据库构建企业智能知识库。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/baeeikb) |
-| [build-a-dialogue-model-based-on-ChatGLM-and-LangChain.yml](documents/solution/ai/build-a-dialogue-model-based-on-ChatGLM-and-LangChain.yml)                     | 基于ChatGLM和LangChain搭建对话模型。                                                  |
-| [ack-ai-fine-tuning.yml](documents/solution/ai/ack-ai-fine-tuning.yml)                                                                                           | 使用云原生AI套件提交模型微调训练任务与部署GPU共享推理服务。                                 |
+| [pai-ai-painting-solution.yml](documents/solution/ai/pai-ai-painting-solution.yml)                                                                     | PAI AI绘画解决方案。                                                                     |
+| [pai-lingjun-serverless-LLM-best-practice.yml](documents/solution/ai/upai-lingjun-serverless-LLM-best-practice.yml)                                              | PAI灵骏智算资源（Serverless版）大模型最佳实践。                                                    |
+| [use-gpu-ecs-to-deploy-chatGLM.yaml](documents/solution/ai/use-gpu-ecs-to-deploy-chatGLM.yaml)                                                                   | 向量数据库构建企业智能知识库。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/baeeikb)       |
+| [build-a-dialogue-model-based-on-ChatGLM-and-LangChain.yml](documents/solution/ai/build-a-dialogue-model-based-on-ChatGLM-and-LangChain.yml)                     | 基于ChatGLM和LangChain搭建对话模型。｜ [解决方案](https://www.aliyun.com/solution/tech-solution/calbadm)     |
+| [ack-ai-fine-tuning.yml](documents/solution/ai/ack-ai-fine-tuning.yml)                                                                                           | 使用云原生AI套件提交模型微调训练任务与部署GPU共享推理服务。                                                  |
 
 - data-analysis
 
@@ -452,13 +452,13 @@ ROS 模板的示例和最佳实践。模板分类如下：
 
 - database
 
-| 模板                                                                                                         | 说明                                                                                            |
-|------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
-| [automatic-database-scaling-and-SQL-optimization.yml](documents/solution/database/automatic-database-scaling-and-SQL-optimization.yml) | 数据库自动扩缩容和自动SQL优化。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/adsa_sql)                |
-| [wordpress-website-database-on-the-cloud.yml](documents/solution/database/wordpress-website-database-on-the-cloud.yml) | WordPress网站数据库上云。                                                                             |
+| 模板                                                                                                         | 说明                                                                                           |
+|------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------|
+| [automatic-database-scaling-and-SQL-optimization.yml](documents/solution/database/automatic-database-scaling-and-SQL-optimization.yml) | 数据库自动扩缩容和自动SQL优化。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/adsa_sql)               |
+| [wordpress-website-database-on-the-cloud.yml](documents/solution/database/wordpress-website-database-on-the-cloud.yml) | WordPress网站数据库上云。                                                                            |
 | [dts-cache-synchronization.yml](documents/solution/database/dts-cache-synchronization.yml) | 通过DTS实现MySQL与Redis缓存同步一致性方案。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/rtsorarctebcc) |
-| [migrate-rds-mysql-to-polardb-mysql.yml](documents/solution/database/migrate-rds-mysql-to-polardb-mysql.yml)                    | 在不修改应用程序任何代码和配置的情况下，将RDS MySQL在线一键升级至PolarDB MySQL版。                                          |
-| [one-stop-htap-service.yml](documents/solution/database/one-stop-htap-service.yml) | RDS+ClickHouse构建一站式HTAP。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/rdsclickhouse_htap)  |
+| [migrate-rds-mysql-to-polardb-mysql.yml](documents/solution/database/migrate-rds-mysql-to-polardb-mysql.yml)                    | 在不修改应用程序任何代码和配置的情况下，将RDS MySQL在线一键升级至PolarDB MySQL版。   ｜ [解决方案](https://www.aliyun.com/solution/tech-solution/rds_polardb)  |
+| [one-stop-htap-service.yml](documents/solution/database/one-stop-htap-service.yml) | RDS+ClickHouse构建一站式HTAP。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/rdsclickhouse_htap) |
 
 - micro
 
@@ -468,13 +468,13 @@ ROS 模板的示例和最佳实践。模板分类如下：
 
 - network
 
-| 模板                                                                                                                                    | 说明             |
-|---------------------------------------------------------------------------------------------------------------------------------------|----------------|
+| 模板                                                                                                                                    | 说明                                                                       |
+|---------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------|
 | [cross-region-account-network-interwork-scheme.yml](./documents/solution/network/cross-region-account-network-interwork-scheme.yml)   | 跨地域跨账号网络互通方案。 ｜ [解决方案](https://aliyun.com/solution/tech-solution/cracani) |
-| [public-network-architecture-design.yml](./documents/solution/network/public-network-architecture-design.yml)                         | 云上公网架构设计和安全管理。 |
-| [ga-nlb-global-accelerate.yml](./documents/solution/network/ga-nlb-global-accelerate.yml)                                             | 互联网应用全球加速。     |
-| [enterprise-cloud-network-architecture-planning.yml](./documents/solution/network/enterprise-cloud-network-architecture-planning.yml) | 企业云上网络架构规划。    |
-| [two-region-three-center-high-availability.yml](./documents/solution/network/two-region-three-center-high-availability.yml)           | 两地三中心异地多活。     |
+| [public-network-architecture-design.yml](./documents/solution/network/public-network-architecture-design.yml)                         | 云上公网架构设计和安全管理。  ｜ [解决方案](https://www.aliyun.com/solution/tech-solution/cbpnadasm)    |
+| [ga-nlb-global-accelerate.yml](./documents/solution/network/ga-nlb-global-accelerate.yml)                                             | 互联网应用全球加速。  ｜ [解决方案](https://www.aliyun.com/solution/tech-solution/gaoia) |
+| [enterprise-cloud-network-architecture-planning.yml](./documents/solution/network/enterprise-cloud-network-architecture-planning.yml) | 企业云上网络架构规划。 ｜ [解决方案](https://www.aliyun.com/solution/tech-solution/ecnap) |
+| [two-region-three-center-high-availability.yml](./documents/solution/network/two-region-three-center-high-availability.yml)           | 两地三中心异地多活。 ｜ [解决方案](https://www.aliyun.com/solution/tech-solution/tltcamanidl)   |
 
 - storage
 
@@ -529,7 +529,7 @@ ROS 模板的示例和最佳实践。模板分类如下：
 
 | 模板                                                                                                                                                                              | 说明            |
 |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
-| [efficiently-build-a-new-account-with-security-and-compliance.yml](documents/solution/security-and-compliance/efficiently-build-a-new-account-with-security-and-compliance.yml) | 高效构建安全合规的新账号。 |
+| [efficiently-build-a-new-account-with-security-and-compliance.yml](documents/solution/security-and-compliance/efficiently-build-a-new-account-with-security-and-compliance.yml) | 高效构建安全合规的新账号。｜ [解决方案](https://www.aliyun.com/solution/tech-solution/ecosacna) |
 
   </details>
 

diff --git a/documents/help/ga/ga-accelerated-access-to-specified-ip.yml b/documents/help/ga/ga-accelerated-access-to-specified-ip.yml
@@ -1,13 +1,10 @@
-ROSTemplateFormatVersion: '2015-09-01'
+ROSTemplateFormatVersion: '2015-09-01'  
 Parameters:
   AccelerateRegionId:
     Type: String
     Label:
       en: Accelerate region ID.
       zh-cn: 加速地域ID。
-    Description:
-      zh-cn: 该模板不支持跨境网络（中国内地的地域与中国香港、中国澳门、中国台湾地域或其他国家和地区）加速。业务涉及跨境网络时，您可以选择中国香港作为加速地域或终端节点地域。
-      en: This template does not support cross-border network acceleration. When your business involves cross-border networks, you can choose Hong Kong, China as the acceleration region or terminal node region.
     AssociationProperty: ALIYUN::ECS::RegionId
     Default: cn-hongkong
   EndpointGroupRegion:
@@ -17,23 +14,27 @@ Parameters:
       zh-cn: 终端节点所在的地域ID。
     AssociationProperty: ALIYUN::ECS::RegionId
     Default: us-west-1
-  EndpointIPs:
-    Type: Json
+  EndpointIP:
+    Type: String
     Label:
-      en: Endpoint ip list.
+      en: Endpoint IP.
       zh-cn: 终端节点IP。
-    AssociationProperty: List[Parameter]
-    AssociationPropertyMetadata:
-      Parameter:
-        Type: String
-    MinLength: 2
-    MaxLength: 2
+  EnableCrossBorder:
+    Type: Boolean
+    Label:
+      en: CDT type accelerator whether to agree cross-border compliance commitments. If there is a cross-border situation between the acceleration region and the endpoint group region, you must agree to the compliance commitment.
+      zh-cn: CDT加速实例是否同意跨境合规协议。如果您的业务涉及跨境（中国内地的地域与中国香港、中国澳门、中国台湾地域或其他国家和地区）加速，必须同意该合规承诺。
+    Description:
+      en: "Please note: Your use of this product or this function will transfer your business data on the cloud to the region or product deployment region of your choice, which may involve cross-border data. You agree and confirm that you have full authority to dispose of this business data and are fully responsible for the data transmission. You should ensure that your data transfer complies with all applicable laws, including providing adequate data security protection technologies and strategies, fulfilling legal obligations such as obtaining full express consent from individuals, completing data export security assessment and declaration, and you promise that your business data does not contain The transmission or disclosure of which is restricted, prohibited or prohibited by any applicable law. If you fail to comply with the foregoing statements and warranties, you will bear the corresponding legal consequences, and you shall be liable for compensation for any losses suffered by Alibaba Cloud and or other affiliated companies."
+      zh-cn: 请注意：您使用该产品或该功能，将使您在云上的业务数据传输至您所选择的区域或产品部署区域，可能会涉及数据跨境。您同意并确认，您完全拥有该份业务数据的所有处置权限，对数据传输的行为全权负责。您应确保您的数据传输符合所有适用法律，包括提供充分的数据安全保护技术和策略，履行获得个人充分明示同意、完成数据出境安全评估和申报等法定义务，且您承诺您的业务数据不含任何所适用法律限制、禁止传输或披露的内容。如您未遵守前述声明与保证，您将承担对应的法律后果，导致阿里云和或其他关联公司遭受任何损失的，您应承担赔偿责任。
 Resources:
   Accelerator:
     Type: ALIYUN::GA::Accelerator
     Properties:
       BandwidthBillingType: CDT
       InstanceChargeType: PayAsYouGo
+      EnableCrossBorder:
+        Ref: EnableCrossBorder
   AccelerateRegion:
     Type: ALIYUN::GA::IpSets
     Properties:
@@ -67,17 +68,9 @@ Resources:
         Ref: Listener
       EndpointConfigurations:
       - Type: Ip
-        Weight: 10
+        Weight: 100
         Endpoint:
-          Fn::Select:
-          - 0
-          - Ref: EndpointIPs
-      - Type: Ip
-        Weight: 40
-        Endpoint:
-          Fn::Select:
-          - 1
-          - Ref: EndpointIPs
+          Ref: EndpointIP
 Outputs:
   AcceleratorId:
     Description:
@@ -114,10 +107,16 @@ Metadata:
           zh-cn: 加速地域
     - Parameters:
       - EndpointGroupRegion
-      - EndpointIPs
+      - EndpointIP
       Label:
         default:
           en: EndpointGroup
           zh-cn: 终端节点
+    - Parameters:
+      - EnableCrossBorder
+      Label:
+        default:
+          en: Cross-border Compliance Commitments
+          zh-cn: 跨境合规承诺
     TemplateTags:
     - acs:document-help:ga:加速访问指定IP的后端服务