diff --git a/internal/web/actions/default/dns/domainOptions.go b/internal/web/actions/default/dns/domainOptions.go index a20d3ef9..45a3039a 100644 --- a/internal/web/actions/default/dns/domainOptions.go +++ b/internal/web/actions/default/dns/domainOptions.go @@ -14,7 +14,7 @@ type DomainOptionsAction struct { func (this *DomainOptionsAction) RunPost(params struct { ProviderId int64 }) { - domainsResp, err := this.RPC().DNSDomainRPC().FindAllEnabledBasicDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.FindAllEnabledBasicDNSDomainsWithDNSProviderIdRequest{ + domainsResp, err := this.RPC().DNSDomainRPC().FindAllBasicDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.FindAllBasicDNSDomainsWithDNSProviderIdRequest{ DnsProviderId: params.ProviderId, }) if err != nil { diff --git a/internal/web/actions/default/dns/domains/clustersPopup.go b/internal/web/actions/default/dns/domains/clustersPopup.go index 0699166e..dfff3e2d 100644 --- a/internal/web/actions/default/dns/domains/clustersPopup.go +++ b/internal/web/actions/default/dns/domains/clustersPopup.go @@ -18,7 +18,7 @@ func (this *ClustersPopupAction) RunGet(params struct { DomainId int64 }) { // 域名信息 - domainResp, err := this.RPC().DNSDomainRPC().FindEnabledBasicDNSDomain(this.AdminContext(), &pb.FindEnabledBasicDNSDomainRequest{ + domainResp, err := this.RPC().DNSDomainRPC().FindBasicDNSDomain(this.AdminContext(), &pb.FindBasicDNSDomainRequest{ DnsDomainId: params.DomainId, }) if err != nil { diff --git a/internal/web/actions/default/dns/domains/nodesPopup.go b/internal/web/actions/default/dns/domains/nodesPopup.go index dd14749b..8bfdc276 100644 --- a/internal/web/actions/default/dns/domains/nodesPopup.go +++ b/internal/web/actions/default/dns/domains/nodesPopup.go @@ -19,7 +19,7 @@ func (this *NodesPopupAction) RunGet(params struct { DomainId int64 }) { // 域名信息 - domainResp, err := this.RPC().DNSDomainRPC().FindEnabledBasicDNSDomain(this.AdminContext(), &pb.FindEnabledBasicDNSDomainRequest{ + domainResp, err := this.RPC().DNSDomainRPC().FindBasicDNSDomain(this.AdminContext(), &pb.FindBasicDNSDomainRequest{ DnsDomainId: params.DomainId, }) if err != nil { diff --git a/internal/web/actions/default/dns/domains/selectPopup.go b/internal/web/actions/default/dns/domains/selectPopup.go index 02aff1f2..7ffd89e6 100644 --- a/internal/web/actions/default/dns/domains/selectPopup.go +++ b/internal/web/actions/default/dns/domains/selectPopup.go @@ -25,7 +25,7 @@ func (this *SelectPopupAction) RunGet(params struct { // 域名信息 if params.DomainId > 0 { - domainResp, err := this.RPC().DNSDomainRPC().FindEnabledDNSDomain(this.AdminContext(), &pb.FindEnabledDNSDomainRequest{DnsDomainId: params.DomainId}) + domainResp, err := this.RPC().DNSDomainRPC().FindDNSDomain(this.AdminContext(), &pb.FindDNSDomainRequest{DnsDomainId: params.DomainId}) if err != nil { this.ErrorPage(err) return @@ -76,7 +76,7 @@ func (this *SelectPopupAction) RunPost(params struct { this.Data["providerName"] = "" if params.DomainId > 0 { - domainResp, err := this.RPC().DNSDomainRPC().FindEnabledDNSDomain(this.AdminContext(), &pb.FindEnabledDNSDomainRequest{DnsDomainId: params.DomainId}) + domainResp, err := this.RPC().DNSDomainRPC().FindDNSDomain(this.AdminContext(), &pb.FindDNSDomainRequest{DnsDomainId: params.DomainId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/dns/domains/serversPopup.go b/internal/web/actions/default/dns/domains/serversPopup.go index 103f7102..afabe526 100644 --- a/internal/web/actions/default/dns/domains/serversPopup.go +++ b/internal/web/actions/default/dns/domains/serversPopup.go @@ -18,7 +18,7 @@ func (this *ServersPopupAction) RunGet(params struct { DomainId int64 }) { // 域名信息 - domainResp, err := this.RPC().DNSDomainRPC().FindEnabledBasicDNSDomain(this.AdminContext(), &pb.FindEnabledBasicDNSDomainRequest{ + domainResp, err := this.RPC().DNSDomainRPC().FindBasicDNSDomain(this.AdminContext(), &pb.FindBasicDNSDomainRequest{ DnsDomainId: params.DomainId, }) if err != nil { diff --git a/internal/web/actions/default/dns/domains/updatePopup.go b/internal/web/actions/default/dns/domains/updatePopup.go index d21d3516..569e832f 100644 --- a/internal/web/actions/default/dns/domains/updatePopup.go +++ b/internal/web/actions/default/dns/domains/updatePopup.go @@ -21,7 +21,7 @@ func (this *UpdatePopupAction) Init() { func (this *UpdatePopupAction) RunGet(params struct { DomainId int64 }) { - domainResp, err := this.RPC().DNSDomainRPC().FindEnabledDNSDomain(this.AdminContext(), &pb.FindEnabledDNSDomainRequest{DnsDomainId: params.DomainId}) + domainResp, err := this.RPC().DNSDomainRPC().FindDNSDomain(this.AdminContext(), &pb.FindDNSDomainRequest{DnsDomainId: params.DomainId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/dns/index.go b/internal/web/actions/default/dns/index.go index b66d2fca..4e19576d 100644 --- a/internal/web/actions/default/dns/index.go +++ b/internal/web/actions/default/dns/index.go @@ -47,7 +47,7 @@ func (this *IndexAction) RunGet(params struct { providerTypeName := "" if cluster.DnsDomainId > 0 { - domainResp, err := this.RPC().DNSDomainRPC().FindEnabledBasicDNSDomain(this.AdminContext(), &pb.FindEnabledBasicDNSDomainRequest{DnsDomainId: domainId}) + domainResp, err := this.RPC().DNSDomainRPC().FindBasicDNSDomain(this.AdminContext(), &pb.FindBasicDNSDomainRequest{DnsDomainId: domainId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/dns/providers/index.go b/internal/web/actions/default/dns/providers/index.go index d108eec7..95664a63 100644 --- a/internal/web/actions/default/dns/providers/index.go +++ b/internal/web/actions/default/dns/providers/index.go @@ -65,7 +65,7 @@ func (this *IndexAction) RunGet(params struct { } // 域名 - countDomainsResp, err := this.RPC().DNSDomainRPC().CountAllEnabledDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.CountAllEnabledDNSDomainsWithDNSProviderIdRequest{ + countDomainsResp, err := this.RPC().DNSDomainRPC().CountAllDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.CountAllDNSDomainsWithDNSProviderIdRequest{ DnsProviderId: provider.Id, }) if err != nil { diff --git a/internal/web/actions/default/dns/providers/provider.go b/internal/web/actions/default/dns/providers/provider.go index 0b350d1b..25cf3427 100644 --- a/internal/web/actions/default/dns/providers/provider.go +++ b/internal/web/actions/default/dns/providers/provider.go @@ -18,19 +18,24 @@ func (this *ProviderAction) Init() { func (this *ProviderAction) RunGet(params struct { ProviderId int64 + Page int + Filter string }) { + this.Data["pageNo"] = params.Page + this.Data["filter"] = params.Filter + providerResp, err := this.RPC().DNSProviderRPC().FindEnabledDNSProvider(this.AdminContext(), &pb.FindEnabledDNSProviderRequest{DnsProviderId: params.ProviderId}) if err != nil { this.ErrorPage(err) return } - provider := providerResp.DnsProvider + var provider = providerResp.DnsProvider if provider == nil { this.NotFound("dnsProvider", params.ProviderId) return } - apiParams := maps.Map{} + var apiParams = maps.Map{} if len(provider.ApiParamsJSON) > 0 { err = json.Unmarshal(provider.ApiParamsJSON, &apiParams) if err != nil { @@ -55,13 +60,33 @@ func (this *ProviderAction) RunGet(params struct { "localEdgeDNS": localEdgeDNSMap, } - // 域名 - domainsResp, err := this.RPC().DNSDomainRPC().FindAllEnabledDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.FindAllEnabledDNSDomainsWithDNSProviderIdRequest{DnsProviderId: provider.Id}) + // 域名数量 + countDomainsResp, err := this.RPC().DNSDomainRPC().CountAllDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.CountAllDNSDomainsWithDNSProviderIdRequest{ + DnsProviderId: params.ProviderId, + IsDeleted: params.Filter == "deleted", + IsDown: params.Filter == "down", + }) if err != nil { this.ErrorPage(err) return } - domainMaps := []maps.Map{} + var countDomains = countDomainsResp.Count + var page = this.NewPage(countDomains) + this.Data["page"] = page.AsHTML() + + // 域名 + domainsResp, err := this.RPC().DNSDomainRPC().ListBasicDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.ListBasicDNSDomainsWithDNSProviderIdRequest{ + DnsProviderId: params.ProviderId, + IsDeleted: params.Filter == "deleted", + IsDown: params.Filter == "down", + Offset: page.Offset, + Size: page.Size, + }) + if err != nil { + this.ErrorPage(err) + return + } + var domainMaps = []maps.Map{} for _, domain := range domainsResp.DnsDomains { dataUpdatedTime := "" if domain.DataUpdatedAt > 0 { diff --git a/web/views/@default/dns/providers/provider.html b/web/views/@default/dns/providers/provider.html index bc54a7ac..f82c876a 100644 --- a/web/views/@default/dns/providers/provider.html +++ b/web/views/@default/dns/providers/provider.html @@ -185,68 +185,71 @@ -

管理的域名 [添加域名]

+

管理的域名   [刷新域名]   [添加域名]

正在检查域名状态...

-

暂时还没有可以管理的域名。

+ + 正常状态 + 已下线 + 已删除 + -
-
-

已删除的域名

-
- - - - - - - - - - - - - - - - - - - - - - +

暂时还没有已删除已下线可以管理的域名。

+ +
域名线路集群节点域名服务域名数据更新时间状态操作
{{domain.name}} - {{domain.countRoutes}}个 - 0个 - - {{domain.countClusters}} - 0个 - - {{domain.countNodeRecords}}/{{domain.countAllNodes}}个 - 0个 - - {{domain.countServerRecords}}/{{domain.countAllServers}}个 - 0个 - - {{domain.dataUpdatedTime}} - 尚未更新 - - -
- 需要同步 - 正在同步... -
-
- 已下线 -
- 		- 同步 - 正在同步...  - 修改   - 删除 - 恢复 -
+ + + + + + + + + + -
域名线路集群节点域名服务域名数据更新时间状态操作
-
\ No newline at end of file + + + {{domain.name}} + + {{domain.countRoutes}}个 + 0个 + + + {{domain.countClusters}} + 0个 + + + {{domain.countNodeRecords}}/{{domain.countAllNodes}}个 + 0个 + + + {{domain.countServerRecords}}/{{domain.countAllServers}}个 + 0个 + + + {{domain.dataUpdatedTime}} + 尚未更新 + + + +
+ 需要同步 + 正在同步... +
+
+ 已下线 +
+ + + 同步 + 正在同步...  + 修改   + 删除 + 恢复 + + + + + \ No newline at end of file diff --git a/web/views/@default/dns/providers/provider.js b/web/views/@default/dns/providers/provider.js index d984cfce..096ed20f 100644 --- a/web/views/@default/dns/providers/provider.js +++ b/web/views/@default/dns/providers/provider.js @@ -1,9 +1,13 @@ Tea.context(function () { this.isUpdatingDomains = false - this.hasDeletedDomains = this.domains.$find(function (k, v) {return v.isDeleted}) != null + this.hasDeletedDomains = this.domains.$find(function (k, v) { + return v.isDeleted + }) != null this.$delay(function () { - this.syncDomains() + if (this.pageNo <= 1 && this.filter.length == 0) { + this.syncDomains() + } }) this.syncDomains = function () {