[Fix] 🐛 Send Instance Current Config to Controler #23

README.md

@@ -46,7 +46,7 @@
 > [!WARNING]
 > 部署仓库: [XShengTech/MEGREZ-Deploy](https://github.com/XShengTech/MEGREZ-Deploy)
 > 
-> 查看文档 [**>>> 🚧 正在施工中 <<<**]()
+> 查看文档 [**>>> MEGREZ 文档 <<<**](http://docs.megrez.xsheng-ai.com/)
 
 
 ## 📌 效果展示
@@ -81,7 +81,7 @@
 
 | VSCode 网页版                                        | Jupyter Notebook                                 | Grafana 资源监控                 |
 | ---------------------------------------------------- | ----------------------------------------------- | -------------------------------- |
-| ![image-20250116010708107](./assets/code-server/.png) | ![Jupyter NoteBook](./assets/juper-notebook.png) | ![Grafana](./assets/grafana.png) |
+| ![image-20250116010708107](./assets/code-server.png) | ![Jupyter NoteBook](./assets/juper-notebook.png) | ![Grafana](./assets/grafana.png) |
 
 ### 系统管理
 

frontend/src/layout/AppMenu.vue

@@ -56,15 +56,9 @@ const model = ref([
       {
         label: '使用文档',
         icon: 'pi pi-fw pi-book text-amber-500',
-        url: '#',
+        url: 'http://docs.megrez.xsheng-ai.com/guide/usage/',
         target: '_blank'
       },
-      // {
-      //     label: '开源信息',
-      //     icon: 'pi pi-fw pi-cog',
-      //     url: 'https://github.com/primefaces/sakai-vue',
-      //     target: '_blank'
-      // },
     ]
   }
 ]);

frontend/src/layout/composables/layout.js

@@ -4,10 +4,36 @@ const layoutConfig = reactive({
   preset: 'Aura',
   primary: 'blue',
   surface: null,
-  darkTheme: false,
+  darkTheme: window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches,
   menuMode: 'static'
 });
 
