From 0f7699b21c9a0474914bfe931e7a6091b04f21aa Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Mon, 4 Aug 2025 14:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BF=AE=E6=94=B9dns=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E5=8A=9F=E8=83=BD=E5=B9=B6=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JsiteDomainModifyDNSServerDialog.vue      | 293 ++++++++++++++++++
 .../src2/components/JsiteDomainOverview.vue   |  31 +-
 jcloud/api/domain_west.py                     |  32 +-
 .../pagetype/jsite_domain/jsite_domain.py     |  36 +++
 4 files changed, 379 insertions(+), 13 deletions(-)
 create mode 100644 dashboard/src2/components/JsiteDomainModifyDNSServerDialog.vue

diff --git a/dashboard/src2/components/JsiteDomainModifyDNSServerDialog.vue b/dashboard/src2/components/JsiteDomainModifyDNSServerDialog.vue
new file mode 100644
index 0000000..c09f0e8
--- /dev/null
+++ b/dashboard/src2/components/JsiteDomainModifyDNSServerDialog.vue
@@ -0,0 +1,293 @@
+<template>
+  <Dialog :options="{ title: '修改DNS服务器', size: 'lg' }" v-model="show">
+    <template #body-content>
+      <div class="p-4 sm:p-6">
+        <div class="mb-6">
+          <p class="mt-1 text-sm text-gray-600">
+            域名： <span class="font-medium">{{ domainDoc?.domain }}</span>
+          </p>
+        </div>
+
+        <div class="space-y-4">
+          <!-- DNS1 -->
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-2">
+              主DNS服务器 <span class="text-red-500">*</span>
+            </label>
+            <input
+              v-model="dnsServers.dns1"
+              type="text"
+              class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+              placeholder="例如：ns1.example.com"
+              :class="{ 'border-red-300': errors.dns1 }"
+            />
+            <p v-if="errors.dns1" class="mt-1 text-sm text-red-600">{{ errors.dns1 }}</p>
+          </div>
+
+          <!-- DNS2 -->
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-2">
+              辅DNS服务器 <span class="text-red-500">*</span>
+            </label>
+            <input
+              v-model="dnsServers.dns2"
+              type="text"
+              class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+              placeholder="例如：ns2.example.com"
+              :class="{ 'border-red-300': errors.dns2 }"
+            />
+            <p v-if="errors.dns2" class="mt-1 text-sm text-red-600">{{ errors.dns2 }}</p>
+          </div>
+
+          <!-- DNS3 -->
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-2">
+              第三个DNS服务器
+            </label>
+            <input
+              v-model="dnsServers.dns3"
+              type="text"
+              class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+              placeholder="例如：ns3.example.com（可选）"
+            />
+          </div>
+
+          <!-- DNS4 -->
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-2">
+              第四个DNS服务器
+            </label>
+            <input
+              v-model="dnsServers.dns4"
+              type="text"
+              class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+              placeholder="例如：ns4.example.com（可选）"
+            />
+          </div>
+
+          <!-- DNS5 -->
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-2">
+              第五个DNS服务器
+            </label>
+            <input
+              v-model="dnsServers.dns5"
+              type="text"
+              class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+              placeholder="例如：ns5.example.com（可选）"
+            />
+          </div>
+
+          <!-- DNS6 -->
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-2">
+              第六个DNS服务器
+            </label>
+            <input
+              v-model="dnsServers.dns6"
+              type="text"
+              class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+              placeholder="例如：ns6.example.com（可选）"
+            />
+          </div>
+        </div>
+
+        <!-- 当前DNS服务器信息 -->
+        <div class="mt-6 p-4 bg-gray-50 rounded-md">
+          <h4 class="text-sm font-medium text-gray-700 mb-3">当前DNS服务器</h4>
+          <div class="space-y-2 text-sm">
+            <div class="flex justify-between">
+              <span class="text-gray-600">主DNS:</span>
+              <span class="font-mono text-gray-900">{{ domainDoc?.dns_host1 || '未设置' }}</span>
+            </div>
+            <div class="flex justify-between">
+              <span class="text-gray-600">辅DNS:</span>
+              <span class="font-mono text-gray-900">{{ domainDoc?.dns_host2 || '未设置' }}</span>
+            </div>
+            <div class="flex justify-between">
+              <span class="text-gray-600">DNS3:</span>
+              <span class="font-mono text-gray-900">{{ domainDoc?.dns_host3 || '未设置' }}</span>
+            </div>
+            <div class="flex justify-between">
+              <span class="text-gray-600">DNS4:</span>
+              <span class="font-mono text-gray-900">{{ domainDoc?.dns_host4 || '未设置' }}</span>
+            </div>
+            <div class="flex justify-between">
+              <span class="text-gray-600">DNS5:</span>
+              <span class="font-mono text-gray-900">{{ domainDoc?.dns_host5 || '未设置' }}</span>
+            </div>
+            <div class="flex justify-between">
+              <span class="text-gray-600">DNS6:</span>
+              <span class="font-mono text-gray-900">{{ domainDoc?.dns_host6 || '未设置' }}</span>
+            </div>
+          </div>
+        </div>
+
+        <div v-if="error" class="mt-4 p-3 bg-red-50 text-red-700 rounded-md text-sm">
+          {{ error }}
+        </div>
+      </div>
+    </template>
+
+    <template #actions>
+      <div class="w-full flex justify-end space-x-3">
+        <button
+          type="button"
+          class="px-4 py-2 border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none"
+          @click="cancel"
+        >
+          取消
+        </button>
+        <button
+          type="button"
+          class="px-4 py-2 bg-blue-600 border border-transparent rounded-md text-sm font-medium text-white hover:bg-blue-700 focus:outline-none disabled:bg-gray-300 disabled:cursor-not-allowed"
+          @click="modifyDNSServer"
+          :disabled="isLoading || !isValid"
+        >
+          {{ isLoading ? '修改中...' : '确认修改' }}
+        </button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script>
+import { toast } from 'vue-sonner';
+import { Dialog } from 'jingrow-ui';
+import { DashboardError } from '../utils/error';
+
+export default {
+  name: 'JsiteDomainModifyDNSServerDialog',
+  components: {
+    Dialog
+  },
+  props: {
+    domain: {
+      type: String,
+      required: true
+    },
+    domainDoc: {
+      type: Object,
+      default: null
+    }
+  },
+  emits: ['success'],
+  data() {
+    return {
+      show: true,
+      dnsServers: {
+        dns1: '',
+        dns2: '',
+        dns3: '',
+        dns4: '',
+        dns5: '',
+        dns6: ''
+      },
+      errors: {},
+      error: null
+    };
+  },
+  computed: {
+    isLoading() {
+      return this.$resources.modifyDNSServer.loading;
+    },
+    isValid() {
+      return this.dnsServers.dns1 && this.dnsServers.dns2 && !this.hasErrors;
+    },
+    hasErrors() {
+      return Object.keys(this.errors).length > 0;
+    }
+  },
+  resources: {
+    modifyDNSServer() {
+      return {
+        url: 'jcloud.api.domain_west.west_domain_modify_dns_server',
+        validate() {
+          this.errors = {};
+          
+          if (!this.dnsServers.dns1) {
+            this.errors.dns1 = '主DNS服务器不能为空';
+          } else if (!this.isValidDNSFormat(this.dnsServers.dns1)) {
+            this.errors.dns1 = '主DNS服务器格式不正确';
+          }
+          
+          if (!this.dnsServers.dns2) {
+            this.errors.dns2 = '辅DNS服务器不能为空';
+          } else if (!this.isValidDNSFormat(this.dnsServers.dns2)) {
+            this.errors.dns2 = '辅DNS服务器格式不正确';
+          }
+          
+          // 验证可选的DNS服务器格式
+          if (this.dnsServers.dns3 && !this.isValidDNSFormat(this.dnsServers.dns3)) {
+            this.errors.dns3 = '第三个DNS服务器格式不正确';
+          }
+          if (this.dnsServers.dns4 && !this.isValidDNSFormat(this.dnsServers.dns4)) {
+            this.errors.dns4 = '第四个DNS服务器格式不正确';
+          }
+          if (this.dnsServers.dns5 && !this.isValidDNSFormat(this.dnsServers.dns5)) {
+            this.errors.dns5 = '第五个DNS服务器格式不正确';
+          }
+          if (this.dnsServers.dns6 && !this.isValidDNSFormat(this.dnsServers.dns6)) {
+            this.errors.dns6 = '第六个DNS服务器格式不正确';
+          }
+          
+          if (Object.keys(this.errors).length > 0) {
+            throw new DashboardError('请检查DNS服务器格式');
+          }
+        },
+        onSuccess(data) {
+          if (data.status === 'success') {
+            toast.success('DNS服务器修改成功！');
+            this.$emit('success', {
+              domain: this.domain,
+              dnsServers: this.dnsServers,
+              message: data.message
+            });
+            this.show = false;
+          } else {
+            this.error = data.message || '修改DNS服务器失败';
+          }
+        },
+        onError(error) {
+          this.error = error.message || '修改DNS服务器失败';
+        }
+      };
+    }
+  },
+  mounted() {
+    // 初始化DNS服务器信息
+    if (this.domainDoc) {
+      this.dnsServers.dns1 = this.domainDoc.dns_host1 || '';
+      this.dnsServers.dns2 = this.domainDoc.dns_host2 || '';
+      this.dnsServers.dns3 = this.domainDoc.dns_host3 || '';
+      this.dnsServers.dns4 = this.domainDoc.dns_host4 || '';
+      this.dnsServers.dns5 = this.domainDoc.dns_host5 || '';
+      this.dnsServers.dns6 = this.domainDoc.dns_host6 || '';
+    }
+  },
+  methods: {
+    cancel() {
+      this.show = false;
+    },
+    modifyDNSServer() {
+      this.error = null;
+      this.$resources.modifyDNSServer.submit({
+        domain: this.domain,
+        dns1: this.dnsServers.dns1,
+        dns2: this.dnsServers.dns2,
+        dns3: this.dnsServers.dns3 || undefined,
+        dns4: this.dnsServers.dns4 || undefined,
+        dns5: this.dnsServers.dns5 || undefined,
+        dns6: this.dnsServers.dns6 || undefined
+      });
+    },
+    isValidDNSFormat(dns) {
+      if (!dns) return false;
+      
+      // 简单的DNS格式验证
+      const dnsRegex = /^[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?)*$/;
+      return dnsRegex.test(dns) && dns.length >= 3 && dns.length <= 253;
+    }
+  }
+};
+</script> 
\ No newline at end of file
diff --git a/dashboard/src2/components/JsiteDomainOverview.vue b/dashboard/src2/components/JsiteDomainOverview.vue
index 342ce46..4940080 100644
--- a/dashboard/src2/components/JsiteDomainOverview.vue
+++ b/dashboard/src2/components/JsiteDomainOverview.vue
@@ -110,12 +110,12 @@
 				<div class="p-5">
 					<div class="flex flex-wrap gap-2">
 						<Button 
-							@click="manageDNS"
+							@click="modifyDNSServer"
 							:loading="dnsLoading"
 							variant="outline"
 							class="bg-gray-100 text-gray-700 hover:bg-gray-200"
 						>
-							管理DNS
+							修改DNS服务器
 						</Button>
 						<!-- <Button 
 							@click="toggleAutoRenew"
@@ -146,27 +146,27 @@
 					<div class="space-y-3">
 						<div class="flex justify-between">
 							<span class="text-gray-600">主DNS:</span>
-							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host1 || '未设置' }}</span>
+							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host1 }}</span>
 						</div>
 						<div class="flex justify-between">
 							<span class="text-gray-600">辅DNS:</span>
-							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host2 || '未设置' }}</span>
+							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host2 }}</span>
 						</div>
 						<div class="flex justify-between">
 							<span class="text-gray-600">DNS3:</span>
-							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host3 || '未设置' }}</span>
+							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host3 }}</span>
 						</div>
 						<div class="flex justify-between">
 							<span class="text-gray-600">DNS4:</span>
-							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host4 || '未设置' }}</span>
+							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host4 }}</span>
 						</div>
 						<div class="flex justify-between">
 							<span class="text-gray-600">DNS5:</span>
-							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host5 || '未设置' }}</span>
+							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host5 }}</span>
 						</div>
 						<div class="flex justify-between">
 							<span class="text-gray-600">DNS6:</span>
-							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host6 || '未设置' }}</span>
+							<span class="font-mono text-gray-900">{{ $domain.pg.dns_host6 }}</span>
 						</div>
 					</div>
 				</div>
@@ -291,14 +291,19 @@ export default {
 				onSuccess: this.onRenewalSuccess
 			}));
 		},
-		async manageDNS() {
+		async modifyDNSServer() {
 			if (!this.$domain.pg.domain) {
 				toast.error('域名信息不存在');
 				return;
 			}
 			
-			// 这里可以打开DNS管理对话框
-			toast.info('DNS管理功能开发中...');
+			const JsiteDomainModifyDNSServerDialog = defineAsyncComponent(() => import('./JsiteDomainModifyDNSServerDialog.vue'));
+			
+			renderDialog(h(JsiteDomainModifyDNSServerDialog, {
+				domain: this.domain,
+				domainDoc: this.$domain.pg,
+				onSuccess: this.onModifyDNSSuccess
+			}));
 		},
 		async toggleAutoRenew() {
 			if (!this.$domain.pg.name) {
@@ -384,6 +389,10 @@ export default {
 			toast.success('域名续费成功！');
 			this.$domain.reload();
 		},
+		onModifyDNSSuccess(data) {
+			toast.success('DNS服务器修改成功！');
+			this.$domain.reload();
+		},
 		// 显示实名认证信息
 		showRealNameInfo() {
 			const JsiteDomainRealNameInfoDialog = defineAsyncComponent(() => import('./JsiteDomainRealNameInfoDialog.vue'));
diff --git a/jcloud/api/domain_west.py b/jcloud/api/domain_west.py
index 76832ca..d7e2fac 100644
--- a/jcloud/api/domain_west.py
+++ b/jcloud/api/domain_west.py
@@ -1406,7 +1406,7 @@ def register_domain_from_order(order_name):
             raise Exception(f"域名注册失败: {error_msg}")
         
         # 创建域名记录
-        domain_doc = jingrow.get_pg({
+        domain_pg = jingrow.get_pg({
             "pagetype": "Jsite Domain",
             "domain": domain_name,
             "team": order.team,
@@ -1420,7 +1420,7 @@ def register_domain_from_order(order_name):
             "registration_date": jingrow.utils.nowdate(),
             "end_date": jingrow.utils.add_months(jingrow.utils.nowdate(), period * 12)
         })
-        domain_doc.insert(ignore_permissions=True)
+        domain_pg.insert(ignore_permissions=True)
                
         # 更新订单状态
         order.status = "交易成功"
@@ -2393,6 +2393,34 @@ def west_domain_modify_dns_server(**data):
             error_msg = response.get('msg', response.get('message', '未知错误'))
             return {"status": "error", "message": f"修改DNS服务器失败: {error_msg}"}
         
+        # 异步更新本地域名记录的DNS服务器字段
+        try:
+            # 查找对应的Jsite Domain记录
+            domain_records = jingrow.get_all(
+                "Jsite Domain",
+                {"domain": domain},
+                ["name"]
+            )
+            
+            if domain_records:
+                # 如果找到记录，异步更新DNS服务器
+                jingrow.enqueue_pg(
+                    "Jsite Domain",
+                    domain_records[0].name,
+                    "update_dns_servers",
+                    dns1=dns1,
+                    dns2=dns2,
+                    dns3=dns3,
+                    dns4=dns4,
+                    dns5=dns5,
+                    dns6=dns6
+                )
+                jingrow.log_error("DNS服务器异步更新", f"已为域名 {domain} 安排异步更新DNS服务器")
+            else:
+                jingrow.log_error("DNS服务器异步更新", f"未找到域名 {domain} 对应的Jsite Domain记录")
+        except Exception as e:
+            jingrow.log_error("DNS服务器异步更新失败", f"域名 {domain} 异步更新失败: {str(e)}")
+        
         # 返回成功结果
         return {
             "status": "success",
diff --git a/jcloud/jcloud/pagetype/jsite_domain/jsite_domain.py b/jcloud/jcloud/pagetype/jsite_domain/jsite_domain.py
index cc722cc..09aec6e 100644
--- a/jcloud/jcloud/pagetype/jsite_domain/jsite_domain.py
+++ b/jcloud/jcloud/pagetype/jsite_domain/jsite_domain.py
@@ -71,3 +71,39 @@ class JsiteDomain(Document):
 
 	def get_pg(self, pg):
 		return pg
+
+	def update_dns_servers(self, dns1=None, dns2=None, dns3=None, dns4=None, dns5=None, dns6=None):
+		"""
+		异步更新DNS服务器字段
+		
+		Args:
+			dns1: 主DNS服务器
+			dns2: 辅DNS服务器
+			dns3: 第三个DNS服务器（可选）
+			dns4: 第四个DNS服务器（可选）
+			dns5: 第五个DNS服务器（可选）
+			dns6: 第六个DNS服务器（可选）
+		"""
+		try:
+			# 更新DNS服务器字段
+			if dns1 is not None:
+				self.dns_host1 = dns1
+			if dns2 is not None:
+				self.dns_host2 = dns2
+			if dns3 is not None:
+				self.dns_host3 = dns3
+			if dns4 is not None:
+				self.dns_host4 = dns4
+			if dns5 is not None:
+				self.dns_host5 = dns5
+			if dns6 is not None:
+				self.dns_host6 = dns6
+			
+			# 保存更改
+			self.save(ignore_permissions=True)
+			
+			jingrow.log_error("DNS服务器更新成功", f"域名 {self.domain} 的DNS服务器已更新")
+			
+		except Exception as e:
+			jingrow.log_error("DNS服务器更新失败", f"域名 {self.domain} 更新DNS服务器失败: {str(e)}")
+			raise e