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

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.211" /> <PackageReference Include="SqlSugarCore" Version="5.1.3.38" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ApplicationIcon /> <ApplicationIcon />
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<StartupObject /> <StartupObject />
@@ -18,10 +18,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="6.2.2" /> <PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -8,13 +8,11 @@ using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using System.Text; using System.Text;
using System.Text.Json;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Web; using System.Web;
using System.Xml; using System.Xml;
using System.Xml.Linq; using System.Xml.Linq;
namespace iMES.Core.Extensions namespace iMES.Core.Extensions
{ {
@@ -543,23 +541,28 @@ namespace iMES.Core.Extensions
return info; 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> /// <summary>

View File

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

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@@ -21,10 +21,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" /> <FrameworkReference Include="Microsoft.AspNetCore.App" />

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ApplicationIcon /> <ApplicationIcon />
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<StartupObject /> <StartupObject />
@@ -18,10 +18,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="6.2.2" /> <PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@@ -17,7 +17,8 @@
"DBType": "MsSql", //MySql/MsSql/PgSql //数据库类型如果使用的是sqlserver此处应设置为MsSql "DBType": "MsSql", //MySql/MsSql/PgSql //数据库类型如果使用的是sqlserver此处应设置为MsSql
//sqlserver连接字符串 //sqlserver连接字符串
//"DbConnectionString": "Data Source=.;Initial Catalog=iMES;Persist Security Info=True;User ID=sa;Password=sunlin786546;Connect Timeout=500;", //"DbConnectionString": "Data Source=.;Initial Catalog=iMES;Persist Security Info=True;User ID=sa;Password=sunlin786546;Connect Timeout=500;",
"DbConnectionString": "Data Source=.;Initial Catalog=iMES;Persist Security Info=True;User ID=sa;Password=sunlin786546;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;Packet Size=4096;", //"DbConnectionString": "Data Source=113.44.218.8;Initial Catalog=iMES;Persist Security Info=True;User ID=sa;Password=Sunlin786546+;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;Packet Size=4096;",
"DbConnectionString": "Data Source=.;Initial Catalog=iMES;Persist Security Info=True;User ID=sa;Password=123;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;Packet Size=4096;",
//mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20) //mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20)
//"DbConnectionString": " Data Source=127.0.0.1;Database=netcoredev1;AllowLoadLocalInfile=true;User ID=root;Password=jxx!@#123..errrewJXXX;allowPublicKeyRetrieval=true;pooling=true;CharSet=utf8;port=3306;sslmode=none;", //"DbConnectionString": " Data Source=127.0.0.1;Database=netcoredev1;AllowLoadLocalInfile=true;User ID=root;Password=jxx!@#123..errrewJXXX;allowPublicKeyRetrieval=true;pooling=true;CharSet=utf8;port=3306;sslmode=none;",

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UserSecretsId>bcbf6258-c4b4-4daf-8676-641b2abd648e</UserSecretsId> <UserSecretsId>bcbf6258-c4b4-4daf-8676-641b2abd648e</UserSecretsId>
</PropertyGroup> </PropertyGroup>
@@ -20,8 +20,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
<PackageReference Include="MiniExcel" Version="1.30.0" /> <PackageReference Include="MiniExcel" Version="1.30.0" />
<PackageReference Include="QuestPDF" Version="2022.12.1" /> <PackageReference Include="QuestPDF" Version="2022.12.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.0.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.0.0" />
@@ -37,6 +37,7 @@
<ProjectReference Include="..\iMES.Custom\iMES.Custom.csproj" /> <ProjectReference Include="..\iMES.Custom\iMES.Custom.csproj" />
<ProjectReference Include="..\iMES.Entity\iMES.Entity.csproj" /> <ProjectReference Include="..\iMES.Entity\iMES.Entity.csproj" />
<ProjectReference Include="..\iMES.Equip\iMES.Equip.csproj" /> <ProjectReference Include="..\iMES.Equip\iMES.Equip.csproj" />
<ProjectReference Include="..\iMES.Injection\iMES.Injection.csproj" />
<ProjectReference Include="..\iMES.Production\iMES.Production.csproj" /> <ProjectReference Include="..\iMES.Production\iMES.Production.csproj" />
<ProjectReference Include="..\iMES.Quality\iMES.Quality.csproj" /> <ProjectReference Include="..\iMES.Quality\iMES.Quality.csproj" />
<ProjectReference Include="..\iMES.Report\iMES.Report.csproj" /> <ProjectReference Include="..\iMES.Report\iMES.Report.csproj" />

View File

@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.29613.14 VisualStudioVersion = 17.14.36414.22 d17.14
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iMES.Core", "iMES.Core\iMES.Core.csproj", "{9F72743E-647E-4D37-85D1-07EC9CD0AB71}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iMES.Core", "iMES.Core\iMES.Core.csproj", "{9F72743E-647E-4D37-85D1-07EC9CD0AB71}"
EndProject EndProject
@@ -40,6 +40,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iMES.Bi.API", "iMES.Bi.API\
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iMES.Bi.Data", "iMES.Bi.Data\iMES.Bi.Data.csproj", "{9E2AE622-7047-464A-9F4F-B88DD34223A4}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iMES.Bi.Data", "iMES.Bi.Data\iMES.Bi.Data.csproj", "{9E2AE622-7047-464A-9F4F-B88DD34223A4}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iMES.Injection", "iMES.Injection\iMES.Injection.csproj", "{E750C801-4A25-4097-A54F-AEDCCF627737}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -110,6 +112,10 @@ Global
{9E2AE622-7047-464A-9F4F-B88DD34223A4}.Debug|Any CPU.Build.0 = Debug|Any CPU {9E2AE622-7047-464A-9F4F-B88DD34223A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9E2AE622-7047-464A-9F4F-B88DD34223A4}.Release|Any CPU.ActiveCfg = Release|Any CPU {9E2AE622-7047-464A-9F4F-B88DD34223A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9E2AE622-7047-464A-9F4F-B88DD34223A4}.Release|Any CPU.Build.0 = Release|Any CPU {9E2AE622-7047-464A-9F4F-B88DD34223A4}.Release|Any CPU.Build.0 = Release|Any CPU
{E750C801-4A25-4097-A54F-AEDCCF627737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E750C801-4A25-4097-A54F-AEDCCF627737}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E750C801-4A25-4097-A54F-AEDCCF627737}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E750C801-4A25-4097-A54F-AEDCCF627737}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE