修改 时间日期格式

src/YSAI.Core/YSAI.Core.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.0.92</Version>
+    <Version>1.0.0.93</Version>
     <Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>
@@ -16,8 +16,8 @@
 		<PackageReference Include="StackExchange.Redis" Version="2.7.4" />
 		<PackageReference Include="Microsoft.ClearScript" Version="7.4.4" />
 		<PackageReference Include="System.IO.Ports" Version="7.0.0" />
-		<PackageReference Include="YSAI.Log" Version="1.0.0.12" />
-		<PackageReference Include="YSAI.Unility" Version="1.0.0.29" />
+		<PackageReference Include="YSAI.Log" Version="1.0.0.13" />
+		<PackageReference Include="YSAI.Unility" Version="1.0.0.30" />
 	</ItemGroup>
 
 </Project>

src/YSAI.Log/LogBase.cs

@@ -31,7 +31,7 @@ namespace YSAI.Log
         /// <summary>
         /// 日期的时间格式
         /// </summary>
-        public static string LogInfoTimeFormat = "yyyy-MM-dd HH:mm:ss:ffff";
+        public static string LogInfoTimeFormat = "yyyy-MM-dd HH:mm:ss.fff";
 
         /// <summary>
         /// 日志输出的路径
@@ -105,7 +105,7 @@ namespace YSAI.Log
                 }
 
                 //模版
-                string template = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} | {Level:u3} | {Message:lj}{NewLine}{Exception}";
+                string template = "{Timestamp:" + LogInfoTimeFormat + "} | {Level:u3} | {Message:lj}{NewLine}{Exception}";
 
                 //文件夹路径
                 string folder = $"{LogFileLocation}{LogFolderName}/{DateTime.Now.ToString("yyyy-MM-dd")}/";

src/YSAI.Log/YSAI.Log.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	<Version>1.0.0.12</Version>
+	<Version>1.0.0.13</Version>
 	<Authors>Shun</Authors>
     <Company>YSAI</Company>
     <Product>SCADA</Product>

src/YSAI.Opc/ua/service/core/Node.cs

@@ -3263,7 +3263,7 @@ namespace YSAI.Opc.ua.service.core
                     //循环添加节点
                     foreach (var item in datatype)
                     {
-                        nodes_Static.Add(new NodeJsonStructuralBody() { Name = $"{item}_Static", DataType = item, Description = "静态常量", CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff") });
+                        nodes_Static.Add(new NodeJsonStructuralBody() { Name = $"{item}_Static", DataType = item, Description = "静态常量", CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") });
                     }
                     //数据赋值
                     Devices_Static.Nodes = nodes_Static;
@@ -3276,13 +3276,13 @@ namespace YSAI.Opc.ua.service.core
                     //循环添加节点
                     foreach (var item in datatype)
                     {
-                        nodes_Dynamic.Add(new NodeJsonStructuralBody() { Name = $"{item}_Dynamic", DataType = item, Description = "动态常量", CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff"), IsDynamic = true });
+                        nodes_Dynamic.Add(new NodeJsonStructuralBody() { Name = $"{item}_Dynamic", DataType = item, Description = "动态常量", CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), IsDynamic = true });
                     }
                     //数据赋值
                     Devices_Dynamic.Nodes = nodes_Dynamic;
 
                     //创建车间
-                    NodeJsonStructuralBody nodeStructuralBody = new NodeJsonStructuralBody() { Name = "YSAI", CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff"), Description = "YSAI节点测试" };
+                    NodeJsonStructuralBody nodeStructuralBody = new NodeJsonStructuralBody() { Name = "YSAI", CreateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), Description = "YSAI节点测试" };
                     nodeStructuralBody.Nodes = new List<NodeJsonStructuralBody>();
                     nodeStructuralBody.Nodes.Add(Devices_Static);
                     nodeStructuralBody.Nodes.Add(Devices_Dynamic);

src/YSAI.Test.All/Program.cs

@@ -1,6 +1,6 @@
 
 
-//Console.WriteLine(DateTime.Parse($"{0}:{0}:{0}.{123}").ToString("HH:mm:ss:fff"));
+//Console.WriteLine(DateTime.Parse($"{0}:{0}:{0}.{123}").ToString("HH:mm:ss.fff"));
 
 //using YSAI.Unility;
 

src/YSAI.Tool.Core/serialport/SerialPortToolController.cs

@@ -463,11 +463,11 @@ namespace YSAI.Tool.Core.serialport
         //        string DirectionStr = Direction == 0 ? "Receive" : "Send";
         //        if (Direction == 0)
         //        {
-        //            ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss:ffff")} ][ {DirectionStr} ]\r\n{Data}\r\n" + ReceiveData;
+        //            ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss.fff")} ][ {DirectionStr} ]\r\n{Data}\r\n" + ReceiveData;
         //        }
         //        else
         //        {
-        //            ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss:ffff")} ][ {DirectionStr} ]{Data}\r\n" + ReceiveData;
+        //            ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss.fff")} ][ {DirectionStr} ]{Data}\r\n" + ReceiveData;
         //        }
         //    }));
         //}

src/YSAI.Tool.Core/sockettcpclient/SocketTcpClientToolController.cs

@@ -329,11 +329,11 @@ namespace YSAI.Tool.Core.sockettcpclient
                 string DirectionStr = Direction == 0 ? "Receive" : "Send";
                 if (Direction == 0)
                 {
-                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss:ffff")} ][ {Address} ][ {DirectionStr} ]\r\n{Data}\r\n" + ReceiveData;
+                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss.fff")} ][ {Address} ][ {DirectionStr} ]\r\n{Data}\r\n" + ReceiveData;
                 }
                 else
                 {
-                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss:ffff")} ][ {Address} ][ {DirectionStr} ]{Data}\r\n" + ReceiveData;
+                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss.fff")} ][ {Address} ][ {DirectionStr} ]{Data}\r\n" + ReceiveData;
                 }
             }));
         }

src/YSAI.Tool.Core/sockettcpserver/SocketTcpServerToolController.cs

@@ -451,11 +451,11 @@ namespace YSAI.Tool.Core.sockettcpserver
                 string DirectionStr = Direction == 0 ? "Receive" : "Send";
                 if (Direction == 0)
                 {
-                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss:ffff")} ][ {Address} ][ {DirectionStr} ]\r\n{Data}\r\n" + ReceiveData;
+                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss.fff")} ][ {Address} ][ {DirectionStr} ]\r\n{Data}\r\n" + ReceiveData;
                 }
                 else
                 {
-                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss:ffff")} ][ {Address} ][ {DirectionStr} ]{Data}\r\n" + ReceiveData;
+                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss.fff")} ][ {Address} ][ {DirectionStr} ]{Data}\r\n" + ReceiveData;
                 }
             }));
         }

