diff --git a/internal/rpc/rpc_client.go b/internal/rpc/rpc_client.go index 3bd156ff..ce209757 100644 --- a/internal/rpc/rpc_client.go +++ b/internal/rpc/rpc_client.go @@ -204,6 +204,10 @@ func (this *RPCClient) LogRPC() pb.LogServiceClient { return pb.NewLogServiceClient(this.pickConn()) } +func (this *RPCClient) DNSProviderRPC() pb.DNSProviderServiceClient { + return pb.NewDNSProviderServiceClient(this.pickConn()) +} + // 构造Admin上下文 func (this *RPCClient) Context(adminId int64) context.Context { ctx := context.Background() diff --git a/internal/web/actions/default/dns/init.go b/internal/web/actions/default/dns/init.go index 488b245e..5ca6b509 100644 --- a/internal/web/actions/default/dns/init.go +++ b/internal/web/actions/default/dns/init.go @@ -17,6 +17,9 @@ func init() { Prefix("/dns/providers"). Data("teaSubMenu", "provider"). Get("", new(providers.IndexAction)). + GetPost("/createPopup", new(providers.CreatePopupAction)). + GetPost("/updatePopup", new(providers.UpdatePopupAction)). + Post("/delete", new(providers.DeleteAction)). EndData(). EndAll() diff --git a/internal/web/actions/default/dns/providers/createPopup.go b/internal/web/actions/default/dns/providers/createPopup.go new file mode 100644 index 00000000..31ee16fa --- /dev/null +++ b/internal/web/actions/default/dns/providers/createPopup.go @@ -0,0 +1,84 @@ +package providers + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" +) + +type CreatePopupAction struct { + actionutils.ParentAction +} + +func (this *CreatePopupAction) Init() { + this.Nav("", "", "") +} + +func (this *CreatePopupAction) RunGet(params struct{}) { + // 所有厂商 + typesResp, err := this.RPC().DNSProviderRPC().FindAllDNSProviderTypes(this.AdminContext(), &pb.FindAllDNSProviderTypesRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + typeMaps := []maps.Map{} + for _, t := range typesResp.ProviderTypes { + typeMaps = append(typeMaps, maps.Map{ + "name": t.Name, + "code": t.Code, + }) + } + this.Data["types"] = typeMaps + + this.Show() +} + +func (this *CreatePopupAction) RunPost(params struct { + Name string + Type string + + // dnspod + ParamId string + ParamToken string + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + params.Must. + Field("name", params.Name). + Require("请输入账号说明"). + Field("type", params.Type). + Require("请选择服务商厂家") + + apiParams := maps.Map{} + switch params.Type { + case "dnspod": + params.Must. + Field("paramId", params.ParamId). + Require("请输入密钥ID"). + Field("paramToken", params.ParamToken). + Require("请输入密钥Token") + + apiParams["id"] = params.ParamId + apiParams["token"] = params.ParamToken + default: + this.Fail("暂时不支持此服务商'" + params.Type + "'") + } + + createResp, err := this.RPC().DNSProviderRPC().CreateDNSProvider(this.AdminContext(), &pb.CreateDNSProviderRequest{ + Name: params.Name, + Type: params.Type, + ApiParamsJSON: apiParams.AsJSON(), + RoutesJSON: nil, + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.CreateLog(oplogs.LevelInfo, "创建DNS服务商 %d", createResp.DnsProviderId) + + this.Success() +} diff --git a/internal/web/actions/default/dns/providers/delete.go b/internal/web/actions/default/dns/providers/delete.go new file mode 100644 index 00000000..ca83d5bb --- /dev/null +++ b/internal/web/actions/default/dns/providers/delete.go @@ -0,0 +1,40 @@ +package providers + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" + "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" +) + +type DeleteAction struct { + actionutils.ParentAction +} + +func (this *DeleteAction) RunPost(params struct { + ProviderId int64 +}) { + // TODO 检查权限 + + // 记录日志 + this.CreateLog(oplogs.LevelInfo, "删除DNS服务商 %d", params.ProviderId) + + // 检查是否被使用 + countClustersResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithDNSProviderId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithDNSProviderIdRequest{DnsProviderId: params.ProviderId}) + if err != nil { + this.ErrorPage(err) + return + } + if countClustersResp.Count > 0 { + this.Fail("当前DNS服务商账号正在被" + numberutils.FormatInt64(countClustersResp.Count) + "个集群所使用，所以不能删除。请修改后再操作。") + } + + // 执行删除 + _, err = this.RPC().DNSProviderRPC().DeleteDNSProvider(this.AdminContext(), &pb.DeleteDNSProviderRequest{DnsProviderId: params.ProviderId}) + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} diff --git a/internal/web/actions/default/dns/providers/index.go b/internal/web/actions/default/dns/providers/index.go index 31778fd5..917ab6b5 100644 --- a/internal/web/actions/default/dns/providers/index.go +++ b/internal/web/actions/default/dns/providers/index.go @@ -1,6 +1,11 @@ package providers -import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/maps" + timeutil "github.com/iwind/TeaGo/utils/time" +) type IndexAction struct { actionutils.ParentAction @@ -11,5 +16,39 @@ func (this *IndexAction) Init() { } func (this *IndexAction) RunGet(params struct{}) { + countResp, err := this.RPC().DNSProviderRPC().CountAllEnabledDNSProviders(this.AdminContext(), &pb.CountAllEnabledDNSProvidersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + count := countResp.Count + page := this.NewPage(count) + this.Data["page"] = page.AsHTML() + + providersResp, err := this.RPC().DNSProviderRPC().ListEnabledDNSProviders(this.AdminContext(), &pb.ListEnabledDNSProvidersRequest{ + Offset: page.Offset, + Size: page.Size, + }) + if err != nil { + this.ErrorPage(err) + return + } + providerMaps := []maps.Map{} + for _, provider := range providersResp.DnsProviders { + dataUpdatedTime := "" + if provider.DataUpdatedAt > 0 { + dataUpdatedTime = timeutil.FormatTime("Y-m-d H:i:s", provider.DataUpdatedAt) + } + + providerMaps = append(providerMaps, maps.Map{ + "id": provider.Id, + "name": provider.Name, + "type": provider.Type, + "typeName": provider.TypeName, + "dataUpdatedTime": dataUpdatedTime, + }) + } + this.Data["providers"] = providerMaps + this.Show() } diff --git a/internal/web/actions/default/dns/providers/updatePopup.go b/internal/web/actions/default/dns/providers/updatePopup.go new file mode 100644 index 00000000..8bf9079e --- /dev/null +++ b/internal/web/actions/default/dns/providers/updatePopup.go @@ -0,0 +1,118 @@ +package providers + +import ( + "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/maps" +) + +type UpdatePopupAction struct { + actionutils.ParentAction +} + +func (this *UpdatePopupAction) Init() { + this.Nav("", "", "") +} + +func (this *UpdatePopupAction) RunGet(params struct { + ProviderId int64 +}) { + providerResp, err := this.RPC().DNSProviderRPC().FindEnabledDNSProvider(this.AdminContext(), &pb.FindEnabledDNSProviderRequest{DnsProviderId: params.ProviderId}) + if err != nil { + this.ErrorPage(err) + return + } + provider := providerResp.DnsProvider + if provider == nil { + this.NotFound("dnsProvider", params.ProviderId) + return + } + + apiParams := maps.Map{} + if len(provider.ApiParamsJSON) > 0 { + err = json.Unmarshal(provider.ApiParamsJSON, &apiParams) + if err != nil { + this.ErrorPage(err) + return + } + + } + + this.Data["provider"] = maps.Map{ + "id": provider.Id, + "name": provider.Name, + "type": provider.Type, + "typeName": provider.TypeName, + "params": apiParams, + } + + // 所有厂商 + typesResp, err := this.RPC().DNSProviderRPC().FindAllDNSProviderTypes(this.AdminContext(), &pb.FindAllDNSProviderTypesRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + typeMaps := []maps.Map{} + for _, t := range typesResp.ProviderTypes { + typeMaps = append(typeMaps, maps.Map{ + "name": t.Name, + "code": t.Code, + }) + } + this.Data["types"] = typeMaps + + this.Show() +} + +func (this *UpdatePopupAction) RunPost(params struct { + ProviderId int64 + + Name string + Type string + + // dnspod + ParamId string + ParamToken string + + Must *actions.Must + CSRF *actionutils.CSRF +}) { + this.CreateLog(oplogs.LevelInfo, "修改DNS服务商 %d", params.ProviderId) + + params.Must. + Field("name", params.Name). + Require("请输入账号说明"). + Field("type", params.Type). + Require("请选择服务商厂家") + + apiParams := maps.Map{} + switch params.Type { + case "dnspod": + params.Must. + Field("paramId", params.ParamId). + Require("请输入密钥ID"). + Field("paramToken", params.ParamToken). + Require("请输入密钥Token") + + apiParams["id"] = params.ParamId + apiParams["token"] = params.ParamToken + default: + this.Fail("暂时不支持此服务商'" + params.Type + "'") + } + + _, err := this.RPC().DNSProviderRPC().UpdateDNSProvider(this.AdminContext(), &pb.UpdateDNSProviderRequest{ + DnsProviderId: params.ProviderId, + Name: params.Name, + ApiParamsJSON: apiParams.AsJSON(), + RoutesJSON: nil, + }) + if err != nil { + this.ErrorPage(err) + return + } + + this.Success() +} diff --git a/internal/web/actions/default/servers/server/settings/index.go b/internal/web/actions/default/servers/server/settings/index.go index 85be531d..3572d837 100644 --- a/internal/web/actions/default/servers/server/settings/index.go +++ b/internal/web/actions/default/servers/server/settings/index.go @@ -2,6 +2,7 @@ package settings import ( "errors" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -101,6 +102,9 @@ func (this *IndexAction) RunPost(params struct { Must *actions.Must }) { + // 记录日志 + this.CreateLog(oplogs.LevelInfo, "修改代理服务 %d 基本信息", params.ServerId) + params.Must. Field("name", params.Name). Require("请输入服务名称") diff --git a/internal/web/actions/default/servers/server/settings/serverNames/index.go b/internal/web/actions/default/servers/server/settings/serverNames/index.go index 791deabe..2f3850fa 100644 --- a/internal/web/actions/default/servers/server/settings/serverNames/index.go +++ b/internal/web/actions/default/servers/server/settings/serverNames/index.go @@ -2,6 +2,7 @@ package serverNames import ( "encoding/json" + "github.com/TeaOSLab/EdgeAdmin/internal/oplogs" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/servers/serverutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -36,6 +37,9 @@ func (this *IndexAction) RunGet(params struct { } this.Data["serverNames"] = serverNamesConfig + // DNS + this.Data["dnsName"] = server.DnsName + this.Show() } @@ -44,6 +48,9 @@ func (this *IndexAction) RunPost(params struct { ServerNames string Must *actions.Must }) { + // 记录日志 + this.CreateLog(oplogs.LevelInfo, "修改代理服务 %d 域名", params.ServerId) + serverNames := []*serverconfigs.ServerNameConfig{} err := json.Unmarshal([]byte(params.ServerNames), &serverNames) if err != nil { diff --git a/internal/web/helpers/user_must_auth.go b/internal/web/helpers/user_must_auth.go index 70bccd2f..446852b8 100644 --- a/internal/web/helpers/user_must_auth.go +++ b/internal/web/helpers/user_must_auth.go @@ -110,7 +110,7 @@ func (this *UserMustAuth) BeforeAction(actionPtr actions.ActionWrapper, paramNam "icon": "globe", "subItems": []maps.Map{ { - "name": "第三方DNS", + "name": "DNS服务商", "url": "/dns/providers", "code": "provider", }, diff --git a/web/views/@default/dns/providers/createPopup.html b/web/views/@default/dns/providers/createPopup.html new file mode 100644 index 00000000..3e493e59 --- /dev/null +++ b/web/views/@default/dns/providers/createPopup.html @@ -0,0 +1,46 @@ +{$layout "layout_popup"} + +

