This commit is contained in:
2026-02-23 19:18:51 +08:00
parent f7f4c94c00
commit 0fba392cb0
19 changed files with 67 additions and 56 deletions

View File

@@ -8,13 +8,11 @@ using System.Linq.Expressions;
using System.Reflection;
using System.Runtime.Serialization.Formatters.Binary;
using System.Text;
using System.Text.Json;
using System.Text.RegularExpressions;
using System.Web;
using System.Xml;
using System.Xml.Linq;
namespace iMES.Core.Extensions
{
@@ -543,23 +541,28 @@ namespace iMES.Core.Extensions
return info;
}
public static T FromBytes<T>(this byte[] data)
public static byte[] ToBytes(this object obj)
{
if (data == null || data.Length == 0)
if (obj == null)
return null;
var bf = new BinaryFormatter();
using (var ms = new MemoryStream())
{
return default(T);
bf.Serialize(ms, obj);
return ms.ToArray();
}
return JsonSerializer.Deserialize<T>(data);
}
public static T ToObject<T>(this byte[] source)
public static object ToObject(this byte[] source)
{
if (source == null || source.Length == 0)
using (var memStream = new MemoryStream())
{
return default(T);
var bf = new BinaryFormatter();
memStream.Write(source, 0, source.Length);
memStream.Seek(0, SeekOrigin.Begin);
var obj = bf.Deserialize(memStream);
return obj;
}
return JsonSerializer.Deserialize<T>(source);
}
/// <summary>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<ApplicationIcon />
<OutputType>Library</OutputType>
<StartupObject />
@@ -35,8 +35,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="8.0.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac" Version="6.0.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Confluent.Kafka" Version="1.8.2" />
<PackageReference Include="CSRedisCore" Version="3.6.5" />
@@ -45,20 +45,20 @@
<PackageReference Include="EPPlus.Core" Version="1.5.4" />
<PackageReference Include="Haukcode.WkHtmlToPdfDotNet" Version="1.5.72" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.1.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Redis.Core" Version="1.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
<PackageReference Include="Npgsql" Version="6.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
<PackageReference Include="PinYinConverterCore" Version="1.0.2" />
<!--<PackageReference Include="MySql.Data" Version="8.0.13" />-->
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
<PackageReference Include="Quartz" Version="3.4.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.17.0" />
<PackageReference Include="ZKWeb.System.Drawing" Version="4.0.1" />
</ItemGroup>