feat: sync httpdns sdk/platform updates without large binaries

EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/index.go

@@ -1,9 +1,11 @@
 package node
 
 import (
+	"strings"
 	"time"
 
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	timeutil "github.com/iwind/TeaGo/utils/time"
 )
 
@@ -50,7 +52,22 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["nodeDatetime"] = nodeDatetime
 	this.Data["nodeTimeDiff"] = nodeTimeDiff
 
-	this.Data["shouldUpgrade"] = false
-	this.Data["newVersion"] = ""
+	osName := strings.TrimSpace(status.GetString("os"))
+	if len(osName) > 0 {
+		checkVersionResp, err := this.RPC().HTTPDNSNodeRPC().CheckHTTPDNSNodeLatestVersion(this.AdminContext(), &pb.CheckHTTPDNSNodeLatestVersionRequest{
+			Os:             osName,
+			Arch:           strings.TrimSpace(status.GetString("arch")),
+			CurrentVersion: strings.TrimSpace(status.GetString("buildVersion")),
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		this.Data["shouldUpgrade"] = checkVersionResp.GetHasNewVersion()
+		this.Data["newVersion"] = checkVersionResp.GetNewVersion()
+	} else {
+		this.Data["shouldUpgrade"] = false
+		this.Data["newVersion"] = ""
+	}
 	this.Show()
 }

EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/rpc_helpers.go

@@ -22,14 +22,14 @@ func findHTTPDNSClusterMap(parent *actionutils.ParentAction, clusterID int64) (m
 		return maps.Map{
 			"id":         clusterID,
 			"name":       "",
-			"installDir": "/opt/edge-httpdns",
+			"installDir": "/root/edge-httpdns",
 		}, nil
 	}
 
 	cluster := resp.GetCluster()
 	installDir := strings.TrimSpace(cluster.GetInstallDir())
 	if len(installDir) == 0 {
-		installDir = "/opt/edge-httpdns"
+		installDir = "/root/edge-httpdns"
 	}
 	return maps.Map{
 		"id":         cluster.GetId(),
@@ -93,7 +93,7 @@ func findHTTPDNSNodeMap(parent *actionutils.ParentAction, nodeID int64) (maps.Ma
 
 	installDir := strings.TrimSpace(node.GetInstallDir())
 	if len(installDir) == 0 {
-		installDir = "/opt/edge-httpdns"
+		installDir = "/root/edge-httpdns"
 	}
 
 	clusterMap, err := findHTTPDNSClusterMap(parent, node.GetClusterId())
@@ -137,22 +137,22 @@ func findHTTPDNSNodeMap(parent *actionutils.ParentAction, nodeID int64) (maps.Ma
 	}
 
 	return maps.Map{
-		"id":          node.GetId(),
-		"clusterId":   node.GetClusterId(),
-		"name":        node.GetName(),
-		"isOn":        node.GetIsOn(),
-		"isUp":        node.GetIsUp(),
-		"isInstalled": node.GetIsInstalled(),
-		"isActive":    node.GetIsActive(),
-		"uniqueId":    node.GetUniqueId(),
-		"secret":      node.GetSecret(),
-		"installDir":  installDir,
-		"status":      statusMap,
+		"id":            node.GetId(),
+		"clusterId":     node.GetClusterId(),
+		"name":          node.GetName(),
+		"isOn":          node.GetIsOn(),
+		"isUp":          node.GetIsUp(),
+		"isInstalled":   node.GetIsInstalled(),
+		"isActive":      node.GetIsActive(),
+		"uniqueId":      node.GetUniqueId(),
+		"secret":        node.GetSecret(),
+		"installDir":    installDir,
+		"status":        statusMap,
 		"installStatus": installStatusMap,
-		"cluster":     clusterMap,
-		"login":       loginMap,
-		"apiNodeAddrs": []string{},
-		"ipAddresses": ipAddresses,
+		"cluster":       clusterMap,
+		"login":         loginMap,
+		"apiNodeAddrs":  []string{},
+		"ipAddresses":   ipAddresses,
 	}, nil
 }
 
@@ -165,21 +165,23 @@ func decodeNodeStatus(raw []byte) maps.Map {
 	memText := fmt.Sprintf("%.2f%%", status.MemoryUsage*100)
 
 	return maps.Map{
-		"isActive":         status.IsActive,
-		"updatedAt":        status.UpdatedAt,
-		"hostname":         status.Hostname,
-		"hostIP":           status.HostIP,
-		"cpuUsage":         status.CPUUsage,
-		"cpuUsageText":     cpuText,
-		"memUsage":         status.MemoryUsage,
-		"memUsageText":     memText,
-		"load1m":           status.Load1m,
-		"load5m":           status.Load5m,
-		"load15m":          status.Load15m,
-		"buildVersion":     status.BuildVersion,
-		"cpuPhysicalCount": status.CPUPhysicalCount,
-		"cpuLogicalCount":  status.CPULogicalCount,
-		"exePath":          status.ExePath,
+		"isActive":          status.IsActive,
+		"updatedAt":         status.UpdatedAt,
+		"os":                status.OS,
+		"arch":              status.Arch,
+		"hostname":          status.Hostname,
+		"hostIP":            status.HostIP,
+		"cpuUsage":          status.CPUUsage,
+		"cpuUsageText":      cpuText,
+		"memUsage":          status.MemoryUsage,
+		"memUsageText":      memText,
+		"load1m":            status.Load1m,
+		"load5m":            status.Load5m,
+		"load15m":           status.Load15m,
+		"buildVersion":      status.BuildVersion,
+		"cpuPhysicalCount":  status.CPUPhysicalCount,
+		"cpuLogicalCount":   status.CPULogicalCount,
+		"exePath":           status.ExePath,
 		"apiSuccessPercent": status.APISuccessPercent,
 		"apiAvgCostSeconds": status.APIAvgCostSeconds,
 	}

EdgeAdmin/internal/web/actions/default/httpdns/clusters/cluster/node/update.go

@@ -195,7 +195,7 @@ func (this *UpdateAction) RunPost(params struct {
 
 	installDir := strings.TrimSpace(node.GetInstallDir())
 	if len(installDir) == 0 {
-		installDir = "/opt/edge-httpdns"
+		installDir = "/root/edge-httpdns"
 	}
 
 	_, err = this.RPC().HTTPDNSNodeRPC().UpdateHTTPDNSNode(this.AdminContext(), &pb.UpdateHTTPDNSNodeRequest{

EdgeAdmin/internal/web/actions/default/httpdns/clusters/clusterSettings.go

@@ -1,17 +1,20 @@
-package clusters
+package clusters
 
 import (
 	"encoding/json"
+	"fmt"
 	"strconv"
 	"strings"
 
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
+	"google.golang.org/grpc/metadata"
 )
 
 type ClusterSettingsAction struct {
@@ -41,14 +44,15 @@ func (this *ClusterSettingsAction) RunGet(params struct {
 	}
 
 	settings := maps.Map{
-		"name":                   cluster.GetString("name"),
-		"gatewayDomain":          cluster.GetString("gatewayDomain"),
-		"cacheTtl":               cluster.GetInt("defaultTTL"),
-		"fallbackTimeout":        cluster.GetInt("fallbackTimeout"),
-		"installDir":             cluster.GetString("installDir"),
-		"isOn":                   cluster.GetBool("isOn"),
-		"autoRemoteStart":        cluster.GetBool("autoRemoteStart"),
-		"accessLogIsOn":          cluster.GetBool("accessLogIsOn"),
+		"name":            cluster.GetString("name"),
+		"gatewayDomain":   cluster.GetString("gatewayDomain"),
+		"cacheTtl":        cluster.GetInt("defaultTTL"),
+		"fallbackTimeout": cluster.GetInt("fallbackTimeout"),
+		"installDir":      cluster.GetString("installDir"),
+		"isOn":            cluster.GetBool("isOn"),
+		"autoRemoteStart": cluster.GetBool("autoRemoteStart"),
+		"accessLogIsOn":   cluster.GetBool("accessLogIsOn"),
+		"timeZone":        cluster.GetString("timeZone"),
 	}
 	if settings.GetInt("cacheTtl") <= 0 {
 		settings["cacheTtl"] = 60
@@ -57,7 +61,10 @@ func (this *ClusterSettingsAction) RunGet(params struct {
 		settings["fallbackTimeout"] = 300
 	}
 	if len(settings.GetString("installDir")) == 0 {
-		settings["installDir"] = "/opt/edge-httpdns"
+		settings["installDir"] = "/root/edge-httpdns"
+	}
+	if len(settings.GetString("timeZone")) == 0 {
+		settings["timeZone"] = "Asia/Shanghai"
 	}
 
 	listenAddresses := []*serverconfigs.NetworkAddressConfig{
@@ -101,19 +108,29 @@ func (this *ClusterSettingsAction) RunGet(params struct {
 		"listen":    listenAddresses,
 		"sslPolicy": sslPolicy,
 	}
+
+	this.Data["timeZoneGroups"] = nodeconfigs.FindAllTimeZoneGroups()
+	this.Data["timeZoneLocations"] = nodeconfigs.FindAllTimeZoneLocations()
+	timeZoneStr := settings.GetString("timeZone")
+	if len(timeZoneStr) == 0 {
+		timeZoneStr = nodeconfigs.DefaultTimeZoneLocation
+	}
+	this.Data["timeZoneLocation"] = nodeconfigs.FindTimeZoneLocation(timeZoneStr)
+
 	this.Show()
 }
 
 func (this *ClusterSettingsAction) RunPost(params struct {
-	ClusterId              int64
-	Name                   string
-	GatewayDomain          string
-	CacheTtl               int32
-	FallbackTimeout        int32
-	InstallDir             string
-	IsOn bool
+	ClusterId       int64
+	Name            string
+	GatewayDomain   string
+	CacheTtl        int32
+	FallbackTimeout int32
+	InstallDir      string
+	IsOn            bool
 	AutoRemoteStart bool
-	AccessLogIsOn bool
+	AccessLogIsOn   bool
+	TimeZone        string
 
 	Addresses     []byte
 	SslPolicyJSON []byte
@@ -129,6 +146,31 @@ func (this *ClusterSettingsAction) RunPost(params struct {
 	params.Must.Field("name", params.Name).Require("请输入集群名称")
 	params.Must.Field("gatewayDomain", params.GatewayDomain).Require("请输入服务域名")
 
+	cluster, err := findClusterMap(this.Parent(), params.ClusterId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	// 开关项按请求值强制覆盖：未提交/空值都视为 false，支持取消勾选
+	autoRemoteStartRaw := strings.ToLower(strings.TrimSpace(this.ParamString("autoRemoteStart")))
+	params.AutoRemoteStart = autoRemoteStartRaw == "1" || autoRemoteStartRaw == "true" || autoRemoteStartRaw == "on" || autoRemoteStartRaw == "yes" || autoRemoteStartRaw == "enabled"
+
+	accessLogIsOnRaw := strings.ToLower(strings.TrimSpace(this.ParamString("accessLogIsOn")))
+	params.AccessLogIsOn = accessLogIsOnRaw == "1" || accessLogIsOnRaw == "true" || accessLogIsOnRaw == "on" || accessLogIsOnRaw == "yes" || accessLogIsOnRaw == "enabled"
+
+	isOnRaw := strings.ToLower(strings.TrimSpace(this.ParamString("isOn")))
+	params.IsOn = isOnRaw == "1" || isOnRaw == "true" || isOnRaw == "on" || isOnRaw == "yes" || isOnRaw == "enabled"
+
+	// 时区为空时继承当前值，再兜底默认值
+	params.TimeZone = strings.TrimSpace(this.ParamString("timeZone"))
+	if len(params.TimeZone) == 0 {
+		params.TimeZone = strings.TrimSpace(cluster.GetString("timeZone"))
+	}
+	if len(params.TimeZone) == 0 {
+		params.TimeZone = "Asia/Shanghai"
+	}
+
 	if params.CacheTtl <= 0 {
 		params.CacheTtl = 60
 	}
@@ -136,20 +178,13 @@ func (this *ClusterSettingsAction) RunPost(params struct {
 		params.FallbackTimeout = 300
 	}
 	if len(params.InstallDir) == 0 {
-		params.InstallDir = "/opt/edge-httpdns"
-	}
-
-	cluster, err := findClusterMap(this.Parent(), params.ClusterId)
-	if err != nil {
-		this.ErrorPage(err)
-		return
+		params.InstallDir = "/root/edge-httpdns"
 	}
 
 	tlsConfig := maps.Map{}
 	if rawTLS := strings.TrimSpace(cluster.GetString("tlsPolicyJSON")); len(rawTLS) > 0 {
 		_ = json.Unmarshal([]byte(rawTLS), &tlsConfig)
 	}
-
 	if len(params.Addresses) > 0 {
 		var addresses []*serverconfigs.NetworkAddressConfig
 		if err := json.Unmarshal(params.Addresses, &addresses); err != nil {
@@ -158,7 +193,6 @@ func (this *ClusterSettingsAction) RunPost(params struct {
 		}
 		tlsConfig["listen"] = addresses
 	}
-
 	if len(params.SslPolicyJSON) > 0 {
 		sslPolicy := &sslconfigs.SSLPolicy{}
 		if err := json.Unmarshal(params.SslPolicyJSON, sslPolicy); err != nil {
@@ -177,7 +211,7 @@ func (this *ClusterSettingsAction) RunPost(params struct {
 		}
 	}
 
-	_, err = this.RPC().HTTPDNSClusterRPC().UpdateHTTPDNSCluster(this.AdminContext(), &pb.UpdateHTTPDNSClusterRequest{
+	updateReq := &pb.UpdateHTTPDNSClusterRequest{
 		ClusterId:         params.ClusterId,
 		Name:              params.Name,
 		ServiceDomain:     params.GatewayDomain,
@@ -189,7 +223,16 @@ func (this *ClusterSettingsAction) RunPost(params struct {
 		IsDefault:         false,
 		AutoRemoteStart:   params.AutoRemoteStart,
 		AccessLogIsOn:     params.AccessLogIsOn,
-	})
+		TimeZone:          params.TimeZone,
+	}
+	updateCtx := metadata.AppendToOutgoingContext(
+		this.AdminContext(),
+		"x-httpdns-auto-remote-start", fmt.Sprintf("%t", updateReq.GetAutoRemoteStart()),
+		"x-httpdns-access-log-is-on", fmt.Sprintf("%t", updateReq.GetAccessLogIsOn()),
+		"x-httpdns-time-zone", updateReq.GetTimeZone(),
+	)
+
+	_, err = this.RPC().HTTPDNSClusterRPC().UpdateHTTPDNSCluster(updateCtx, updateReq)
 	if err != nil {
 		this.ErrorPage(err)
 		return

EdgeAdmin/internal/web/actions/default/httpdns/clusters/create.go

@@ -1,6 +1,7 @@
 package clusters
 
 import (
+	"strconv"
 	"strings"
 
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
@@ -36,7 +37,7 @@ func (this *CreateAction) RunPost(params struct {
 	params.GatewayDomain = strings.TrimSpace(params.GatewayDomain)
 	params.InstallDir = strings.TrimSpace(params.InstallDir)
 	if len(params.InstallDir) == 0 {
-		params.InstallDir = "/opt/edge-httpdns"
+		params.InstallDir = "/root/edge-httpdns"
 	}
 	if params.CacheTtl <= 0 {
 		params.CacheTtl = 60
@@ -56,6 +57,9 @@ func (this *CreateAction) RunPost(params struct {
 		InstallDir:        params.InstallDir,
 		IsOn:              params.IsOn,
 		IsDefault:         false,
+		AutoRemoteStart:   true,
+		AccessLogIsOn:     true,
+		TimeZone:          "Asia/Shanghai",
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -63,5 +67,12 @@ func (this *CreateAction) RunPost(params struct {
 	}
 
 	this.Data["clusterId"] = resp.GetClusterId()
+
+	// fallback: if frontend JS doesn't intercept form submit, redirect instead of showing raw JSON
+	if len(this.Request.Header.Get("X-Requested-With")) == 0 {
+		this.RedirectURL("/httpdns/clusters/cluster?clusterId=" + strconv.FormatInt(resp.GetClusterId(), 10))
+		return
+	}
+
 	this.Success()
 }

EdgeAdmin/internal/web/actions/default/httpdns/clusters/createNode.go

@@ -51,7 +51,7 @@ func (this *CreateNodeAction) RunPost(params struct {
 			params.InstallDir = strings.TrimSpace(cluster.GetString("installDir"))
 		}
 		if len(params.InstallDir) == 0 {
-			params.InstallDir = "/opt/edge-httpdns"
+			params.InstallDir = "/root/edge-httpdns"
 		}
 	}
 

EdgeAdmin/internal/web/actions/default/httpdns/clusters/init.go

@@ -22,7 +22,9 @@ func init() {
 			// Node level
 			GetPost("/createNode", new(CreateNodeAction)).
 			Post("/deleteNode", new(DeleteNodeAction)).
-			Get("/upgradeRemote", new(UpgradeRemoteAction)).
+			GetPost("/cluster/upgradeRemote", new(UpgradeRemoteAction)).
+			GetPost("/upgradeRemote", new(UpgradeRemoteAction)).
+			Post("/upgradeStatus", new(UpgradeStatusAction)).
 			GetPost("/updateNodeSSH", new(UpdateNodeSSHAction)).
 			Post("/checkPorts", new(CheckPortsAction)).
 

EdgeAdmin/internal/web/actions/default/httpdns/clusters/rpc_helpers.go

@@ -9,6 +9,10 @@ import (
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
 )
 
 func listClusterMaps(parent *actionutils.ParentAction, keyword string) ([]maps.Map, error) {
@@ -37,6 +41,11 @@ func listClusterMaps(parent *actionutils.ParentAction, keyword string) ([]maps.M
 			}
 		}
 
+		countUpgradeNodes, err := countUpgradeHTTPDNSNodes(parent, cluster.GetId())
+		if err != nil {
+			return nil, err
+		}
+
 		port := "443"
 		if rawTLS := cluster.GetTlsPolicyJSON(); len(rawTLS) > 0 {
 			tlsConfig := maps.Map{}
@@ -56,32 +65,87 @@ func listClusterMaps(parent *actionutils.ParentAction, keyword string) ([]maps.M
 		apiAddress := "https://" + cluster.GetServiceDomain() + ":" + port
 
 		result = append(result, maps.Map{
-			"id":               cluster.GetId(),
-			"name":             cluster.GetName(),
-			"gatewayDomain":    cluster.GetServiceDomain(),
-			"apiAddress":       apiAddress,
-			"defaultTTL":       cluster.GetDefaultTTL(),
-			"fallbackTimeout":  cluster.GetFallbackTimeoutMs(),
-			"installDir":       cluster.GetInstallDir(),
-			"isOn":             cluster.GetIsOn(),
-			"isDefault":        cluster.GetIsDefault(),
-			"countAllNodes":    countAllNodes,
-			"countActiveNodes": countActiveNodes,
+			"id":                cluster.GetId(),
+			"name":              cluster.GetName(),
+			"gatewayDomain":     cluster.GetServiceDomain(),
+			"apiAddress":        apiAddress,
+			"defaultTTL":        cluster.GetDefaultTTL(),
+			"fallbackTimeout":   cluster.GetFallbackTimeoutMs(),
+			"installDir":        cluster.GetInstallDir(),
+			"timeZone":          cluster.GetTimeZone(),
+			"isOn":              cluster.GetIsOn(),
+			"isDefault":         cluster.GetIsDefault(),
+			"autoRemoteStart":   cluster.GetAutoRemoteStart(),
+			"accessLogIsOn":     cluster.GetAccessLogIsOn(),
+			"tlsPolicyJSON":     cluster.GetTlsPolicyJSON(),
+			"countAllNodes":     countAllNodes,
+			"countActiveNodes":  countActiveNodes,
+			"countUpgradeNodes": countUpgradeNodes,
 		})
 	}
 	return result, nil
 }
 
+func countUpgradeHTTPDNSNodes(parent *actionutils.ParentAction, clusterID int64) (int64, error) {
+	countResp, err := parent.RPC().HTTPDNSNodeRPC().CountAllUpgradeHTTPDNSNodesWithClusterId(parent.AdminContext(), &pb.CountAllUpgradeHTTPDNSNodesWithClusterIdRequest{
+		ClusterId: clusterID,
+	})
+	if err == nil {
+		return countResp.GetCount(), nil
+	}
+
+	grpcStatus, ok := status.FromError(err)
+	if !ok || grpcStatus.Code() != codes.Unimplemented {
+		return 0, err
+	}
+
+	// Compatibility fallback: old edge-api may not implement countAllUpgradeHTTPDNSNodesWithClusterId yet.
+	listResp, listErr := parent.RPC().HTTPDNSNodeRPC().FindAllUpgradeHTTPDNSNodesWithClusterId(parent.AdminContext(), &pb.FindAllUpgradeHTTPDNSNodesWithClusterIdRequest{
+		ClusterId: clusterID,
+	})
+	if listErr == nil {
+		return int64(len(listResp.GetNodes())), nil
+	}
+
+	listStatus, ok := status.FromError(listErr)
+	if ok && listStatus.Code() == codes.Unimplemented {
+		// Compatibility fallback: both methods missing on old edge-api, don't block page rendering.
+		return 0, nil
+	}
+
+	return 0, listErr
+}
+
 func findClusterMap(parent *actionutils.ParentAction, clusterID int64) (maps.Map, error) {
 	if clusterID > 0 {
+		var headerMD metadata.MD
 		resp, err := parent.RPC().HTTPDNSClusterRPC().FindHTTPDNSCluster(parent.AdminContext(), &pb.FindHTTPDNSClusterRequest{
 			ClusterId: clusterID,
-		})
+		}, grpc.Header(&headerMD))
 		if err != nil {
 			return nil, err
 		}
 		if resp.GetCluster() != nil {
 			cluster := resp.GetCluster()
+			autoRemoteStart := cluster.GetAutoRemoteStart()
+			accessLogIsOn := cluster.GetAccessLogIsOn()
+			timeZone := cluster.GetTimeZone()
+
+			// Compatibility fallback:
+			// Some deployed admin binaries may decode newly-added protobuf fields incorrectly.
+			// Read values from grpc response headers as a source of truth.
+			if values := headerMD.Get("x-httpdns-auto-remote-start"); len(values) > 0 {
+				autoRemoteStart = parseBoolLike(values[0], autoRemoteStart)
+			}
+			if values := headerMD.Get("x-httpdns-access-log-is-on"); len(values) > 0 {
+				accessLogIsOn = parseBoolLike(values[0], accessLogIsOn)
+			}
+			if values := headerMD.Get("x-httpdns-time-zone"); len(values) > 0 {
+				if tz := strings.TrimSpace(values[0]); len(tz) > 0 {
+					timeZone = tz
+				}
+			}
+
 			return maps.Map{
 				"id":              cluster.GetId(),
 				"name":            cluster.GetName(),
@@ -92,8 +156,9 @@ func findClusterMap(parent *actionutils.ParentAction, clusterID int64) (maps.Map
 				"isOn":            cluster.GetIsOn(),
 				"isDefault":       cluster.GetIsDefault(),
 				"tlsPolicyJSON":   cluster.GetTlsPolicyJSON(),
-				"autoRemoteStart": cluster.GetAutoRemoteStart(),
-				"accessLogIsOn":   cluster.GetAccessLogIsOn(),
+				"autoRemoteStart": autoRemoteStart,
+				"accessLogIsOn":   accessLogIsOn,
+				"timeZone":        timeZone,
 			}, nil
 		}
 	}
@@ -109,12 +174,25 @@ func findClusterMap(parent *actionutils.ParentAction, clusterID int64) (maps.Map
 			"gatewayDomain":   "",
 			"defaultTTL":      60,
 			"fallbackTimeout": 300,
-			"installDir":      "/opt/edge-httpdns",
+			"installDir":      "/root/edge-httpdns",
+			"timeZone":        "Asia/Shanghai",
 		}, nil
 	}
 	return clusters[0], nil
 }
 
+func parseBoolLike(raw string, defaultValue bool) bool {
+	s := strings.ToLower(strings.TrimSpace(raw))
+	switch s {
+	case "1", "true", "on", "yes", "enabled":
+		return true
+	case "0", "false", "off", "no", "disabled":
+		return false
+	default:
+		return defaultValue
+	}
+}
+
 func listNodeMaps(parent *actionutils.ParentAction, clusterID int64) ([]maps.Map, error) {
 	resp, err := parent.RPC().HTTPDNSNodeRPC().ListHTTPDNSNodes(parent.AdminContext(), &pb.ListHTTPDNSNodesRequest{
 		ClusterId: clusterID,
@@ -132,21 +210,21 @@ func listNodeMaps(parent *actionutils.ParentAction, clusterID int64) ([]maps.Map
 			ip = parsed
 		}
 		nodeMap := maps.Map{
-			"id":           node.GetId(),
-			"clusterId":    node.GetClusterId(),
-			"name":         node.GetName(),
-			"isOn":         node.GetIsOn(),
-			"isUp":         node.GetIsUp(),
-			"isInstalled":  node.GetIsInstalled(),
-			"isActive":     node.GetIsActive(),
-			"installDir":   node.GetInstallDir(),
-			"uniqueId":     node.GetUniqueId(),
-			"secret":       node.GetSecret(),
-			"status":       statusMap,
+			"id":            node.GetId(),
+			"clusterId":     node.GetClusterId(),
+			"name":          node.GetName(),
+			"isOn":          node.GetIsOn(),
+			"isUp":          node.GetIsUp(),
+			"isInstalled":   node.GetIsInstalled(),
+			"isActive":      node.GetIsActive(),
+			"installDir":    node.GetInstallDir(),
+			"uniqueId":      node.GetUniqueId(),
+			"secret":        node.GetSecret(),
+			"status":        statusMap,
 			"installStatus": installStatusMap,
-			"region":       nil,
-			"login":        nil,
-			"apiNodeAddrs": []string{},
+			"region":        nil,
+			"login":         nil,
+			"apiNodeAddrs":  []string{},
 			"cluster": maps.Map{
 				"id":         node.GetClusterId(),
 				"installDir": node.GetInstallDir(),
@@ -227,21 +305,21 @@ func decodeNodeStatus(raw []byte) maps.Map {
 	cpuText := fmt.Sprintf("%.2f%%", status.CPUUsage*100)
 	memText := fmt.Sprintf("%.2f%%", status.MemoryUsage*100)
 	return maps.Map{
-		"isActive":        status.IsActive,
-		"updatedAt":       status.UpdatedAt,
-		"hostname":        status.Hostname,
-		"hostIP":          status.HostIP,
-		"cpuUsage":        status.CPUUsage,
-		"cpuUsageText":    cpuText,
-		"memUsage":        status.MemoryUsage,
-		"memUsageText":    memText,
-		"load1m":          status.Load1m,
-		"load5m":          status.Load5m,
-		"load15m":         status.Load15m,
-		"buildVersion":    status.BuildVersion,
+		"isActive":         status.IsActive,
+		"updatedAt":        status.UpdatedAt,
+		"hostname":         status.Hostname,
+		"hostIP":           status.HostIP,
+		"cpuUsage":         status.CPUUsage,
+		"cpuUsageText":     cpuText,
+		"memUsage":         status.MemoryUsage,
+		"memUsageText":     memText,
+		"load1m":           status.Load1m,
+		"load5m":           status.Load5m,
+		"load15m":          status.Load15m,
+		"buildVersion":     status.BuildVersion,
 		"cpuPhysicalCount": status.CPUPhysicalCount,
-		"cpuLogicalCount": status.CPULogicalCount,
-		"exePath":         status.ExePath,
+		"cpuLogicalCount":  status.CPULogicalCount,
+		"exePath":          status.ExePath,
 	}
 }
 

EdgeAdmin/internal/web/actions/default/httpdns/clusters/upgradeRemote.go

@@ -1,16 +1,108 @@
 package clusters
 
-import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/actions"
+	"github.com/iwind/TeaGo/maps"
+)
 
 type UpgradeRemoteAction struct {
 	actionutils.ParentAction
 }
 
+func (this *UpgradeRemoteAction) Init() {
+	this.Nav("httpdns", "cluster", "index")
+}
+
 func (this *UpgradeRemoteAction) RunGet(params struct {
 	NodeId    int64
 	ClusterId int64
 }) {
-	this.Data["nodeId"] = params.NodeId
+	httpdnsutils.AddLeftMenu(this.Parent())
+
+	cluster, err := findClusterMap(this.Parent(), params.ClusterId)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	httpdnsutils.AddClusterTabbar(this.Parent(), cluster.GetString("name"), params.ClusterId, "node")
+
 	this.Data["clusterId"] = params.ClusterId
+	this.Data["cluster"] = cluster
+
+	resp, err := this.RPC().HTTPDNSNodeRPC().FindAllUpgradeHTTPDNSNodesWithClusterId(this.AdminContext(), &pb.FindAllUpgradeHTTPDNSNodesWithClusterIdRequest{
+		ClusterId: params.ClusterId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	nodes := make([]maps.Map, 0, len(resp.GetNodes()))
+	for _, upgradeNode := range resp.GetNodes() {
+		node := upgradeNode.Node
+		if node == nil {
+			continue
+		}
+
+		loginParams := maps.Map{}
+		if node.GetNodeLogin() != nil && len(node.GetNodeLogin().GetParams()) > 0 {
+			_ = json.Unmarshal(node.GetNodeLogin().GetParams(), &loginParams)
+		}
+
+		status := decodeNodeStatus(node.GetStatusJSON())
+		accessIP := strings.TrimSpace(status.GetString("hostIP"))
+		if len(accessIP) == 0 {
+			accessIP = strings.TrimSpace(node.GetName())
+		}
+
+		nodes = append(nodes, maps.Map{
+			"id":            node.GetId(),
+			"name":          node.GetName(),
+			"accessIP":      accessIP,
+			"oldVersion":    upgradeNode.OldVersion,
+			"newVersion":    upgradeNode.NewVersion,
+			"login":         node.GetNodeLogin(),
+			"loginParams":   loginParams,
+			"installStatus": decodeUpgradeInstallStatus(node.GetInstallStatusJSON()),
+		})
+	}
+	this.Data["nodes"] = nodes
 	this.Show()
 }
+
+func (this *UpgradeRemoteAction) RunPost(params struct {
+	NodeId int64
+
+	Must *actions.Must
+}) {
+	_, err := this.RPC().HTTPDNSNodeRPC().UpgradeHTTPDNSNode(this.AdminContext(), &pb.UpgradeHTTPDNSNodeRequest{
+		NodeId: params.NodeId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	this.Success()
+}
+
+func decodeUpgradeInstallStatus(raw []byte) maps.Map {
+	result := maps.Map{
+		"isRunning":  false,
+		"isFinished": false,
+		"isOk":       false,
+		"error":      "",
+		"errorCode":  "",
+	}
+	if len(raw) == 0 {
+		return result
+	}
+
+	_ = json.Unmarshal(raw, &result)
+	return result
+}

EdgeAdmin/internal/web/actions/default/httpdns/clusters/upgradeStatus.go

@@ -0,0 +1,48 @@
+package clusters
+
+import (
+	"encoding/json"
+
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type UpgradeStatusAction struct {
+	actionutils.ParentAction
+}
+
+func (this *UpgradeStatusAction) RunPost(params struct {
+	NodeId int64
+}) {
+	resp, err := this.RPC().HTTPDNSNodeRPC().FindHTTPDNSNode(this.AdminContext(), &pb.FindHTTPDNSNodeRequest{
+		NodeId: params.NodeId,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if resp.GetNode() == nil {
+		this.Data["status"] = nil
+		this.Success()
+		return
+	}
+
+	this.Data["status"] = decodeUpgradeInstallStatusMap(resp.GetNode().GetInstallStatusJSON())
+	this.Success()
+}
+
+func decodeUpgradeInstallStatusMap(raw []byte) map[string]interface{} {
+	result := map[string]interface{}{
+		"isRunning":  false,
+		"isFinished": false,
+		"isOk":       false,
+		"error":      "",
+		"errorCode":  "",
+	}
+	if len(raw) == 0 {
+		return result
+	}
+
+	_ = json.Unmarshal(raw, &result)
+	return result
+}