From c86761e977c2e2bf2f5c3f7ba525a33de4db0be9 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Mon, 28 Jul 2025 00:05:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BAJsite=20Server=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=97=B6=E5=90=8C=E6=97=B6=E5=86=99=E5=85=A5=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jcloud/api/aliyun_server_light.py                     | 9 ++++++++-
 jcloud/jcloud/pagetype/jsite_server/jsite_server.json | 9 +++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/jcloud/api/aliyun_server_light.py b/jcloud/api/aliyun_server_light.py
index ad707f8..2aac8f0 100644
--- a/jcloud/api/aliyun_server_light.py
+++ b/jcloud/api/aliyun_server_light.py
@@ -428,6 +428,7 @@ def create_server_order(**kwargs):
         server = jingrow.get_pg({
             "pagetype": "Jsite Server",
             "team": team.name,
+            "order_id": order_id,
             "status": "Pending",
             "region": region_id,
             "system_image": image_id,
@@ -435,7 +436,10 @@ def create_server_order(**kwargs):
             "title": f"{region_id} - {selected_plan.get('core')}核/{selected_plan.get('memory')}GB",
             "planid": plan_id,
             "period": period,
-            "order_id": order_id
+            "cpu": selected_plan.get('core'),
+            "memory": selected_plan.get('memory'),
+            "disk_size": selected_plan.get('disk_size'),
+            "bandwidth": selected_plan.get('bandwidth')
         })
         server.insert(ignore_permissions=True)
         
@@ -468,6 +472,9 @@ def create_server_async(order_name):
         # 调用阿里云API创建实例
         result = create_aliyun_instance(plan_id, image_id, period, region_id)
         
+        # 打印result到后台日志
+        jingrow.log_error("阿里云创建实例结果", f"订单 {order_name} 的创建结果: {result}")
+        
         if not result or not result.get('success'):
             raise Exception(f"阿里云创建失败: {result.get('message', '未知错误')}")
         
diff --git a/jcloud/jcloud/pagetype/jsite_server/jsite_server.json b/jcloud/jcloud/pagetype/jsite_server/jsite_server.json
index 7106632..280913f 100644
--- a/jcloud/jcloud/pagetype/jsite_server/jsite_server.json
+++ b/jcloud/jcloud/pagetype/jsite_server/jsite_server.json
@@ -132,21 +132,21 @@
    "fieldname": "cpu",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "CPU",
+   "label": "CPU（核）",
    "read_only": 1
   },
   {
    "fieldname": "memory",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "内存",
+   "label": "内存（GB）",
    "read_only": 1
   },
   {
    "fieldname": "disk_size",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "硬盘容量",
+   "label": "硬盘容量（GB）",
    "read_only": 1
   },
   {
@@ -178,13 +178,14 @@
   {
    "fieldname": "period",
    "fieldtype": "Int",
+   "hidden": 1,
    "label": "购买时长（月）",
    "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-07-27 23:19:16.648233",
+ "modified": "2025-07-27 23:51:17.953839",
  "modified_by": "Administrator",
  "module": "Jcloud",
  "name": "Jsite Server",