From e64b3f2d7d7155921c03b40b239c2b21a4d25748 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Fri, 14 Mar 2025 18:13:09 +0800
Subject: [PATCH] fix: Modify the default group value (#8157)

---
 agent/app/service/backup.go                          | 2 +-
 core/init/migration/migrations/init.go               | 2 +-
 frontend/src/api/modules/setting.ts                  | 4 ++--
 frontend/src/components/agent-group/index.vue        | 4 ++--
 frontend/src/components/group/index.vue              | 4 ++--
 frontend/src/views/cronjob/cronjob/operate/index.vue | 2 +-
 frontend/src/views/login/components/login-form.vue   | 2 ++
 frontend/src/views/setting/license/index.vue         | 2 +-
 frontend/src/views/terminal/command/index.vue        | 8 ++++----
 frontend/src/views/terminal/host/index.vue           | 6 +++---
 frontend/src/views/terminal/host/operate/index.vue   | 2 +-
 frontend/src/views/terminal/terminal/host-create.vue | 2 +-
 frontend/src/views/website/website/index.vue         | 2 +-
 13 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/agent/app/service/backup.go b/agent/app/service/backup.go
index 653205595..9657571e0 100644
--- a/agent/app/service/backup.go
+++ b/agent/app/service/backup.go
@@ -566,7 +566,7 @@ func changeLocalBackup(oldPath, newPath string) error {
 		}
 	}
 	if fileOp.Stat(path.Join(oldPath, "website")) {
-		if err := fileOp.CopyDir(path.Join(oldPath, "website"), newPath); err != nil {
+		if err := fileOp.Mv(path.Join(oldPath, "website"), newPath); err != nil {
 			return err
 		}
 	}
diff --git a/core/init/migration/migrations/init.go b/core/init/migration/migrations/init.go
index 5241c03a6..4da8b8ae0 100644
--- a/core/init/migration/migrations/init.go
+++ b/core/init/migration/migrations/init.go
@@ -167,7 +167,7 @@ var InitHost = &gormigrate.Migration{
 	ID: "20240816-init-host",
 	Migrate: func(tx *gorm.DB) error {
 		hostGroup := &model.Group{Name: "Default", Type: "host", IsDefault: true}
-		if err := tx.Create(hostGroup).Error; err != nil {
+		if err := global.DB.Create(hostGroup).Error; err != nil {
 			return err
 		}
 		if err := tx.Create(&model.Group{Name: "Default", Type: "node", IsDefault: true}).Error; err != nil {
diff --git a/frontend/src/api/modules/setting.ts b/frontend/src/api/modules/setting.ts
index 886f3010e..8a07bf655 100644
--- a/frontend/src/api/modules/setting.ts
+++ b/frontend/src/api/modules/setting.ts
@@ -30,8 +30,8 @@ export const syncLicense = (id: number) => {
 export const bindLicense = (id: number, nodeID: number) => {
     return http.post(`/core/licenses/bind`, { nodeID: nodeID, licenseID: id }, TimeoutEnum.T_60S);
 };
-export const unbindLicense = (id: number) => {
-    return http.post(`/core/licenses/unbind`, { id: id }, TimeoutEnum.T_60S);
+export const unbindLicense = (id: number, force: boolean) => {
+    return http.post(`/core/licenses/unbind`, { id: id, force: force }, TimeoutEnum.T_60S);
 };
 export const loadLicenseOptions = () => {
     return http.get(`/core/licenses/options`);
diff --git a/frontend/src/components/agent-group/index.vue b/frontend/src/components/agent-group/index.vue
index 60100f39d..ba6c49d1a 100644
--- a/frontend/src/components/agent-group/index.vue
+++ b/frontend/src/components/agent-group/index.vue
@@ -8,10 +8,10 @@
                 <el-table-column :label="$t('commons.table.name')" prop="name">
                     <template #default="{ row }">
                         <div v-if="!row.edit">
-                            <span v-if="row.name === 'default'">
+                            <span v-if="row.name === 'Default'">
                                 {{ $t('commons.table.default') }}
                             </span>
-                            <span v-if="row.name !== 'default'">{{ row.name }}</span>
+                            <span v-if="row.name !== 'Default'">{{ row.name }}</span>
                             <el-tag v-if="row.isDefault" type="success" class="ml-2" size="small">
                                 ({{ $t('commons.table.default') }})
                             </el-tag>
diff --git a/frontend/src/components/group/index.vue b/frontend/src/components/group/index.vue
index 05a394ea7..0b0ba6cdd 100644
--- a/frontend/src/components/group/index.vue
+++ b/frontend/src/components/group/index.vue
@@ -8,10 +8,10 @@
                 <el-table-column :label="$t('commons.table.name')" prop="name">
                     <template #default="{ row }">
                         <div v-if="!row.edit">
-                            <span v-if="row.name === 'default'">
+                            <span v-if="row.name === 'Default'">
                                 {{ $t('commons.table.default') }}
                             </span>
-                            <span v-if="row.name !== 'default'">{{ row.name }}</span>
+                            <span v-if="row.name !== 'Default'">{{ row.name }}</span>
                             <el-tag v-if="row.isDefault" type="success" class="ml-2" size="small">
                                 ({{ $t('commons.table.default') }})
                             </el-tag>
diff --git a/frontend/src/views/cronjob/cronjob/operate/index.vue b/frontend/src/views/cronjob/cronjob/operate/index.vue
index 69bf74e06..4a2531c5a 100644
--- a/frontend/src/views/cronjob/cronjob/operate/index.vue
+++ b/frontend/src/views/cronjob/cronjob/operate/index.vue
@@ -1053,7 +1053,7 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
         }
 
         dialogData.value.rowData.alertCount =
-            dialogData.value.rowData!.hasAlert && isProductPro.value ? dialogData.value.rowData.alertCount : 3;
+            dialogData.value.rowData!.hasAlert && isProductPro.value ? dialogData.value.rowData.alertCount : 0;
         dialogData.value.rowData.alertTitle =
             dialogData.value.rowData!.hasAlert && isProductPro.value
                 ? i18n.global.t('cronjob.alertTitle', [
diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue
index 567f6d06a..f758559a8 100644
--- a/frontend/src/views/login/components/login-form.vue
+++ b/frontend/src/views/login/components/login-form.vue
@@ -335,6 +335,7 @@ const login = (formEl: FormInstance | undefined) => {
             globalStore.setAgreeLicense(true);
             menuStore.setMenuList([]);
             tabsStore.removeAllTabs();
+            globalStore.currentNode = 'local';
             MsgSuccess(i18n.t('commons.msg.loginSuccess'));
             router.push({ name: 'home' });
         } catch (res) {
@@ -370,6 +371,7 @@ const mfaLogin = async (auto: boolean) => {
             menuStore.setMenuList([]);
             tabsStore.removeAllTabs();
             MsgSuccess(i18n.t('commons.msg.loginSuccess'));
+            globalStore.currentNode = 'local';
             router.push({ name: 'home' });
         } catch (res) {
             if (res.code === 401) {
diff --git a/frontend/src/views/setting/license/index.vue b/frontend/src/views/setting/license/index.vue
index 30fd0f639..468f0693f 100644
--- a/frontend/src/views/setting/license/index.vue
+++ b/frontend/src/views/setting/license/index.vue
@@ -164,7 +164,7 @@ const onUnbind = async (row: any) => {
 };
 const submitUnbind = async () => {
     loading.value = true;
-    await unbindLicense(unbindRow.value.id)
+    await unbindLicense(unbindRow.value.id, forceUnbind.value)
         .then(() => {
             loading.value = false;
             MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
diff --git a/frontend/src/views/terminal/command/index.vue b/frontend/src/views/terminal/command/index.vue
index 51d166151..3e6627a68 100644
--- a/frontend/src/views/terminal/command/index.vue
+++ b/frontend/src/views/terminal/command/index.vue
@@ -20,7 +20,7 @@
                     <template #prefix>{{ $t('commons.table.group') }}</template>
                     <div v-for="item in groupList" :key="item.id">
                         <el-option
-                            v-if="item.name === 'default'"
+                            v-if="item.name === 'Default'"
                             :label="$t('commons.table.default')"
                             :value="item.id"
                         />
@@ -64,11 +64,11 @@
                         <template #default="{ row }">
                             <fu-select-rw-switch v-model="row.groupID" @change="updateGroup(row)">
                                 <template #read>
-                                    {{ row.groupBelong === 'default' ? $t('commons.table.default') : row.groupBelong }}
+                                    {{ row.groupBelong === 'Default' ? $t('commons.table.default') : row.groupBelong }}
                                 </template>
                                 <div v-for="item in groupList" :key="item.id">
                                     <el-option
-                                        v-if="item.name === 'default'"
+                                        v-if="item.name === 'Default'"
                                         :label="$t('commons.table.default')"
                                         :value="item.id"
                                     />
@@ -102,7 +102,7 @@
                     <el-select filterable v-model="commandInfo.groupID" clearable style="width: 100%">
                         <div v-for="item in groupList" :key="item.id">
                             <el-option
-                                v-if="item.name === 'default'"
+                                v-if="item.name === 'Default'"
                                 :label="$t('commons.table.default')"
                                 :value="item.id"
                             />
diff --git a/frontend/src/views/terminal/host/index.vue b/frontend/src/views/terminal/host/index.vue
index 648b62a53..db98e9cb5 100644
--- a/frontend/src/views/terminal/host/index.vue
+++ b/frontend/src/views/terminal/host/index.vue
@@ -18,7 +18,7 @@
                     <el-option :label="$t('commons.table.all')" value=""></el-option>
                     <div v-for="item in groupList" :key="item.id">
                         <el-option
-                            v-if="item.name === 'default'"
+                            v-if="item.name === 'Default'"
                             :label="$t('commons.table.default')"
                             :value="item.id"
                         />
@@ -47,11 +47,11 @@
                         <template #default="{ row }">
                             <fu-select-rw-switch v-model="row.groupID" @change="updateGroup(row)">
                                 <template #read>
-                                    {{ row.groupBelong === 'default' ? $t('commons.table.default') : row.groupBelong }}
+                                    {{ row.groupBelong === 'Default' ? $t('commons.table.default') : row.groupBelong }}
                                 </template>
                                 <div v-for="item in groupList" :key="item.id">
                                     <el-option
-                                        v-if="item.name === 'default'"
+                                        v-if="item.name === 'Default'"
                                         :label="$t('commons.table.default')"
                                         :value="item.id"
                                     />
diff --git a/frontend/src/views/terminal/host/operate/index.vue b/frontend/src/views/terminal/host/operate/index.vue
index 88fe1735d..f289190ef 100644
--- a/frontend/src/views/terminal/host/operate/index.vue
+++ b/frontend/src/views/terminal/host/operate/index.vue
@@ -52,7 +52,7 @@
                 <el-select filterable v-model="dialogData.rowData!.groupID" clearable style="width: 100%">
                     <div v-for="item in groupList" :key="item.id">
                         <el-option
-                            v-if="item.name === 'default'"
+                            v-if="item.name === 'Default'"
                             :label="$t('commons.table.default')"
                             :value="item.id"
                         />
diff --git a/frontend/src/views/terminal/terminal/host-create.vue b/frontend/src/views/terminal/terminal/host-create.vue
index d9648c02f..159a3fbe7 100644
--- a/frontend/src/views/terminal/terminal/host-create.vue
+++ b/frontend/src/views/terminal/terminal/host-create.vue
@@ -46,7 +46,7 @@
                 <el-select filterable v-model="hostInfo.groupID" clearable style="width: 100%">
                     <div v-for="item in groupList" :key="item.id">
                         <el-option
-                            v-if="item.name === 'default'"
+                            v-if="item.name === 'Default'"
                             :label="$t('commons.table.default')"
                             :value="item.id"
                         />
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index f0b12fead..8a72c73b8 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -43,7 +43,7 @@
                     <el-option :label="$t('commons.table.all')" :value="0"></el-option>
                     <div v-for="item in groups" :key="item.id">
                         <el-option
-                            v-if="item.name === 'default'"
+                            v-if="item.name === 'Default'"
                             :label="$t('commons.table.default')"
                             :value="item.id"
                         />