ChenKaiLiuG/GoEdgeAdmin
Archived
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

将api.yaml修改为api_admin.yaml

Browse Source
This commit is contained in:
刘祥超
2023-08-12 17:58:00 +08:00
parent cbce8a9934
commit df19a04ad1
19 changed files with 113 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/actions/default/setup/confirm/index.go
+5 -5
View File
@@ -26,7 +26,7 @@ func (this *IndexAction) RunGet(params struct{}) {
config, err := configs.LoadAPIConfig()
if err == nil {
endpoints = config.RPC.Endpoints
endpoints = config.RPCEndpoints
this.Data["nodeId"] = config.NodeId
this.Data["secret"] = config.Secret
this.Data["canInstall"] = false
@@ -78,7 +78,7 @@ func (this *IndexAction) RunPost(params struct {
var config = &configs.APIConfig{}
config.NodeId = params.NodeId
config.Secret = params.Secret
config.RPC.Endpoints = []string{endpoint}
config.RPCEndpoints = []string{endpoint}
client, err := rpc.NewRPCClient(config, false)
if err != nil {
this.Fail("尝试配置RPC发生错误：" + err.Error())
@@ -124,9 +124,9 @@ func (this *IndexAction) RunPost(params struct {
}
config.NodeId = params.NodeId
config.Secret = params.Secret
config.RPC.Endpoints = endpoints
config.RPC.DisableUpdate = true
err = config.WriteFile(Tea.ConfigFile("api.yaml"))
config.RPCEndpoints = endpoints
config.RPCDisableUpdate = true
err = config.WriteFile(Tea.ConfigFile(configs.ConfigFileName))
if err != nil {
this.Fail("配置保存失败：" + err.Error())
}
internal/web/actions/default/setup/install.go
+8 -18
View File
@@ -231,14 +231,9 @@ func (this *InstallAction) RunPost(params struct {
// 写入API节点配置，完成安装
var apiConfig = &configs.APIConfig{
RPC: struct {
Endpoints []string `yaml:"endpoints"`
DisableUpdate bool `yaml:"disableUpdate"`
}{
Endpoints: []string{"http://" + configutils.QuoteIP(apiNodeMap.GetString("newHost")) + ":" + apiNodeMap.GetString("newPort")},
},
NodeId: resultMap.GetString("adminNodeId"),
Secret: resultMap.GetString("adminNodeSecret"),
RPCEndpoints: []string{"http://" + configutils.QuoteIP(apiNodeMap.GetString("newHost")) + ":" + apiNodeMap.GetString("newPort")},
NodeId: resultMap.GetString("adminNodeId"),
Secret: resultMap.GetString("adminNodeSecret"),
}
// 设置管理员
@@ -285,7 +280,7 @@ func (this *InstallAction) RunPost(params struct {
}
}
err = apiConfig.WriteFile(Tea.ConfigFile("api.yaml"))
err = apiConfig.WriteFile(Tea.ConfigFile(configs.ConfigFileName))
if err != nil {
this.Fail("保存配置失败，原因：" + err.Error())
}
@@ -294,14 +289,9 @@ func (this *InstallAction) RunPost(params struct {
} else if mode == "old" {
// 构造RPC
var apiConfig = &configs.APIConfig{
RPC: struct {
Endpoints []string `yaml:"endpoints"`
DisableUpdate bool `yaml:"disableUpdate"`
}{
Endpoints: []string{apiNodeMap.GetString("oldProtocol") + "://" + configutils.QuoteIP(apiNodeMap.GetString("oldHost")) + ":" + apiNodeMap.GetString("oldPort")},
},
NodeId: apiNodeMap.GetString("oldNodeId"),
Secret: apiNodeMap.GetString("oldNodeSecret"),
RPCEndpoints: []string{apiNodeMap.GetString("oldProtocol") + "://" + configutils.QuoteIP(apiNodeMap.GetString("oldHost")) + ":" + apiNodeMap.GetString("oldPort")},
NodeId: apiNodeMap.GetString("oldNodeId"),
Secret: apiNodeMap.GetString("oldNodeSecret"),
}
client, err := rpc.NewRPCClient(apiConfig, false)
if err != nil {
@@ -343,7 +333,7 @@ func (this *InstallAction) RunPost(params struct {
}
// 写入API节点配置，完成安装
err = apiConfig.WriteFile(Tea.ConfigFile("api.yaml"))
err = apiConfig.WriteFile(Tea.ConfigFile(configs.ConfigFileName))
if err != nil {
this.Fail("保存配置失败，原因：" + err.Error())
}
internal/web/actions/default/setup/validateApi.go
+3 -8
View File
@@ -102,14 +102,9 @@ func (this *ValidateApiAction) RunPost(params struct {
Field("oldNodeSecret", params.OldNodeSecret).
Require("请输入节点secret")
client, err := rpc.NewRPCClient(&configs.APIConfig{
RPC: struct {
Endpoints []string `yaml:"endpoints"`
DisableUpdate bool `yaml:"disableUpdate"`
}{
Endpoints: []string{params.OldProtocol + "://" + configutils.QuoteIP(params.OldHost) + ":" + params.OldPort},
},
NodeId: params.OldNodeId,
Secret: params.OldNodeSecret,
RPCEndpoints: []string{params.OldProtocol + "://" + configutils.QuoteIP(params.OldHost) + ":" + params.OldPort},
NodeId: params.OldNodeId,
Secret: params.OldNodeSecret,
}, false)
if err != nil {
this.FailField("oldHost", "测试API节点时出错，请检查配置，错误信息："+err.Error())