Merge pull request #184 from ruanzhengxin-zhuxing/master

Modify tech solu 31
aliyun · Jan 30, 2024 · 65c12a7 · 65c12a7
2 parents cb8c4f8 + 79e3344
commit 65c12a7
Showing 1 changed file with 7 additions and 70 deletions.
diff --git a/documents/solution/ai/build-a-dialogue-model-based-on-ChatGLM-and-LangChain.yml b/documents/solution/ai/build-a-dialogue-model-based-on-ChatGLM-and-LangChain.yml
@@ -6,55 +6,12 @@ Parameters:
   ZoneId:
     Type: String
     Label:
-      en: Primary VSwitch Availability Zone
-      zh-cn: 主可用区
+      en: VSwitch Availability Zone
+      zh-cn: 可用区
     Description:
-      en: Availability Zone ID,<br><b>note： <font color='blue'>Before selecting, please
-        confirm that the Availability Zone supports the specification of creating ECS resources.</font></b>
-      zh-cn: 可用区ID。<br><b>注： <font color='blue'>选择可用区前请确认该可用区是否支持创建ECS资源的规格。</font></b>
-    AssociationProperty: ALIYUN::ECS::Instance:ZoneId
-  EcsInstanceType:
-    Type: String
-    Label:
-      en: Instance Type
-      zh-cn: 实例类型
-    Description:
-      zh-cn: <br>规格详见：<a href='https://help.aliyun.com/document_detail/25378.html' target='_blank'><b><font color='blue'>实例规格族</font></a></b>
-      en: '<br>see detail: <a href=''https://www.alibabacloud.com/help/en/doc-detail/25378.html'' target=''_blank''><b><font color=''blue''>Instance Specification Family</font></a></b>'
-    AssociationProperty: ALIYUN::ECS::Instance::InstanceType
-  SystemDiskCategory:
-    Type: String
-    Label:
-      en: System Disk Type
-      zh-cn: 系统盘类型
-    Description:
-      en: '<font color=''blue''><b>Optional values:</b></font><br>[cloud_efficiency: <font color=''green''>Efficient Cloud Disk</font>]<br>[cloud_ssd: <font color=''green''>SSD Cloud Disk</font>]<br>[cloud_essd: <font color=''green''>ESSD Cloud Disk</font>]<br>[cloud: <font color=''green''>Cloud Disk</font>]<br>[ephemeral_ssd: <font color=''green''>Local SSD Cloud Disk</font>]'
-      zh-cn: '<font color=''blue''><b>可选值：</b></font><br>[cloud_efficiency: <font color=''green''>高效云盘</font>]<br>[cloud_ssd: <font color=''green''>SSD云盘</font>]<br>[cloud_essd: <font color=''green''>ESSD云盘</font>]<br>[cloud: <font color=''green''>普通云盘</font>]<br>[ephemeral_ssd: <font color=''green''>本地SSD盘</font>]'
-  InstancePassword:
-    Type: String
-    Label:
-      en: Instance Password
-      zh-cn: 实例密码
-    Description:
-      en: >-
-        <br>Server login password, Length 8-30, must contain three(Capital letters,
-        lowercase letters, numbers, ()`~!@#$%^&*_-+=|{}[]:;'<>,.?/ Special
-        symbol in).<br>
-        When you later connect to the ECS instance, you will need to enter the user name administrator and the password set here.
-      zh-cn: >-
-        <br>服务器登录密码,长度8-30，必须包含三项（大写字母、小写字母、数字、 ()`~!@#$%^&*_-+=|{}[]:;'<>,.?/
-        中的特殊符号）。<br>
-        在后续连接ECS实例时，您需要输入用户名administrator和此处设置的密码。
-    ConstraintDescription:
-      en: >-
-        Length 8-30, must contain three(Capital letters, lowercase letters,
-        numbers, ()`~!@#$%^&*_-+=|{}[]:;'<>,.?/ Special symbol in)
-      zh-cn: '长度8-30，必须包含三项（大写字母、小写字母、数字、 ()`~!@#$%^&*_-+=|{}[]:;''<>,.?/ 中的特殊符号）'
-    AssociationProperty: 'ALIYUN::ECS::Instance::Password'
-    AllowedPattern: '[0-9A-Za-z\_\-\&:;''<>,=%`~!@#\(\)\$\^\*\+\|\{\}\[\]\.\?\/]+$'
-    MinLength: 8
-    MaxLength: 30
-    NoEcho: true
+      en: Availability Zone ID
+      zh-cn: 可用区ID。
+    AssociationProperty: ZoneId
   PAIEASInstanceType:
     Type: String
     Label:
@@ -118,23 +75,6 @@ Resources:
           SourceCidrIp: 0.0.0.0/0
           IpProtocol: tcp
           NicType: internet
-  EcsInstance:
-    Type: ALIYUN::ECS::Instance
-    Properties:
-      VpcId:
-        Ref: Vpc
-      VSwitchId:
-        Ref: VSwitch
-      SecurityGroupId:
-        Ref: SecurityGroup
-      ImageId: aliyun_2_1903_x64_20G_alibase_20230731.vhd
-      InstanceType:
-        Ref: EcsInstanceType
-      Password:
-        Ref: InstancePassword
-      InternetMaxBandwidthOut: 5
-      SystemDiskCategory:
-        Ref: SystemDiskCategory
   NasFileSystem:
     Type: ALIYUN::NAS::FileSystem
     Properties:
@@ -282,13 +222,10 @@ Metadata:
     ParameterGroups:
       - Parameters:
           - ZoneId
-          - EcsInstanceType
-          - SystemDiskCategory
-          - InstancePassword
         Label:
           default:
-            en: ECS
-            zh-cn: 云服务器
+            en: Zone
+            zh-cn: 可用区
       - Parameters:
           - PAIEASInstanceType
         Label: