Buriburizaemon/admin-frontend-domain
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/admin-frontend-domain.git synced 2026-05-06 05:38:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve domain.ts type errors and SWR fetching bugs; fix vps config unmarshal issue

Browse Source
This commit is contained in:
Bot
2026-04-26 22:07:27 +08:00
parent 825bcb08f4
commit 1e4fae5306
16 changed files with 2513 additions and 2057 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/nzcfg.html
+442 -303
View File
File diff suppressed because it is too large Load Diff
src/api/domain.ts
+18 -9
View File
@@ -1,30 +1,36 @@
import { fetcher, FetcherMethod, swrFetcher } from './api' // 导入正确的 fetcher 函数和方法枚举 // 导入正确的 fetcher 函数和方法枚举
import type { Domain, BillingDataMod} from '@/types/api' import type { BillingDataMod, Domain } from "@/types/domain"
import { FetcherMethod, fetcher } from "./api"
// --- GET 请求 (用于 SWR) --- // --- GET 请求 (用于 SWR) ---
// 获取域名列表的函数，专门为 useSWR 设计 // 获取域名列表的函数，专门为 useSWR 设计
// swrFetcher 内部会调用 fetcher，这一部分是正确的 // swrFetcher 内部会调用 fetcher，这一部分是正确的
export const useDomainList = () => { export const useDomainList = (url: string) => {
return swrFetcher<Domain[]>('/api/v1/domains') return fetcher<Domain[]>(FetcherMethod.GET, url)
} }
// --- POST, PUT, DELETE 请求 (使用 fetcher) --- // --- POST, PUT, DELETE 请求 (使用 fetcher) ---
// 添加一个新的域名 // 添加一个新的域名
export const addDomain = (domain: string) => { export const addDomain = (domain: string) => {
return fetcher<Domain>(FetcherMethod.POST, '/api/v1/domains', { domain }) return fetcher<Domain>(FetcherMethod.POST, "/api/v1/domains", { domain })
} }
// 触发域名验证 // 触发域名验证
export const verifyDomain = (id: number) => { export const verifyDomain = (id: number) => {
return fetcher<{ success: boolean; message: string }>(FetcherMethod.POST, `/api/v1/domains/${id}/verify`) return fetcher<{ success: boolean; message: string }>(
FetcherMethod.POST,
`/api/v1/domains/${id}/verify`,
)
} }
// 更新域名的配置信息 // 更新域名的配置信息
export const updateDomainConfig = (id: number, billingData: BillingDataMod) => { export const updateDomainConfig = (id: number, billingData: BillingDataMod) => {
return fetcher<Domain>(FetcherMethod.PUT, `/api/v1/domains/${id}`, { billing_data: billingData }) return fetcher<Domain>(FetcherMethod.PUT, `/api/v1/domains/${id}`, {
billing_data: billingData,
})
} }
// 删除一个域名 // 删除一个域名
@@ -34,7 +40,10 @@ export const deleteDomain = (id: number) => {
} }
// 更新一个域名（包括公开状态和配置信息） // 更新一个域名（包括公开状态和配置信息）
export const updateDomain = (id: number, data: { is_public: boolean, billing_data: BillingDataMod }) => { export const updateDomain = (
id: number,
data: { is_public: boolean; billing_data: BillingDataMod },
) => {
return fetcher<Domain>(FetcherMethod.PUT, `/api/v1/domains/${id}`, data) return fetcher<Domain>(FetcherMethod.PUT, `/api/v1/domains/${id}`, data)
} }
src/components/header.tsx
+14 -16
View File
@@ -1,4 +1,6 @@
import { ModeToggle } from "@/components/mode-toggle" import { ModeToggle } from "@/components/mode-toggle"
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
import { Button } from "@/components/ui/button"
import { import {
Drawer, Drawer,
DrawerClose, DrawerClose,
@@ -9,12 +11,24 @@ import {
DrawerTitle, DrawerTitle,
DrawerTrigger, DrawerTrigger,
} from "@/components/ui/drawer" } from "@/components/ui/drawer"
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuGroup,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuShortcut,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"
import { import {
NavigationMenu, NavigationMenu,
NavigationMenuItem, NavigationMenuItem,
NavigationMenuLink, NavigationMenuLink,
navigationMenuTriggerStyle, navigationMenuTriggerStyle,
} from "@/components/ui/navigation-menu" } from "@/components/ui/navigation-menu"
import { IconButton } from "@/components/xui/icon-button"
import { NzNavigationMenuLink } from "@/components/xui/navigation-menu"
import { useAuth } from "@/hooks/useAuth" import { useAuth } from "@/hooks/useAuth"
import { useMainStore } from "@/hooks/useMainStore" import { useMainStore } from "@/hooks/useMainStore"
import { useMediaQuery } from "@/hooks/useMediaQuery" import { useMediaQuery } from "@/hooks/useMediaQuery"
@@ -26,21 +40,6 @@ import { useEffect, useRef, useState } from "react"
import { useTranslation } from "react-i18next" import { useTranslation } from "react-i18next"
import { Link, useLocation, useNavigate } from "react-router-dom" import { Link, useLocation, useNavigate } from "react-router-dom"
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
import { Button } from "@/components/ui/button"
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuGroup,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuShortcut,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"
import { IconButton } from "@/components/xui/icon-button"
import { NzNavigationMenuLink } from "@/components/xui/navigation-menu"
// ======================================================= // =======================================================
// vvvvvvvvvvv 1. 在这里为移动端菜单添加新页面 vvvvvvvvvvv // vvvvvvvvvvv 1. 在这里为移动端菜单添加新页面 vvvvvvvvvvv
const pages = [ const pages = [
@@ -428,4 +427,3 @@ function Overview() {
</section> </section>
) )
} }
src/components/notifier.tsx
+42 -12
View File
@@ -177,11 +177,21 @@ export const NotifierCard: React.FC<NotifierCardProps> = ({ data, mutate }) => {
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel> <FormLabel>
{form.watch("type") == 2 ? "SMTP Server (host:port)" : {form.watch("type") == 2
form.watch("type") == 3 ? "Bot Token" : "URL"} ? "SMTP Server (host:port)"
: form.watch("type") == 3
? "Bot Token"
: "URL"}
</FormLabel> </FormLabel>
<FormControl> <FormControl>
<Input {...field} placeholder={form.watch("type") == 3 ? "123456:ABC-DEF" : ""} /> <Input
{...field}
placeholder={
form.watch("type") == 3
? "123456:ABC-DEF"
: ""
}
/>
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
@@ -234,11 +244,13 @@ export const NotifierCard: React.FC<NotifierCardProps> = ({ data, mutate }) => {
</SelectTrigger> </SelectTrigger>
</FormControl> </FormControl>
<SelectContent> <SelectContent>
{Object.entries(nrequestTypes).map(([k, v]) => ( {Object.entries(nrequestTypes).map(
([k, v]) => (
<SelectItem key={k} value={k}> <SelectItem key={k} value={k}>
{v} {v}
</SelectItem> </SelectItem>
))} ),
)}
</SelectContent> </SelectContent>
</Select> </Select>
<FormMessage /> <FormMessage />
@@ -253,15 +265,21 @@ export const NotifierCard: React.FC<NotifierCardProps> = ({ data, mutate }) => {
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel> <FormLabel>
{form.watch("type") == 2 ? "SMTP User:Pass" : {form.watch("type") == 2
form.watch("type") == 3 ? "Chat ID" : t("RequestHeader")} ? "SMTP User:Pass"
: form.watch("type") == 3
? "Chat ID"
: t("RequestHeader")}
</FormLabel> </FormLabel>
<FormControl> <FormControl>
<Textarea <Textarea
className="resize-y" className="resize-y"
placeholder={ placeholder={
form.watch("type") == 2 ? "user:pass" : form.watch("type") == 2
form.watch("type") == 3 ? "123456789" : '{"User-Agent":"Nezha-Agent"}' ? "user:pass"
: form.watch("type") == 3
? "123456789"
: '{"User-Agent":"Nezha-Agent"}'
} }
{...field} {...field}
/> />
@@ -276,11 +294,23 @@ export const NotifierCard: React.FC<NotifierCardProps> = ({ data, mutate }) => {
name="request_body" name="request_body"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>{form.watch("type") == 2 ? "Recipient Email" : t("RequestBody")}</FormLabel> <FormLabel>
{form.watch("type") == 2
? "Recipient Email"
: t("RequestBody")}
</FormLabel>
<FormControl> <FormControl>
<Textarea <Textarea
className={form.watch("type") == 2 ? "resize-y" : "resize-y h-[240px]"} className={
placeholder={form.watch("type") == 2 ? "target@example.com" : '...'} form.watch("type") == 2
? "resize-y"
: "resize-y h-[240px]"
}
placeholder={
form.watch("type") == 2
? "target@example.com"
: "..."
}
{...field} {...field}
/> />
</FormControl> </FormControl>
src/components/server-config.tsx
+9 -5
View File
@@ -160,13 +160,17 @@ export const ServerConfigCard = ({ sid, menuItem = false, ...props }: ServerConf
const onSubmit = async (values: any) => { const onSubmit = async (values: any) => {
let resp: ModelServerTaskResponse = {} let resp: ModelServerTaskResponse = {}
try { try {
values.nic_allowlist = values.nic_allowlist_raw const submitValues = { ...values }
? JSON.parse(values.nic_allowlist_raw) submitValues.nic_allowlist = submitValues.nic_allowlist_raw
? JSON.parse(submitValues.nic_allowlist_raw)
: undefined : undefined
values.hard_drive_partition_allowlist = values.hard_drive_partition_allowlist_raw submitValues.hard_drive_partition_allowlist =
? JSON.parse(values.hard_drive_partition_allowlist_raw) submitValues.hard_drive_partition_allowlist_raw
? JSON.parse(submitValues.hard_drive_partition_allowlist_raw)
: undefined : undefined
resp = await setServerConfig({ config: JSON.stringify(values), servers: [sid] }) delete submitValues.nic_allowlist_raw
delete submitValues.hard_drive_partition_allowlist_raw
resp = await setServerConfig({ config: JSON.stringify(submitValues), servers: [sid] })
} catch (e) { } catch (e) {
console.error(e) console.error(e)
toast(t("Error"), { toast(t("Error"), {
src/components/server.tsx
+51 -21
View File
@@ -28,7 +28,7 @@ import { conv } from "@/lib/utils"
import { asOptionalField } from "@/lib/utils" import { asOptionalField } from "@/lib/utils"
import { ModelServer } from "@/types" import { ModelServer } from "@/types"
import { zodResolver } from "@hookform/resolvers/zod" import { zodResolver } from "@hookform/resolvers/zod"
import { useState, useEffect } from "react" import { useEffect, useState } from "react"
import { useForm } from "react-hook-form" import { useForm } from "react-hook-form"
import { useTranslation } from "react-i18next" import { useTranslation } from "react-i18next"
import { toast } from "sonner" import { toast } from "sonner"
@@ -65,11 +65,13 @@ const serverFormSchema = z.object({
}, },
), ),
), ),
billing_data: z.object({ billing_data: z
.object({
registrar: asOptionalField(z.string()), registrar: asOptionalField(z.string()),
endDate: asOptionalField(z.string()), endDate: asOptionalField(z.string()),
notes: asOptionalField(z.string()), notes: asOptionalField(z.string()),
}).optional(), })
.optional(),
}) })
export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => { export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
@@ -92,16 +94,16 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
useEffect(() => { useEffect(() => {
const handleMessage = (e: MessageEvent) => { const handleMessage = (e: MessageEvent) => {
if (e.data?.type === 'NZCFG_JSON') { if (e.data?.type === "NZCFG_JSON") {
if (e.data.target === 'public_note') { if (e.data.target === "public_note") {
form.setValue('public_note', e.data.payload); form.setValue("public_note", e.data.payload)
toast(t("Success"), { description: "配置已通过可视化构建器自动填入" }); toast(t("Success"), { description: "配置已通过可视化构建器自动填入" })
} }
} }
}; }
window.addEventListener('message', handleMessage); window.addEventListener("message", handleMessage)
return () => window.removeEventListener('message', handleMessage); return () => window.removeEventListener("message", handleMessage)
}, [form, t]); }, [form, t])
const onSubmit = async (values: any) => { const onSubmit = async (values: any) => {
try { try {
@@ -255,7 +257,9 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
)} )}
/> />
<div className="p-3 border rounded-md border-dashed space-y-2"> <div className="p-3 border rounded-md border-dashed space-y-2">
<Label className="text-xs text-muted-foreground uppercase font-bold">Billing & Expiry</Label> <Label className="text-xs text-muted-foreground uppercase font-bold">
Billing & Expiry
</Label>
<FormField <FormField
control={form.control as any} control={form.control as any}
name="billing_data.registrar" name="billing_data.registrar"
@@ -263,7 +267,10 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
<FormItem> <FormItem>
<FormLabel>Registrar</FormLabel> <FormLabel>Registrar</FormLabel>
<FormControl> <FormControl>
<Input placeholder="AWS / Azure /阿里云" {...field} /> <Input
placeholder="AWS / Azure /阿里云"
{...field}
/>
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
@@ -276,7 +283,20 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
<FormItem> <FormItem>
<FormLabel>Expiry Date</FormLabel> <FormLabel>Expiry Date</FormLabel>
<FormControl> <FormControl>
<Input type="date" {...field} value={field.value?.split('T')[0] || ''} onChange={(e) => field.onChange(e.target.value ? new Date(e.target.value).toISOString() : '')} /> <Input
type="date"
{...field}
value={field.value?.split("T")[0] || ""}
onChange={(e) =>
field.onChange(
e.target.value
? new Date(
e.target.value,
).toISOString()
: "",
)
}
/>
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
@@ -290,18 +310,28 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
<FormItem> <FormItem>
<FormLabel className="flex justify-between items-center w-full"> <FormLabel className="flex justify-between items-center w-full">
<span>{t("Public") + t("Note")}</span> <span>{t("Public") + t("Note")}</span>
<a href="/dashboard/nzcfg.html" target="_blank" className="text-blue-500 hover:text-blue-700 text-xs flex items-center gap-1" onClick={(e) => { <a
e.preventDefault(); href="/dashboard/nzcfg.html"
const popup = window.open('/dashboard/nzcfg.html', 'nzcfg', 'width=1000,height=800'); target="_blank"
className="text-blue-500 hover:text-blue-700 text-xs flex items-center gap-1"
onClick={(e) => {
e.preventDefault()
const popup = window.open(
"/dashboard/nzcfg.html",
"nzcfg",
"width=1000,height=800",
)
if (popup) { if (popup) {
const timer = setInterval(() => { const timer = setInterval(() => {
if (popup.closed) { if (popup.closed) {
clearInterval(timer); clearInterval(timer)
} }
}, 500); }, 500)
} }
}}> }}
可视化管理配置 <i className="fa-solid fa-up-right-from-square"></i> >
可视化管理配置{" "}
<i className="fa-solid fa-up-right-from-square"></i>
</a> </a>
</FormLabel> </FormLabel>
<FormControl> <FormControl>
src/components/ui/badge.tsx
+1 -2
View File
@@ -23,8 +23,7 @@ const badgeVariants = cva(
) )
export interface BadgeProps export interface BadgeProps
extends HTMLAttributes<HTMLDivElement>, extends HTMLAttributes<HTMLDivElement>, VariantProps<typeof badgeVariants> {}
VariantProps<typeof badgeVariants> {}
function Badge({ className, variant, ...props }: BadgeProps) { function Badge({ className, variant, ...props }: BadgeProps) {
return <div className={cn(badgeVariants({ variant }), className)} {...props} /> return <div className={cn(badgeVariants({ variant }), className)} {...props} />
src/components/ui/button.tsx
+1 -2
View File
@@ -31,8 +31,7 @@ const buttonVariants = cva(
) )
export interface ButtonProps export interface ButtonProps
extends ButtonHTMLAttributes<HTMLButtonElement>, extends ButtonHTMLAttributes<HTMLButtonElement>, VariantProps<typeof buttonVariants> {
VariantProps<typeof buttonVariants> {
asChild?: boolean asChild?: boolean
} }
src/components/xui/multi-select.tsx
+2 -1
View File
@@ -67,7 +67,8 @@ const multiSelectVariants = cva(
* Props for MultiSelect component * Props for MultiSelect component
*/ */
interface MultiSelectProps interface MultiSelectProps
extends React.ButtonHTMLAttributes<HTMLButtonElement>, extends
React.ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof multiSelectVariants> { VariantProps<typeof multiSelectVariants> {
/** /**
* An array of option objects to be displayed in the multi-select component. * An array of option objects to be displayed in the multi-select component.
src/components/xui/overlayless-sheet.tsx
+2 -1
View File
@@ -37,7 +37,8 @@ const sheetVariants = cva(
) )
interface SheetContentProps interface SheetContentProps
extends ComponentPropsWithoutRef<typeof SheetPrimitive.Content>, extends
ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
VariantProps<typeof sheetVariants> { VariantProps<typeof sheetVariants> {
setOpen: Dispatch<SetStateAction<boolean>> setOpen: Dispatch<SetStateAction<boolean>>
} }
src/routes/domain.tsx
+259 -76
View File
@@ -1,27 +1,57 @@
// src/routes/domain.tsx (最终 Bug 修复版) // src/routes/domain.tsx (最终 Bug 修复版)
import {
import { useState, useEffect } from 'react' addDomain,
import { PlusCircle, RefreshCw, MoreVertical, Trash2, Edit, CheckCircle, RefreshCcw } from 'lucide-react' deleteDomain,
syncDomainWHOIS,
updateDomain,
useDomainList,
verifyDomain,
} from "@/api/domain"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
// 导入 shadcn/ui 组件 // 导入 shadcn/ui 组件
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card' import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table' import {
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu' Dialog,
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog' DialogContent,
import { Badge } from '@/components/ui/badge' DialogDescription,
import { Button } from '@/components/ui/button' DialogFooter,
import { Input } from '@/components/ui/input' DialogHeader,
import { Textarea } from '@/components/ui/textarea' DialogTitle,
import { Label } from '@/components/ui/label' DialogTrigger,
} from "@/components/ui/dialog"
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"
import { Input } from "@/components/ui/input"
import { Label } from "@/components/ui/label"
import { Switch } from "@/components/ui/switch" import { Switch } from "@/components/ui/switch"
import {
import { toast } from 'sonner' Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table"
import { Textarea } from "@/components/ui/textarea"
// 导入 API 类型和函数 // 导入 API 类型和函数
import type { Domain, BillingDataMod } from '@/types/api' import type { BillingDataMod, Domain } from "@/types/domain"
import { useDomainList, addDomain, verifyDomain, deleteDomain, updateDomain, syncDomainWHOIS } from '@/api/domain' import {
import useSWR from 'swr' CheckCircle,
Edit,
MoreVertical,
PlusCircle,
RefreshCcw,
RefreshCw,
Trash2,
} from "lucide-react"
import { useEffect, useState } from "react"
import { toast } from "sonner"
import useSWR from "swr"
export default function DomainPage() { export default function DomainPage() {
// --- React State Hooks --- // --- React State Hooks ---
@@ -29,9 +59,9 @@ export default function DomainPage() {
const [isLoading, setIsLoading] = useState(true) const [isLoading, setIsLoading] = useState(true)
const [isAddModalOpen, setIsAddModalOpen] = useState(false) const [isAddModalOpen, setIsAddModalOpen] = useState(false)
const [newDomainName, setNewDomainName] = useState('') const [newDomainName, setNewDomainName] = useState("")
const [verificationToken, setVerificationToken] = useState('') const [verificationToken, setVerificationToken] = useState("")
const [isVerificationInfoModalOpen, setIsVerificationInfoModalOpen] = useState(false) const [isVerificationInfoModalOpen, setIsVerificationInfoModalOpen] = useState(false)
const [isEditModalOpen, setIsEditModalOpen] = useState(false) const [isEditModalOpen, setIsEditModalOpen] = useState(false)
@@ -39,7 +69,11 @@ export default function DomainPage() {
const [editFormData, setEditFormData] = useState<Partial<BillingDataMod>>({}) const [editFormData, setEditFormData] = useState<Partial<BillingDataMod>>({})
// --- 数据获取 (使用 SWR) --- // --- 数据获取 (使用 SWR) ---
const { data: domainData, error, mutate } = useSWR('/api/v1/domains', useDomainList, { revalidateOnFocus: false }) const {
data: domainData,
error,
mutate,
} = useSWR("/api/v1/domains", useDomainList, { revalidateOnFocus: false })
useEffect(() => { useEffect(() => {
if (domainData) { if (domainData) {
@@ -47,14 +81,14 @@ export default function DomainPage() {
setIsLoading(false) setIsLoading(false)
} }
if (error) { if (error) {
toast.error('无法加载域名列表，请检查后端服务是否正常。') toast.error("无法加载域名列表，请检查后端服务是否正常。")
setIsLoading(false) setIsLoading(false)
} }
}, [domainData, error]) }, [domainData, error])
const handleAddDomain = async () => { const handleAddDomain = async () => {
if (!newDomainName) { if (!newDomainName) {
toast.error('请输入域名') toast.error("请输入域名")
return return
} }
try { try {
@@ -62,10 +96,10 @@ export default function DomainPage() {
setVerificationToken(response.VerifyToken) setVerificationToken(response.VerifyToken)
setIsAddModalOpen(false) setIsAddModalOpen(false)
setIsVerificationInfoModalOpen(true) setIsVerificationInfoModalOpen(true)
setNewDomainName('') setNewDomainName("")
mutate() mutate()
} catch (err) { } catch (err) {
toast.error('添加失败', { description: (err as Error).message }) toast.error("添加失败", { description: (err as Error).message })
} }
} }
@@ -73,24 +107,24 @@ export default function DomainPage() {
try { try {
const response = await verifyDomain(domainId) const response = await verifyDomain(domainId)
if (response.success) { if (response.success) {
toast.success('验证成功', { description: response.message }) toast.success("验证成功", { description: response.message })
} else { } else {
toast.warning('验证失败', { description: response.message }) toast.warning("验证失败", { description: response.message })
} }
setTimeout(() => mutate(), 2000) setTimeout(() => mutate(), 2000)
} catch (err) { } catch (err) {
toast.error('操作失败', { description: (err as Error).message }) toast.error("操作失败", { description: (err as Error).message })
} }
} }
const handleSyncWhois = async (domainId: number) => { const handleSyncWhois = async (domainId: number) => {
const loadingToast = toast.loading('正在同步 Whois 信息...') const loadingToast = toast.loading("正在同步 Whois 信息...")
try { try {
await syncDomainWHOIS(domainId) await syncDomainWHOIS(domainId)
toast.success('同步成功', { id: loadingToast, description: '域名 Whois 信息已更新。' }) toast.success("同步成功", { id: loadingToast, description: "域名 Whois 信息已更新。" })
mutate() mutate()
} catch (err) { } catch (err) {
toast.error('同步失败', { id: loadingToast, description: (err as Error).message }) toast.error("同步失败", { id: loadingToast, description: (err as Error).message })
} }
} }
@@ -98,10 +132,10 @@ export default function DomainPage() {
if (window.confirm(`确定要删除域名 ${domainName} 吗？`)) { if (window.confirm(`确定要删除域名 ${domainName} 吗？`)) {
try { try {
await deleteDomain(domainId) await deleteDomain(domainId)
toast.success('删除成功', { description: `域名 ${domainName} 已被删除。` }) toast.success("删除成功", { description: `域名 ${domainName} 已被删除。` })
mutate() mutate()
} catch (err) { } catch (err) {
toast.error('删除失败', { description: (err as Error).message }) toast.error("删除失败", { description: (err as Error).message })
} }
} }
} }
@@ -115,7 +149,7 @@ export default function DomainPage() {
toast.success(`域名 ${domain.Domain} 的可见状态已更新`) toast.success(`域名 ${domain.Domain} 的可见状态已更新`)
mutate() mutate()
} catch (err) { } catch (err) {
toast.error('更新失败', { description: (err as Error).message }) toast.error("更新失败", { description: (err as Error).message })
} }
} }
@@ -135,32 +169,40 @@ export default function DomainPage() {
const handleUpdateDomain = async () => { const handleUpdateDomain = async () => {
if (!currentDomain) return if (!currentDomain) return
try { try {
const dataToSend = { ...editFormData }; const dataToSend = { ...editFormData }
if (dataToSend.registeredDate) { if (dataToSend.registeredDate) {
dataToSend.registeredDate = new Date(dataToSend.registeredDate).toISOString(); dataToSend.registeredDate = new Date(dataToSend.registeredDate).toISOString()
} }
if (dataToSend.endDate) { if (dataToSend.endDate) {
dataToSend.endDate = new Date(dataToSend.endDate).toISOString(); dataToSend.endDate = new Date(dataToSend.endDate).toISOString()
} }
await updateDomain(currentDomain.ID, { await updateDomain(currentDomain.ID, {
is_public: currentDomain.IsPublic, is_public: currentDomain.IsPublic,
billing_data: dataToSend as BillingDataMod billing_data: dataToSend as BillingDataMod,
})
toast.success("更新成功", {
description: `域名 ${currentDomain.Domain} 的配置已保存。`,
}) })
toast.success('更新成功', { description: `域名 ${currentDomain.Domain} 的配置已保存。` })
setIsEditModalOpen(false) setIsEditModalOpen(false)
mutate() mutate()
} catch (err) { } catch (err) {
toast.error('更新失败', { description: (err as Error).message }) toast.error("更新失败", { description: (err as Error).message })
} }
} }
const getStatusVariant = (status: string): 'default' | 'secondary' | 'destructive' | 'outline' => { const getStatusVariant = (
status: string,
): "default" | "secondary" | "destructive" | "outline" => {
switch (status) { switch (status) {
case 'verified': return 'default' case "verified":
case 'pending': return 'secondary' return "default"
case 'expired': return 'destructive' case "pending":
default: return 'outline' return "secondary"
case "expired":
return "destructive"
default:
return "outline"
} }
} }
@@ -174,21 +216,43 @@ export default function DomainPage() {
<CardDescription>管理并监控您的域名到期状态。</CardDescription> <CardDescription>管理并监控您的域名到期状态。</CardDescription>
</div> </div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Button variant="outline" size="icon" onClick={() => mutate()} disabled={isLoading}> <Button
<RefreshCw className={`h-4 w-4 ${isLoading ? 'animate-spin' : ''}`} /> variant="outline"
size="icon"
onClick={() => mutate()}
disabled={isLoading}
>
<RefreshCw className={`h-4 w-4 ${isLoading ? "animate-spin" : ""}`} />
</Button> </Button>
<Dialog open={isAddModalOpen} onOpenChange={setIsAddModalOpen}> <Dialog open={isAddModalOpen} onOpenChange={setIsAddModalOpen}>
<DialogTrigger asChild><Button><PlusCircle className="mr-2 h-4 w-4" />添加域名</Button></DialogTrigger> <DialogTrigger asChild>
<Button>
<PlusCircle className="mr-2 h-4 w-4" />
添加域名
</Button>
</DialogTrigger>
<DialogContent> <DialogContent>
<DialogHeader> <DialogHeader>
<DialogTitle>添加新域名</DialogTitle> <DialogTitle>添加新域名</DialogTitle>
<DialogDescription>输入您需要监控的域名，例如 "example.com"。</DialogDescription> <DialogDescription>
输入您需要监控的域名，例如 "example.com"。
</DialogDescription>
</DialogHeader> </DialogHeader>
<div className="py-4"> <div className="py-4">
<Input value={newDomainName} onChange={(e) => setNewDomainName(e.target.value)} placeholder="your-domain.com" onKeyUp={(e) => e.key === 'Enter' && handleAddDomain()} /> <Input
value={newDomainName}
onChange={(e) => setNewDomainName(e.target.value)}
placeholder="your-domain.com"
onKeyUp={(e) => e.key === "Enter" && handleAddDomain()}
/>
</div> </div>
<DialogFooter> <DialogFooter>
<Button variant="secondary" onClick={() => setIsAddModalOpen(false)}>取消</Button> <Button
variant="secondary"
onClick={() => setIsAddModalOpen(false)}
>
取消
</Button>
<Button onClick={handleAddDomain}>提交</Button> <Button onClick={handleAddDomain}>提交</Button>
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
@@ -196,7 +260,9 @@ export default function DomainPage() {
</div> </div>
</CardHeader> </CardHeader>
<CardContent> <CardContent>
{isLoading ? ( <div className="text-center py-10 text-muted-foreground">加载中...</div> ) : ( {isLoading ? (
<div className="text-center py-10 text-muted-foreground">加载中...</div>
) : (
<Table> <Table>
<TableHeader> <TableHeader>
<TableRow> <TableRow>
@@ -210,9 +276,15 @@ export default function DomainPage() {
<TableBody> <TableBody>
{domains.map((domain) => ( {domains.map((domain) => (
<TableRow key={domain.ID}> <TableRow key={domain.ID}>
<TableCell className="font-medium">{domain.Domain}</TableCell> <TableCell className="font-medium">
<TableCell><Badge variant={getStatusVariant(domain.Status)}>{domain.Status}</Badge></TableCell> {domain.Domain}
<TableCell>{domain.expires_in_days ?? 'N/A'}</TableCell> </TableCell>
<TableCell>
<Badge variant={getStatusVariant(domain.Status)}>
{domain.Status}
</Badge>
</TableCell>
<TableCell>{domain.expires_in_days ?? "N/A"}</TableCell>
<TableCell> <TableCell>
<Switch <Switch
checked={domain.IsPublic} checked={domain.IsPublic}
@@ -221,12 +293,43 @@ export default function DomainPage() {
</TableCell> </TableCell>
<TableCell className="text-right"> <TableCell className="text-right">
<DropdownMenu> <DropdownMenu>
<DropdownMenuTrigger asChild><Button variant="ghost" size="icon"><MoreVertical className="h-4 w-4" /></Button></DropdownMenuTrigger> <DropdownMenuTrigger asChild>
<Button variant="ghost" size="icon">
<MoreVertical className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent> <DropdownMenuContent>
{domain.Status === 'pending' && (<DropdownMenuItem onClick={() => handleVerify(domain.ID)}><CheckCircle className="mr-2 h-4 w-4" /> 验证</DropdownMenuItem>)} {domain.Status === "pending" && (
{domain.Status === 'verified' && (<DropdownMenuItem onClick={() => handleSyncWhois(domain.ID)}><RefreshCcw className="mr-2 h-4 w-4" /> 同步 Whois</DropdownMenuItem>)} <DropdownMenuItem
<DropdownMenuItem onClick={() => handleEditClick(domain)}><Edit className="mr-2 h-4 w-4" /> 编辑</DropdownMenuItem> onClick={() => handleVerify(domain.ID)}
<DropdownMenuItem className="text-red-600" onClick={() => handleDelete(domain.ID, domain.Domain)}><Trash2 className="mr-2 h-4 w-4" /> 删除</DropdownMenuItem> >
<CheckCircle className="mr-2 h-4 w-4" />{" "}
验证
</DropdownMenuItem>
)}
{domain.Status === "verified" && (
<DropdownMenuItem
onClick={() =>
handleSyncWhois(domain.ID)
}
>
<RefreshCcw className="mr-2 h-4 w-4" />{" "}
同步 Whois
</DropdownMenuItem>
)}
<DropdownMenuItem
onClick={() => handleEditClick(domain)}
>
<Edit className="mr-2 h-4 w-4" /> 编辑
</DropdownMenuItem>
<DropdownMenuItem
className="text-red-600"
onClick={() =>
handleDelete(domain.ID, domain.Domain)
}
>
<Trash2 className="mr-2 h-4 w-4" /> 删除
</DropdownMenuItem>
</DropdownMenuContent> </DropdownMenuContent>
</DropdownMenu> </DropdownMenu>
</TableCell> </TableCell>
@@ -239,23 +342,41 @@ export default function DomainPage() {
</Card> </Card>
{/* 验证信息弹窗 */} {/* 验证信息弹窗 */}
<Dialog open={isVerificationInfoModalOpen} onOpenChange={setIsVerificationInfoModalOpen}> <Dialog
open={isVerificationInfoModalOpen}
onOpenChange={setIsVerificationInfoModalOpen}
>
<DialogContent> <DialogContent>
<DialogHeader> <DialogHeader>
<DialogTitle>请验证域名所有权</DialogTitle> <DialogTitle>请验证域名所有权</DialogTitle>
<DialogDescription>为了开始监控，请为您的域名添加一条 DNS TXT 记录。</DialogDescription> <DialogDescription>
为了开始监控，请为您的域名添加一条 DNS TXT 记录。
</DialogDescription>
</DialogHeader> </DialogHeader>
<div className="py-4 space-y-2"> <div className="py-4 space-y-2">
<p>请将以下内容添加到您的 DNS 解析记录中：</p> <p>请将以下内容添加到您的 DNS 解析记录中：</p>
<div className="p-2 bg-muted rounded-md text-sm"> <div className="p-2 bg-muted rounded-md text-sm">
<p><span className="font-semibold">类型:</span> TXT</p> <p>
<p><span className="font-semibold">主机/名称:</span> @</p> <span className="font-semibold">类型:</span> TXT
</p>
<p>
<span className="font-semibold">主机/名称:</span> @
</p>
<p className="font-semibold">记录值:</p> <p className="font-semibold">记录值:</p>
<p className="font-mono bg-background p-2 rounded">{verificationToken}</p> <p className="font-mono bg-background p-2 rounded">
{verificationToken}
</p>
</div> </div>
<p className="text-xs text-muted-foreground">DNS 记录生效可能需要几分钟到几小时不等。生效后，请回到域名列表点击“验证”。</p> <p className="text-xs text-muted-foreground">
DNS
记录生效可能需要几分钟到几小时不等。生效后，请回到域名列表点击“验证”。
</p>
</div> </div>
<DialogFooter><Button onClick={() => setIsVerificationInfoModalOpen(false)}>我明白了</Button></DialogFooter> <DialogFooter>
<Button onClick={() => setIsVerificationInfoModalOpen(false)}>
我明白了
</Button>
</DialogFooter>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
@@ -264,17 +385,79 @@ export default function DomainPage() {
<DialogContent className="sm:max-w-[425px]"> <DialogContent className="sm:max-w-[425px]">
<DialogHeader> <DialogHeader>
<DialogTitle>编辑域名信息</DialogTitle> <DialogTitle>编辑域名信息</DialogTitle>
<DialogDescription>为 <span className="font-mono">{currentDomain?.Domain}</span> 添加或修改详细信息。</DialogDescription> <DialogDescription>
为 <span className="font-mono">{currentDomain?.Domain}</span>{" "}
添加或修改详细信息。
</DialogDescription>
</DialogHeader> </DialogHeader>
<div className="grid gap-4 py-4"> <div className="grid gap-4 py-4">
<div className="grid grid-cols-4 items-center gap-4"><Label htmlFor="registrar" className="text-right">注册商</Label><Input id="registrar" name="registrar" value={editFormData.registrar || ''} onChange={handleEditFormChange} className="col-span-3" /></div> <div className="grid grid-cols-4 items-center gap-4">
<div className="grid grid-cols-4 items-center gap-4"><Label htmlFor="registeredDate" className="text-right">注册日期</Label><Input id="registeredDate" name="registeredDate" type="date" value={editFormData.registeredDate?.split('T')[0] || ''} onChange={handleEditFormChange} className="col-span-3" /></div> <Label htmlFor="registrar" className="text-right">
<div className="grid grid-cols-4 items-center gap-4"><Label htmlFor="endDate" className="text-right">到期日期</Label><Input id="endDate" name="endDate" type="date" value={editFormData.endDate?.split('T')[0] || ''} onChange={handleEditFormChange} className="col-span-3" /></div> 注册商
<div className="grid grid-cols-4 items-center gap-4"><Label htmlFor="renewalPrice" className="text-right">续费价格</Label><Input id="renewalPrice" name="renewalPrice" value={editFormData.renewalPrice || ''} onChange={handleEditFormChange} className="col-span-3" /></div> </Label>
<div className="grid grid-cols-4 items-center gap-4"><Label htmlFor="notes" className="text-right">备注</Label><Textarea id="notes" name="notes" value={editFormData.notes || ''} onChange={handleEditFormChange} className="col-span-3" /></div> <Input
id="registrar"
name="registrar"
value={editFormData.registrar || ""}
onChange={handleEditFormChange}
className="col-span-3"
/>
</div>
<div className="grid grid-cols-4 items-center gap-4">
<Label htmlFor="registeredDate" className="text-right">
注册日期
</Label>
<Input
id="registeredDate"
name="registeredDate"
type="date"
value={editFormData.registeredDate?.split("T")[0] || ""}
onChange={handleEditFormChange}
className="col-span-3"
/>
</div>
<div className="grid grid-cols-4 items-center gap-4">
<Label htmlFor="endDate" className="text-right">
到期日期
</Label>
<Input
id="endDate"
name="endDate"
type="date"
value={editFormData.endDate?.split("T")[0] || ""}
onChange={handleEditFormChange}
className="col-span-3"
/>
</div>
<div className="grid grid-cols-4 items-center gap-4">
<Label htmlFor="renewalPrice" className="text-right">
续费价格
</Label>
<Input
id="renewalPrice"
name="renewalPrice"
value={editFormData.renewalPrice || ""}
onChange={handleEditFormChange}
className="col-span-3"
/>
</div>
<div className="grid grid-cols-4 items-center gap-4">
<Label htmlFor="notes" className="text-right">
备注
</Label>
<Textarea
id="notes"
name="notes"
value={editFormData.notes || ""}
onChange={handleEditFormChange}
className="col-span-3"
/>
</div>
</div> </div>
<DialogFooter> <DialogFooter>
<Button variant="secondary" onClick={() => setIsEditModalOpen(false)}>取消</Button> <Button variant="secondary" onClick={() => setIsEditModalOpen(false)}>
取消
</Button>
<Button onClick={handleUpdateDomain}>保存</Button> <Button onClick={handleUpdateDomain}>保存</Button>
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
src/routes/server.tsx
+3 -1
View File
@@ -212,7 +212,9 @@ export default function ServerPage() {
}) })
}} }}
/> />
<BatchMoveServerIcon serverIds={selectedRows.map((r) => r.original.id) as number[]} /> <BatchMoveServerIcon
serverIds={selectedRows.map((r) => r.original.id) as number[]}
/>
<ServerConfigCardBatch <ServerConfigCardBatch
sid={selectedRows.map((r) => r.original.id) as number[]} sid={selectedRows.map((r) => r.original.id) as number[]}
className="shadow-[inset_0_1px_0_rgba(255,255,255,0.2)] bg-yellow-600 text-white hover:bg-yellow-500 dark:hover:bg-yellow-700 rounded-lg" className="shadow-[inset_0_1px_0_rgba(255,255,255,0.2)] bg-yellow-600 text-white hover:bg-yellow-500 dark:hover:bg-yellow-700 rounded-lg"
src/routes/settings.tsx
+23 -7
View File
@@ -3,6 +3,7 @@ import { SettingsTab } from "@/components/settings-tab"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { Card, CardContent } from "@/components/ui/card" import { Card, CardContent } from "@/components/ui/card"
import { Checkbox } from "@/components/ui/checkbox" import { Checkbox } from "@/components/ui/checkbox"
import { Combobox } from "@/components/ui/combobox"
import { import {
Form, Form,
FormControl, FormControl,
@@ -21,9 +22,8 @@ import {
SelectValue, SelectValue,
} from "@/components/ui/select" } from "@/components/ui/select"
import { Textarea } from "@/components/ui/textarea" import { Textarea } from "@/components/ui/textarea"
import { Combobox } from "@/components/ui/combobox"
import { useNotification } from "@/hooks/useNotfication"
import { useAuth } from "@/hooks/useAuth" import { useAuth } from "@/hooks/useAuth"
import { useNotification } from "@/hooks/useNotfication"
import useSetting from "@/hooks/useSetting" import useSetting from "@/hooks/useSetting"
import { asOptionalField } from "@/lib/utils" import { asOptionalField } from "@/lib/utils"
import { nezhaLang, settingCoverageTypes } from "@/types" import { nezhaLang, settingCoverageTypes } from "@/types"
@@ -151,7 +151,11 @@ export default function SettingsPage() {
<FormItem> <FormItem>
<FormLabel>Expiry Notification Group ID</FormLabel> <FormLabel>Expiry Notification Group ID</FormLabel>
<FormControl> <FormControl>
<Input type="number" placeholder="Enter Group ID" {...field} /> <Input
type="number"
placeholder="Enter Group ID"
{...field}
/>
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
@@ -177,7 +181,10 @@ export default function SettingsPage() {
<FormItem> <FormItem>
<FormLabel>Custom Logo URL</FormLabel> <FormLabel>Custom Logo URL</FormLabel>
<FormControl> <FormControl>
<Input placeholder="https://example.com/logo.png" {...field} /> <Input
placeholder="https://example.com/logo.png"
{...field}
/>
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
@@ -203,7 +210,10 @@ export default function SettingsPage() {
<FormItem> <FormItem>
<FormLabel>Custom Links (JSON Array)</FormLabel> <FormLabel>Custom Links (JSON Array)</FormLabel>
<FormControl> <FormControl>
<Input placeholder='[{"link":"https://loohui.com/","name":"Blog","blank":false}]' {...field} /> <Input
placeholder='[{"link":"https://loohui.com/","name":"Blog","blank":false}]'
{...field}
/>
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
@@ -216,7 +226,10 @@ export default function SettingsPage() {
<FormItem> <FormItem>
<FormLabel>Background Image (Day)</FormLabel> <FormLabel>Background Image (Day)</FormLabel>
<FormControl> <FormControl>
<Input placeholder="https://example.com/day.jpg" {...field} /> <Input
placeholder="https://example.com/day.jpg"
{...field}
/>
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
@@ -229,7 +242,10 @@ export default function SettingsPage() {
<FormItem> <FormItem>
<FormLabel>Background Image (Night)</FormLabel> <FormLabel>Background Image (Night)</FormLabel>
<FormControl> <FormControl>
<Input placeholder="https://example.com/night.jpg" {...field} /> <Input
placeholder="https://example.com/night.jpg"
{...field}
/>
</FormControl> </FormControl>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
src/types/api.ts
+444 -444
View File
File diff suppressed because it is too large Load Diff
src/types/domain.ts
+20
View File
@@ -0,0 +1,20 @@
export interface BillingDataMod {
registrar?: string;
registeredDate?: string;
endDate?: string;
renewalPrice?: string;
autoRenewal?: string;
notes?: string;
cycle?: string;
amount?: string;
}
export interface Domain {
ID: number;
Domain: string;
Status: string;
VerifyToken: string;
IsPublic: boolean;
BillingData: BillingDataMod | null;
expires_in_days?: number;
}
test_json.go
+25
View File
@@ -0,0 +1,25 @@
package main
import (
"encoding/json"
"fmt"
"strings"
)
type Config struct {
IPReportPeriod int `json:"ip_report_period"`
}
func main() {
jsonData := `{"ip_report_period":30, "unknown_field": 123}`
var c Config
dec := json.NewDecoder(strings.NewReader(jsonData))
dec.DisallowUnknownFields()
err := dec.Decode(&c)
if err != nil {
fmt.Println("Error:", err)
} else {
fmt.Println("Success")
}
}