From c1dc3d97bb1f7bf56b1b6fdfb5cea05571a1301f Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sat, 1 Jul 2023 15:09:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=81=E7=A7=BB=E5=90=8E?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=A1=A8=E5=8D=95=E7=9A=84=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/actions/default/setup/confirm/index.go | 17 ++++++++++++++--- web/views/@default/recover/@install.css.map | 2 +- web/views/@default/recover/@install.less | 6 +++--- web/views/@default/recover/index.css.map | 2 +- web/views/@default/setup/confirm/index.css | 3 +++ web/views/@default/setup/confirm/index.css.map | 2 +- web/views/@default/setup/confirm/index.html | 14 +++++++------- web/views/@default/setup/confirm/index.less | 12 +++++++++--- 8 files changed, 39 insertions(+), 19 deletions(-) diff --git a/internal/web/actions/default/setup/confirm/index.go b/internal/web/actions/default/setup/confirm/index.go index ec145fc8..0e864eac 100644 --- a/internal/web/actions/default/setup/confirm/index.go +++ b/internal/web/actions/default/setup/confirm/index.go @@ -10,6 +10,7 @@ import ( "github.com/iwind/TeaGo/Tea" "github.com/iwind/TeaGo/actions" "net/url" + "strings" ) type IndexAction struct { @@ -80,13 +81,23 @@ func (this *IndexAction) RunPost(params struct { config.RPC.Endpoints = []string{endpoint} client, err := rpc.NewRPCClient(config, false) if err != nil { - actionutils.Fail(this, err) + this.Fail("尝试配置RPC发生错误：" + err.Error()) return } - _, err = client.APINodeRPC().FindCurrentAPINodeVersion(client.Context(0), &pb.FindCurrentAPINodeVersionRequest{}) + resp, err := client.APINodeRPC().FindCurrentAPINodeVersion(client.Context(0), &pb.FindCurrentAPINodeVersionRequest{}) if err != nil { _ = client.Close() - actionutils.Fail(this, err) + + if strings.Contains(err.Error(), "wrong token role") { + this.Fail("你输入的NodeId和Secret为其他节点的配置信息，不是管理系统的配置信息，所以无法使用；请从管理系统的配置目录下找到管理系统的配置信息并填入。如果你不知道如何查找，请刷新当前页面，使用默认填写的NodeId和Secret提交。") + } else { + this.Fail("无法连接你填入的API节点地址，请检查协议、IP和端口是否正确，错误信息：" + err.Error()) + } + return + } + + if resp != nil && resp.Role != "admin" { + this.Fail("你输入的NodeId和Secret为API节点的配置信息，不是管理系统的配置信息，所以无法使用；请从管理系统的配置目录下找到管理系统的配置信息并填入") return } _ = client.Close() diff --git a/web/views/@default/recover/@install.css.map b/web/views/@default/recover/@install.css.map index 92310f3d..2613e6dd 100644 --- a/web/views/@default/recover/@install.css.map +++ b/web/views/@default/recover/@install.css.map @@ -1 +1 @@ -{"version":3,"sources":["@install.less"],"names":[],"mappings":"AAAA;EAGC,WAAA;EACA,eAAA;EACA,SAAA;EACA,kBAAA;EACA,QAAA;EACA,WAAA;EACA,gBAAA;;AATD,YAWC,QAAO;EACN,eAAA;;AAZF,YAeC,QAAO;EACN,YAAA;;AAhBF,YAmBC,MACC,GAAE;EACD,WAAA;;AArBH,YAyBC;EACC,iBAAA;;AA1BF,YAyBC,OAGC;EACC,0BAAA;EACA,2BAAA;;AA9BH,YAkCC;EACC,mBAAA;;AAnCF,YAsCC;EACC,gBAAA;EACA,eAAA;EACA,QAAA;EACA,WAAA;EACA,SAAA;EACA,WAAA;EACA,kBAAA;EACA,kBAAA;EACA,UAAA;;AA/CF,YAkDC,aAAY;EACX,UAAA;;AAnDF,YAsDC;EACC,eAAA;EACA,SAAA;EACA,kBAAA;EACA,UAAA;EACA,WAAA;EACA,WAAA;;AAIF,YAAY;EACX,UAAA","file":"@install.css"} \ No newline at end of file +{"version":3,"sources":["@install.less"],"names":[],"mappings":"AAAA;EAGC,WAAA;EACA,eAAA;EACA,SAAA;EACA,kBAAA;EACA,QAAA;EACA,WAAA;EACA,gBAAA;;AATD,YAWC,QAAO;EACN,eAAA;;AAZF,YAeC,QAAO;EACN,YAAA;;AAhBF,YAmBC,MACC,GAAE;EACD,WAAA;;AArBH,YAyBC;EACC,iBAAA;;AA1BF,YAyBC,OAGC;EACC,0BAAA;EACA,gBAAA;;AA9BH,YAkCC;EACC,mBAAA;;AAnCF,YAsCC;EACC,gBAAA;EACA,eAAA;EACA,QAAA;EACA,WAAA;EACA,SAAA;EACA,WAAA;EACA,kBAAA;EACA,kBAAA;EACA,UAAA;;AA/CF,YAkDC,aAAY;EACX,UAAA;;AAnDF,YAsDC;EACC,eAAA;EACA,SAAA;EACA,kBAAA;EACA,UAAA;EACA,WAAA;EACA,WAAA;;AAIF,YAAY;EACX,UAAA","file":"@install.css"} \ No newline at end of file diff --git a/web/views/@default/recover/@install.less b/web/views/@default/recover/@install.less index 261888b8..9980dfbc 100644 --- a/web/views/@default/recover/@install.less +++ b/web/views/@default/recover/@install.less @@ -4,7 +4,7 @@ width: @width; position: fixed; left: 50%; - margin-left: -@width/2; + margin-left: -(@width/2); top: 1em; bottom: 1em; overflow-y: auto; @@ -44,7 +44,7 @@ left: 50%; width: @width; padding-right: 1em; - margin-left: -@width/2; + margin-left: -(@width/2); z-index: 1; } @@ -55,7 +55,7 @@ .button-group { position: fixed; left: 50%; - margin-left: -@width/2; + margin-left: -(@width/2); z-index: 1; width: @width; bottom: 1em; diff --git a/web/views/@default/recover/index.css.map b/web/views/@default/recover/index.css.map index 4aef29ee..b03fad66 100644 --- a/web/views/@default/recover/index.css.map +++ b/web/views/@default/recover/index.css.map @@ -1 +1 @@ -{"version":3,"sources":["@install.less"],"names":[],"mappings":"AAAA;EAGC,WAAA;EACA,eAAA;EACA,SAAA;EACA,kBAAA;EACA,QAAA;EACA,WAAA;EACA,gBAAA;;AATD,YAWC,QAAO;EACN,eAAA;;AAZF,YAeC,QAAO;EACN,YAAA;;AAhBF,YAmBC,MACC,GAAE;EACD,WAAA;;AArBH,YAyBC;EACC,iBAAA;;AA1BF,YAyBC,OAGC;EACC,0BAAA;EACA,2BAAA;;AA9BH,YAkCC;EACC,mBAAA;;AAnCF,YAsCC;EACC,gBAAA;EACA,eAAA;EACA,QAAA;EACA,WAAA;EACA,SAAA;EACA,WAAA;EACA,kBAAA;EACA,kBAAA;EACA,UAAA;;AA/CF,YAkDC,aAAY;EACX,UAAA;;AAnDF,YAsDC;EACC,eAAA;EACA,SAAA;EACA,kBAAA;EACA,UAAA;EACA,WAAA;EACA,WAAA;;AAIF,YAAY;EACX,UAAA","file":"index.css"} \ No newline at end of file +{"version":3,"sources":["@install.less"],"names":[],"mappings":"AAAA;EAGC,WAAA;EACA,eAAA;EACA,SAAA;EACA,kBAAA;EACA,QAAA;EACA,WAAA;EACA,gBAAA;;AATD,YAWC,QAAO;EACN,eAAA;;AAZF,YAeC,QAAO;EACN,YAAA;;AAhBF,YAmBC,MACC,GAAE;EACD,WAAA;;AArBH,YAyBC;EACC,iBAAA;;AA1BF,YAyBC,OAGC;EACC,0BAAA;EACA,gBAAA;;AA9BH,YAkCC;EACC,mBAAA;;AAnCF,YAsCC;EACC,gBAAA;EACA,eAAA;EACA,QAAA;EACA,WAAA;EACA,SAAA;EACA,WAAA;EACA,kBAAA;EACA,kBAAA;EACA,UAAA;;AA/CF,YAkDC,aAAY;EACX,UAAA;;AAnDF,YAsDC;EACC,eAAA;EACA,SAAA;EACA,kBAAA;EACA,UAAA;EACA,WAAA;EACA,WAAA;;AAIF,YAAY;EACX,UAAA","file":"index.css"} \ No newline at end of file diff --git a/web/views/@default/setup/confirm/index.css b/web/views/@default/setup/confirm/index.css index 13155e76..d573fb31 100644 --- a/web/views/@default/setup/confirm/index.css +++ b/web/views/@default/setup/confirm/index.css @@ -66,4 +66,7 @@ .install-box::-webkit-scrollbar { width: 4px; } +.label span { + color: #999 !important; +} /*# sourceMappingURL=index.css.map */ \ No newline at end of file diff --git a/web/views/@default/setup/confirm/index.css.map b/web/views/@default/setup/confirm/index.css.map index 6258e403..079289fb 100644 --- a/web/views/@default/setup/confirm/index.css.map +++ b/web/views/@default/setup/confirm/index.css.map @@ -1 +1 @@ -{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EAGC,WAAA;EACA,eAAA;EACA,SAAA;EACA,kBAAA;EACA,QAAA;EACA,WAAA;EACA,gBAAA;;AATD,YAWC,QAAO;EACN,eAAA;;AAZF,YAeC,QAAO;EACN,YAAA;;AAhBF,YAmBC,QAAO;EACN,YAAA;;AApBF,YAuBC,MACC,GAAE;EACD,WAAA;;AAzBH,YA6BC;EACC,iBAAA;;AA9BF,YA6BC,OAGC;EACC,0BAAA;EACA,2BAAA;;AAlCH,YAsCC;EACC,mBAAA;;AAvCF,YA0CC;EACC,gBAAA;EACA,eAAA;EACA,QAAA;EACA,WAAA;EACA,SAAA;EACA,WAAA;EACA,kBAAA;EACA,kBAAA;EACA,UAAA;;AAnDF,YAsDC,aAAY;EACX,UAAA;;AAvDF,YA0DC;EACC,eAAA;EACA,SAAA;EACA,kBAAA;EACA,UAAA;EACA,WAAA;EACA,WAAA;;AAhEF,YA0DC,cAQC;EACC,WAAA;;AAnEH,YA0DC,cAYC;EACC,kBAAA;EACA,QAAA;EACA,UAAA;EACA,WAAA;EACA,SAAA;EACA,kBAAA;EACA,UAAA;;AAKH,YAAY;EACX,UAAA","file":"index.css"} \ No newline at end of file +{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EAGC,WAAA;EACA,eAAA;EACA,SAAA;EACA,kBAAA;EACA,QAAA;EACA,WAAA;EACA,gBAAA;;AATD,YAWC,QAAO;EACN,eAAA;;AAZF,YAeC,QAAO;EACN,YAAA;;AAhBF,YAmBC,QAAO;EACN,YAAA;;AApBF,YAuBC,MACC,GAAE;EACD,WAAA;;AAzBH,YA6BC;EACC,iBAAA;;AA9BF,YA6BC,OAGC;EACC,0BAAA;EACA,gBAAA;;AAlCH,YAsCC;EACC,mBAAA;;AAvCF,YA0CC;EACC,gBAAA;EACA,eAAA;EACA,QAAA;EACA,WAAA;EACA,SAAA;EACA,WAAA;EACA,kBAAA;EACA,kBAAA;EACA,UAAA;;AAnDF,YAsDC,aAAY;EACX,UAAA;;AAvDF,YA0DC;EACC,eAAA;EACA,SAAA;EACA,kBAAA;EACA,UAAA;EACA,WAAA;EACA,WAAA;;AAhEF,YA0DC,cAQC;EACC,WAAA;;AAnEH,YA0DC,cAYC;EACC,kBAAA;EACA,QAAA;EACA,UAAA;EACA,WAAA;EACA,SAAA;EACA,kBAAA;EACA,UAAA;;AAKH,YAAY;EACX,UAAA;;AAGD,MACC;EACC,WAAA","file":"index.css"} \ No newline at end of file diff --git a/web/views/@default/setup/confirm/index.html b/web/views/@default/setup/confirm/index.html index 771d7d66..46c20fcd 100644 --- a/web/views/@default/setup/confirm/index.html +++ b/web/views/@default/setup/confirm/index.html @@ -22,7 +22,7 @@ - + @@ -30,17 +30,17 @@ - + - + diff --git a/web/views/@default/setup/confirm/index.less b/web/views/@default/setup/confirm/index.less index 43c6f8b7..c72eb2fc 100644 --- a/web/views/@default/setup/confirm/index.less +++ b/web/views/@default/setup/confirm/index.less @@ -4,7 +4,7 @@ width: @width; position: fixed; left: 50%; - margin-left: -@width/2; + margin-left: -(@width/2); top: 1em; bottom: 1em; overflow-y: auto; @@ -48,7 +48,7 @@ left: 50%; width: @width; padding-right: 1em; - margin-left: -@width/2; + margin-left: -(@width/2); z-index: 1; } @@ -59,7 +59,7 @@ .button-group { position: fixed; left: 50%; - margin-left: -@width/2; + margin-left: -(@width/2); z-index: 1; width: @width; bottom: 1em; @@ -82,4 +82,10 @@ .install-box::-webkit-scrollbar { width: 4px; +} + +.label { + span { + color: #999!important; + } } \ No newline at end of file
API节点地址{{index+1}} *新的API节点地址{{index+1}} *
NodeId *管理系统NodeId * - -

可以在安装时的系统目录下configs/api.yaml文件中找到。

+ +

可以在安装时的管理系统目录下edge-admin/configs/api.yaml文件中找到，通常不需要修改。
Secret *管理系统Secret * - -

可以在安装时的系统目录下configs/api.yaml文件中找到。

+ +

可以在安装时的管理系统目录下edge-admin/configs/api.yaml文件中找到，通常不需要修改。