+// Listen for changes to the prefers-color-scheme media query
+if (window.matchMedia) {
+  window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => {
+    layoutConfig.darkTheme = e.matches;
+    toggleDarkMode();
+  });
+}
+
+const toggleDarkMode = () => {
+  if (!document.startViewTransition) {
+    executeDarkModeToggle();
+    return;
+  }
+
+  document.startViewTransition(() => executeDarkModeToggle(event));
+};
+
+if (layoutConfig.darkTheme) {
+  toggleDarkMode()
+}
+
+const executeDarkModeToggle = () => {
+  layoutConfig.darkTheme = !layoutConfig.darkTheme;
+  document.documentElement.classList.toggle('app-dark');
+};
+
 const layoutState = reactive({
   staticMenuDesktopInactive: false,
   overlayMenuActive: false,
@@ -39,21 +65,6 @@ export function useLayout() {
     layoutConfig.menuMode = mode;
   };
 
-  const toggleDarkMode = () => {
-    if (!document.startViewTransition) {
-      executeDarkModeToggle();
-
-      return;
-    }
-
-    document.startViewTransition(() => executeDarkModeToggle(event));
-  };
-
-  const executeDarkModeToggle = () => {
-    layoutConfig.darkTheme = !layoutConfig.darkTheme;
-    document.documentElement.classList.toggle('app-dark');
-  };
-
   const onMenuToggle = () => {
     if (layoutConfig.menuMode === 'overlay') {
       layoutState.overlayMenuActive = !layoutState.overlayMenuActive;

frontend/src/views/Forget.vue

@@ -20,7 +20,8 @@
               <span class="font-medium no-underline ml-2 text-right cursor-pointer text-slate-600">记起密码？<span
                   class="text-primary" @click="handleLogin">立即登入</span></span>
             </div>
-            <Button label="发送邮件" class="w-full" @click="handleSubmit"></Button>
+            <Button v-if="!requesting" label="发送邮件" class="w-full" @click="handleSubmit"></Button>
+            <Button v-else label="发送中" icon="pi pi-spin pi-spinner" disabled class="w-full"></Button>
           </div>
         </div>
       </div>
@@ -40,16 +41,20 @@ import { useRouter } from 'vue-router';
 const router = useRouter()
 const toast = useToast()
 
+const requesting = ref(false)
 const form = ref({
   email: ''
 })
 
 const handleSubmit = () => {
+  requesting.value = true
   api.UserForgetRequest(form.value).then(res => {
     toast.add({ severity: 'success', summary: '发送成功', detail: '请查看邮箱', life: 3000 })
+    requesting.value = false
   }).catch(err => {
     console.error(err)
     toast.add({ severity: 'error', summary: '发送失败', detail: '请检查后重新尝试', life: 3000 })
+    requesting.value = false
   })
 }
 

frontend/src/views/Reset.vue

@@ -27,7 +27,7 @@
               <span class="font-medium no-underline ml-2 text-right cursor-pointer text-slate-600">记起密码？<span
                   class="text-primary" @click="handleLogin">立即登入</span></span>
             </div>
-            <Button label="注册" class="w-full" @click="handleSubmit"></Button>
+            <Button label="重置密码" class="w-full" @click="handleSubmit"></Button>
           </div>
         </div>
       </div>

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

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

libs/utils/email.go

@@ -5,7 +5,7 @@ import (
 )
 
 func EmailFormat(email string) bool {
-	pattern := `^\w+(-+.\w+)*@\w+(-.\w+)*.\w+(-.\w+)*$`
+	pattern := `\w[-\w.+]*@([-A-Za-z0-9]+\.)+[A-Za-z]{2,14}`
 	match, err := regexp.MatchString(pattern, email)
 	if err != nil {
 		return false

main.go

@@ -27,6 +27,7 @@ var (
 )
 
 func main() {
+	l.SetModel("main")
 	l.Info("Branch: %s", BRANCH)
 	l.Info("Version: %s", VERSION)
 	l.Info("Commit: %s", COMMIT)

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)
@@ -62,7 +66,17 @@ func modifyHandler(ctx iris.Context) {
 		return
 	}
 
-	if req.CpuOnly == instance.CpuOnly && req.CpuOnly {
+	hasChanges := false
+	if req.CpuOnly != instance.CpuOnly {
+		hasChanges = true
+	}
+	if req.GpuCount != nil && *req.GpuCount != instance.GpuCount {
+		hasChanges = true
+	}
+	if req.VolumeSize != nil && *req.VolumeSize != instance.VolumeSize {
+		hasChanges = true
+	}
+	if !hasChanges {
 		middleware.Error(ctx, middleware.CodeBadRequest, iris.StatusBadRequest)
 		return
 	}

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)
@@ -68,7 +72,17 @@ func modifyHandler(ctx iris.Context) {
 		return
 	}
 
-	if req.CpuOnly == instance.CpuOnly && req.CpuOnly {
+	hasChanges := false
+	if req.CpuOnly != instance.CpuOnly {
+		hasChanges = true
+	}
+	if req.GpuCount != nil && *req.GpuCount != instance.GpuCount {
+		hasChanges = true
+	}
+	if req.VolumeSize != nil && *req.VolumeSize != instance.VolumeSize {
+		hasChanges = true
+	}
+	if !hasChanges {
 		middleware.Error(ctx, middleware.CodeBadRequest, iris.StatusBadRequest)
 		return
 	}

services/dispatcher/modify.go

@@ -43,9 +43,19 @@ func modify(serverID uint, data Data) (err error) {
 		return errors.New("instance status error")
 	}
 
-	if data.CpuOnly == instance.CpuOnly && data.CpuOnly {
-		lc.Error("instance already cpu_only mode")
-		return errors.New("instance already cpu_only mode")
+	hasChanges := false
+	if data.CpuOnly != instance.CpuOnly {
+		hasChanges = true
+	}
+	if data.GpuCount != nil && *data.GpuCount != instance.GpuCount {
+		hasChanges = true
+	}
+	if data.VolumeSize != nil && *data.VolumeSize != instance.VolumeSize {
+		hasChanges = true
+	}
+	if !hasChanges {
+		lc.Error("no changes")
+		return errors.New("no changes")
 	}
 
 	oldVolumeSize := instance.VolumeSize

services/instanceController/createInstance.go

@@ -62,7 +62,7 @@ func createInstance(ip string, port int, apikey string,
 	if config.GetSystemMountDir() != "" {
 		data.Binds = append(data.Binds, bindStruct{
 			Src:  config.GetSystemMountDir(),
-			Dest: "/root/megrez-pub",
+			Dest: "/root/megrez-mnt",
 		})
 	}
 

services/instanceController/patchGpu.go

@@ -45,6 +45,15 @@ func patchGpu(ip string, port int, apikey string,
 				Dest: "/root/megrez-tmp",
 			},
 		}
+		data.GpuPatch = &gpuPatchStruct{
+			GpuCount: gpuCount,
+		}
+		data.CpuPatch = &cpuPatchStruct{
+			CpuCount: cpuCountPerGpu * gpuCount,
+		}
+		data.MemoryPatch = &MemoryPatchStruct{
+			Memory: strconv.Itoa(memoryPerGpu*gpuCount) + "GB",
+		}
 	}
 
 	reqBytes, err := json.Marshal(data)