0.7.0.4

Author: Yvees

src/SystemCommonLibrary.AspNetCore/SystemCommonLibrary.AspNetCore.csproj

@@ -3,12 +3,12 @@
   <PropertyGroup>
 	<TargetFramework>net7.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.7.0.3</Version>
+    <Version>0.7.0.4</Version>
     <Copyright>clawit.com</Copyright>
     <PackageLicenseUrl></PackageLicenseUrl>
     <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
-    <AssemblyVersion>0.7.0.3</AssemblyVersion>
-    <FileVersion>0.7.0.3</FileVersion>
+    <AssemblyVersion>0.7.0.4</AssemblyVersion>
+    <FileVersion>0.7.0.4</FileVersion>
     <Authors>clawit.com</Authors>
     <Company>clawit.com</Company>
   </PropertyGroup>

src/SystemCommonLibrary.Data/SystemCommonLibrary.Data.csproj

@@ -5,11 +5,11 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
     <Copyright>clawit.com</Copyright>
-    <Version>0.7.0.3</Version>
-    <AssemblyVersion>0.7.0.3</AssemblyVersion>
+    <Version>0.7.0.4</Version>
+    <AssemblyVersion>0.7.0.4</AssemblyVersion>
     <Authors>clawit.com</Authors>
     <Company>clawit.com</Company>
-    <FileVersion>0.7.0.3</FileVersion>
+    <FileVersion>0.7.0.4</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/SystemCommonLibrary/Reflect/TypeExtension.cs

@@ -13,5 +13,16 @@ public static bool IsRuntimeType(this Type type)
         {
             return type.FullName == "System.RuntimeType";
         }
+
+        public static bool IsStruct(this Type type)
+        {
+            return type.IsValueType &&
+                   !type.IsEnum &&
+                   !type.IsPrimitive &&
+                   type != typeof(decimal) &&
+                   type != typeof(DateTime) &&
+                   type != typeof(TimeSpan) &&
+                   type != typeof(Guid);
+        }
     }
 }

src/SystemCommonLibrary/Reflect/TypeInfo.cs

@@ -34,7 +34,7 @@ public static SlimTypeInfo GetOrAddInstance(Type type, string methodName = "Add"
             {
                 throw new Exception("服务方法中不能包含接口内容！");
             }
-            else if (type.IsClass)
+            else if (type.IsClass || type.IsStruct())
             {
                 var fullName = type.FullName + methodName;
 

src/SystemCommonLibrary/Serialization/BitSerializer.cs

@@ -354,7 +354,7 @@ public static byte[] Serialize(object param)
                 else
                 {
                     var type = param.GetType();
-                    if (type.IsClass)
+                    if (type.IsClass || type.IsStruct())
                     {
                         if (type.IsGenericType || type.IsArray)
                         {
@@ -514,7 +514,7 @@ public static object Deserialize(Type type, byte[] datas, ref int offset)
                         throw new NotImplementedException("未定义的类型：" + type.ToString());
                     }
                 }
-                else if (type.IsClass)
+                else if (type.IsClass || type.IsStruct())
                 {
                     obj = DeserializeInstanceWithFields(type, data);
                 }

src/SystemCommonLibrary/SystemCommonLibrary.csproj

@@ -4,9 +4,9 @@
 	<TargetFramework>net7.0</TargetFramework>
 
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.7.0.3</Version>
-    <AssemblyVersion>0.7.0.3</AssemblyVersion>
-    <FileVersion>0.7.0.3</FileVersion>
+    <Version>0.7.0.4</Version>
+    <AssemblyVersion>0.7.0.4</AssemblyVersion>
+    <FileVersion>0.7.0.4</FileVersion>
     <Copyright>clawit.com</Copyright>
     <PackageLicenseUrl></PackageLicenseUrl>
     <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>

src/UnitTest/BitSerializerTest.cs

@@ -77,6 +77,11 @@ public class ClassInherit : ClassBase {
         public int Dim1 { get; set; }
     }
 
+    public class ClassSize
+    { 
+        public Size Dim1 { get; set; }
+    }
+
     public class ClassParent
     {
         public ClassBase Dim0 { get; set; }
@@ -214,5 +219,17 @@ public void SerializeInherit()
             var dest2 = BitSerializer.Deserialize<ClassInherit>(bytes2);
             Assert.Equal(((ClassInherit)src2).Dim1, ((ClassInherit)dest2).Dim1);
         }
+
+        [Fact]
+        public void DeserializeSize() 
+        {
+            var src = new ClassSize() { 
+                Dim1 = new Size(600, 300)
+            };
+            var bytes = BitSerializer.Serialize(src);
+            var dest = BitSerializer.Deserialize<ClassSize>(bytes);
+            Assert.Equal(src.Dim1.Height, dest.Dim1.Height);
+            Assert.Equal(src.Dim1.Width, dest.Dim1.Width);
+        }
     }
 }