From 1ce349a23888471e92f25a38c85efe5f5adb272f Mon Sep 17 00:00:00 2001
From: HynoR <20227709+HynoR@users.noreply.github.com>
Date: Sun, 14 Dec 2025 13:17:05 +0800
Subject: [PATCH 1/7] feat: improve website create function and interface

---
 frontend/src/lang/modules/en.ts               |   3 +
 frontend/src/lang/modules/zh.ts               |   3 +
 .../views/website/website/create/index.vue    | 141 +++++-----
 .../website/website/domain-create/index.vue   | 245 ++++++++++++++----
 4 files changed, 266 insertions(+), 126 deletions(-)

diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index b934867df2e1..a568c396aa2a 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -2639,6 +2639,9 @@ const message = {
         createDb: 'Create Database',
         enableSSLHelper: 'Failure to enable will not affect the creation of the website',
         batchAdd: 'Batch Add Domains',
+        batchInput: 'Batch Input',
+        domainNotFQDN: 'This domain may not be accessible on the public network',
+        domainBatchHelper: 'One domain per line, format: domain:port@ssl\nExample: example.com:443@ssl or example.com',
         generateDomain: 'Generate',
         global: 'Global',
         subsite: 'Subsite',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 01377e8dfad6..f9fcda8cf1f8 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -2451,6 +2451,9 @@ const message = {
         createDb: '创建数据库',
         enableSSLHelper: '开启失败不会影响网站创建',
         batchAdd: '批量添加域名',
+        batchInput: '批量编辑',
+        domainNotFQDN: '该域名可能无法在公网访问',
+        domainBatchHelper: '一行一个域名，格式：域名:端口\n示例：example.com',
         generateDomain: '生成',
         global: '全局',
         subsite: '子网站',
diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue
index 2c74cd1f2b7a..cc67c4a7577f 100644
--- a/frontend/src/views/website/website/create/index.vue
+++ b/frontend/src/views/website/website/create/index.vue
@@ -1,21 +1,5 @@
 <template>
     <DrawerPro v-model="open" :header="$t('website.create')" size="60%" @close="handleClose">
-        <template #buttons>
-            <span class="drawer-header-button">
-                <template v-for="item in WebsiteTypes" :key="item.value">
-                    <el-button
-                        :class="website.type === item.value ? 'active-button' : ''"
-                        @click="changeType(item.value)"
-                        :type="website.type === item.value ? '' : 'info'"
-                        :plain="website.type === item.value"
-                        :text="website.type !== item.value"
-                        :bg="website.type !== item.value"
-                    >
-                        {{ item.label }}
-                    </el-button>
-                </template>
-            </span>
-        </template>
         <div v-loading="loading" :class="{ mask: !versionExist }">
             <SSLAlert :websiteType="website.type" />
             <br />
@@ -28,6 +12,13 @@
                 :validate-on-rule-change="false"
                 v-loading="loading"
             >
+                <el-form-item :label="$t('commons.table.type')">
+                    <el-radio-group v-model="website.type" @change="changeType">
+                        <el-radio-button v-for="item in WebsiteTypes" :key="item.value" :value="item.value">
+                            {{ item.label }}
+                        </el-radio-button>
+                    </el-radio-group>
+                </el-form-item>
                 <GroupSelect
                     v-model="website.webSiteGroupId"
                     :prop="'webSiteGroupId'"
@@ -185,6 +176,10 @@
                         {{ $t('website.runtimePortWarn') }}
                     </el-text>
                 </div>
+
+                <el-divider content-position="left">
+                    <el-text type="info" size="small">{{ $t('website.domain') }}</el-text>
+                </el-divider>
                 <div v-if="website.type === 'stream'">
                     <el-form-item :label="$t('website.streamPorts')" prop="streamPorts">
                         <el-input
@@ -196,10 +191,10 @@
                 <div v-else>
                     <DomainCreate v-model:form="website" @gengerate="websiteForm.clearValidate()"></DomainCreate>
                 </div>
-                <el-form-item prop="IPV6">
-                    <el-checkbox v-model="website.IPV6" :label="$t('website.ipv6')" size="large" />
-                </el-form-item>
-                <el-form-item :label="$t('website.alias')" prop="alias">
+                <el-divider content-position="left">
+                    <el-text type="info" size="small">{{ $t('website.websiteSetting') }}</el-text>
+                </el-divider>
+                <el-form-item :label="$t('website.alias')" prop="alias" class="mt-2">
                     <el-input v-model.trim="website.alias" :placeholder="$t('website.aliasHelper')"></el-input>
                     <div>
                         <span class="input-help">
@@ -208,7 +203,58 @@
                         </span>
                     </div>
                 </el-form-item>
-
+                <el-form-item prop="IPV6">
+                    <el-checkbox v-model="website.IPV6" :label="$t('website.ipv6')" size="large" />
+                </el-form-item>
+                <div v-if="website.type == 'stream'">
+                    <LoadBalanceForm ref="lbFormRef" v-model="steamConfig" :disabled="true" />
+                </div>
+                <div v-else>
+                    <el-form-item prop="enableSSL">
+                        <el-checkbox v-model="website.enableSSL" :label="$t('website.enableHTTPS')" size="large" />
+                        <span class="input-help">{{ $t('website.enableSSLHelper') }}</span>
+                    </el-form-item>
+                    <div v-if="website.enableSSL">
+                        <el-form-item :label="$t('website.acmeAccountManage')" prop="acmeAccountID">
+                            <el-select
+                                v-model="website.acmeAccountID"
+                                :placeholder="$t('website.selectAcme')"
+                                @change="listSSLs"
+                            >
+                                <el-option :key="0" :label="$t('website.imported')" :value="0"></el-option>
+                                <el-option
+                                    v-for="(acme, index) in acmeAccounts"
+                                    :key="index"
+                                    :label="acme.email"
+                                    :value="acme.id"
+                                >
+                                    <span>
+                                        {{ acme.email }}
+                                        <el-tag class="ml-5">{{ getAccountName(acme.type) }}</el-tag>
+                                    </span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="$t('website.ssl')" prop="websiteSSLID" :hide-required-asterisk="true">
+                            <el-select
+                                v-model="website.websiteSSLID"
+                                :placeholder="$t('website.selectSSL')"
+                                @change="handleSSLSelectChange"
+                            >
+                                <el-option
+                                    v-for="(ssl, index) in ssls"
+                                    :key="index"
+                                    :label="ssl.primaryDomain"
+                                    :value="ssl.id"
+                                    :disabled="ssl.pem == ''"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="' '" v-if="websiteSSL && websiteSSL.id > 0">
+                            <WebsiteSSL :websiteSSL="websiteSSL" />
+                        </el-form-item>
+                    </div>
+                </div>
                 <el-form-item prop="enableFtp" v-if="website.type === 'static' || website.type === 'runtime'">
                     <el-checkbox
                         @change="random"
@@ -333,55 +379,10 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <div v-if="website.type == 'stream'">
-                    <LoadBalanceForm ref="lbFormRef" v-model="steamConfig" :disabled="true" />
-                </div>
-                <div v-else>
-                    <el-form-item prop="enableSSL">
-                        <el-checkbox v-model="website.enableSSL" :label="$t('website.enableHTTPS')" size="large" />
-                        <span class="input-help">{{ $t('website.enableSSLHelper') }}</span>
-                    </el-form-item>
-                    <div v-if="website.enableSSL">
-                        <el-form-item :label="$t('website.acmeAccountManage')" prop="acmeAccountID">
-                            <el-select
-                                v-model="website.acmeAccountID"
-                                :placeholder="$t('website.selectAcme')"
-                                @change="listSSLs"
-                            >
-                                <el-option :key="0" :label="$t('website.imported')" :value="0"></el-option>
-                                <el-option
-                                    v-for="(acme, index) in acmeAccounts"
-                                    :key="index"
-                                    :label="acme.email"
-                                    :value="acme.id"
-                                >
-                                    <span>
-                                        {{ acme.email }}
-                                        <el-tag class="ml-5">{{ getAccountName(acme.type) }}</el-tag>
-                                    </span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item :label="$t('website.ssl')" prop="websiteSSLID" :hide-required-asterisk="true">
-                            <el-select
-                                v-model="website.websiteSSLID"
-                                :placeholder="$t('website.selectSSL')"
-                                @change="handleSSLSelectChange"
-                            >
-                                <el-option
-                                    v-for="(ssl, index) in ssls"
-                                    :key="index"
-                                    :label="ssl.primaryDomain"
-                                    :value="ssl.id"
-                                    :disabled="ssl.pem == ''"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item :label="' '" v-if="websiteSSL && websiteSSL.id > 0">
-                            <WebsiteSSL :websiteSSL="websiteSSL" />
-                        </el-form-item>
-                    </div>
-                </div>
+
+                <el-divider content-position="left">
+                    <el-text type="info" size="small">{{ $t('commons.table.description') }}</el-text>
+                </el-divider>
                 <el-form-item :label="$t('website.remark')" prop="remark">
                     <el-input type="textarea" :rows="3" clearable v-model="website.remark" />
                 </el-form-item>
diff --git a/frontend/src/views/website/website/domain-create/index.vue b/frontend/src/views/website/website/domain-create/index.vue
index 0cdea8f10af3..7affd46438a8 100644
--- a/frontend/src/views/website/website/domain-create/index.vue
+++ b/frontend/src/views/website/website/domain-create/index.vue
@@ -1,25 +1,7 @@
 <template>
     <div>
-        <el-form-item :label="$t('website.batchAdd')">
-            <el-row :gutter="20">
-                <el-col :span="20">
-                    <el-input
-                        class="p-w-400"
-                        type="textarea"
-                        :rows="3"
-                        v-model="create.domainStr"
-                        :placeholder="$t('website.domainHelper')"
-                    ></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button @click="gengerateDomains" :disabled="create.domainStr == ''">
-                        {{ $t('website.generateDomain') }}
-                    </el-button>
-                </el-col>
-            </el-row>
-        </el-form-item>
-        <el-row :gutter="20" v-for="(domain, index) of create.domains" :key="index">
-            <el-col :span="8">
+        <el-row :gutter="22" v-for="(domain, index) of create.domains" :key="index">
+            <el-col :span="6">
                 <el-form-item
                     :label="index == 0 ? $t('website.domain') : ''"
                     :prop="`domains.${index}.domain`"
@@ -29,10 +11,28 @@
                         type="string"
                         v-model="create.domains[index].domain"
                         :placeholder="index > 0 ? $t('website.domain') : ''"
+                        @blur="handleDomainBlur(index)"
                     ></el-input>
+                    <div
+                        v-if="domainWarnings[index]"
+                        class="el-form-item__error"
+                        style="position: relative; color: #e6a23c"
+                    >
+                        {{ $t('website.domainNotFQDN') }}
+                    </div>
                 </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
+                <el-form-item :label="index == 0 ? 'Host' : ''">
+                    <el-input
+                        type="string"
+                        :model-value="create.domains[index].host"
+                        :placeholder="index > 0 ? 'Host' : ''"
+                        disabled
+                    ></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="4">
                 <el-form-item
                     :label="index == 0 ? $t('commons.table.port') : ''"
                     :prop="`domains.${index}.port`"
@@ -41,7 +41,7 @@
                     <el-input type="number" v-model.number="create.domains[index].port"></el-input>
                 </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="2">
                 <el-form-item :label="index == 0 ? 'SSL' : ''" prop="ssl">
                     <el-checkbox
                         v-model="create.domains[index].ssl"
@@ -58,23 +58,41 @@
             </el-col>
             <el-col :span="4" v-else>
                 <el-form-item>
-                    <el-button @click="removeDomain(index)" link type="primary">
+                    <el-button @click="removeDomain(index)">
                         <el-icon><Delete /></el-icon>
                     </el-button>
                 </el-form-item>
             </el-col>
         </el-row>
+        <div class="mt-1">
+            <el-button @click="openBatchDialog" type="primary" plain>
+                {{ $t('website.batchInput') }}
+            </el-button>
+        </div>
+
+        <el-dialog v-model="batchDialogVisible" :title="$t('website.batchAdd')" width="600px">
+            <el-input
+                type="textarea"
+                :rows="8"
+                v-model="create.domainStr"
+                :placeholder="$t('website.domainBatchHelper')"
+            ></el-input>
+            <template #footer>
+                <el-button @click="batchDialogVisible = false">{{ $t('commons.button.cancel') }}</el-button>
+                <el-button type="primary" @click="saveBatchInput" :disabled="create.domainStr == ''">
+                    {{ $t('commons.button.confirm') }}
+                </el-button>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
 <script lang="ts" setup>
 import { checkAppInstalled } from '@/api/modules/app';
 import { Rules, checkNumberRange } from '@/global/form-rules';
-import i18n from '@/lang';
 import { MsgError } from '@/utils/message';
-import { ref } from 'vue';
+import { ref, onMounted } from 'vue';
 
-const emit = defineEmits(['gengerate']);
 const props = defineProps({
     form: {
         type: Object,
@@ -83,16 +101,84 @@ const props = defineProps({
         },
     },
 });
+const singleDomainRegex = /^(?:\*|[\w\u4e00-\u9fa5-]{1,63})(?:\.(?:\*|[\w\u4e00-\u9fa5-]{1,63}))*$/;
+const FQDNDomainRegex =
+    /^(?:\*\.)?(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,63}(?::(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|[1-5]?\d{1,4}))?$/;
+
+const isFQDN = (domain: string): boolean => {
+    if (!domain) return true;
+    return FQDNDomainRegex.test(domain);
+};
+
+function toPunycode(hostname: string): string {
+    try {
+        if (hostname.startsWith('*.')) {
+            const domainPart = hostname.substring(2);
+            const convertedDomain = new URL(`http://${domainPart}`).hostname;
+            return `*.${convertedDomain}`;
+        }
+        if (hostname.endsWith('.*')) {
+            const domainPart = hostname.slice(0, -2);
+            const convertedDomain = new URL(`http://${domainPart}`).hostname;
+            return `${convertedDomain}.*`;
+        }
+        return new URL(`http://${hostname}`).hostname;
+    } catch {
+        return hostname;
+    }
+}
+
+const handleDomainBlur = (index: number) => {
+    let singleRegexChecked = singleDomainRegex.test(create.value.domains[index].domain);
+    if (!singleRegexChecked) {
+        domainWarnings.value[index] = false;
+        return;
+    }
+    const originalDomain = create.value.domains[index].domain;
+    if (!originalDomain) {
+        create.value.domains[index].host = '';
+        domainWarnings.value[index] = false;
+        return;
+    }
+    const punycoded = toPunycode(originalDomain);
+    if (punycoded !== originalDomain) {
+        create.value.domains[index].host = originalDomain;
+        create.value.domains[index].domain = punycoded;
+    } else {
+        create.value.domains[index].host = originalDomain;
+    }
+
+    if (singleRegexChecked) {
+        domainWarnings.value[index] = !isFQDN(create.value.domains[index].domain);
+    } else {
+        domainWarnings.value[index] = false;
+    }
+};
+
+const validateSingleDomain = (_rule: any, value: string, callback: (error?: Error) => void) => {
+    if (!value) {
+        return callback();
+    }
+    if (singleDomainRegex.test(value)) {
+        return callback();
+    }
+    callback(new Error('域名格式不正确'));
+};
+
 const rules = ref({
     port: [Rules.requiredInput, Rules.paramPort, checkNumberRange(1, 65535)],
-    domain: [Rules.requiredInput, Rules.domain],
+    domain: [Rules.requiredInput, { validator: validateSingleDomain, trigger: 'blur' }],
     domains: {
         type: Array,
     },
 });
 const defaultPort = ref(80);
+const batchDialogVisible = ref(false);
+const domainWarnings = ref<{ [key: number]: boolean }>({});
+
 const initDomain = () => ({
     domain: '',
+    host: '',
     port: defaultPort.value,
     ssl: false,
 });
@@ -102,6 +188,44 @@ const create = ref({
     domainStr: '',
 });
 
+const domainToString = (domain: { domain: string; port: number; ssl: boolean }): string => {
+    if (!domain.domain) return '';
+    let str = domain.domain;
+    if (domain.port && domain.port !== 80) {
+        str += `:${domain.port}`;
+    }
+    return str;
+};
+
+const stringToDomain = (line: string): { domain: string; host: string; port: number; ssl: boolean } | null => {
+    if (!line.trim()) return null;
+
+    let ssl = false;
+    let str = line.trim();
+
+    const [domainRaw, portStr] = str.split(':');
+    if (!domainRaw) return null;
+
+    const domain = toPunycode(domainRaw);
+    const host = domain !== domainRaw ? domainRaw : domain;
+
+    const port = portStr ? Number(portStr) : defaultPort.value;
+
+    if (port === 443) {
+        ssl = true;
+    } else if (port === 80) {
+        ssl = false;
+    }
+
+    return { domain, host, port, ssl };
+};
+
+const openBatchDialog = () => {
+    const lines = create.value.domains.map(domainToString).filter((line) => line !== '');
+    create.value.domainStr = lines.join('\n');
+    batchDialogVisible.value = true;
+};
+
 const addDomain = () => {
     create.value.domains.push(initDomain());
 };
@@ -110,41 +234,50 @@ const removeDomain = (index: number) => {
     create.value.domains.splice(index, 1);
 };
 
-const checkDomain = (domain: string) => {
-    const reg =
-        /^([\w\u4e00-\u9fa5\-\*]{1,100}\.){1,10}([\w\u4e00-\u9fa5\-]{1,24}|[\w\u4e00-\u9fa5\-]{1,24}\.[\w\u4e00-\u9fa5\-]{1,24})(:\d{1,5})?$/;
-    return reg.test(domain);
-};
-
-const gengerateDomains = () => {
+const saveBatchInput = () => {
+    if (create.value.domainStr.trim() === '') {
+        return true;
+    }
     const lines = create.value.domainStr.split(/\r?\n/);
-    lines.forEach((line) => {
-        const [domain, port] = line.split(':');
-        if (domain == '') {
-            return;
-        }
-        if (!checkDomain(domain)) {
-            MsgError(line + i18n.global.t('commons.rule.domain'));
+    const newDomains: { domain: string; host: string; port: number; ssl: boolean }[] = [];
+    let hasError = false;
+
+    const isFirstBatchInput = create.value.domains.length === 1 && !create.value.domains[0].domain;
+
+    lines.forEach((line, index) => {
+        const parsed = stringToDomain(line);
+        if (!parsed) return;
+
+        const { domain, host, port, ssl } = parsed;
+
+        if (!domain.trim() || !singleDomainRegex.test(domain)) {
+            MsgError(line + ' 域名格式不正确');
+            hasError = true;
             return;
         }
-        const exists = (domain: string, port: number): boolean => {
-            return create.value.domains.some((info) => info.domain === domain && info.port === port);
-        };
-        if (exists(domain, port ? Number(port) : defaultPort.value)) {
-            return;
+
+        if (!newDomains.some((d) => d.domain === domain && d.port === port)) {
+            newDomains.push({ domain, host, port, ssl });
         }
-        if (create.value.domains[0].domain == '') {
-            create.value.domains[0].domain = domain;
-            create.value.domains[0].port = port ? Number(port) : defaultPort.value;
-        } else {
-            create.value.domains.push({
-                domain,
-                port: port ? Number(port) : defaultPort.value,
-                ssl: false,
-            });
+
+        if (isFirstBatchInput && index === 0) {
+            const alias = domain.split(':')[0];
+            if (props.form.alias !== undefined) {
+                props.form.alias = alias;
+            }
         }
     });
-    emit('gengerate');
+
+    if (hasError) return false;
+
+    if (newDomains.length > 0) {
+        create.value.domains = newDomains;
+    } else {
+        create.value.domains = [initDomain()];
+    }
+
+    batchDialogVisible.value = false;
+    return true;
 };
 
 const handleParams = () => {

From 74b0986d6bb4eeeb2f8ca29e18d9d4135d1d11b2 Mon Sep 17 00:00:00 2001
From: HynoR <20227709+HynoR@users.noreply.github.com>
Date: Sun, 14 Dec 2025 14:05:01 +0800
Subject: [PATCH 2/7] feat: update website create tag

---
 frontend/src/views/website/website/create/index.vue |  2 +-
 .../views/website/website/domain-create/index.vue   | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue
index cc67c4a7577f..ca26816fc1e3 100644
--- a/frontend/src/views/website/website/create/index.vue
+++ b/frontend/src/views/website/website/create/index.vue
@@ -192,7 +192,7 @@
                     <DomainCreate v-model:form="website" @gengerate="websiteForm.clearValidate()"></DomainCreate>
                 </div>
                 <el-divider content-position="left">
-                    <el-text type="info" size="small">{{ $t('website.websiteSetting') }}</el-text>
+                    <el-text type="info" size="small">{{ $t('website.advancedSettings') }}</el-text>
                 </el-divider>
                 <el-form-item :label="$t('website.alias')" prop="alias" class="mt-2">
                     <el-input v-model.trim="website.alias" :placeholder="$t('website.aliasHelper')"></el-input>
diff --git a/frontend/src/views/website/website/domain-create/index.vue b/frontend/src/views/website/website/domain-create/index.vue
index 7affd46438a8..c7931ad4e6ef 100644
--- a/frontend/src/views/website/website/domain-create/index.vue
+++ b/frontend/src/views/website/website/domain-create/index.vue
@@ -3,7 +3,7 @@
         <el-row :gutter="22" v-for="(domain, index) of create.domains" :key="index">
             <el-col :span="6">
                 <el-form-item
-                    :label="index == 0 ? $t('website.domain') : ''"
+                    :label="index == 0 ? $t('toolbox.device.hostname') : ''"
                     :prop="`domains.${index}.domain`"
                     :rules="rules.domain"
                 >
@@ -23,7 +23,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="6">
-                <el-form-item :label="index == 0 ? 'Host' : ''">
+                <el-form-item :label="index == 0 ? $t('website.domain') : ''">
                     <el-input
                         type="string"
                         :model-value="create.domains[index].host"
@@ -42,7 +42,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="2">
-                <el-form-item :label="index == 0 ? 'SSL' : ''" prop="ssl">
+                <el-form-item :label="index == 0 ? 'SSL' : ''" :prop="`domains.${index}.ssl`">
                     <el-checkbox
                         v-model="create.domains[index].ssl"
                         :disabled="create.domains[index].port == 80"
@@ -91,7 +91,7 @@
 import { checkAppInstalled } from '@/api/modules/app';
 import { Rules, checkNumberRange } from '@/global/form-rules';
 import { MsgError } from '@/utils/message';
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, nextTick } from 'vue';
 
 const props = defineProps({
     form: {
@@ -101,6 +101,8 @@ const props = defineProps({
         },
     },
 });
+
+const emit = defineEmits(['gengerate']);
 const singleDomainRegex = /^(?:\*|[\w\u4e00-\u9fa5-]{1,63})(?:\.(?:\*|[\w\u4e00-\u9fa5-]{1,63}))*$/;
 const FQDNDomainRegex =
     /^(?:\*\.)?(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,63}(?::(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|[1-5]?\d{1,4}))?$/;
@@ -276,6 +278,9 @@ const saveBatchInput = () => {
         create.value.domains = [initDomain()];
     }
 
+    handleParams();
+    nextTick(() => emit('gengerate'));
+
     batchDialogVisible.value = false;
     return true;
 };

From deafba3ecf5b1215aee79ca3ec6392c4c635e2f4 Mon Sep 17 00:00:00 2001
From: HynoR <20227709+HynoR@users.noreply.github.com>
Date: Sun, 14 Dec 2025 14:13:45 +0800
Subject: [PATCH 3/7] feat: update i18n files

---
 frontend/src/lang/modules/es-es.ts   | 3 +++
 frontend/src/lang/modules/ja.ts      | 3 +++
 frontend/src/lang/modules/ko.ts      | 3 +++
 frontend/src/lang/modules/ms.ts      | 3 +++
 frontend/src/lang/modules/pt-br.ts   | 3 +++
 frontend/src/lang/modules/ru.ts      | 3 +++
 frontend/src/lang/modules/tr.ts      | 3 +++
 frontend/src/lang/modules/zh-Hant.ts | 3 +++
 8 files changed, 24 insertions(+)

diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts
index c0e78c33db25..2ffbffd287e3 100644
--- a/frontend/src/lang/modules/es-es.ts
+++ b/frontend/src/lang/modules/es-es.ts
@@ -2631,6 +2631,9 @@ const message = {
         createDb: 'Crear base de datos',
         enableSSLHelper: 'Si falla, no afectará la creación del sitio',
         batchAdd: 'Añadir múltiples dominios',
+        batchInput: 'Entrada por Lotes',
+        domainNotFQDN: 'Este dominio puede no ser accesible en la red pública',
+        domainBatchHelper: 'Un dominio por línea, formato: dominio:puerto@ssl\nEjemplo: example.com:443@ssl o example.com',
         generateDomain: 'Generar',
         global: 'Global',
         subsite: 'Subsitio',
diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts
index a7576ad8928e..42b24ffc9e91 100644
--- a/frontend/src/lang/modules/ja.ts
+++ b/frontend/src/lang/modules/ja.ts
@@ -2560,6 +2560,9 @@ const message = {
         createDb: 'データベースを作成',
         enableSSLHelper: 'SSLの有効化に失敗しても、ウェブサイトの作成には影響しません。',
         batchAdd: 'ドメインを一括追加',
+        batchInput: 'バッチ入力',
+        domainNotFQDN: 'このドメインはパブリックネットワークからアクセスできない可能性があります',
+        domainBatchHelper: '1行に1ドメイン、形式: domain:port@ssl\n例: example.com:443@ssl または example.com',
         generateDomain: '生成',
         global: 'グローバル',
         subsite: 'サブサイト',
diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts
index 75e84b97dca2..a84f281316b4 100644
--- a/frontend/src/lang/modules/ko.ts
+++ b/frontend/src/lang/modules/ko.ts
@@ -2515,6 +2515,9 @@ const message = {
         createDb: '데이터베이스 생성',
         enableSSLHelper: 'SSL 활성화 실패는 웹사이트 생성에 영향을 미치지 않습니다.',
         batchAdd: '도메인 일괄 추가',
+        batchInput: '일괄 입력',
+        domainNotFQDN: '이 도메인은 공용 네트워크에서 액세스할 수 없을 수 있습니다',
+        domainBatchHelper: '한 줄에 하나의 도메인, 형식: domain:port@ssl\n예: example.com:443@ssl 또는 example.com',
         generateDomain: '생성',
         global: '글로벌',
         subsite: '하위 사이트',
diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts
index 0b38ac44260e..1e497411bd29 100644
--- a/frontend/src/lang/modules/ms.ts
+++ b/frontend/src/lang/modules/ms.ts
@@ -2616,6 +2616,9 @@ const message = {
         createDb: 'Cipta Pangkalan Data',
         enableSSLHelper: 'Kegagalan mengaktifkan SSL tidak akan menjejaskan penciptaan laman web.',
         batchAdd: 'Tambah Domain Secara Batch',
+        batchInput: 'Input Kelompok',
+        domainNotFQDN: 'Domain ini mungkin tidak boleh diakses di rangkaian awam',
+        domainBatchHelper: 'Satu domain per baris, format: domain:port@ssl\nContoh: example.com:443@ssl atau example.com',
         generateDomain: 'Hasilkan',
         global: 'Global',
         subsite: 'Sublaman',
diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts
index dcd853892613..8fdd362a1610 100644
--- a/frontend/src/lang/modules/pt-br.ts
+++ b/frontend/src/lang/modules/pt-br.ts
@@ -2621,6 +2621,9 @@ const message = {
         createDb: 'Criar Banco de Dados',
         enableSSLHelper: 'A falha ao ativar o SSL não afetará a criação do site.',
         batchAdd: 'Adicionar Domínios em Lote',
+        batchInput: 'Entrada em Lote',
+        domainNotFQDN: 'Este domínio pode não estar acessível na rede pública',
+        domainBatchHelper: 'Um domínio por linha, formato: domínio:porta@ssl\nExemplo: example.com:443@ssl ou example.com',
         generateDomain: 'Gerar',
         global: 'Global',
         subsite: 'Subsite',
diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts
index d9faa6aedd58..d969897a4780 100644
--- a/frontend/src/lang/modules/ru.ts
+++ b/frontend/src/lang/modules/ru.ts
@@ -2616,6 +2616,9 @@ const message = {
         rcreateDb: 'Создать Базу Данных',
         enableSSLHelper: 'Неудача при включении SSL не повлияет на создание сайта.',
         batchAdd: 'Пакетное Добавление Доменов',
+        batchInput: 'Пакетный ввод',
+        domainNotFQDN: 'Этот домен может быть недоступен в публичной сети',
+        domainBatchHelper: 'Один домен на строку, формат: domain:port@ssl\nПример: example.com:443@ssl или example.com',
         generateDomain: 'Сгенерировать',
         global: 'Глобальный',
         subsite: 'Подсайт',
diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts
index b6ca141dca26..294d9b39ed5e 100644
--- a/frontend/src/lang/modules/tr.ts
+++ b/frontend/src/lang/modules/tr.ts
@@ -2674,6 +2674,9 @@ const message = {
         createDb: 'Veritabanı Oluştur',
         enableSSLHelper: 'Etkinleştirme başarısızlığı web sitesinin oluşturulmasını etkilemez',
         batchAdd: 'Toplu Alan Adı Ekle',
+        batchInput: 'Toplu Giriş',
+        domainNotFQDN: 'Bu alan adı genel ağda erişilebilir olmayabilir',
+        domainBatchHelper: 'Bir satırda bir alan adı, format: domain:port@ssl\nÖrnek: example.com:443@ssl veya example.com',
         generateDomain: 'Oluştur',
         global: 'Küresel',
         subsite: 'Alt site',
diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts
index cc88f6ce2262..6a9d16ac8f1d 100644
--- a/frontend/src/lang/modules/zh-Hant.ts
+++ b/frontend/src/lang/modules/zh-Hant.ts
@@ -2453,6 +2453,9 @@ const message = {
         createDb: '建立資料庫',
         enableSSLHelper: '開啟失敗不會影響網站建立',
         batchAdd: '批次新增域名',
+        batchInput: '批次輸入',
+        domainNotFQDN: '此域名可能無法在公網訪問',
+        domainBatchHelper: '一行一個域名，格式：域名:端口@ssl\n範例：example.com:443@ssl 或 example.com',
         generateDomain: '生成',
         global: '全域',
         subsite: '子網站',

From 02e715f6a7bfefc5481af8dc712870c38eab94ec Mon Sep 17 00:00:00 2001
From: HynoR <20227709+HynoR@users.noreply.github.com>
Date: Sun, 14 Dec 2025 14:22:43 +0800
Subject: [PATCH 4/7] feat: update valid domain regex

---
 agent/app/service/website_utils.go | 5 +++--
 agent/utils/common/common.go       | 4 ++++
 agent/utils/re/re.go               | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/agent/app/service/website_utils.go b/agent/app/service/website_utils.go
index bf0c9803413c..372d42ff0e24 100644
--- a/agent/app/service/website_utils.go
+++ b/agent/app/service/website_utils.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/1Panel-dev/1Panel/agent/utils/xpack"
 	"log"
 	"net"
 	"os"
@@ -15,6 +14,8 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/1Panel-dev/1Panel/agent/utils/xpack"
+
 	"github.com/1Panel-dev/1Panel/agent/app/repo"
 
 	"github.com/1Panel-dev/1Panel/agent/app/dto/request"
@@ -1103,7 +1104,7 @@ func getWebsiteDomains(domains []request.WebsiteDomain, defaultHTTPPort, default
 		if domain.Domain == "" {
 			continue
 		}
-		if !common.IsValidDomain(domain.Domain) {
+		if !common.IsValidNginxServerName(domain.Domain) {
 			err = buserr.WithName("ErrDomainFormat", domain.Domain)
 			return
 		}
diff --git a/agent/utils/common/common.go b/agent/utils/common/common.go
index 0fab2a42f906..749d5504a4df 100644
--- a/agent/utils/common/common.go
+++ b/agent/utils/common/common.go
@@ -306,6 +306,10 @@ func IsValidDomain(domain string) bool {
 	return re.GetRegex(re.DomainPattern).MatchString(domain)
 }
 
+func IsValidNginxServerName(serverName string) bool {
+	return re.GetRegex(re.NginxServerNamePattern).MatchString(serverName)
+}
+
 func ContainsChinese(text string) bool {
 	for _, char := range text {
 		if unicode.Is(unicode.Han, char) {
diff --git a/agent/utils/re/re.go b/agent/utils/re/re.go
index 8519d0cfc6ed..84239ce37c89 100644
--- a/agent/utils/re/re.go
+++ b/agent/utils/re/re.go
@@ -14,6 +14,7 @@ const (
 	ValidatorNamePattern               = `^[a-zA-Z\p{Han}]{1}[a-zA-Z0-9_\p{Han}]{0,30}$`
 	ValidatorIPPattern                 = `^((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}$`
 	DomainPattern                      = `^([\w\p{Han}\-\*]{1,100}\.){1,10}([\w\p{Han}\-]{1,24}|[\w\p{Han}\-]{1,24}\.[\w\p{Han}\-]{1,24})(:\d{1,5})?$`
+	NginxServerNamePattern             = `^(?:\*|[\w\p{Han}-]{1,63})(?:\.(?:\*|[\w\p{Han}-]{1,63}))*$`
 	ProxyCacheZonePattern              = `keys_zone=proxy_cache_zone_of_[\w.]+:(\d+)([kmgt]?)`
 	ProxyCacheMaxSizePattern           = `max_size=([0-9.]+)([kmgt]?)`
 	ProxyCacheMaxSizeValidationPattern = `max_size=\d+(\.\d+)?[kmgt]?`
@@ -44,6 +45,7 @@ func Init() {
 		ValidatorNamePattern,
 		ValidatorIPPattern,
 		DomainPattern,
+		NginxServerNamePattern,
 		ProxyCacheZonePattern,
 		ProxyCacheMaxSizePattern,
 		ProxyCacheMaxSizeValidationPattern,

From e356aafe7720cb02db4061a337eea8703ce0dc05 Mon Sep 17 00:00:00 2001
From: HynoR <20227709+HynoR@users.noreply.github.com>
Date: Sun, 14 Dec 2025 14:29:33 +0800
Subject: [PATCH 5/7] feat: reorder website types to improve structure

---
 frontend/src/global/mimetype.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/global/mimetype.ts b/frontend/src/global/mimetype.ts
index 40391478f74d..be8acde88238 100644
--- a/frontend/src/global/mimetype.ts
+++ b/frontend/src/global/mimetype.ts
@@ -458,14 +458,14 @@ export const getWebsiteTypes = () => [
         label: i18n.global.t('runtime.runtime'),
         value: 'runtime',
     },
-    {
-        label: i18n.global.t('website.proxy'),
-        value: 'proxy',
-    },
     {
         label: i18n.global.t('website.static'),
         value: 'static',
     },
+    {
+        label: i18n.global.t('website.proxy'),
+        value: 'proxy',
+    },
     {
         label: i18n.global.t('website.subsite'),
         value: 'subsite',

From 0e4fd093d5621fa6025966757f5187a99eaf4c4e Mon Sep 17 00:00:00 2001
From: HynoR <20227709+HynoR@users.noreply.github.com>
Date: Sun, 14 Dec 2025 17:22:34 +0800
Subject: [PATCH 6/7] feat: update domain labels for consistency in the domain
 creation form

---
 frontend/src/views/website/website/domain-create/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/website/website/domain-create/index.vue b/frontend/src/views/website/website/domain-create/index.vue
index c7931ad4e6ef..d049d46819e8 100644
--- a/frontend/src/views/website/website/domain-create/index.vue
+++ b/frontend/src/views/website/website/domain-create/index.vue
@@ -3,7 +3,7 @@
         <el-row :gutter="22" v-for="(domain, index) of create.domains" :key="index">
             <el-col :span="6">
                 <el-form-item
-                    :label="index == 0 ? $t('toolbox.device.hostname') : ''"
+                    :label="index == 0 ? $t('website.domain') : ''"
                     :prop="`domains.${index}.domain`"
                     :rules="rules.domain"
                 >
@@ -23,11 +23,11 @@
                 </el-form-item>
             </el-col>
             <el-col :span="6">
-                <el-form-item :label="index == 0 ? $t('website.domain') : ''">
+                <el-form-item :label="index == 0 ? $t('toolbox.device.hostname') : ''">
                     <el-input
                         type="string"
                         :model-value="create.domains[index].host"
-                        :placeholder="index > 0 ? 'Host' : ''"
+                        :placeholder="index > 0 ? $t('toolbox.device.hostname') : ''"
                         disabled
                     ></el-input>
                 </el-form-item>

From b44209a59662f61d9b50dc4c4f40e6f29f1c6d31 Mon Sep 17 00:00:00 2001
From: HynoR <20227709+HynoR@users.noreply.github.com>
Date: Mon, 15 Dec 2025 15:59:50 +0800
Subject: [PATCH 7/7] feat: update i18n

---
 frontend/src/lang/modules/en.ts                            | 1 +
 frontend/src/lang/modules/es-es.ts                         | 4 +++-
 frontend/src/lang/modules/ja.ts                            | 1 +
 frontend/src/lang/modules/ko.ts                            | 1 +
 frontend/src/lang/modules/ms.ts                            | 4 +++-
 frontend/src/lang/modules/pt-br.ts                         | 4 +++-
 frontend/src/lang/modules/ru.ts                            | 1 +
 frontend/src/lang/modules/tr.ts                            | 4 +++-
 frontend/src/lang/modules/zh-Hant.ts                       | 1 +
 frontend/src/lang/modules/zh.ts                            | 1 +
 frontend/src/views/website/website/domain-create/index.vue | 7 +++++--
 11 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index a568c396aa2a..15a430faa9a6 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -2641,6 +2641,7 @@ const message = {
         batchAdd: 'Batch Add Domains',
         batchInput: 'Batch Input',
         domainNotFQDN: 'This domain may not be accessible on the public network',
+        domainInvalid: 'Invalid domain format',
         domainBatchHelper: 'One domain per line, format: domain:port@ssl\nExample: example.com:443@ssl or example.com',
         generateDomain: 'Generate',
         global: 'Global',
diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts
index 2ffbffd287e3..721c3371d056 100644
--- a/frontend/src/lang/modules/es-es.ts
+++ b/frontend/src/lang/modules/es-es.ts
@@ -2633,7 +2633,9 @@ const message = {
         batchAdd: 'Añadir múltiples dominios',
         batchInput: 'Entrada por Lotes',
         domainNotFQDN: 'Este dominio puede no ser accesible en la red pública',
-        domainBatchHelper: 'Un dominio por línea, formato: dominio:puerto@ssl\nEjemplo: example.com:443@ssl o example.com',
+        domainInvalid: 'Formato de dominio inválido',
+        domainBatchHelper:
+            'Un dominio por línea, formato: dominio:puerto@ssl\nEjemplo: example.com:443@ssl o example.com',
         generateDomain: 'Generar',
         global: 'Global',
         subsite: 'Subsitio',
diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts
index 42b24ffc9e91..68e79e2382f6 100644
--- a/frontend/src/lang/modules/ja.ts
+++ b/frontend/src/lang/modules/ja.ts
@@ -2562,6 +2562,7 @@ const message = {
         batchAdd: 'ドメインを一括追加',
         batchInput: 'バッチ入力',
         domainNotFQDN: 'このドメインはパブリックネットワークからアクセスできない可能性があります',
+        domainInvalid: 'ドメイン形式が正しくありません',
         domainBatchHelper: '1行に1ドメイン、形式: domain:port@ssl\n例: example.com:443@ssl または example.com',
         generateDomain: '生成',
         global: 'グローバル',
diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts
index a84f281316b4..3705bc7ea71e 100644
--- a/frontend/src/lang/modules/ko.ts
+++ b/frontend/src/lang/modules/ko.ts
@@ -2517,6 +2517,7 @@ const message = {
         batchAdd: '도메인 일괄 추가',
         batchInput: '일괄 입력',
         domainNotFQDN: '이 도메인은 공용 네트워크에서 액세스할 수 없을 수 있습니다',
+        domainInvalid: '도메인 형식이 올바르지 않습니다',
         domainBatchHelper: '한 줄에 하나의 도메인, 형식: domain:port@ssl\n예: example.com:443@ssl 또는 example.com',
         generateDomain: '생성',
         global: '글로벌',
diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts
index 1e497411bd29..8f003756df66 100644
--- a/frontend/src/lang/modules/ms.ts
+++ b/frontend/src/lang/modules/ms.ts
@@ -2618,7 +2618,9 @@ const message = {
         batchAdd: 'Tambah Domain Secara Batch',
         batchInput: 'Input Kelompok',
         domainNotFQDN: 'Domain ini mungkin tidak boleh diakses di rangkaian awam',
-        domainBatchHelper: 'Satu domain per baris, format: domain:port@ssl\nContoh: example.com:443@ssl atau example.com',
+        domainInvalid: 'Format domain tidak sah',
+        domainBatchHelper:
+            'Satu domain per baris, format: domain:port@ssl\nContoh: example.com:443@ssl atau example.com',
         generateDomain: 'Hasilkan',
         global: 'Global',
         subsite: 'Sublaman',
diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts
index 8fdd362a1610..efa5ff34564e 100644
--- a/frontend/src/lang/modules/pt-br.ts
+++ b/frontend/src/lang/modules/pt-br.ts
@@ -2623,7 +2623,9 @@ const message = {
         batchAdd: 'Adicionar Domínios em Lote',
         batchInput: 'Entrada em Lote',
         domainNotFQDN: 'Este domínio pode não estar acessível na rede pública',
-        domainBatchHelper: 'Um domínio por linha, formato: domínio:porta@ssl\nExemplo: example.com:443@ssl ou example.com',
+        domainInvalid: 'Formato de domínio inválido',
+        domainBatchHelper:
+            'Um domínio por linha, formato: domínio:porta@ssl\nExemplo: example.com:443@ssl ou example.com',
         generateDomain: 'Gerar',
         global: 'Global',
         subsite: 'Subsite',
diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts
index d969897a4780..af102c7b91c0 100644
--- a/frontend/src/lang/modules/ru.ts
+++ b/frontend/src/lang/modules/ru.ts
@@ -2618,6 +2618,7 @@ const message = {
         batchAdd: 'Пакетное Добавление Доменов',
         batchInput: 'Пакетный ввод',
         domainNotFQDN: 'Этот домен может быть недоступен в публичной сети',
+        domainInvalid: 'Неверный формат домена',
         domainBatchHelper: 'Один домен на строку, формат: domain:port@ssl\nПример: example.com:443@ssl или example.com',
         generateDomain: 'Сгенерировать',
         global: 'Глобальный',
diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts
index 294d9b39ed5e..bd1c69e080f1 100644
--- a/frontend/src/lang/modules/tr.ts
+++ b/frontend/src/lang/modules/tr.ts
@@ -2676,7 +2676,9 @@ const message = {
         batchAdd: 'Toplu Alan Adı Ekle',
         batchInput: 'Toplu Giriş',
         domainNotFQDN: 'Bu alan adı genel ağda erişilebilir olmayabilir',
-        domainBatchHelper: 'Bir satırda bir alan adı, format: domain:port@ssl\nÖrnek: example.com:443@ssl veya example.com',
+        domainInvalid: 'Geçersiz alan adı biçimi',
+        domainBatchHelper:
+            'Bir satırda bir alan adı, format: domain:port@ssl\nÖrnek: example.com:443@ssl veya example.com',
         generateDomain: 'Oluştur',
         global: 'Küresel',
         subsite: 'Alt site',
diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts
index 6a9d16ac8f1d..dff04accbf61 100644
--- a/frontend/src/lang/modules/zh-Hant.ts
+++ b/frontend/src/lang/modules/zh-Hant.ts
@@ -2455,6 +2455,7 @@ const message = {
         batchAdd: '批次新增域名',
         batchInput: '批次輸入',
         domainNotFQDN: '此域名可能無法在公網訪問',
+        domainInvalid: '域名格式不正確',
         domainBatchHelper: '一行一個域名，格式：域名:端口@ssl\n範例：example.com:443@ssl 或 example.com',
         generateDomain: '生成',
         global: '全域',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index f9fcda8cf1f8..b520471ec0de 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -2453,6 +2453,7 @@ const message = {
         batchAdd: '批量添加域名',
         batchInput: '批量编辑',
         domainNotFQDN: '该域名可能无法在公网访问',
+        domainInvalid: '域名格式不正确',
         domainBatchHelper: '一行一个域名，格式：域名:端口\n示例：example.com',
         generateDomain: '生成',
         global: '全局',
diff --git a/frontend/src/views/website/website/domain-create/index.vue b/frontend/src/views/website/website/domain-create/index.vue
index d049d46819e8..2a13045e292f 100644
--- a/frontend/src/views/website/website/domain-create/index.vue
+++ b/frontend/src/views/website/website/domain-create/index.vue
@@ -92,6 +92,9 @@ import { checkAppInstalled } from '@/api/modules/app';
 import { Rules, checkNumberRange } from '@/global/form-rules';
 import { MsgError } from '@/utils/message';
 import { ref, onMounted, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const i18n = useI18n();
 
 const props = defineProps({
     form: {
@@ -164,7 +167,7 @@ const validateSingleDomain = (_rule: any, value: string, callback: (error?: Erro
     if (singleDomainRegex.test(value)) {
         return callback();
     }
-    callback(new Error('域名格式不正确'));
+    callback(new Error(i18n.t('website.domainInvalid')));
 };
 
 const rules = ref({
@@ -253,7 +256,7 @@ const saveBatchInput = () => {
         const { domain, host, port, ssl } = parsed;
 
         if (!domain.trim() || !singleDomainRegex.test(domain)) {
-            MsgError(line + ' 域名格式不正确');
+            MsgError(line + ' ' + i18n.t('website.domainInvalid'));
             hasError = true;
             return;
         }