v1.5.1 增强程序稳定性

EdgeAPI/internal/rpc/services/httpdns/converters.go

@@ -16,8 +16,8 @@ func toPBCluster(cluster *models.HTTPDNSCluster) *pb.HTTPDNSCluster {
 	}
 	return &pb.HTTPDNSCluster{
 		Id:                int64(cluster.Id),
-		IsOn:              cluster.IsOn,
-		IsDefault:         cluster.IsDefault,
+		IsOn:              cluster.IsOn > 0,
+		IsDefault:         cluster.IsDefault > 0,
 		Name:              cluster.Name,
 		ServiceDomain:     cluster.ServiceDomain,
 		DefaultTTL:        cluster.DefaultTTL,
@@ -26,8 +26,8 @@ func toPBCluster(cluster *models.HTTPDNSCluster) *pb.HTTPDNSCluster {
 		TlsPolicyJSON:     cluster.TLSPolicy,
 		CreatedAt:         int64(cluster.CreatedAt),
 		UpdatedAt:         int64(cluster.UpdatedAt),
-		AutoRemoteStart:   cluster.AutoRemoteStart,
-		AccessLogIsOn:     cluster.AccessLogIsOn,
+		AutoRemoteStart:   cluster.AutoRemoteStart > 0,
+		AccessLogIsOn:     cluster.AccessLogIsOn > 0,
 		TimeZone:          cluster.TimeZone,
 	}
 }

EdgeAPI/internal/rpc/services/httpdns/service_httpdns_app.go

@@ -127,7 +127,7 @@ func readHTTPDNSDefaultClusterIdList(tx *dbs.Tx) ([]int64, error) {
 					if err != nil {
 						return nil, err
 					}
-					if cluster != nil && cluster.IsOn {
+					if cluster != nil && cluster.IsOn > 0 {
 						validIds = append(validIds, id)
 					}
 				}

EdgeAPI/internal/rpc/services/httpdns/service_httpdns_cluster.go

@@ -120,8 +120,8 @@ func (this *HTTPDNSClusterService) FindHTTPDNSCluster(ctx context.Context, req *
 	}
 	if cluster != nil {
 		_ = grpc.SetHeader(ctx, metadata.Pairs(
-			"x-httpdns-auto-remote-start", fmt.Sprintf("%t", cluster.AutoRemoteStart),
-			"x-httpdns-access-log-is-on", fmt.Sprintf("%t", cluster.AccessLogIsOn),
+			"x-httpdns-auto-remote-start", fmt.Sprintf("%t", cluster.AutoRemoteStart > 0),
+			"x-httpdns-access-log-is-on", fmt.Sprintf("%t", cluster.AccessLogIsOn > 0),
 			"x-httpdns-time-zone", cluster.TimeZone,
 		))
 	}

EdgeAPI/internal/rpc/services/nameservers/service_ns_node.go

@@ -6,7 +6,6 @@ package nameservers
 import (
 	"context"
 	"encoding/json"
-	teaconst "github.com/TeaOSLab/EdgeAPI/internal/const"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
 	"github.com/TeaOSLab/EdgeAPI/internal/errors"
 	"github.com/TeaOSLab/EdgeAPI/internal/goman"
@@ -475,7 +474,7 @@ func (this *NSNodeService) FindLatestNSNodeVersion(ctx context.Context, req *pb.
 		return nil, err
 	}
 
-	return &pb.FindLatestNSNodeVersionResponse{Version: teaconst.DNSNodeVersion}, nil
+	return &pb.FindLatestNSNodeVersionResponse{Version: installers.SharedDeployManager.LatestNSNodeVersion()}, nil
 }
 
 // DownloadNSNodeInstallationFile 下载最新DNS节点安装文件

EdgeAPI/internal/rpc/services/service_admin.go

@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models/stats"
 	"github.com/TeaOSLab/EdgeAPI/internal/errors"
+	"github.com/TeaOSLab/EdgeAPI/internal/installers"
 	"github.com/TeaOSLab/EdgeAPI/internal/rpc/tasks"
 	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
 	"github.com/TeaOSLab/EdgeAPI/internal/utils"
@@ -689,17 +690,20 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 
 	// 边缘节点升级信息
 	{
-		upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
-			NewVersion: teaconst.NodeVersion,
+		var nodeVersion = installers.SharedDeployManager.LatestNodeVersion()
+		if len(nodeVersion) > 0 {
+			upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
+				NewVersion: nodeVersion,
+			}
+			this.BeginTag(ctx, "SharedNodeDAO.CountAllLowerVersionNodes")
+			countNodes, err := models.SharedNodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
+			this.EndTag(ctx, "SharedNodeDAO.CountAllLowerVersionNodes")
+			if err != nil {
+				return nil, err
+			}
+			upgradeInfo.CountNodes = countNodes
+			result.NodeUpgradeInfo = upgradeInfo
 		}
-		this.BeginTag(ctx, "SharedNodeDAO.CountAllLowerVersionNodes")
-		countNodes, err := models.SharedNodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
-		this.EndTag(ctx, "SharedNodeDAO.CountAllLowerVersionNodes")
-		if err != nil {
-			return nil, err
-		}
-		upgradeInfo.CountNodes = countNodes
-		result.NodeUpgradeInfo = upgradeInfo
 	}
 
 	// API节点升级信息

EdgeAPI/internal/rpc/services/service_admin_ext_plus.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	teaconst "github.com/TeaOSLab/EdgeAPI/internal/const"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeAPI/internal/installers"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models/regions"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models/stats"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -36,17 +37,20 @@ func (this *AdminService) composeAdminDashboardExt(tx *dbs.Tx, ctx context.Conte
 
 	// DNS节点升级信息
 	if isPlus {
-		upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
-			NewVersion: teaconst.DNSNodeVersion,
+		var dnsNodeVersion = installers.SharedDeployManager.LatestNSNodeVersion()
+		if len(dnsNodeVersion) > 0 {
+			upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
+				NewVersion: dnsNodeVersion,
+			}
+			this.BeginTag(ctx, "SharedNSNodeDAO.CountAllLowerVersionNodes")
+			countNodes, err := models.SharedNSNodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
+			this.EndTag(ctx, "SharedNSNodeDAO.CountAllLowerVersionNodes")
+			if err != nil {
+				return err
+			}
+			upgradeInfo.CountNodes = countNodes
+			result.NsNodeUpgradeInfo = upgradeInfo
 		}
-		this.BeginTag(ctx, "SharedNSNodeDAO.CountAllLowerVersionNodes")
-		countNodes, err := models.SharedNSNodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
-		this.EndTag(ctx, "SharedNSNodeDAO.CountAllLowerVersionNodes")
-		if err != nil {
-			return err
-		}
-		upgradeInfo.CountNodes = countNodes
-		result.NsNodeUpgradeInfo = upgradeInfo
 	}
 
 	// Report节点升级信息