From 43e0a993fae1f4de2d30575c6fcaefe50b28f359 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Mon, 3 Nov 2025 16:43:49 +0800
Subject: [PATCH] =?UTF-8?q?dashboard=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E9=87=8D=E5=90=AF=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src2/components/JsiteServerOverview.vue   | 43 +++++++++++++
 jcloud/api/aliyun_server_light.py             | 61 +++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/dashboard/src2/components/JsiteServerOverview.vue b/dashboard/src2/components/JsiteServerOverview.vue
index e2d3542..039a1a5 100644
--- a/dashboard/src2/components/JsiteServerOverview.vue
+++ b/dashboard/src2/components/JsiteServerOverview.vue
@@ -171,6 +171,14 @@
 						>
 							重启
 						</Button>
+						<Button 
+							@click="forceRestartServer"
+							:loading="forceRestartLoading"
+							variant="outline"
+							class="bg-orange-50 text-orange-700 hover:bg-orange-100 border-orange-200"
+						>
+							强制重启
+						</Button>
 						<Button 
 							@click="resetPassword"
 							:loading="resetPasswordLoading"
@@ -293,6 +301,7 @@ export default {
 			showPassword: false,
 			decryptedPassword: null,
 			restartLoading: false,
+			forceRestartLoading: false,
 			resetPasswordLoading: false,
 			resetKeyPairLoading: false,
 			deleteKeyPairLoading: false,
@@ -417,6 +426,40 @@ export default {
 				}
 			});
 		},
+		async forceRestartServer() {
+			if (!this.$jsiteServer.pg.instance_id) {
+				toast.error('服务器实例ID不存在');
+				return;
+			}
+			
+			confirmDialog({
+				title: '强制重启',
+				message: '确定要强制重启服务器吗？该操作可能会导致未保存的数据丢失。',
+				primaryAction: {
+					label: '确定',
+					onClick: ({ hide }) => {
+						toast.success('强制重启请求已提交');
+						hide();
+						this.forceRestartLoading = true;
+						const req = createResource({
+							url: '/api/action/jcloud.api.aliyun_server_light.force_reboot_aliyun_instance',
+							params: {
+								instance_id: this.$jsiteServer.pg.instance_id,
+								region_id: this.$jsiteServer.pg.region
+							},
+							onSuccess: () => {
+								this.forceRestartLoading = false;
+							},
+							onError: (error) => {
+								toast.error(getToastErrorMessage(error));
+								this.forceRestartLoading = false;
+							}
+						});
+						req.submit();
+					}
+				}
+			});
+		},
 		async resetPassword() {
 			if (!this.$jsiteServer.pg.instance_id) {
 				toast.error('服务器实例ID不存在');
diff --git a/jcloud/api/aliyun_server_light.py b/jcloud/api/aliyun_server_light.py
index 137493f..ab229c2 100644
--- a/jcloud/api/aliyun_server_light.py
+++ b/jcloud/api/aliyun_server_light.py
@@ -166,6 +166,27 @@ class AliyunLightServerManager:
         except Exception as e:
             jingrow.log_error("重启实例失败", f"重启实例 {instance_id} 时发生错误: {str(e)}")
             return {'success': False, 'error': str(e), 'message': '实例重启失败'}
+
+    def force_reboot_instances(self, instance_ids, region_id='cn-shanghai'):
+        """强制重启实例（支持批量）"""
+        client = self._get_client(region_id)
+        try:
+            if isinstance(instance_ids, list):
+                instance_ids_str = json.dumps(instance_ids)
+            else:
+                instance_ids_str = instance_ids
+
+            request = swas__open20200601_models.RebootInstancesRequest(
+                region_id=region_id,
+                force_reboot=True,
+                instance_ids=instance_ids_str
+            )
+            runtime = util_models.RuntimeOptions()
+            response = client.reboot_instances_with_options(request, runtime)
+            return {'success': True, 'data': self._convert_response_to_dict(response.body), 'message': '实例强制重启命令已发送'}
+        except Exception as e:
+            jingrow.log_error("强制重启实例失败", f"强制重启实例 {instance_ids} 时发生错误: {str(e)}")
+            return {'success': False, 'error': str(e), 'message': '实例强制重启失败'}
     
     def upgrade_instance(self, instance_id, plan_id, region_id='cn-shanghai'):
         """升级实例配置"""
@@ -603,6 +624,46 @@ def reboot_aliyun_instance(instance_id, region_id='cn-shanghai'):
         jingrow.log_error("重启实例失败", f"重启实例 {instance_id} 时发生错误: {str(e)}")
         return {"success": False, "error": str(e), "message": "重启实例失败"}
 
+@jingrow.whitelist()
+def force_reboot_aliyun_instance(instance_id, region_id='cn-shanghai'):
+    """强制重启实例并更新状态"""
+    try:
+        # 1. 查找对应的Jsite Server记录
+        server = jingrow.get_pg("Jsite Server", {"instance_id": instance_id})
+        if not server:
+            return {"success": False, "message": "找不到对应的服务器记录"}
+
+        # 2. 立即更新状态为"启动中"（与普通重启保持一致）
+        server.status = "Starting"
+        server.save(ignore_permissions=True)
+        jingrow.db.commit()
+
+        # 3. 调用阿里云API强制重启实例
+        manager = _get_manager()
+        result = manager.force_reboot_instances([instance_id], region_id)
+
+        if not result or not result.get('success'):
+            return result
+
+        # 4. 启动后台任务监控重启状态（延迟10秒开始）
+        time.sleep(10)
+        jingrow.enqueue(
+            "jcloud.api.aliyun_server_light.monitor_server_status",
+            instance_id=instance_id,
+            region_id=region_id,
+            timeout=600
+        )
+
+        return {
+            "success": True,
+            "message": "强制重启命令已发送，正在监控重启状态...",
+            "server_name": server.name
+        }
+
+    except Exception as e:
+        jingrow.log_error("强制重启实例失败", f"强制重启实例 {instance_id} 时发生错误: {str(e)}")
+        return {"success": False, "error": str(e), "message": "强制重启实例失败"}
+
 
 def monitor_server_status(instance_id, region_id):
     """通用的服务器状态监控 - 监控服务器状态直到Running"""