添加DNS服务商账号

+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
账号说明 * + +

用来方便区分不同的账号。

+
服务商厂家 * + +

创建后无法修改此选项。

+
API参数
密钥ID * + +
密钥Token * + +
+ + +
\ No newline at end of file diff --git a/web/views/@default/dns/providers/createPopup.js b/web/views/@default/dns/providers/createPopup.js new file mode 100644 index 00000000..87a5452c --- /dev/null +++ b/web/views/@default/dns/providers/createPopup.js @@ -0,0 +1,4 @@ +Tea.context(function () { + this.success = NotifyPopup + this.type = "" +}) \ No newline at end of file diff --git a/web/views/@default/dns/providers/index.html b/web/views/@default/dns/providers/index.html index a98dc909..41f42417 100644 --- a/web/views/@default/dns/providers/index.html +++ b/web/views/@default/dns/providers/index.html @@ -1,3 +1,33 @@ {$layout} -

此功能暂未开放，敬请期待。

\ No newline at end of file + + [添加DNS账号信息] + + +

暂时还没有第三方DNS服务商。

+ + + + + + + + + + + + + + + + + + +
账号说明服务商可用线路最近更新时间操作
{{provider.name}}{{provider.typeName}} + {{provider.dataUpdatedTime}} + - + + 修改   删除 +
+ +
\ No newline at end of file diff --git a/web/views/@default/dns/providers/index.js b/web/views/@default/dns/providers/index.js new file mode 100644 index 00000000..22de9a02 --- /dev/null +++ b/web/views/@default/dns/providers/index.js @@ -0,0 +1,34 @@ +Tea.context(function () { + this.createProvider = function () { + teaweb.popup(Tea.url(".createPopup"), { + height: "26em", + callback: function () { + teaweb.success("保存成功", function () { + teaweb.reload() + }) + } + }) + } + + this.updateProvider = function (providerId) { + teaweb.popup(Tea.url(".updatePopup?providerId=" + providerId), { + height: "26em", + callback: function () { + teaweb.success("保存成功", function () { + teaweb.reload() + }) + } + }) + } + + this.deleteProvider = function (providerId) { + let that = this + teaweb.confirm("确定要删除这个DNS服务商账号吗？", function () { + that.$post(".delete") + .params({ + providerId: providerId + }) + .refresh() + }) + } +}) \ No newline at end of file diff --git a/web/views/@default/dns/providers/updatePopup.html b/web/views/@default/dns/providers/updatePopup.html new file mode 100644 index 00000000..7e727cc2 --- /dev/null +++ b/web/views/@default/dns/providers/updatePopup.html @@ -0,0 +1,45 @@ +{$layout "layout_popup"} + +

修改DNS服务商账号

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
账号说明 * + +

用来方便区分不同的账号。

+
服务商厂家 * + {{provider.typeName}} +

创建后无法修改此选项。

+
API参数
密钥ID * + +
密钥Token * + +
+ + +
\ No newline at end of file diff --git a/web/views/@default/dns/providers/updatePopup.js b/web/views/@default/dns/providers/updatePopup.js new file mode 100644 index 00000000..c8fe9515 --- /dev/null +++ b/web/views/@default/dns/providers/updatePopup.js @@ -0,0 +1,3 @@ +Tea.context(function () { + this.success = NotifyPopup +}) \ No newline at end of file