冲突处理

项目目录修改

UserClass/AsyncTcpServer.cs

@@ -15,6 +15,7 @@ namespace SunlightAggregationManager.UserClass
         {
             public required string User { get; set; }
             public required string Password { get; set; }
+            public required string IP { get; set; }
             public required string Terminal { get; set; }
             public required string Dat { get; set; }
         }
@@ -55,7 +56,7 @@ namespace SunlightAggregationManager.UserClass
                             {//行为
                                 Dictionary<string, object> myDict = new Dictionary<string, object>();
                                 myDict.Add("LinkID", client.Id);
-                                myDict.Add("LastLoginIP", client.IP);
+                                myDict.Add("LastLoginIP", deserializedPerson?.IP ?? client.IP);
                                 myDict.Add("LastActionTime", DateTime.Now);
                                 myDict.Add("Note", deserializedPerson?.Dat ?? "unknown");
                                 MainWindowViewModel.Updata_Memory(MainWindowViewModel._userData, "User='" + deserializedPerson?.User + "'", myDict);
@@ -67,14 +68,14 @@ namespace SunlightAggregationManager.UserClass
                                 Dictionary<string, object> myDict = new Dictionary<string, object>();
                                 myDict.Add("State", 20);
                                 myDict.Add("LinkID", client.Id);
-                                myDict.Add("LastLoginIP", client.IP);
+                                myDict.Add("LastLoginIP", deserializedPerson?.IP ?? client.IP);
                                 myDict.Add("LastLoginTime", DateTime.Now);
                                 myDict.Add("LastLoginTerminal", deserializedPerson?.Terminal ?? "unknown device");
                                 myDict.Add("LastActionTime", DateTime.Now);
                                 myDict.Add("Note", deserializedPerson?.Dat ?? "unknown");
                                 MainWindowViewModel.Updata_Memory(MainWindowViewModel._userData, "User='" + deserializedPerson?.User + "'", myDict);
 
-                                Console.WriteLine("[Log on]User[" + deserializedPerson?.User + "]IP[" + client.IP +
+                                Console.WriteLine("[Log on]User[" + deserializedPerson?.User + "]IP[" + deserializedPerson?.IP ?? client.IP +
                                     "]ID[" + client.Id + "]Terminal[" + (deserializedPerson?.Terminal ?? "unknown device") + "]");
                             }
                         }

UserWindow/UserSet.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="SunlightAggregationManager.UserWindow.UserSet"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SunlightAggregationManager.UserWindow"
+        mc:Ignorable="d"
+        Title="UserSet" Height="450" Width="800" WindowStyle="None" >
+    <Grid>
+        
+    </Grid>
+</Window>

UserWindow/UserSet.xaml.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace SunlightAggregationManager.UserWindow
+{
+    /// <summary>
+    /// UserSet.xaml 的交互逻辑
+    /// </summary>
+    public partial class UserSet : Window
+    {
+        public UserSet()
+        {
+            InitializeComponent();
+        }
+    }
+}