From c1b8df471068610c58b8df107146ddfc00addf8c Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Wed, 24 Nov 2021 11:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/web/actions/default/servers/create.go | 12 ++++++------ .../servers/groups/group/settings/accessLog/index.go | 2 +- .../servers/groups/group/settings/cache/index.go | 2 +- .../servers/groups/group/settings/charset/index.go | 2 +- .../groups/group/settings/compression/index.go | 2 +- .../servers/groups/group/settings/headers/index.go | 8 ++++---- .../servers/groups/group/settings/pages/index.go | 4 ++-- .../groups/group/settings/remoteAddr/index.go | 2 +- .../servers/groups/group/settings/stat/index.go | 4 ++-- .../servers/groups/group/settings/waf/index.go | 2 +- .../servers/groups/group/settings/web/index.go | 4 ++-- .../servers/groups/group/settings/webp/index.go | 4 ++-- .../servers/groups/group/settings/websocket/index.go | 2 +- .../default/servers/server/settings/access/index.go | 4 ++-- .../servers/server/settings/accessLog/index.go | 2 +- .../default/servers/server/settings/cache/index.go | 2 +- .../default/servers/server/settings/charset/index.go | 2 +- .../servers/server/settings/compression/index.go | 2 +- .../default/servers/server/settings/fastcgi/index.go | 2 +- .../default/servers/server/settings/headers/index.go | 4 ++-- .../default/servers/server/settings/http/index.go | 2 +- .../server/settings/locations/access/index.go | 4 ++-- .../server/settings/locations/accessLog/index.go | 2 +- .../servers/server/settings/locations/cache/index.go | 2 +- .../server/settings/locations/charset/index.go | 2 +- .../server/settings/locations/compression/index.go | 2 +- .../servers/server/settings/locations/create.go | 2 +- .../servers/server/settings/locations/delete.go | 2 +- .../server/settings/locations/fastcgi/index.go | 2 +- .../server/settings/locations/headers/index.go | 8 ++++---- .../servers/server/settings/locations/http/index.go | 2 +- .../servers/server/settings/locations/pages/index.go | 4 ++-- .../server/settings/locations/remoteAddr/index.go | 2 +- .../servers/server/settings/locations/sort.go | 2 +- .../servers/server/settings/locations/stat/index.go | 4 ++-- .../servers/server/settings/locations/waf/index.go | 2 +- .../servers/server/settings/locations/web/index.go | 4 ++-- .../servers/server/settings/locations/webp/index.go | 4 ++-- .../server/settings/locations/websocket/index.go | 2 +- .../default/servers/server/settings/pages/index.go | 4 ++-- .../servers/server/settings/redirects/index.go | 2 +- .../servers/server/settings/remoteAddr/index.go | 2 +- .../servers/server/settings/rewrite/createPopup.go | 2 +- .../servers/server/settings/rewrite/delete.go | 2 +- .../default/servers/server/settings/rewrite/sort.go | 2 +- .../default/servers/server/settings/stat/index.go | 4 ++-- .../default/servers/server/settings/waf/index.go | 2 +- .../default/servers/server/settings/web/index.go | 4 ++-- .../default/servers/server/settings/webp/index.go | 4 ++-- .../servers/server/settings/websocket/index.go | 2 +- .../default/settings/authority/nodes/delete.go | 2 +- .../default/settings/authority/nodes/index.go | 2 +- .../settings/authority/nodes/node/createPopup.go | 2 +- .../default/settings/authority/nodes/node/index.go | 4 ++-- .../default/settings/authority/nodes/node/install.go | 4 ++-- .../default/settings/authority/nodes/node/logs.go | 4 ++-- .../default/settings/authority/nodes/node/update.go | 12 ++++++------ 57 files changed, 91 insertions(+), 91 deletions(-) diff --git a/internal/web/actions/default/servers/create.go b/internal/web/actions/default/servers/create.go index 891542de..7fb188fc 100644 --- a/internal/web/actions/default/servers/create.go +++ b/internal/web/actions/default/servers/create.go @@ -364,7 +364,7 @@ func (this *CreateAction) RunPost(params struct { this.ErrorPage(err) return } - webId = webResp.WebId + webId = webResp.HttpWebId } // 包含条件 @@ -462,7 +462,7 @@ func (this *CreateAction) RunPost(params struct { // 访问日志 if params.AccessLogIsOn { _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.AdminContext(), &pb.UpdateHTTPWebAccessLogRequest{ - WebId: webConfig.Id, + HttpWebId: webConfig.Id, AccessLogJSON: []byte(`{ "isPrior": false, "isOn": true, @@ -501,7 +501,7 @@ func (this *CreateAction) RunPost(params struct { } else { websocketId := createWebSocketResp.WebsocketId _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebsocket(this.AdminContext(), &pb.UpdateHTTPWebWebsocketRequest{ - WebId: webConfig.Id, + HttpWebId: webConfig.Id, WebsocketJSON: []byte(` { "isPrior": false, "isOn": true, @@ -530,7 +530,7 @@ func (this *CreateAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCache(this.AdminContext(), &pb.UpdateHTTPWebCacheRequest{ - WebId: webConfig.Id, + HttpWebId: webConfig.Id, CacheJSON: cacheConfigJSON, }) if err != nil { @@ -552,7 +552,7 @@ func (this *CreateAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebFirewall(this.AdminContext(), &pb.UpdateHTTPWebFirewallRequest{ - WebId: webConfig.Id, + HttpWebId: webConfig.Id, FirewallJSON: firewallRefJSON, }) if err != nil { @@ -575,7 +575,7 @@ func (this *CreateAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{ - WebId: webConfig.Id, + HttpWebId: webConfig.Id, RemoteAddrJSON: remoteAddrConfigJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/accessLog/index.go b/internal/web/actions/default/servers/groups/group/settings/accessLog/index.go index 9b22dce6..9c2b3a9f 100644 --- a/internal/web/actions/default/servers/groups/group/settings/accessLog/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/accessLog/index.go @@ -56,7 +56,7 @@ func (this *IndexAction) RunPost(params struct { // TODO 检查参数 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.AdminContext(), &pb.UpdateHTTPWebAccessLogRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, AccessLogJSON: params.AccessLogJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/cache/index.go b/internal/web/actions/default/servers/groups/group/settings/cache/index.go index 2e7890bf..0e59d4d2 100644 --- a/internal/web/actions/default/servers/groups/group/settings/cache/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/cache/index.go @@ -76,7 +76,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCache(this.AdminContext(), &pb.UpdateHTTPWebCacheRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, CacheJSON: cacheJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/charset/index.go b/internal/web/actions/default/servers/groups/group/settings/charset/index.go index 9ed66823..15c36aaa 100644 --- a/internal/web/actions/default/servers/groups/group/settings/charset/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/charset/index.go @@ -52,7 +52,7 @@ func (this *IndexAction) RunPost(params struct { defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的字符集设置", params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, CharsetJSON: params.CharsetJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/compression/index.go b/internal/web/actions/default/servers/groups/group/settings/compression/index.go index 1328f325..1d5d1f0b 100644 --- a/internal/web/actions/default/servers/groups/group/settings/compression/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/compression/index.go @@ -66,7 +66,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCompression(this.AdminContext(), &pb.UpdateHTTPWebCompressionRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, CompressionJSON: params.CompressionJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/headers/index.go b/internal/web/actions/default/servers/groups/group/settings/headers/index.go index 590902e7..8319ea96 100644 --- a/internal/web/actions/default/servers/groups/group/settings/headers/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/headers/index.go @@ -55,7 +55,7 @@ func (this *IndexAction) RunGet(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeader(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderRequest{ - WebId: webId, + HttpWebId: webId, HeaderJSON: refJSON, }) if err != nil { @@ -82,7 +82,7 @@ func (this *IndexAction) RunGet(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeader(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderRequest{ - WebId: webId, + HttpWebId: webId, HeaderJSON: refJSON, }) if err != nil { @@ -129,7 +129,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeader(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, HeaderJSON: params.RequestHeaderJSON, }) if err != nil { @@ -145,7 +145,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeader(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, HeaderJSON: params.ResponseHeaderJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/pages/index.go b/internal/web/actions/default/servers/groups/group/settings/pages/index.go index 5d3541e5..968a691f 100644 --- a/internal/web/actions/default/servers/groups/group/settings/pages/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/pages/index.go @@ -52,7 +52,7 @@ func (this *IndexAction) RunPost(params struct { // TODO 检查配置 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebPages(this.AdminContext(), &pb.UpdateHTTPWebPagesRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, PagesJSON: []byte(params.PagesJSON), }) if err != nil { @@ -61,7 +61,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebShutdown(this.AdminContext(), &pb.UpdateHTTPWebShutdownRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, ShutdownJSON: []byte(params.ShutdownJSON), }) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go b/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go index c55c2ad5..3997e424 100644 --- a/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go @@ -56,7 +56,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, RemoteAddrJSON: params.RemoteAddrJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/stat/index.go b/internal/web/actions/default/servers/groups/group/settings/stat/index.go index ed05847f..183eab93 100644 --- a/internal/web/actions/default/servers/groups/group/settings/stat/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/stat/index.go @@ -49,8 +49,8 @@ func (this *IndexAction) RunPost(params struct { // TODO 校验配置 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebStat(this.AdminContext(), &pb.UpdateHTTPWebStatRequest{ - WebId: params.WebId, - StatJSON: params.StatJSON, + HttpWebId: params.WebId, + StatJSON: params.StatJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/index.go b/internal/web/actions/default/servers/groups/group/settings/waf/index.go index a5695c68..013ae362 100644 --- a/internal/web/actions/default/servers/groups/group/settings/waf/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/waf/index.go @@ -64,7 +64,7 @@ func (this *IndexAction) RunPost(params struct { // TODO 检查配置 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebFirewall(this.AdminContext(), &pb.UpdateHTTPWebFirewallRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, FirewallJSON: params.FirewallJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/groups/group/settings/web/index.go b/internal/web/actions/default/servers/groups/group/settings/web/index.go index 33a03f65..76f19841 100644 --- a/internal/web/actions/default/servers/groups/group/settings/web/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/web/index.go @@ -47,8 +47,8 @@ func (this *IndexAction) RunPost(params struct { defer this.CreateLogInfo("修改Web %d 的首页文件名", params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWeb(this.AdminContext(), &pb.UpdateHTTPWebRequest{ - WebId: params.WebId, - RootJSON: params.RootJSON, + HttpWebId: params.WebId, + RootJSON: params.RootJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/groups/group/settings/webp/index.go b/internal/web/actions/default/servers/groups/group/settings/webp/index.go index a86b63dd..ce3809cc 100644 --- a/internal/web/actions/default/servers/groups/group/settings/webp/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/webp/index.go @@ -56,8 +56,8 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebP(this.AdminContext(), &pb.UpdateHTTPWebWebPRequest{ - WebId: params.WebId, - WebpJSON: params.WebpJSON, + HttpWebId: params.WebId, + WebpJSON: params.WebpJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/groups/group/settings/websocket/index.go b/internal/web/actions/default/servers/groups/group/settings/websocket/index.go index 1baf1d62..f8ed7112 100644 --- a/internal/web/actions/default/servers/groups/group/settings/websocket/index.go +++ b/internal/web/actions/default/servers/groups/group/settings/websocket/index.go @@ -110,7 +110,7 @@ func (this *IndexAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebsocket(this.AdminContext(), &pb.UpdateHTTPWebWebsocketRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, WebsocketJSON: websocketRefJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/access/index.go b/internal/web/actions/default/servers/server/settings/access/index.go index bca6dada..9de863b4 100644 --- a/internal/web/actions/default/servers/server/settings/access/index.go +++ b/internal/web/actions/default/servers/server/settings/access/index.go @@ -64,8 +64,8 @@ func (this *IndexAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebAuth(this.AdminContext(), &pb.UpdateHTTPWebAuthRequest{ - WebId: params.WebId, - AuthJSON: configJSON, + HttpWebId: params.WebId, + AuthJSON: configJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/accessLog/index.go b/internal/web/actions/default/servers/server/settings/accessLog/index.go index 50ece6f0..7cdc396f 100644 --- a/internal/web/actions/default/servers/server/settings/accessLog/index.go +++ b/internal/web/actions/default/servers/server/settings/accessLog/index.go @@ -61,7 +61,7 @@ func (this *IndexAction) RunPost(params struct { // TODO 检查参数 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.AdminContext(), &pb.UpdateHTTPWebAccessLogRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, AccessLogJSON: params.AccessLogJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/cache/index.go b/internal/web/actions/default/servers/server/settings/cache/index.go index 8694015b..093d410a 100644 --- a/internal/web/actions/default/servers/server/settings/cache/index.go +++ b/internal/web/actions/default/servers/server/settings/cache/index.go @@ -97,7 +97,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCache(this.AdminContext(), &pb.UpdateHTTPWebCacheRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, CacheJSON: cacheJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/charset/index.go b/internal/web/actions/default/servers/server/settings/charset/index.go index 4adf0771..fd02fcb8 100644 --- a/internal/web/actions/default/servers/server/settings/charset/index.go +++ b/internal/web/actions/default/servers/server/settings/charset/index.go @@ -57,7 +57,7 @@ func (this *IndexAction) RunPost(params struct { defer this.CreateLog(oplogs.LevelInfo, "修改Web %d 的字符集设置", params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, CharsetJSON: params.CharsetJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/compression/index.go b/internal/web/actions/default/servers/server/settings/compression/index.go index 7876f638..ee8be48c 100644 --- a/internal/web/actions/default/servers/server/settings/compression/index.go +++ b/internal/web/actions/default/servers/server/settings/compression/index.go @@ -71,7 +71,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCompression(this.AdminContext(), &pb.UpdateHTTPWebCompressionRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, CompressionJSON: params.CompressionJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/fastcgi/index.go b/internal/web/actions/default/servers/server/settings/fastcgi/index.go index 46f7db7b..273a9e33 100644 --- a/internal/web/actions/default/servers/server/settings/fastcgi/index.go +++ b/internal/web/actions/default/servers/server/settings/fastcgi/index.go @@ -58,7 +58,7 @@ func (this *IndexAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebFastcgi(this.AdminContext(), &pb.UpdateHTTPWebFastcgiRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, FastcgiJSON: fastcgiRefJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/headers/index.go b/internal/web/actions/default/servers/server/settings/headers/index.go index 58844cc6..9fc4f8f3 100644 --- a/internal/web/actions/default/servers/server/settings/headers/index.go +++ b/internal/web/actions/default/servers/server/settings/headers/index.go @@ -59,7 +59,7 @@ func (this *IndexAction) RunGet(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeader(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderRequest{ - WebId: webId, + HttpWebId: webId, HeaderJSON: refJSON, }) if err != nil { @@ -86,7 +86,7 @@ func (this *IndexAction) RunGet(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeader(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderRequest{ - WebId: webId, + HttpWebId: webId, HeaderJSON: refJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/http/index.go b/internal/web/actions/default/servers/server/settings/http/index.go index af9e6f4a..5a35004d 100644 --- a/internal/web/actions/default/servers/server/settings/http/index.go +++ b/internal/web/actions/default/servers/server/settings/http/index.go @@ -129,7 +129,7 @@ func (this *IndexAction) RunPost(params struct { // 设置跳转到HTTPS // TODO 校验设置 _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRedirectToHTTPS(this.AdminContext(), &pb.UpdateHTTPWebRedirectToHTTPSRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, RedirectToHTTPSJSON: params.RedirectToHTTPSJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/access/index.go b/internal/web/actions/default/servers/server/settings/locations/access/index.go index 96f27747..9bb79f38 100644 --- a/internal/web/actions/default/servers/server/settings/locations/access/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/access/index.go @@ -64,8 +64,8 @@ func (this *IndexAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebAuth(this.AdminContext(), &pb.UpdateHTTPWebAuthRequest{ - WebId: params.WebId, - AuthJSON: configJSON, + HttpWebId: params.WebId, + AuthJSON: configJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/locations/accessLog/index.go b/internal/web/actions/default/servers/server/settings/locations/accessLog/index.go index ccee155e..ecdd1bfe 100644 --- a/internal/web/actions/default/servers/server/settings/locations/accessLog/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/accessLog/index.go @@ -45,7 +45,7 @@ func (this *IndexAction) RunPost(params struct { // TODO 检查参数 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebAccessLog(this.AdminContext(), &pb.UpdateHTTPWebAccessLogRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, AccessLogJSON: params.AccessLogJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/cache/index.go b/internal/web/actions/default/servers/server/settings/locations/cache/index.go index 4c1aca44..cfb340eb 100644 --- a/internal/web/actions/default/servers/server/settings/locations/cache/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/cache/index.go @@ -81,7 +81,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCache(this.AdminContext(), &pb.UpdateHTTPWebCacheRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, CacheJSON: cacheJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/charset/index.go b/internal/web/actions/default/servers/server/settings/locations/charset/index.go index 04db91d9..474aca4c 100644 --- a/internal/web/actions/default/servers/server/settings/locations/charset/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/charset/index.go @@ -42,7 +42,7 @@ func (this *IndexAction) RunPost(params struct { defer this.CreateLogInfo("修改Web %d 的字符集设置", params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebCharset(this.AdminContext(), &pb.UpdateHTTPWebCharsetRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, CharsetJSON: params.CharsetJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/compression/index.go b/internal/web/actions/default/servers/server/settings/locations/compression/index.go index 80a0e4f1..7bb29b43 100644 --- a/internal/web/actions/default/servers/server/settings/locations/compression/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/compression/index.go @@ -57,7 +57,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebCompression(this.AdminContext(), &pb.UpdateHTTPWebCompressionRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, CompressionJSON: params.CompressionJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/create.go b/internal/web/actions/default/servers/server/settings/locations/create.go index 472932a7..2a5d944e 100644 --- a/internal/web/actions/default/servers/server/settings/locations/create.go +++ b/internal/web/actions/default/servers/server/settings/locations/create.go @@ -123,7 +123,7 @@ func (this *CreateAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebLocations(this.AdminContext(), &pb.UpdateHTTPWebLocationsRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, LocationsJSON: refJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/delete.go b/internal/web/actions/default/servers/server/settings/locations/delete.go index bc826439..304fe6d9 100644 --- a/internal/web/actions/default/servers/server/settings/locations/delete.go +++ b/internal/web/actions/default/servers/server/settings/locations/delete.go @@ -28,7 +28,7 @@ func (this *DeleteAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebLocations(this.AdminContext(), &pb.UpdateHTTPWebLocationsRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, LocationsJSON: refJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/fastcgi/index.go b/internal/web/actions/default/servers/server/settings/locations/fastcgi/index.go index 4a1e4419..21caae30 100644 --- a/internal/web/actions/default/servers/server/settings/locations/fastcgi/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/fastcgi/index.go @@ -57,7 +57,7 @@ func (this *IndexAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebFastcgi(this.AdminContext(), &pb.UpdateHTTPWebFastcgiRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, FastcgiJSON: fastcgiRefJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/headers/index.go b/internal/web/actions/default/servers/server/settings/locations/headers/index.go index 9438002e..26eeabbc 100644 --- a/internal/web/actions/default/servers/server/settings/locations/headers/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/headers/index.go @@ -48,7 +48,7 @@ func (this *IndexAction) RunGet(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeader(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderRequest{ - WebId: webId, + HttpWebId: webId, HeaderJSON: refJSON, }) isChanged = true @@ -71,7 +71,7 @@ func (this *IndexAction) RunGet(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeader(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderRequest{ - WebId: webId, + HttpWebId: webId, HeaderJSON: refJSON, }) isChanged = true @@ -109,7 +109,7 @@ func (this *IndexAction) RunPost(params struct { switch params.Type { case "request": _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRequestHeader(this.AdminContext(), &pb.UpdateHTTPWebRequestHeaderRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, HeaderJSON: params.RequestHeaderJSON, }) if err != nil { @@ -118,7 +118,7 @@ func (this *IndexAction) RunPost(params struct { } case "response": _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebResponseHeader(this.AdminContext(), &pb.UpdateHTTPWebResponseHeaderRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, HeaderJSON: params.ResponseHeaderJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/http/index.go b/internal/web/actions/default/servers/server/settings/locations/http/index.go index 0a596ce8..c0737eba 100644 --- a/internal/web/actions/default/servers/server/settings/locations/http/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/http/index.go @@ -40,7 +40,7 @@ func (this *IndexAction) RunPost(params struct { // 设置跳转到HTTPS // TODO 校验设置 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebRedirectToHTTPS(this.AdminContext(), &pb.UpdateHTTPWebRedirectToHTTPSRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, RedirectToHTTPSJSON: params.RedirectToHTTPSJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/pages/index.go b/internal/web/actions/default/servers/server/settings/locations/pages/index.go index 8b9463dd..42f12624 100644 --- a/internal/web/actions/default/servers/server/settings/locations/pages/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/pages/index.go @@ -41,7 +41,7 @@ func (this *IndexAction) RunPost(params struct { // TODO 检查配置 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebPages(this.AdminContext(), &pb.UpdateHTTPWebPagesRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, PagesJSON: []byte(params.PagesJSON), }) if err != nil { @@ -50,7 +50,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebShutdown(this.AdminContext(), &pb.UpdateHTTPWebShutdownRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, ShutdownJSON: []byte(params.ShutdownJSON), }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go b/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go index 4b16cb2b..7474dca0 100644 --- a/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go @@ -48,7 +48,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, RemoteAddrJSON: params.RemoteAddrJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/sort.go b/internal/web/actions/default/servers/server/settings/locations/sort.go index b671678f..50981974 100644 --- a/internal/web/actions/default/servers/server/settings/locations/sort.go +++ b/internal/web/actions/default/servers/server/settings/locations/sort.go @@ -47,7 +47,7 @@ func (this *SortAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebLocations(this.AdminContext(), &pb.UpdateHTTPWebLocationsRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, LocationsJSON: newRefsJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/stat/index.go b/internal/web/actions/default/servers/server/settings/locations/stat/index.go index 0f7ae4e6..c6def53d 100644 --- a/internal/web/actions/default/servers/server/settings/locations/stat/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/stat/index.go @@ -40,8 +40,8 @@ func (this *IndexAction) RunPost(params struct { // TODO 校验配置 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebStat(this.AdminContext(), &pb.UpdateHTTPWebStatRequest{ - WebId: params.WebId, - StatJSON: params.StatJSON, + HttpWebId: params.WebId, + StatJSON: params.StatJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/locations/waf/index.go b/internal/web/actions/default/servers/server/settings/locations/waf/index.go index 9e3bf00d..4459e235 100644 --- a/internal/web/actions/default/servers/server/settings/locations/waf/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/waf/index.go @@ -61,7 +61,7 @@ func (this *IndexAction) RunPost(params struct { // TODO 检查配置 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebFirewall(this.AdminContext(), &pb.UpdateHTTPWebFirewallRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, FirewallJSON: params.FirewallJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/locations/web/index.go b/internal/web/actions/default/servers/server/settings/locations/web/index.go index 64e45d6b..620a35c8 100644 --- a/internal/web/actions/default/servers/server/settings/locations/web/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/web/index.go @@ -38,8 +38,8 @@ func (this *IndexAction) RunPost(params struct { defer this.CreateLogInfo("修改Web %d 的根目录等设置", params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWeb(this.AdminContext(), &pb.UpdateHTTPWebRequest{ - WebId: params.WebId, - RootJSON: params.RootJSON, + HttpWebId: params.WebId, + RootJSON: params.RootJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/locations/webp/index.go b/internal/web/actions/default/servers/server/settings/locations/webp/index.go index 3b35f392..f0a566cc 100644 --- a/internal/web/actions/default/servers/server/settings/locations/webp/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/webp/index.go @@ -48,8 +48,8 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebP(this.AdminContext(), &pb.UpdateHTTPWebWebPRequest{ - WebId: params.WebId, - WebpJSON: params.WebpJSON, + HttpWebId: params.WebId, + WebpJSON: params.WebpJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/locations/websocket/index.go b/internal/web/actions/default/servers/server/settings/locations/websocket/index.go index e8f2c664..b572cdbe 100644 --- a/internal/web/actions/default/servers/server/settings/locations/websocket/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/websocket/index.go @@ -102,7 +102,7 @@ func (this *IndexAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebsocket(this.AdminContext(), &pb.UpdateHTTPWebWebsocketRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, WebsocketJSON: websocketRefJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/pages/index.go b/internal/web/actions/default/servers/server/settings/pages/index.go index 0ff31b72..5b953aad 100644 --- a/internal/web/actions/default/servers/server/settings/pages/index.go +++ b/internal/web/actions/default/servers/server/settings/pages/index.go @@ -57,7 +57,7 @@ func (this *IndexAction) RunPost(params struct { // TODO 检查配置 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebPages(this.AdminContext(), &pb.UpdateHTTPWebPagesRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, PagesJSON: []byte(params.PagesJSON), }) if err != nil { @@ -66,7 +66,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebShutdown(this.AdminContext(), &pb.UpdateHTTPWebShutdownRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, ShutdownJSON: []byte(params.ShutdownJSON), }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/redirects/index.go b/internal/web/actions/default/servers/server/settings/redirects/index.go index 44d218bc..a5a014ce 100644 --- a/internal/web/actions/default/servers/server/settings/redirects/index.go +++ b/internal/web/actions/default/servers/server/settings/redirects/index.go @@ -42,7 +42,7 @@ func (this *IndexAction) RunPost(params struct { defer this.CreateLogInfo("修改Web %d 的URL跳转设置", params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebHostRedirects(this.AdminContext(), &pb.UpdateHTTPWebHostRedirectsRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, HostRedirectsJSON: params.HostRedirectsJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/remoteAddr/index.go b/internal/web/actions/default/servers/server/settings/remoteAddr/index.go index 75312e11..8da23e30 100644 --- a/internal/web/actions/default/servers/server/settings/remoteAddr/index.go +++ b/internal/web/actions/default/servers/server/settings/remoteAddr/index.go @@ -61,7 +61,7 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRemoteAddr(this.AdminContext(), &pb.UpdateHTTPWebRemoteAddrRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, RemoteAddrJSON: params.RemoteAddrJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go b/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go index d7072a61..ee215fa4 100644 --- a/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go +++ b/internal/web/actions/default/servers/server/settings/rewrite/createPopup.go @@ -108,7 +108,7 @@ func (this *CreatePopupAction) RunPost(params struct { // 设置Web中的重写规则 _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRewriteRules(this.AdminContext(), &pb.UpdateHTTPWebRewriteRulesRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, RewriteRulesJSON: refsJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/rewrite/delete.go b/internal/web/actions/default/servers/server/settings/rewrite/delete.go index 4db7e54c..3609ebde 100644 --- a/internal/web/actions/default/servers/server/settings/rewrite/delete.go +++ b/internal/web/actions/default/servers/server/settings/rewrite/delete.go @@ -38,7 +38,7 @@ func (this *DeleteAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRewriteRules(this.AdminContext(), &pb.UpdateHTTPWebRewriteRulesRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, RewriteRulesJSON: refsJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/rewrite/sort.go b/internal/web/actions/default/servers/server/settings/rewrite/sort.go index b8f80189..9712da3c 100644 --- a/internal/web/actions/default/servers/server/settings/rewrite/sort.go +++ b/internal/web/actions/default/servers/server/settings/rewrite/sort.go @@ -40,7 +40,7 @@ func (this *SortAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebRewriteRules(this.AdminContext(), &pb.UpdateHTTPWebRewriteRulesRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, RewriteRulesJSON: refsJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/stat/index.go b/internal/web/actions/default/servers/server/settings/stat/index.go index fdb4dd2e..1d7b572b 100644 --- a/internal/web/actions/default/servers/server/settings/stat/index.go +++ b/internal/web/actions/default/servers/server/settings/stat/index.go @@ -54,8 +54,8 @@ func (this *IndexAction) RunPost(params struct { // TODO 校验配置 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebStat(this.AdminContext(), &pb.UpdateHTTPWebStatRequest{ - WebId: params.WebId, - StatJSON: params.StatJSON, + HttpWebId: params.WebId, + StatJSON: params.StatJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/waf/index.go b/internal/web/actions/default/servers/server/settings/waf/index.go index d5190549..d9b6237f 100644 --- a/internal/web/actions/default/servers/server/settings/waf/index.go +++ b/internal/web/actions/default/servers/server/settings/waf/index.go @@ -86,7 +86,7 @@ func (this *IndexAction) RunPost(params struct { // TODO 检查配置 _, err := this.RPC().HTTPWebRPC().UpdateHTTPWebFirewall(this.AdminContext(), &pb.UpdateHTTPWebFirewallRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, FirewallJSON: params.FirewallJSON, }) if err != nil { diff --git a/internal/web/actions/default/servers/server/settings/web/index.go b/internal/web/actions/default/servers/server/settings/web/index.go index 1298d85e..1b3ed146 100644 --- a/internal/web/actions/default/servers/server/settings/web/index.go +++ b/internal/web/actions/default/servers/server/settings/web/index.go @@ -53,8 +53,8 @@ func (this *IndexAction) RunPost(params struct { defer this.CreateLogInfo("修改Web %d 的首页文件名", params.WebId) _, err := this.RPC().HTTPWebRPC().UpdateHTTPWeb(this.AdminContext(), &pb.UpdateHTTPWebRequest{ - WebId: params.WebId, - RootJSON: params.RootJSON, + HttpWebId: params.WebId, + RootJSON: params.RootJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/webp/index.go b/internal/web/actions/default/servers/server/settings/webp/index.go index 0ff9a89d..e8d59bee 100644 --- a/internal/web/actions/default/servers/server/settings/webp/index.go +++ b/internal/web/actions/default/servers/server/settings/webp/index.go @@ -61,8 +61,8 @@ func (this *IndexAction) RunPost(params struct { } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebP(this.AdminContext(), &pb.UpdateHTTPWebWebPRequest{ - WebId: params.WebId, - WebpJSON: params.WebpJSON, + HttpWebId: params.WebId, + WebpJSON: params.WebpJSON, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/server/settings/websocket/index.go b/internal/web/actions/default/servers/server/settings/websocket/index.go index 08e05e41..1ddccb65 100644 --- a/internal/web/actions/default/servers/server/settings/websocket/index.go +++ b/internal/web/actions/default/servers/server/settings/websocket/index.go @@ -115,7 +115,7 @@ func (this *IndexAction) RunPost(params struct { return } _, err = this.RPC().HTTPWebRPC().UpdateHTTPWebWebsocket(this.AdminContext(), &pb.UpdateHTTPWebWebsocketRequest{ - WebId: params.WebId, + HttpWebId: params.WebId, WebsocketJSON: websocketRefJSON, }) if err != nil { diff --git a/internal/web/actions/default/settings/authority/nodes/delete.go b/internal/web/actions/default/settings/authority/nodes/delete.go index afd587cb..2517c9c9 100644 --- a/internal/web/actions/default/settings/authority/nodes/delete.go +++ b/internal/web/actions/default/settings/authority/nodes/delete.go @@ -15,7 +15,7 @@ func (this *DeleteAction) RunPost(params struct { }) { // TODO 检查权限 - _, err := this.RPC().AuthorityNodeRPC().DeleteAuthorityNode(this.AdminContext(), &pb.DeleteAuthorityNodeRequest{NodeId: params.NodeId}) + _, err := this.RPC().AuthorityNodeRPC().DeleteAuthorityNode(this.AdminContext(), &pb.DeleteAuthorityNodeRequest{AuthorityNodeId: params.NodeId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/settings/authority/nodes/index.go b/internal/web/actions/default/settings/authority/nodes/index.go index 08937b9f..48d8c652 100644 --- a/internal/web/actions/default/settings/authority/nodes/index.go +++ b/internal/web/actions/default/settings/authority/nodes/index.go @@ -40,7 +40,7 @@ func (this *IndexAction) RunGet(params struct{}) { return } - for _, node := range nodesResp.Nodes { + for _, node := range nodesResp.AuthorityNodes { // 状态 status := &nodeconfigs.NodeStatus{} if len(node.StatusJSON) > 0 { diff --git a/internal/web/actions/default/settings/authority/nodes/node/createPopup.go b/internal/web/actions/default/settings/authority/nodes/node/createPopup.go index 034285e4..9132e854 100644 --- a/internal/web/actions/default/settings/authority/nodes/node/createPopup.go +++ b/internal/web/actions/default/settings/authority/nodes/node/createPopup.go @@ -41,7 +41,7 @@ func (this *CreatePopupAction) RunPost(params struct { } // 创建日志 - defer this.CreateLog(oplogs.LevelInfo, "创建认证节点 %d", createResp.NodeId) + defer this.CreateLog(oplogs.LevelInfo, "创建认证节点 %d", createResp.AuthorityNodeId) this.Success() } diff --git a/internal/web/actions/default/settings/authority/nodes/node/index.go b/internal/web/actions/default/settings/authority/nodes/node/index.go index 085413d6..8b0945b7 100644 --- a/internal/web/actions/default/settings/authority/nodes/node/index.go +++ b/internal/web/actions/default/settings/authority/nodes/node/index.go @@ -17,12 +17,12 @@ func (this *IndexAction) Init() { func (this *IndexAction) RunGet(params struct { NodeId int64 }) { - nodeResp, err := this.RPC().AuthorityNodeRPC().FindEnabledAuthorityNode(this.AdminContext(), &pb.FindEnabledAuthorityNodeRequest{NodeId: params.NodeId}) + nodeResp, err := this.RPC().AuthorityNodeRPC().FindEnabledAuthorityNode(this.AdminContext(), &pb.FindEnabledAuthorityNodeRequest{AuthorityNodeId: params.NodeId}) if err != nil { this.ErrorPage(err) return } - node := nodeResp.Node + node := nodeResp.AuthorityNode if node == nil { this.NotFound("authorityNode", params.NodeId) return diff --git a/internal/web/actions/default/settings/authority/nodes/node/install.go b/internal/web/actions/default/settings/authority/nodes/node/install.go index 91ed23ca..12a145ed 100644 --- a/internal/web/actions/default/settings/authority/nodes/node/install.go +++ b/internal/web/actions/default/settings/authority/nodes/node/install.go @@ -19,12 +19,12 @@ func (this *InstallAction) RunGet(params struct { NodeId int64 }) { // 认证节点信息 - nodeResp, err := this.RPC().AuthorityNodeRPC().FindEnabledAuthorityNode(this.AdminContext(), &pb.FindEnabledAuthorityNodeRequest{NodeId: params.NodeId}) + nodeResp, err := this.RPC().AuthorityNodeRPC().FindEnabledAuthorityNode(this.AdminContext(), &pb.FindEnabledAuthorityNodeRequest{AuthorityNodeId: params.NodeId}) if err != nil { this.ErrorPage(err) return } - node := nodeResp.Node + node := nodeResp.AuthorityNode if node == nil { this.NotFound("authorityNode", params.NodeId) return diff --git a/internal/web/actions/default/settings/authority/nodes/node/logs.go b/internal/web/actions/default/settings/authority/nodes/node/logs.go index b608afc0..bb56ba58 100644 --- a/internal/web/actions/default/settings/authority/nodes/node/logs.go +++ b/internal/web/actions/default/settings/authority/nodes/node/logs.go @@ -31,12 +31,12 @@ func (this *LogsAction) RunGet(params struct { this.Data["keyword"] = params.Keyword this.Data["level"] = params.Level - authorityNodeResp, err := this.RPC().AuthorityNodeRPC().FindEnabledAuthorityNode(this.AdminContext(), &pb.FindEnabledAuthorityNodeRequest{NodeId: params.NodeId}) + authorityNodeResp, err := this.RPC().AuthorityNodeRPC().FindEnabledAuthorityNode(this.AdminContext(), &pb.FindEnabledAuthorityNodeRequest{AuthorityNodeId: params.NodeId}) if err != nil { this.ErrorPage(err) return } - authorityNode := authorityNodeResp.Node + authorityNode := authorityNodeResp.AuthorityNode if authorityNode == nil { this.NotFound("authorityNode", params.NodeId) return diff --git a/internal/web/actions/default/settings/authority/nodes/node/update.go b/internal/web/actions/default/settings/authority/nodes/node/update.go index bd32a258..d7777e1c 100644 --- a/internal/web/actions/default/settings/authority/nodes/node/update.go +++ b/internal/web/actions/default/settings/authority/nodes/node/update.go @@ -20,13 +20,13 @@ func (this *UpdateAction) RunGet(params struct { NodeId int64 }) { nodeResp, err := this.RPC().AuthorityNodeRPC().FindEnabledAuthorityNode(this.AdminContext(), &pb.FindEnabledAuthorityNodeRequest{ - NodeId: params.NodeId, + AuthorityNodeId: params.NodeId, }) if err != nil { this.ErrorPage(err) return } - node := nodeResp.Node + node := nodeResp.AuthorityNode if node == nil { this.WriteString("要操作的节点不存在") return @@ -56,10 +56,10 @@ func (this *UpdateAction) RunPost(params struct { Require("请输入认证节点名称") _, err := this.RPC().AuthorityNodeRPC().UpdateAuthorityNode(this.AdminContext(), &pb.UpdateAuthorityNodeRequest{ - NodeId: params.NodeId, - Name: params.Name, - Description: params.Description, - IsOn: params.IsOn, + AuthorityNodeId: params.NodeId, + Name: params.Name, + Description: params.Description, + IsOn: params.IsOn, }) if err != nil { this.ErrorPage(err)