diff --git a/apps/admin/app/dashboard/server/form-schema.ts b/apps/admin/app/dashboard/server/form-schema.ts
index 8819172..bd6c430 100644
--- a/apps/admin/app/dashboard/server/form-schema.ts
+++ b/apps/admin/app/dashboard/server/form-schema.ts
@@ -92,6 +92,8 @@ const protocolConfigSchema = z.discriminatedUnion('protocol', [
 const baseFormSchema = z.object({
   name: z.string(),
   tags: z.array(z.string()).nullish().default([]),
+  country: z.string().nullish(),
+  city: z.string().nullish(),
   server_addr: z.string(),
   speed_limit: z.number().nullish(),
   traffic_ratio: z.number().default(1),
diff --git a/apps/admin/app/dashboard/server/node-form.tsx b/apps/admin/app/dashboard/server/node-form.tsx
index 90e77b4..c905236 100644
--- a/apps/admin/app/dashboard/server/node-form.tsx
+++ b/apps/admin/app/dashboard/server/node-form.tsx
@@ -160,23 +160,61 @@ export default function NodeForm<T extends { [x: string]: any }>({
                   )}
                 />
               </div>
-              <FormField
-                control={form.control}
-                name='tags'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>{t('form.tags')}</FormLabel>
-                    <FormControl>
-                      <TagInput
-                        placeholder={t('form.tagsPlaceholder')}
-                        value={field.value || []}
-                        onChange={(value) => form.setValue(field.name, value)}
-                      />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
+              <div className='grid grid-cols-5 gap-2'>
+                <FormField
+                  control={form.control}
+                  name='tags'
+                  render={({ field }) => (
+                    <FormItem className='col-span-3'>
+                      <FormLabel>{t('form.tags')}</FormLabel>
+                      <FormControl>
+                        <TagInput
+                          placeholder={t('form.tagsPlaceholder')}
+                          value={field.value || []}
+                          onChange={(value) => form.setValue(field.name, value)}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name='country'
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>{t('form.country')}</FormLabel>
+                      <FormControl>
+                        <EnhancedInput
+                          {...field}
+                          onValueChange={(value) => {
+                            form.setValue(field.name, value);
+                          }}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+                <FormField
+                  control={form.control}
+                  name='city'
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel>{t('form.city')}</FormLabel>
+                      <FormControl>
+                        <EnhancedInput
+                          {...field}
+                          onValueChange={(value) => {
+                            form.setValue(field.name, value);
+                          }}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              </div>
               <div className='grid grid-cols-3 gap-2'>
                 <FormField
                   control={form.control}
diff --git a/apps/admin/app/dashboard/server/node-table.tsx b/apps/admin/app/dashboard/server/node-table.tsx
index b9dee12..7b0e28f 100644
--- a/apps/admin/app/dashboard/server/node-table.tsx
+++ b/apps/admin/app/dashboard/server/node-table.tsx
@@ -123,6 +123,16 @@ export default function NodeTable() {
         {
           accessorKey: 'server_addr',
           header: t('serverAddr'),
+          cell: ({ row }) => {
+            return (
+              <div className='flex gap-1'>
+                <Badge variant='outline'>
+                  {row.original.country} - {row.original.city}
+                </Badge>
+                <Badge variant='outline'>{row.getValue('server_addr')}</Badge>
+              </div>
+            );
+          },
         },
         {
           accessorKey: 'status',
diff --git a/apps/admin/locales/cs-CZ/server.json b/apps/admin/locales/cs-CZ/server.json
index 6f0fa5a..9dde76c 100644
--- a/apps/admin/locales/cs-CZ/server.json
+++ b/apps/admin/locales/cs-CZ/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Povolit nezabezpečené",
       "cancel": "Zrušit",
+      "city": "Město",
       "confirm": "Potvrdit",
+      "country": "Země",
       "edit": "Upravit",
       "editSecurity": "Upravit nastavení zabezpečení",
       "enableTLS": "Povolit TLS",
diff --git a/apps/admin/locales/de-DE/server.json b/apps/admin/locales/de-DE/server.json
index 52e6cec..190722b 100644
--- a/apps/admin/locales/de-DE/server.json
+++ b/apps/admin/locales/de-DE/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Unsicher zulassen",
       "cancel": "Abbrechen",
+      "city": "Stadt",
       "confirm": "Bestätigen",
+      "country": "Land",
       "edit": "Bearbeiten",
       "editSecurity": "Sicherheitskonfiguration bearbeiten",
       "enableTLS": "TLS aktivieren",
diff --git a/apps/admin/locales/en-US/server.json b/apps/admin/locales/en-US/server.json
index f1dfe3e..89f1117 100644
--- a/apps/admin/locales/en-US/server.json
+++ b/apps/admin/locales/en-US/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Allow Insecure",
       "cancel": "Cancel",
+      "city": "City",
       "confirm": "Confirm",
+      "country": "Country",
       "edit": "Edit",
       "editSecurity": "Edit Security Configuration",
       "enableTLS": "Enable TLS",
diff --git a/apps/admin/locales/es-ES/server.json b/apps/admin/locales/es-ES/server.json
index 22b638e..b513376 100644
--- a/apps/admin/locales/es-ES/server.json
+++ b/apps/admin/locales/es-ES/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Permitir inseguro",
       "cancel": "Cancelar",
+      "city": "Ciudad",
       "confirm": "Confirmar",
+      "country": "País",
       "edit": "Editar",
       "editSecurity": "Editar configuración de seguridad",
       "enableTLS": "Habilitar TLS",
diff --git a/apps/admin/locales/es-MX/server.json b/apps/admin/locales/es-MX/server.json
index 9c47774..f84a2b7 100644
--- a/apps/admin/locales/es-MX/server.json
+++ b/apps/admin/locales/es-MX/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Permitir inseguro",
       "cancel": "Cancelar",
+      "city": "Ciudad",
       "confirm": "Confirmar",
+      "country": "País",
       "edit": "Editar",
       "editSecurity": "Editar configuración de seguridad",
       "enableTLS": "Habilitar TLS",
diff --git a/apps/admin/locales/fa-IR/server.json b/apps/admin/locales/fa-IR/server.json
index 51648e9..658c590 100644
--- a/apps/admin/locales/fa-IR/server.json
+++ b/apps/admin/locales/fa-IR/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "اجازه به ناامن",
       "cancel": "لغو",
+      "city": "شهر",
       "confirm": "تأیید",
+      "country": "کشور",
       "edit": "ویرایش",
       "editSecurity": "ویرایش تنظیمات امنیتی",
       "enableTLS": "فعال‌سازی TLS",
diff --git a/apps/admin/locales/fi-FI/server.json b/apps/admin/locales/fi-FI/server.json
index bac9856..ba1eb2f 100644
--- a/apps/admin/locales/fi-FI/server.json
+++ b/apps/admin/locales/fi-FI/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Salli epävarma",
       "cancel": "Peruuta",
+      "city": "Kaupunki",
       "confirm": "Vahvista",
+      "country": "Maa",
       "edit": "Muokkaa",
       "editSecurity": "Muokkaa suojausasetuksia",
       "enableTLS": "Ota TLS käyttöön",
diff --git a/apps/admin/locales/fr-FR/server.json b/apps/admin/locales/fr-FR/server.json
index abe0398..ab7748d 100644
--- a/apps/admin/locales/fr-FR/server.json
+++ b/apps/admin/locales/fr-FR/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Autoriser l'insécurité",
       "cancel": "Annuler",
+      "city": "Ville",
       "confirm": "Confirmer",
+      "country": "Pays",
       "edit": "Éditer",
       "editSecurity": "Éditer la configuration de sécurité",
       "enableTLS": "Activer TLS",
diff --git a/apps/admin/locales/hi-IN/server.json b/apps/admin/locales/hi-IN/server.json
index 20c2aa8..0acf838 100644
--- a/apps/admin/locales/hi-IN/server.json
+++ b/apps/admin/locales/hi-IN/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "असुरक्षित की अनुमति दें",
       "cancel": "रद्द करें",
+      "city": "शहर",
       "confirm": "पुष्टि करें",
+      "country": "देश",
       "edit": "संपादित करें",
       "editSecurity": "सुरक्षा कॉन्फ़िगरेशन संपादित करें",
       "enableTLS": "TLS सक्षम करें",
diff --git a/apps/admin/locales/hu-HU/server.json b/apps/admin/locales/hu-HU/server.json
index 534382e..2944d07 100644
--- a/apps/admin/locales/hu-HU/server.json
+++ b/apps/admin/locales/hu-HU/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Nem biztonságos engedélyezése",
       "cancel": "Mégse",
+      "city": "Város",
       "confirm": "Megerősít",
+      "country": "Ország",
       "edit": "Szerkesztés",
       "editSecurity": "Biztonsági beállítások szerkesztése",
       "enableTLS": "TLS engedélyezése",
diff --git a/apps/admin/locales/ja-JP/server.json b/apps/admin/locales/ja-JP/server.json
index fb2b165..5606c38 100644
--- a/apps/admin/locales/ja-JP/server.json
+++ b/apps/admin/locales/ja-JP/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "安全でないことを許可",
       "cancel": "キャンセル",
+      "city": "市",
       "confirm": "確認",
+      "country": "国",
       "edit": "編集",
       "editSecurity": "セキュリティ設定を編集",
       "enableTLS": "TLSを有効化",
diff --git a/apps/admin/locales/ko-KR/server.json b/apps/admin/locales/ko-KR/server.json
index cf14984..0f5e5cd 100644
--- a/apps/admin/locales/ko-KR/server.json
+++ b/apps/admin/locales/ko-KR/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "비보안 허용",
       "cancel": "취소",
+      "city": "도시",
       "confirm": "확인",
+      "country": "국가",
       "edit": "편집",
       "editSecurity": "보안 설정 편집",
       "enableTLS": "TLS 활성화",
diff --git a/apps/admin/locales/no-NO/server.json b/apps/admin/locales/no-NO/server.json
index c0aea76..bb24e3a 100644
--- a/apps/admin/locales/no-NO/server.json
+++ b/apps/admin/locales/no-NO/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Tillat usikker",
       "cancel": "Avbryt",
+      "city": "By",
       "confirm": "Bekreft",
+      "country": "Land",
       "edit": "Rediger",
       "editSecurity": "Rediger sikkerhetskonfigurasjon",
       "enableTLS": "Aktiver TLS",
diff --git a/apps/admin/locales/pl-PL/server.json b/apps/admin/locales/pl-PL/server.json
index 2a128fb..5251a18 100644
--- a/apps/admin/locales/pl-PL/server.json
+++ b/apps/admin/locales/pl-PL/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Zezwól na niebezpieczne",
       "cancel": "Anuluj",
+      "city": "Miasto",
       "confirm": "Potwierdź",
+      "country": "Kraj",
       "edit": "Edytuj",
       "editSecurity": "Edytuj konfigurację bezpieczeństwa",
       "enableTLS": "Włącz TLS",
diff --git a/apps/admin/locales/pt-BR/server.json b/apps/admin/locales/pt-BR/server.json
index 1a0f4ab..99d3fcb 100644
--- a/apps/admin/locales/pt-BR/server.json
+++ b/apps/admin/locales/pt-BR/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Permitir Inseguro",
       "cancel": "Cancelar",
+      "city": "Cidade",
       "confirm": "Confirmar",
+      "country": "País",
       "edit": "Editar",
       "editSecurity": "Editar Configuração de Segurança",
       "enableTLS": "Habilitar TLS",
diff --git a/apps/admin/locales/ro-RO/server.json b/apps/admin/locales/ro-RO/server.json
index 7466085..bfe5781 100644
--- a/apps/admin/locales/ro-RO/server.json
+++ b/apps/admin/locales/ro-RO/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Permite nesigur",
       "cancel": "Anulează",
+      "city": "Oraș",
       "confirm": "Confirmă",
+      "country": "Țară",
       "edit": "Editează",
       "editSecurity": "Editează configurația de securitate",
       "enableTLS": "Activează TLS",
diff --git a/apps/admin/locales/ru-RU/server.json b/apps/admin/locales/ru-RU/server.json
index 59982e5..6057488 100644
--- a/apps/admin/locales/ru-RU/server.json
+++ b/apps/admin/locales/ru-RU/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Разрешить небезопасное",
       "cancel": "Отмена",
+      "city": "Город",
       "confirm": "Подтвердить",
+      "country": "Страна",
       "edit": "Редактировать",
       "editSecurity": "Редактировать настройки безопасности",
       "enableTLS": "Включить TLS",
diff --git a/apps/admin/locales/th-TH/server.json b/apps/admin/locales/th-TH/server.json
index dcb12a9..f40904c 100644
--- a/apps/admin/locales/th-TH/server.json
+++ b/apps/admin/locales/th-TH/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "อนุญาตไม่ปลอดภัย",
       "cancel": "ยกเลิก",
+      "city": "เมือง",
       "confirm": "ยืนยัน",
+      "country": "ประเทศ",
       "edit": "แก้ไข",
       "editSecurity": "แก้ไขการตั้งค่าความปลอดภัย",
       "enableTLS": "เปิดใช้งานTLS",
diff --git a/apps/admin/locales/tr-TR/server.json b/apps/admin/locales/tr-TR/server.json
index 092c9fc..b532363 100644
--- a/apps/admin/locales/tr-TR/server.json
+++ b/apps/admin/locales/tr-TR/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Güvensizliğe izin ver",
       "cancel": "İptal",
+      "city": "Şehir",
       "confirm": "Onayla",
+      "country": "Ülke",
       "edit": "Düzenle",
       "editSecurity": "Güvenlik Ayarlarını Düzenle",
       "enableTLS": "TLS'i Etkinleştir",
diff --git a/apps/admin/locales/uk-UA/server.json b/apps/admin/locales/uk-UA/server.json
index f9f56d5..d46d9f9 100644
--- a/apps/admin/locales/uk-UA/server.json
+++ b/apps/admin/locales/uk-UA/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Дозволити небезпечні з'єднання",
       "cancel": "Скасувати",
+      "city": "Місто",
       "confirm": "Підтвердити",
+      "country": "Країна",
       "edit": "Редагувати",
       "editSecurity": "Редагувати налаштування безпеки",
       "enableTLS": "Увімкнути TLS",
diff --git a/apps/admin/locales/vi-VN/server.json b/apps/admin/locales/vi-VN/server.json
index b690782..f007029 100644
--- a/apps/admin/locales/vi-VN/server.json
+++ b/apps/admin/locales/vi-VN/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "Cho phép không an toàn",
       "cancel": "Hủy",
+      "city": "Thành phố",
       "confirm": "Xác nhận",
+      "country": "Quốc gia",
       "edit": "Chỉnh sửa",
       "editSecurity": "Chỉnh sửa cấu hình bảo mật",
       "enableTLS": "Kích hoạt TLS",
diff --git a/apps/admin/locales/zh-CN/server.json b/apps/admin/locales/zh-CN/server.json
index 2bc5d80..7f3566c 100644
--- a/apps/admin/locales/zh-CN/server.json
+++ b/apps/admin/locales/zh-CN/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "允许不安全",
       "cancel": "取消",
+      "city": "城市",
       "confirm": "确认",
+      "country": "国家",
       "edit": "编辑",
       "editSecurity": "编辑安全性配置",
       "enableTLS": "启用TLS",
diff --git a/apps/admin/locales/zh-HK/server.json b/apps/admin/locales/zh-HK/server.json
index e4c5c46..31db055 100644
--- a/apps/admin/locales/zh-HK/server.json
+++ b/apps/admin/locales/zh-HK/server.json
@@ -66,7 +66,9 @@
     "form": {
       "allowInsecure": "允許不安全",
       "cancel": "取消",
+      "city": "城市",
       "confirm": "確認",
+      "country": "國家",
       "edit": "編輯",
       "editSecurity": "編輯安全性配置",
       "enableTLS": "啟用TLS",
diff --git a/apps/admin/services/admin/index.ts b/apps/admin/services/admin/index.ts
index 5cabc85..05010d8 100644
--- a/apps/admin/services/admin/index.ts
+++ b/apps/admin/services/admin/index.ts
@@ -1,5 +1,5 @@
 // @ts-ignore
- 
+
 // API 更新时间：
 // API 唯一标识：
 import * as announcement from './announcement';