From 69554b5e3999f0a66106fbd85265bb0dcdca0194 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <zklcdc@qq.com>
Date: Sun, 30 Mar 2025 01:24:12 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=20=F0=9F=90=9B=20Ignore=20`GpuCount`=20Va?=
 =?UTF-8?q?lue=20at=20Instance=20Modify=20to=20CpuOnly=20#21?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/admin/Instances.vue    | 7 +++++--
 frontend/src/views/users/InstanceList.vue | 7 +++++--
 routers/api/v1/admin/instance/modify.go   | 4 ++++
 routers/api/v1/user/instances/modify.go   | 4 ++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/admin/Instances.vue b/frontend/src/views/admin/Instances.vue
index 5aff041..95af13e 100644
--- a/frontend/src/views/admin/Instances.vue
+++ b/frontend/src/views/admin/Instances.vue
@@ -121,13 +121,13 @@
         </Fieldset>
         <Fieldset legend="GPU">
           <span v-if="instanceDetail.gpu_count !== 0">{{ instanceDetail.gpu_type }} * {{ instanceDetail.gpu_count
-          }}</span>
+            }}</span>
           <span v-else>无卡模式</span>
         </Fieldset>
         <div class="flex flex-col md:flex-row gap-4">
           <Fieldset class="flex flex-wrap gap-2 w-full" legend="CPU">
             <span v-if="instanceDetail.gpu_count !== 0">{{ instanceDetail.cpu_count_per_gpu * instanceDetail.gpu_count
-            }}
+              }}
               核</span>
             <span v-else>1 核</span>
           </Fieldset>
@@ -498,6 +498,9 @@ const instanceModify = async () => {
   setTimeout(() => {
     getInstances()
   }, 100);
+  if (instanceConfiguration.value.cpu_only) {
+    delete instanceConfiguration.value.gpu_count
+  }
   await api.AdminInstancesModify(instanceDetail.value.id, instanceConfiguration.value).then(async (res) => {
     toast.add({ severity: 'success', summary: '调整配置', detail: '已调整配置', life: 3000 });
     instanceModifyVisible.value = false
diff --git a/frontend/src/views/users/InstanceList.vue b/frontend/src/views/users/InstanceList.vue
index 40c3331..f355807 100644
--- a/frontend/src/views/users/InstanceList.vue
+++ b/frontend/src/views/users/InstanceList.vue
@@ -125,13 +125,13 @@
         </Fieldset>
         <Fieldset legend="GPU">
           <span v-if="instanceDetail.gpu_count !== 0">{{ instanceDetail.gpu_type }} * {{ instanceDetail.gpu_count
-            }}</span>
+          }}</span>
           <span v-else>无卡模式</span>
         </Fieldset>
         <div class="flex flex-col md:flex-row gap-4">
           <Fieldset class="flex flex-wrap gap-2 w-full" legend="CPU">
             <span v-if="instanceDetail.gpu_count !== 0">{{ instanceDetail.cpu_count_per_gpu * instanceDetail.gpu_count
-              }}
+            }}
               核</span>
             <span v-else>1 核</span>
           </Fieldset>
@@ -501,6 +501,9 @@ const instanceModify = async () => {
   setTimeout(() => {
     getInstances()
   }, 100);
+  if (instanceConfiguration.value.cpu_only) {
+    delete instanceConfiguration.value.gpu_count
+  }
   await api.UserInstancesModify(instanceDetail.value.id, instanceConfiguration.value).then(async (res) => {
     toast.add({ severity: 'success', summary: '调整配置', detail: '已调整配置', life: 3000 });
     instanceModifyVisible.value = false
diff --git a/routers/api/v1/admin/instance/modify.go b/routers/api/v1/admin/instance/modify.go
index d1cc228..6958162 100644
--- a/routers/api/v1/admin/instance/modify.go
+++ b/routers/api/v1/admin/instance/modify.go
@@ -33,6 +33,10 @@ func modifyHandler(ctx iris.Context) {
 		return
 	}
 
+	if req.CpuOnly {
+		req.GpuCount = nil
+	}
+
 	if req.GpuCount != nil {
 		if *req.GpuCount < 0 {
 			middleware.Error(ctx, middleware.CodeBadRequest, iris.StatusBadRequest)
diff --git a/routers/api/v1/user/instances/modify.go b/routers/api/v1/user/instances/modify.go
index e69f00f..57cdfd3 100644
--- a/routers/api/v1/user/instances/modify.go
+++ b/routers/api/v1/user/instances/modify.go
@@ -39,6 +39,10 @@ func modifyHandler(ctx iris.Context) {
 		return
 	}
 
+	if req.CpuOnly {
+		req.GpuCount = nil
+	}
+
 	if req.GpuCount != nil {
 		if *req.GpuCount < 0 {
 			middleware.Error(ctx, middleware.CodeBadRequest, iris.StatusBadRequest)