diff --git a/src/components/global-setting/index.vue b/src/components/global-setting/index.vue
index 0a3c8658..c397257c 100644
--- a/src/components/global-setting/index.vue
+++ b/src/components/global-setting/index.vue
@@ -44,7 +44,7 @@ a-drawer.settings-drawer(
           span.bold {{ ` US/Pacific. ` }}
           | See more at
           a-link(icon href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones" target="_blank") Wiki.
-    a-form-item
+    a-form-item.save
       a-button(
         type="primary"
         long
@@ -52,7 +52,10 @@ a-drawer.settings-drawer(
         @click="save"
       ) {{ $t('settings.save') }}
       template(#extra)
-        span.fail(v-if="!loginSuccess") {{ $t('settings.saveTip') }}
+        span.danger-color(v-if="loginStatus === 'fail'") {{ $t('settings.saveTip') }}
+        span.success-color(v-if="loginStatus === 'success'")
+          icon-check-circle
+          | {{ $t('settings.saveSuccess') }}
 </template>
 
 <script lang="ts" setup name="GlobalSetting">
@@ -69,7 +72,7 @@ a-drawer.settings-drawer(
   const { role } = storeToRefs(useUserStore())
   const { globalSettings, host, database, username, password, databaseList, userTimezone } = storeToRefs(useAppStore())
 
-  const loginSuccess = ref(true)
+  const loginStatus = ref('')
   const loginLoading = ref(false)
 
   const settingsForm = ref({
@@ -87,10 +90,17 @@ a-drawer.settings-drawer(
 
     axios.defaults.baseURL = settingsForm.value.host
     loginLoading.value = true
-    loginSuccess.value = await login(settingsForm.value)
-    if (loginSuccess.value) {
-      updateSettings({ globalSettings: false })
+    const res = await login(settingsForm.value)
+    if (res) {
+      loginStatus.value = 'success'
       checkTables()
+      setTimeout(() => {
+        updateSettings({
+          globalSettings: false,
+        })
+      }, 2000)
+    } else {
+      loginStatus.value = 'fail'
     }
     loginLoading.value = false
   }
@@ -109,6 +119,7 @@ a-drawer.settings-drawer(
         database: database.value,
         userTimezone: userTimezone.value,
       }
+      loginStatus.value = ''
     }
   })
 
@@ -148,6 +159,11 @@ a-drawer.settings-drawer(
       }
       .arco-form-item {
         margin-bottom: 10px;
+        &.save {
+          .arco-form-item-extra {
+            font-size: 12px;
+          }
+        }
       }
       .arco-drawer-header {
         display: none;
@@ -156,16 +172,6 @@ a-drawer.settings-drawer(
       .arco-drawer-body {
         padding: 16px 16px 10px 16px;
       }
-
-      .save {
-        .arco-form-item {
-          margin-bottom: 0;
-        }
-      }
-
-      .fail {
-        color: var(--danger-color);
-      }
     }
     .bold {
       font-weight: 600;
diff --git a/src/locale/en-US/settings.ts b/src/locale/en-US/settings.ts
index 91b60ca0..aacbbe97 100644
--- a/src/locale/en-US/settings.ts
+++ b/src/locale/en-US/settings.ts
@@ -8,4 +8,5 @@ export default {
   'settings.username': 'Username',
   'settings.timezone': 'Timezone',
   'settings.saveTip': 'Authentication failed. Please check your settings.',
+  'settings.saveSuccess': 'Success!',
 }
diff --git a/src/locale/zh-CN/settings.ts b/src/locale/zh-CN/settings.ts
index 96f096f1..ec44cf20 100644
--- a/src/locale/zh-CN/settings.ts
+++ b/src/locale/zh-CN/settings.ts
@@ -8,4 +8,5 @@ export default {
   'settings.save': '保存',
   'settings.timezone': '时区',
   'settings.saveTip': '认证失败，请检查您的设置。',
+  'settings.saveSuccess': '保存成功！',
 }