v1.5.1 增强程序稳定性

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节点升级信息