优化迁移后确认表单的文字提示

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()

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"}
+{"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"}

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;

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"}
+{"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"}

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 */

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"}
+{"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"}

web/views/@default/setup/confirm/index.html

@@ -22,7 +22,7 @@
         <table class="ui table definition selectable">
             <tbody v-for="(endpoint, index) in endpoints">
                 <tr>
-                    <td class="title">API节点地址<span v-if="endpoints.length > 1">{{index+1}}</span> *</td>
+                    <td class="title">新的API节点地址<span v-if="endpoints.length > 1">{{index+1}}</span> *</td>
                     <td>
                         <input type="text" name="endpoints" v-model="endpoints[index]"/>
                     </td>
@@ -30,17 +30,17 @@
             </tbody>
             <tbody>
                 <tr>
-                    <td>NodeId *</td>
+                    <td>管理系统NodeId *</td>
                     <td>
-                        <input type="text" name="nodeId" v-model="nodeId" maxlength="100"/>
+                        <input type="text" name="nodeId" v-model="nodeId" maxlength="64"/>
-                        <p class="comment">可以在安装时的系统目录下<code-label>configs/api.yaml</code-label>文件中找到。</p>
+                        <p class="comment">可以在安装时的管理系统目录下<code-label><span>edge-admin/</span>configs/api.yaml</code-label>文件中找到，通常不需要修改。</p>
                     </td>
                 </tr>
                 <tr>
-                    <td>Secret *</td>
+                    <td>管理系统Secret *</td>
                     <td>
-                        <input type="text" name="secret" v-model="secret" maxlength="100"/>
+                        <input type="text" name="secret" v-model="secret" maxlength="64"/>
-                        <p class="comment">可以在安装时的系统目录下<code-label>configs/api.yaml</code-label>文件中找到。</p>
+                        <p class="comment">可以在安装时的管理系统目录下<code-label><span>edge-admin/</span>configs/api.yaml</code-label>文件中找到，通常不需要修改。</p>
                     </td>
                 </tr>
             </tbody>

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;
@@ -83,3 +83,9 @@
 .install-box::-webkit-scrollbar {
 	width: 4px;
 }
+
+.label {
+	span {
+		color: #999!important;
+	}
+}