src/YSAI.Tool.Core/socketudp/SocketUdpToolController.cs

@@ -410,11 +410,11 @@ namespace YSAI.Tool.Core.socketudp
                 string DirectionStr = Direction == 0 ? "Receive" : "Send";
                 if (Direction == 0)
                 {
-                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss:ffff")} ][ {Address} ][ {DirectionStr} ]\r\n{Data}\r\n" + ReceiveData;
+                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss.fff")} ][ {Address} ][ {DirectionStr} ]\r\n{Data}\r\n" + ReceiveData;
                 }
                 else
                 {
-                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss:ffff")} ][ {Address} ][ {DirectionStr} ]{Data}\r\n" + ReceiveData;
+                    ReceiveData = $"[ {DateTime.Now.ToString("HH:mm:ss.fff")} ][ {Address} ][ {DirectionStr} ]{Data}\r\n" + ReceiveData;
                 }
             }));
         }

src/YSAI.Unility/ExtensionTool.cs

@@ -243,12 +243,12 @@ namespace YSAI.Unility
         }
 
         /// <summary>
-        /// 格式化为日期时间格式(yyyy-MM-dd HH:mm:ss:fff)
+        /// 格式化为日期时间格式(yyyy-MM-dd HH:mm:ss.fff)
         /// </summary>
         /// <param name="date"></param>
         public static string ToDateTimeString(this DateTime date)
         {
-            return date.ToString("yyyy-MM-dd HH:mm:ss:fff");
+            return date.ToString("yyyy-MM-dd HH:mm:ss.fff");
         }
 
         /// <summary>
@@ -280,13 +280,13 @@ namespace YSAI.Unility
         }
 
         /// <summary>
-        /// 取日期时间的 yyyy-MM-dd HH:mm:ss:fff
+        /// 取日期时间的 yyyy-MM-dd HH:mm:ss.fff
         /// </summary>
         /// <param name="date"></param>
         /// <returns></returns>
         public static DateTime GetDateDetails(this DateTime date)
         {
-            return date.ToString("yyyy-MM-dd HH:mm:ss:fff").ToDateTime();
+            return date.ToString("yyyy-MM-dd HH:mm:ss.fff").ToDateTime();
         }
 
         /// <summary>

src/YSAI.Unility/YSAI.Unility.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<Version>1.0.0.29</Version>
+		<Version>1.0.0.30</Version>
 		<Authors>Shun</Authors>
 		<Company>YSAI</Company>
 		<Product>SCADA</Product>