test

src/AppModels/MinerStudio/Vms/MinerClientViewModel.cs

@@ -1447,6 +1447,16 @@ namespace NTMiner.MinerStudio.Vms {
             }
         }
 
+        public string LoginName {
+            get { return _data.LoginName; }
+            set {
+                if (_data.LoginName != value) {
+                    _data.LoginName = value;
+                    OnPropertyChanged(nameof(LoginName));
+                }
+            }
+        }
+
         public string OuterUserId {
             get { return _data.OuterUserId; }
             set {

src/NTMinerDataSchemas/Core/MinerServer/ClientData.cs

@@ -87,6 +87,7 @@ namespace NTMiner.Core.MinerServer {
                 IsGotOneIncorrectGpuShare = false,
                 KernelSelfRestartCount = 0,
                 IsOuterUserEnabled = data.IsOuterUserEnabled,
+                LoginName = data.LoginName,
                 OuterUserId = data.OuterUserId,
                 TotalPhysicalMemoryMb = 0,
                 LocalServerMessageTimestamp = Timestamp.UnixBaseTime,
@@ -183,6 +184,7 @@ namespace NTMiner.Core.MinerServer {
                 KernelSelfRestartCount = data.KernelSelfRestartCount,
                 LocalServerMessageTimestamp = data.LocalServerMessageTimestamp,
                 IsOuterUserEnabled = data.IsOuterUserEnabled,
+                LoginName = data.LoginName,
                 OuterUserId = data.OuterUserId,
                 NetActiveOn = data.NetActiveOn,
                 IsOnline = data.IsOnline,
@@ -296,12 +298,14 @@ namespace NTMiner.Core.MinerServer {
                 IsDisableWAU = speedData.IsDisableWAU,
                 IsOnline = false,
                 NetActiveOn = DateTime.MinValue,
+                LoginName = string.Empty,
                 OuterUserId = string.Empty,
                 WorkerName = string.Empty
             };
         }
 
         public void Update(MinerSign minerSign, out bool isChanged) {
+            this.LoginName = minerSign.LoginName;
             isChanged = false;
             if (!isChanged) {
                 isChanged = this.ClientId != minerSign.ClientId;
@@ -596,6 +600,8 @@ namespace NTMiner.Core.MinerServer {
 
         public bool IsOnline { get; set; }
 
+        public string LoginName { get; set; }
+
         public string OuterUserId { get; set; }
 
         public string AESPassword { get; set; }

src/NTMinerDataSchemas/Core/MinerServer/IMinerSign.cs

@@ -5,7 +5,11 @@ namespace NTMiner.Core.MinerServer {
         string Id { get; }
         Guid ClientId { get; }
         /// <summary>
-        /// LoginName、Email或Mobile
+        /// 服务端填充的，一定是LoginName
+        /// </summary>
+        string LoginName { get; }
+        /// <summary>
+        /// 来自客户端：LoginName、Email或Mobile
         /// </summary>
         string OuterUserId { get; }
         string AESPassword { get; }

src/NTMinerDataSchemas/Core/MinerServer/MinerData.cs

@@ -18,6 +18,7 @@ namespace NTMiner.Core.MinerServer {
                 WindowsPassword = string.Empty,
                 WorkId = Guid.Empty,
                 IsOuterUserEnabled = false,
+                LoginName = string.Empty,
                 OuterUserId = string.Empty,
                 AESPassword = string.Empty,
                 AESPasswordOn = DateTime.MinValue
@@ -28,6 +29,7 @@ namespace NTMiner.Core.MinerServer {
             return new MinerData {
                 Id = minerSign.Id,
                 ClientId = minerSign.ClientId,
+                LoginName = minerSign.LoginName,
                 OuterUserId = minerSign.OuterUserId,
                 AESPassword = minerSign.AESPassword,
                 AESPasswordOn = minerSign.AESPasswordOn,
@@ -60,6 +62,7 @@ namespace NTMiner.Core.MinerServer {
                 WindowsPassword = clientData.WindowsPassword,
                 WorkId = clientData.WorkId,
                 IsOuterUserEnabled = clientData.IsOuterUserEnabled,
+                LoginName = clientData.LoginName,
                 OuterUserId = clientData.OuterUserId,
                 AESPassword = clientData.AESPassword,
                 AESPasswordOn = clientData.AESPasswordOn
@@ -70,6 +73,7 @@ namespace NTMiner.Core.MinerServer {
 
         public string Id { get; set; }
         public Guid ClientId { get; set; }
+        public string LoginName { get; set; }
         public string OuterUserId { get; set; }
         public bool IsOuterUserEnabled { get; set; }
         public string AESPassword { get; set; }

src/NTMinerDataSchemas/Core/MinerServer/MinerSign.cs

@@ -6,6 +6,7 @@ namespace NTMiner.Core.MinerServer {
             return new MinerSign {
                 Id = minerData.Id,
                 ClientId = minerData.ClientId,
+                LoginName = minerData.LoginName,
                 OuterUserId = minerData.OuterUserId,
                 AESPassword = minerData.AESPassword,
                 AESPasswordOn = minerData.AESPasswordOn
@@ -16,6 +17,7 @@ namespace NTMiner.Core.MinerServer {
 
         public void Update(MinerData minerData) {
             this.ClientId = minerData.ClientId;
+            this.LoginName = minerData.LoginName;
             this.OuterUserId = minerData.OuterUserId;
             this.AESPassword = minerData.AESPassword;
             this.AESPasswordOn = minerData.AESPasswordOn;
@@ -25,6 +27,8 @@ namespace NTMiner.Core.MinerServer {
 
         public Guid ClientId { get; set; }
 
+        public string LoginName { get; set; }
+
         public string OuterUserId { get; set; }
 
         public string AESPassword { get; set; }