From 40559c299da8b6a767af6db212005ebf547dd37e Mon Sep 17 00:00:00 2001 From: jingrow Date: Wed, 30 Jul 2025 22:19:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E4=BF=A1=E6=81=AF=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B3=BB=E7=BB=9F=E7=B1=BB=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jcloud/api/aliyun_server_light.py | 6 +++++- jcloud/jcloud/pagetype/jsite_server/jsite_server.json | 8 ++++---- jcloud/jcloud/pagetype/jsite_server/jsite_server.py | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/jcloud/api/aliyun_server_light.py b/jcloud/api/aliyun_server_light.py index f62ddaa..d6a3c8c 100644 --- a/jcloud/api/aliyun_server_light.py +++ b/jcloud/api/aliyun_server_light.py @@ -1084,7 +1084,10 @@ def update_server_record(instance_ids): if image_info: image_name = image_info.get('image_name', '') image_version = image_info.get('image_version', '') + os_type = image_info.get('os_type', '') + server.system = f"{image_name} {image_version}".strip() + server.os_type = os_type # 更新资源规格信息 resource_spec = instance_info.get('resource_spec', {}) @@ -1105,7 +1108,8 @@ def update_server_record(instance_ids): "public_ip": public_ip, "end_date": server.end_date, "status": server.status, - "system": server.system + "system": server.system, + "os_type": server.os_type } } diff --git a/jcloud/jcloud/pagetype/jsite_server/jsite_server.json b/jcloud/jcloud/pagetype/jsite_server/jsite_server.json index 09d4da6..c24438a 100644 --- a/jcloud/jcloud/pagetype/jsite_server/jsite_server.json +++ b/jcloud/jcloud/pagetype/jsite_server/jsite_server.json @@ -25,7 +25,7 @@ "bandwidth", "public_ip", "image_id", - "support_platform", + "os_type", "ssh_section", "ssh_user", "ssh_port", @@ -201,14 +201,14 @@ "label": "套餐价格(元/月)" }, { - "fieldname": "support_platform", + "fieldname": "os_type", "fieldtype": "Data", - "label": "支持平台" + "label": "系统类型" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2025-07-30 22:05:00.093363", + "modified": "2025-07-30 22:13:52.117023", "modified_by": "Administrator", "module": "Jcloud", "name": "Jsite Server", diff --git a/jcloud/jcloud/pagetype/jsite_server/jsite_server.py b/jcloud/jcloud/pagetype/jsite_server/jsite_server.py index 3543cc0..55133d1 100644 --- a/jcloud/jcloud/pagetype/jsite_server/jsite_server.py +++ b/jcloud/jcloud/pagetype/jsite_server/jsite_server.py @@ -23,6 +23,7 @@ class JsiteServer(Document): key_pair_name: DF.Data | None memory: DF.Data | None order_id: DF.Data | None + os_type: DF.Data | None password: DF.Password | None period: DF.Int plan_price: DF.Int @@ -33,7 +34,6 @@ class JsiteServer(Document): ssh_port: DF.Int ssh_user: DF.Data | None status: DF.Literal["Pending", "Starting", "Running", "Stopping", "Stopped", "Resetting", "Upgrading", "Disabled"] - support_platform: DF.Data | None system: DF.Data | None team: DF.Link | None title: DF.Data | None