mirror of
https://github.com/0xJacky/nginx-ui.git
synced 2026-06-02 01:23:20 +08:00
32d261d8df
* feat(dns): add comment support for Cloudflare DNS records - Add Comment field to Record and RecordInput structs in provider.go - Update Cloudflare provider to read/write comments on DNS records - Add comment to frontend API types (DNSRecord, RecordPayload) - Display Comment column in DNSRecordTable for Cloudflare domains - Add Comment input field in DNSRecordForm for creating/editing records - Comments are now visible and editable in the DNS management interface Closes: feature request for Cloudflare DNS record comments Co-authored-by: Jacky <me@jackyu.cn> * fix(dns): decouple comment column visibility and preserve comments in DDNS updates - Add separate showComment prop to DNSRecordTable component - DNSRecordManager now passes showComment prop to the table - Comment column visibility is now independent from proxied column - DDNS update now preserves existing record.Comment to prevent silently clearing comments during IP address updates Fixes Bugbot review issues: - Comment column incorrectly coupled to proxied visibility - DDNS updates silently clear Cloudflare record comments Co-authored-by: Jacky <me@jackyu.cn> * fix: resolve code duplication and missing comment field in DNS records - Extract isCloudflare computed property to eliminate duplication between showProxiedToggle and showCommentField in DNSRecordManager.vue - Add Comment field to recordRequest struct in dto.go - Map Comment field in toRecordInput function to properly pass comments from frontend to the DNS provider layer --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com>
118 lines
3.2 KiB
Go
118 lines
3.2 KiB
Go
package dns
|
|
|
|
import (
|
|
"github.com/0xJacky/Nginx-UI/internal/dns"
|
|
"github.com/0xJacky/Nginx-UI/model"
|
|
)
|
|
|
|
type domainListQuery struct {
|
|
Keyword string `form:"keyword"`
|
|
CredentialID uint64 `form:"credential_id"`
|
|
Page int `form:"page"`
|
|
PerPage int `form:"per_page"`
|
|
}
|
|
|
|
type domainRequest struct {
|
|
Domain string `json:"domain" binding:"required"`
|
|
Description string `json:"description"`
|
|
DnsCredentialID uint64 `json:"dns_credential_id" binding:"required"`
|
|
}
|
|
|
|
type recordListQuery struct {
|
|
Type string `form:"type"`
|
|
Name string `form:"name"`
|
|
Page int `form:"page"`
|
|
PerPage int `form:"per_page"`
|
|
}
|
|
|
|
type recordRequest struct {
|
|
Type string `json:"type" binding:"required"`
|
|
Name string `json:"name" binding:"required"`
|
|
Content string `json:"content" binding:"required"`
|
|
TTL int `json:"ttl" binding:"required,min=1"`
|
|
Priority *int `json:"priority"`
|
|
Weight *int `json:"weight"`
|
|
Proxied *bool `json:"proxied"`
|
|
Comment string `json:"comment"`
|
|
}
|
|
|
|
func toRecordInput(req recordRequest) dns.RecordInput {
|
|
return dns.RecordInput{
|
|
Type: req.Type,
|
|
Name: req.Name,
|
|
Content: req.Content,
|
|
TTL: req.TTL,
|
|
Priority: req.Priority,
|
|
Weight: req.Weight,
|
|
Proxied: req.Proxied,
|
|
Comment: req.Comment,
|
|
}
|
|
}
|
|
|
|
const timeFormat = "2006-01-02T15:04:05Z07:00"
|
|
|
|
type ddnsConfigRequest struct {
|
|
Enabled bool `json:"enabled"`
|
|
IntervalSeconds int `json:"interval_seconds" binding:"required,min=60"`
|
|
RecordIDs []string `json:"record_ids"`
|
|
}
|
|
|
|
type ddnsRecordTarget struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
Type string `json:"type"`
|
|
}
|
|
|
|
type ddnsConfigResponse struct {
|
|
Enabled bool `json:"enabled"`
|
|
IntervalSeconds int `json:"interval_seconds"`
|
|
Targets []ddnsRecordTarget `json:"targets"`
|
|
LastIPv4 string `json:"last_ipv4,omitempty"`
|
|
LastIPv6 string `json:"last_ipv6,omitempty"`
|
|
LastRunAt string `json:"last_run_at,omitempty"`
|
|
LastError string `json:"last_error,omitempty"`
|
|
}
|
|
|
|
func toDDNSResponse(cfg *model.DDNSConfig) ddnsConfigResponse {
|
|
resp := ddnsConfigResponse{
|
|
Enabled: cfg != nil && cfg.Enabled,
|
|
IntervalSeconds: dns.DefaultDDNSInterval(),
|
|
Targets: []ddnsRecordTarget{},
|
|
}
|
|
|
|
if cfg == nil {
|
|
return resp
|
|
}
|
|
|
|
interval := cfg.IntervalSeconds
|
|
if interval <= 0 {
|
|
interval = dns.DefaultDDNSInterval()
|
|
}
|
|
resp.IntervalSeconds = interval
|
|
resp.LastIPv4 = cfg.LastIPv4
|
|
resp.LastIPv6 = cfg.LastIPv6
|
|
resp.LastError = cfg.LastError
|
|
|
|
if cfg.LastRunAt != nil {
|
|
resp.LastRunAt = cfg.LastRunAt.Format(timeFormat)
|
|
}
|
|
|
|
for _, target := range cfg.Targets {
|
|
resp.Targets = append(resp.Targets, ddnsRecordTarget{
|
|
ID: target.ID,
|
|
Name: target.Name,
|
|
Type: target.Type,
|
|
})
|
|
}
|
|
|
|
return resp
|
|
}
|
|
|
|
type ddnsDomainItem struct {
|
|
ID uint64 `json:"id"`
|
|
Domain string `json:"domain"`
|
|
CredentialName string `json:"credential_name,omitempty"`
|
|
CredentialProvider string `json:"credential_provider,omitempty"`
|
|
Config ddnsConfigResponse `json:"config"`
|
|
}
|