mirror of
				https://github.com/TeaOSLab/EdgeAdmin.git
				synced 2025-11-04 05:00:25 +08:00 
			
		
		
		
	在节点详情中显示API节点地址
This commit is contained in:
		@@ -10,6 +10,7 @@ import (
 | 
			
		||||
	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/nodes/ipAddresses/ipaddressutils"
 | 
			
		||||
	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 | 
			
		||||
	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 | 
			
		||||
	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 | 
			
		||||
	"github.com/iwind/TeaGo/maps"
 | 
			
		||||
	timeutil "github.com/iwind/TeaGo/utils/time"
 | 
			
		||||
	"time"
 | 
			
		||||
@@ -300,6 +301,22 @@ func (this *DetailAction) RunGet(params struct {
 | 
			
		||||
		lnAddrs = []string{}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// API节点地址
 | 
			
		||||
	var apiNodeAddrStrings = []string{}
 | 
			
		||||
	var apiNodeAddrs = []*serverconfigs.NetworkAddressConfig{}
 | 
			
		||||
	if len(node.ApiNodeAddrsJSON) > 0 {
 | 
			
		||||
		err = json.Unmarshal(node.ApiNodeAddrsJSON, &apiNodeAddrs)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			this.ErrorPage(err)
 | 
			
		||||
			return
 | 
			
		||||
		}
 | 
			
		||||
		for _, addr := range apiNodeAddrs {
 | 
			
		||||
			if addr.Init() == nil {
 | 
			
		||||
				apiNodeAddrStrings = append(apiNodeAddrStrings, addr.FullAddresses()...)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	this.Data["node"] = maps.Map{
 | 
			
		||||
		"id":                node.Id,
 | 
			
		||||
		"name":              node.Name,
 | 
			
		||||
@@ -319,6 +336,7 @@ func (this *DetailAction) RunGet(params struct {
 | 
			
		||||
		"levelInfo":         nodeconfigs.FindNodeLevel(int(node.Level)),
 | 
			
		||||
		"lnAddrs":           lnAddrs,
 | 
			
		||||
		"enableIPLists":     node.EnableIPLists,
 | 
			
		||||
		"apiNodeAddrs":      apiNodeAddrStrings,
 | 
			
		||||
 | 
			
		||||
		"status": maps.Map{
 | 
			
		||||
			"isActive":             status.IsActive,
 | 
			
		||||
 
 | 
			
		||||
@@ -126,6 +126,12 @@ func (this *IndexAction) RunPost(params struct {
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			this.Fail("API节点地址校验错误:" + err.Error())
 | 
			
		||||
		}
 | 
			
		||||
		for _, addr := range apiNodeAddrs {
 | 
			
		||||
			err = addr.Init()
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				this.Fail("API节点地址校验错误:" + err.Error())
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	_, err = this.RPC().NodeRPC().UpdateNodeAPIConfig(this.AdminContext(), &pb.UpdateNodeAPIConfigRequest{
 | 
			
		||||
		NodeId:           params.NodeId,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user