From 500d02286c9956b697391f32927bc5c4fb3054b8 Mon Sep 17 00:00:00 2001 From: smartwyy <645583145@qq.com> Date: Sat, 4 May 2024 23:04:19 +0800 Subject: [PATCH] =?UTF-8?q?wpf=E9=9B=86=E6=88=90Autofac=E5=92=8CSqlsugar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HybirdFrameworkRepository.csproj | 1 + .../System/SysUserRepository.cs | 4 +- .../UnitOfWork/UnitOfWork.cs | 4 +- .../HybirdFrameworkRepository.deps.json | 289 ++++++++++++++++-- .../net6.0/ref/HybirdFrameworkRepository.dll | Bin 25600 -> 26112 bytes .../refint/HybirdFrameworkRepository.dll | Bin 25600 -> 26112 bytes ...FrameworkRepository.csproj.nuget.g.targets | 1 + .../System/SysUserServices.cs | 4 +- WpfStarter/App.xaml | 8 + WpfStarter/App.xaml.cs | 54 ++++ WpfStarter/AssemblyInfo.cs | 10 + WpfStarter/MainWindow.xaml | 13 + WpfStarter/MainWindow.xaml.cs | 33 ++ WpfStarter/WpfStarter.csproj | 35 +++ WpfStarter/appsettings.json | 18 ++ WpfStarter/log4net.xml | 32 ++ hybirdMyFrame.sln | 15 +- 17 files changed, 493 insertions(+), 28 deletions(-) create mode 100644 WpfStarter/App.xaml create mode 100644 WpfStarter/App.xaml.cs create mode 100644 WpfStarter/AssemblyInfo.cs create mode 100644 WpfStarter/MainWindow.xaml create mode 100644 WpfStarter/MainWindow.xaml.cs create mode 100644 WpfStarter/WpfStarter.csproj create mode 100644 WpfStarter/appsettings.json create mode 100644 WpfStarter/log4net.xml diff --git a/HybirdFrameworkRepository/HybirdFrameworkRepository.csproj b/HybirdFrameworkRepository/HybirdFrameworkRepository.csproj index e756aee..c7d82a5 100644 --- a/HybirdFrameworkRepository/HybirdFrameworkRepository.csproj +++ b/HybirdFrameworkRepository/HybirdFrameworkRepository.csproj @@ -12,6 +12,7 @@ + diff --git a/HybirdFrameworkRepository/System/SysUserRepository.cs b/HybirdFrameworkRepository/System/SysUserRepository.cs index 0c7f93c..9a9c0e6 100644 --- a/HybirdFrameworkRepository/System/SysUserRepository.cs +++ b/HybirdFrameworkRepository/System/SysUserRepository.cs @@ -1,9 +1,11 @@ -using HybirdFrameworkEntity.DbModel; +using HybirdFrameworkCore.Autofac.Attribute; +using HybirdFrameworkEntity.DbModel; using SqlSugar; namespace HybirdFrameworkRepository.System { + [Scope("SingleInstance")] public class SysUserRepository : BaseRepository { public SysUserRepository(ISqlSugarClient sqlSugar) : base(sqlSugar) diff --git a/HybirdFrameworkRepository/UnitOfWork/UnitOfWork.cs b/HybirdFrameworkRepository/UnitOfWork/UnitOfWork.cs index 5c35e52..40a98b4 100644 --- a/HybirdFrameworkRepository/UnitOfWork/UnitOfWork.cs +++ b/HybirdFrameworkRepository/UnitOfWork/UnitOfWork.cs @@ -1,7 +1,9 @@ -using SqlSugar; +using HybirdFrameworkCore.Autofac.Attribute; +using SqlSugar; namespace HybirdFrameworkRepository.UnitOfWork { + [Scope("SingleInstance")] public class UnitOfWork { private readonly ISqlSugarClient _sqlSugarClient; diff --git a/HybirdFrameworkRepository/bin/Debug/net6.0/HybirdFrameworkRepository.deps.json b/HybirdFrameworkRepository/bin/Debug/net6.0/HybirdFrameworkRepository.deps.json index 35b2840..e543d05 100644 --- a/HybirdFrameworkRepository/bin/Debug/net6.0/HybirdFrameworkRepository.deps.json +++ b/HybirdFrameworkRepository/bin/Debug/net6.0/HybirdFrameworkRepository.deps.json @@ -8,6 +8,7 @@ ".NETCoreApp,Version=v6.0": { "HybirdFrameworkRepository/1.0.0": { "dependencies": { + "HybirdFrameworkCore": "1.0.0", "HybirdFrameworkEntity": "1.0.0", "SqlSugar.IOC": "2.0.0", "SqlSugarCore": "5.1.4.95" @@ -16,6 +17,28 @@ "HybirdFrameworkRepository.dll": {} } }, + "Autofac/7.0.1": { + "dependencies": { + "System.Diagnostics.DiagnosticSource": "4.7.1" + }, + "runtime": { + "lib/net6.0/Autofac.dll": { + "assemblyVersion": "7.0.1.0", + "fileVersion": "7.0.1.0" + } + } + }, + "log4net/2.0.15": { + "dependencies": { + "System.Configuration.ConfigurationManager": "6.0.0" + }, + "runtime": { + "lib/netstandard2.0/log4net.dll": { + "assemblyVersion": "2.0.15.0", + "fileVersion": "2.0.15.0" + } + } + }, "Microsoft.CSharp/4.5.0": {}, "Microsoft.Data.SqlClient/2.1.4": { "dependencies": { @@ -25,7 +48,7 @@ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.8.0", "Microsoft.Win32.Registry": "4.7.0", "System.Configuration.ConfigurationManager": "6.0.0", - "System.Diagnostics.DiagnosticSource": "4.7.0", + "System.Diagnostics.DiagnosticSource": "4.7.1", "System.Runtime.Caching": "4.7.0", "System.Security.Principal.Windows": "4.7.0", "System.Text.Encoding.CodePages": "5.0.0" @@ -92,6 +115,59 @@ } } }, + "Microsoft.Extensions.Configuration/7.0.0": { + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0", + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "runtime": { + "lib/net6.0/Microsoft.Extensions.Configuration.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "runtime": { + "lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "Microsoft.Extensions.Configuration.FileExtensions/7.0.0": { + "dependencies": { + "Microsoft.Extensions.Configuration": "7.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "7.0.0", + "Microsoft.Extensions.FileProviders.Physical": "7.0.0", + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "runtime": { + "lib/net6.0/Microsoft.Extensions.Configuration.FileExtensions.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "Microsoft.Extensions.Configuration.Json/7.0.0": { + "dependencies": { + "Microsoft.Extensions.Configuration": "7.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "7.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "7.0.0", + "System.Text.Json": "7.0.0" + }, + "runtime": { + "lib/net6.0/Microsoft.Extensions.Configuration.Json.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { "runtime": { "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { @@ -100,6 +176,49 @@ } } }, + "Microsoft.Extensions.FileProviders.Abstractions/7.0.0": { + "dependencies": { + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "runtime": { + "lib/net6.0/Microsoft.Extensions.FileProviders.Abstractions.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "Microsoft.Extensions.FileProviders.Physical/7.0.0": { + "dependencies": { + "Microsoft.Extensions.FileProviders.Abstractions": "7.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "7.0.0", + "Microsoft.Extensions.Primitives": "7.0.0" + }, + "runtime": { + "lib/net6.0/Microsoft.Extensions.FileProviders.Physical.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "Microsoft.Extensions.FileSystemGlobbing/7.0.0": { + "runtime": { + "lib/net6.0/Microsoft.Extensions.FileSystemGlobbing.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "Microsoft.Extensions.Primitives/7.0.0": { + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + }, + "runtime": { + "lib/net6.0/Microsoft.Extensions.Primitives.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, "Microsoft.Identity.Client/4.21.1": { "runtime": { "lib/netcoreapp2.1/Microsoft.Identity.Client.dll": { @@ -196,17 +315,17 @@ } } }, - "Newtonsoft.Json/13.0.2": { + "Newtonsoft.Json/13.0.3": { "runtime": { "lib/net6.0/Newtonsoft.Json.dll": { "assemblyVersion": "13.0.0.0", - "fileVersion": "13.0.2.27524" + "fileVersion": "13.0.3.27908" } } }, "Npgsql/5.0.7": { "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "4.6.0" + "System.Runtime.CompilerServices.Unsafe": "6.0.0" }, "runtime": { "lib/net5.0/Npgsql.dll": { @@ -398,7 +517,7 @@ "Microsoft.Data.SqlClient": "2.1.4", "Microsoft.Data.Sqlite": "7.0.5", "MySqlConnector": "2.2.5", - "Newtonsoft.Json": "13.0.2", + "Newtonsoft.Json": "13.0.3", "Npgsql": "5.0.7", "Oracle.ManagedDataAccess.Core": "3.21.100", "SqlSugarCore.Dm": "1.2.0", @@ -463,7 +582,7 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Diagnostics.DiagnosticSource/4.7.0": {}, + "System.Diagnostics.DiagnosticSource/4.7.1": {}, "System.Diagnostics.PerformanceCounter/6.0.1": { "dependencies": { "System.Configuration.ConfigurationManager": "6.0.0" @@ -650,7 +769,7 @@ } } }, - "System.Runtime.CompilerServices.Unsafe/4.6.0": {}, + "System.Runtime.CompilerServices.Unsafe/6.0.0": {}, "System.Runtime.Extensions/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "5.0.0", @@ -708,6 +827,37 @@ "Microsoft.NETCore.Platforms": "5.0.0" } }, + "System.Text.Encodings.Web/7.0.0": { + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + }, + "runtime": { + "lib/net6.0/System.Text.Encodings.Web.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + }, + "runtimeTargets": { + "runtimes/browser/lib/net6.0/System.Text.Encodings.Web.dll": { + "rid": "browser", + "assetType": "runtime", + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, + "System.Text.Json/7.0.0": { + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "7.0.0" + }, + "runtime": { + "lib/net6.0/System.Text.Json.dll": { + "assemblyVersion": "7.0.0.0", + "fileVersion": "7.0.22.51805" + } + } + }, "System.Text.RegularExpressions/4.3.0": { "dependencies": { "System.Runtime": "4.3.0" @@ -739,6 +889,18 @@ } } }, + "HybirdFrameworkCore/1.0.0": { + "dependencies": { + "Autofac": "7.0.1", + "Microsoft.Extensions.Configuration.Abstractions": "7.0.0", + "Microsoft.Extensions.Configuration.Json": "7.0.0", + "Newtonsoft.Json": "13.0.3", + "log4net": "2.0.15" + }, + "runtime": { + "HybirdFrameworkCore.dll": {} + } + }, "HybirdFrameworkEntity/1.0.0": { "dependencies": { "SqlSugarCore": "5.1.4.95" @@ -755,6 +917,20 @@ "serviceable": false, "sha512": "" }, + "Autofac/7.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-J9Iz0Q+YU3uf82i8Lee0NpQOlRYfwHxwVV26jdG3zH3LFE5Y9Rx97Mju7Nswwzh/C7kVJALkTL860Y7e+mcLaw==", + "path": "autofac/7.0.1", + "hashPath": "autofac.7.0.1.nupkg.sha512" + }, + "log4net/2.0.15": { + "type": "package", + "serviceable": true, + "sha512": "sha512-GahnO9ZgFka+xYcFwAfIFjW+k86P2nxFoaEpH6t3v4hiGj7tv2ksVZphxCVIHmJxoySS0HeU3dgCW+bSCcfD0A==", + "path": "log4net/2.0.15", + "hashPath": "log4net.2.0.15.nupkg.sha512" + }, "Microsoft.CSharp/4.5.0": { "type": "package", "serviceable": true, @@ -790,6 +966,34 @@ "path": "microsoft.data.sqlite.core/7.0.5", "hashPath": "microsoft.data.sqlite.core.7.0.5.nupkg.sha512" }, + "Microsoft.Extensions.Configuration/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-tldQUBWt/xeH2K7/hMPPo5g8zuLc3Ro9I5d4o/XrxvxOCA2EZBtW7bCHHTc49fcBtvB8tLAb/Qsmfrq+2SJ4vA==", + "path": "microsoft.extensions.configuration/7.0.0", + "hashPath": "microsoft.extensions.configuration.7.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Abstractions/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==", + "path": "microsoft.extensions.configuration.abstractions/7.0.0", + "hashPath": "microsoft.extensions.configuration.abstractions.7.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.FileExtensions/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-xk2lRJ1RDuqe57BmgvRPyCt6zyePKUmvT6iuXqiHR+/OIIgWVR8Ff5k2p6DwmqY8a17hx/OnrekEhziEIeQP6Q==", + "path": "microsoft.extensions.configuration.fileextensions/7.0.0", + "hashPath": "microsoft.extensions.configuration.fileextensions.7.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Configuration.Json/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-LDNYe3uw76W35Jci+be4LDf2lkQZe0A7EEYQVChFbc509CpZ4Iupod8li4PUXPBhEUOFI/rlQNf5xkzJRQGvtA==", + "path": "microsoft.extensions.configuration.json/7.0.0", + "hashPath": "microsoft.extensions.configuration.json.7.0.0.nupkg.sha512" + }, "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { "type": "package", "serviceable": true, @@ -797,6 +1001,34 @@ "path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0", "hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512" }, + "Microsoft.Extensions.FileProviders.Abstractions/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-NyawiW9ZT/liQb34k9YqBSNPLuuPkrjMgQZ24Y/xXX1RoiBkLUdPMaQTmxhZ5TYu8ZKZ9qayzil75JX95vGQUg==", + "path": "microsoft.extensions.fileproviders.abstractions/7.0.0", + "hashPath": "microsoft.extensions.fileproviders.abstractions.7.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.FileProviders.Physical/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-K8D2MTR+EtzkbZ8z80LrG7Ur64R7ZZdRLt1J5cgpc/pUWl0C6IkAUapPuK28oionHueCPELUqq0oYEvZfalNdg==", + "path": "microsoft.extensions.fileproviders.physical/7.0.0", + "hashPath": "microsoft.extensions.fileproviders.physical.7.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.FileSystemGlobbing/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2jONjKHiF+E92ynz2ZFcr9OvxIw+rTGMPEH+UZGeHTEComVav93jQUWGkso8yWwVBcEJGcNcZAaqY01FFJcj7w==", + "path": "microsoft.extensions.filesystemglobbing/7.0.0", + "hashPath": "microsoft.extensions.filesystemglobbing.7.0.0.nupkg.sha512" + }, + "Microsoft.Extensions.Primitives/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q==", + "path": "microsoft.extensions.primitives/7.0.0", + "hashPath": "microsoft.extensions.primitives.7.0.0.nupkg.sha512" + }, "Microsoft.Identity.Client/4.21.1": { "type": "package", "serviceable": true, @@ -874,12 +1106,12 @@ "path": "mysqlconnector/2.2.5", "hashPath": "mysqlconnector.2.2.5.nupkg.sha512" }, - "Newtonsoft.Json/13.0.2": { + "Newtonsoft.Json/13.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-R2pZ3B0UjeyHShm9vG+Tu0EBb2lC8b0dFzV9gVn50ofHXh9Smjk6kTn7A/FdAsC8B5cKib1OnGYOXxRBz5XQDg==", - "path": "newtonsoft.json/13.0.2", - "hashPath": "newtonsoft.json.13.0.2.nupkg.sha512" + "sha512": "sha512-HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==", + "path": "newtonsoft.json/13.0.3", + "hashPath": "newtonsoft.json.13.0.3.nupkg.sha512" }, "Npgsql/5.0.7": { "type": "package", @@ -972,12 +1204,12 @@ "path": "system.data.common/4.3.0", "hashPath": "system.data.common.4.3.0.nupkg.sha512" }, - "System.Diagnostics.DiagnosticSource/4.7.0": { + "System.Diagnostics.DiagnosticSource/4.7.1": { "type": "package", "serviceable": true, - "sha512": "sha512-oJjw3uFuVDJiJNbCD8HB4a2p3NYLdt1fiT5OGsPLw+WTOuG0KpP4OXelMmmVKpClueMsit6xOlzy4wNKQFiBLg==", - "path": "system.diagnostics.diagnosticsource/4.7.0", - "hashPath": "system.diagnostics.diagnosticsource.4.7.0.nupkg.sha512" + "sha512": "sha512-j81Lovt90PDAq8kLpaJfJKV/rWdWuEk6jfV+MBkee33vzYLEUsy4gXK8laa9V2nZlLM9VM9yA/OOQxxPEJKAMw==", + "path": "system.diagnostics.diagnosticsource/4.7.1", + "hashPath": "system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512" }, "System.Diagnostics.PerformanceCounter/6.0.1": { "type": "package", @@ -1084,12 +1316,12 @@ "path": "system.runtime.caching/4.7.0", "hashPath": "system.runtime.caching.4.7.0.nupkg.sha512" }, - "System.Runtime.CompilerServices.Unsafe/4.6.0": { + "System.Runtime.CompilerServices.Unsafe/6.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-HxozeSlipUK7dAroTYwIcGwKDeOVpQnJlpVaOkBz7CM4TsE5b/tKlQBZecTjh6FzcSbxndYaxxpsBMz+wMJeyw==", - "path": "system.runtime.compilerservices.unsafe/4.6.0", - "hashPath": "system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512" + "sha512": "sha512-/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==", + "path": "system.runtime.compilerservices.unsafe/6.0.0", + "hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512" }, "System.Runtime.Extensions/4.3.0": { "type": "package", @@ -1154,6 +1386,20 @@ "path": "system.text.encoding.codepages/5.0.0", "hashPath": "system.text.encoding.codepages.5.0.0.nupkg.sha512" }, + "System.Text.Encodings.Web/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg==", + "path": "system.text.encodings.web/7.0.0", + "hashPath": "system.text.encodings.web.7.0.0.nupkg.sha512" + }, + "System.Text.Json/7.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-DaGSsVqKsn/ia6RG8frjwmJonfos0srquhw09TlT8KRw5I43E+4gs+/bZj4K0vShJ5H9imCuXupb4RmS+dBy3w==", + "path": "system.text.json/7.0.0", + "hashPath": "system.text.json.7.0.0.nupkg.sha512" + }, "System.Text.RegularExpressions/4.3.0": { "type": "package", "serviceable": true, @@ -1175,6 +1421,11 @@ "path": "system.windows.extensions/6.0.0", "hashPath": "system.windows.extensions.6.0.0.nupkg.sha512" }, + "HybirdFrameworkCore/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, "HybirdFrameworkEntity/1.0.0": { "type": "project", "serviceable": false, diff --git a/HybirdFrameworkRepository/obj/Debug/net6.0/ref/HybirdFrameworkRepository.dll b/HybirdFrameworkRepository/obj/Debug/net6.0/ref/HybirdFrameworkRepository.dll index 76ccfbb731d6d8b66cbfbd85af08c3322101869b..6d7c9c8b0bca94386ba465df841cc51c95de086b 100644 GIT binary patch delta 6528 zcmbtZ4RjRM6@G7aXJ&V237g$bHta%ZAc1f&2|tzuicL~0KLHI8tObG)LXec7U;rgj zm~im4(xL@k6*x+P+H-2qHp;f1o>MI0a6Cn-MT>~3C4xnMDwUMq2Bh@f_jc#al5C9a zo-=pu_uYHH_cL#1XWup+qK$9UO-~JYesoO}iG5Cz0beudFhXVm;S%J`ZJYOeC&jgm zka8q;5wg#*IV<38A;b&#!d621vMl8;HiMRX=6)Bb5;$hEy>uv@%i8E*IzOr@H>gih zRM)2U-#Qc#BalS0^lj^x7uJjf}PMpW)Qds z;5b0V06pM?OEft0;Ft;rAs!EM$WC(2H8j$~?Kn63&*?cvfHWEy^>Zfddcv)dJa@B4 zBfDK_ALe#7wL@YOeLsLHUbJg5WLQzPvv)}99abfVG&;7?PKIm~T_!$eS_VJ9vS zv?E2bV0BZtXRZIN;(pLZR*zXfBBP$N;+E zjj_2P=1e6JA2}e@_4FI&1qt^fp0#wJ*HvmN^yVok_PmC>O5LxMd4pvDY zeLL88&kJB_$}hm~Fkb4!zuG1LhW5KI`Ah1XUGkO2A>_?Y4OAL$Cn@oV+AC*p;p> zWt=xPa>f_~#fev1gva-omn)_#welpLtE8IQ%|t;s7QL=v7hlq9k_ce~MMiD6QCx1F zFP7Qv!Df!|RoXe+?m_9_XiLDJ^P)|bBQ91?auNn(cCmc0Nge)YX`pdFno%dW5Hbk|gsA&$Nps)4TB2N^*FzoI0{R_tg<0+O*Op^j}!&CLuOT)Z)LH(J!!a~JH zle*GE4QjLcn1!JHq)_=H7#>}0e5$UtVh!p=_4^hoHg2hFEYzTC+FA=$vGTMC{W)8d z78yO=GfVrS6`8F*rv1o5(>>2>Pg`iVx>ws|q3LXYT1CGm_h!A>;vP^B=}`;qWd-Sx z-c9Z$uKgC*#Ac*N%yw_S`%e}(Q2VC)ojBr)?9Vn-pje1J?w#yD5|5FE@V+TgeFBW_n{k6UjlfL|7e1qWbSLlMU}9`g7XG&FUjY_^ISTQ6f}~ zBcXUkX0qm(;#nKl8dE$cIZ%`c72`-Ko|l;{FD&}=56MBbL|7e1qWUwL$<~F%2rt;U zmt%_mlpH8Zgo<$_6hD`l>~>7?qKz985q)fz94JbJig6?q|0OfonppKE$w9S5SRF^A z`m)Sq??uE2uh_VoF~zHr14W5YF^+`dHJQoE`wGSDHm;$s7~#Jq2Z|D*VjKy@4w=c` ziB;c_98^n$)o~=MZ^}%T)lc;23mZ47pXkpm$$_Fos2E2=@jo(??TjhjwsCL86bTjI zs_^^(MTt-`j)WqWnXF%?=#L^fsFnz;<49CHWF~twQ;g7QtYsNX1BfTJQ@ny zLhx1>vnYB7HffOQiEpnJzS)_IGYVXqJN;Y_Hgg~Bhf!kpZ$l>(cw0r@?u%|+ff;hZ zYbwrDToZMGH#-I5P0CRsBcz4Bq#`41B_I9&ZcR$MFHX2xd>O{BTv8ur;ws!7@#QQQ zU=qemSZ+y@y2-(56!%UW+(AzGJ>>JrCER@!J8JHLJ3D^EpoGdL@Fx{cvgmvFIcq>c zfggo9;tfuDFZ75vziPq%kzc?&Di$yLlrZmDJc*~Eky36aayymV8QfNJTg&aEU@6%EHjOlajgZ$klf}O%vM4@~hf~ZM z4b}(K-V62>6_OUs8Pu$34*DV)6^g!}8>HI33ir*HTivNi@qNC1Hfl02YJp>p0hr0h*=gI>4N-FiEA~P#!GPlINnhXpOH)>KhY6ieUTfi?0lpxQB<{LxH zLRD^5Th6165dC$akyowbJmY*6Evw28<&=epXEhlWBp$8|d!L{Twk(vzecTN#i|)wp ztDve$l;kELi-|z)oy^O@8Uh6?F@$s`E=%z<&qxR^9QNF@vZ2tajh=8JNiWV>0bT-B`Fo~2gKr8?q!Af3)l!_9tXA5MDvPzrO1EA9ku-PslhV zwi2@6Rh1tO93UhBcoqb@vV7%sR!+z1Cnf<^3ddyjD(yq3veUE|oe|fRt2DUoj??wC zp13;h#nz0Cy|&$^#?##wXb#y40{FWJ4uz;>LMb6Zkf9)2%oLJC$vcpxDM z(!ei!{IQBh=PU+>92h}}8_oq2%g9^c2hkrjarE7AJ_dLg+okoQ1K24oVuXPk3&-n} zkO$zb!vQX|Nk|bKi_`8Q{~%Iqz&; zBa^w!$!c>gV936gL3IUHvmrn?cE-<-N4sLNuV11mo;QI@XVdim_|;JpZGfw zoo;o9NF!+gg*e6hOL}qaet?de1Gt9u2$g^z+A%2(IAO< zruv85Xdw&+kz(**Elk^RSZFs{4U3gd$EJ-YE?9y}DEy;eplKi$B;Dx~K8#I+;vjj} zC(v{=cAm#(^H{&M^RNgmGKZr>f%85c&|Hpc0d)dYL8hQg4y1+vJ|aW`WdWMU(J4sH z0rX>zmP0HL(0q=(fVu;El%u(TdIDO&(M70>-|t(c7$g1bNKbOR@3*i&RL=&mHTov7 zd(-{^c7lI<8@@Iv|C+WpDSuHtl#~zq4Cq=<~Dfr_l_>(F4GY;O6BM$pN zaRi+Fg`|8lAMqo;mNwBVz;q;fS)~TmNHU2|zzd1XY9vL@t&W_c6gk+HWJ_uBhDJ8~ zOQ1M$rA2sDhk3bUlBtbL(YYy9GuoLb2%FKf8g_BJ_M;R+*uVw7qTMKNx3)8F)acku zJ>R8m!!6e_6AC(zulQ4SbRj4Y)>nf4 zp8hMaYuv^bI3*j?%RF^IPp#*vAE(G{=9x~>RGK#+(>YJofei+XufT_+Ox6imFhQ3) z0Lt2}!uf0R;T$AxYOzTZH#O}4ue;yjeNgOxwsMWUnd^SPlB}`a{vhzF?u`7hEGIAc z@qYA6Ze=s~mBJql^0VxtI{t~0sE6W2g$YQ;ehPK$x%A#c8}w1o1GAh|sAY=RMh*H* zMYmCfx4dXyey(NJ{gK`pLi*^z+yw$jB$2eq?GR~rRX)pd)F4zdLy)OZFo zj%zipm>nrl_qvAI=(zT0SBZ@Z)X!XZ+GqxA1dSQ&TBsQ8pm3qmsWt3GC<7M;D6k)y!rNJb8*)TvAC*fRA^ zb*YV7^m=ufjh3k=)a5pU^1Mv0Qj(dIn;i(lJ=9v@U#JDzY8#caMVV3RXKT6L!R?{U zGCGZQ$%^)=2)Mj^?A%&4=G|wbX}PXGLiZTagtta6i6lMPQfpQ*1=~2JZFM zTQSlNG9@ZZKp`jMd)&_Cnu+K=OEdeZ0Sz`t2o&8B2=`HQ2bbCva~LuKW8Ne)e>Q~g+%o^naQSi z5hMJEgL}qQY?2%(N`#6Q5{jS5Ox9>B{?ozvazr0Ll^iHago+jtisxk}d&sQ*Oma{y z5msABRDUir*(*6>g#U7IADD_?NDdSwLPZM+#S1c%^@|F{FCAQYRE+T7k^@DFP|-p{ z@uJLRFPhbtBnQ>!R3c#eZ{SdC>gLyqqD?burXtcnEE$ zcWpVeH>Y4w?$!3A*wG1a1zQ&eDyUom-@S0cMc3QOF(7F$NGS07 zh$CL(mYe?n!5iPC;U*Z9Lc}gbpOWvx$6xC%Chle5&@xw#E9-iM*!3Q}`GaseIjXCq z3s_3>!RllH_lJTFlDoJa&Fy$@%ekG-Z3VZBz*4dXY$n+OHcDRMOg=nof+oeA?*NK9 z3Q2>{j|$1;HaA|}bB7Xd>YYJfz3pCCS}ZctGmkt?7JEV@#>$HdXpF5a$_2ZzsIWK| z8RP{%QtDkn#)L|}PeJBgz~m{5IbR7p3srJ{HRl=f>{?N-ClGFGDw(I0fsI9`!&k`1vler|5^`P&SMr?IoM)Vmb9(@ym%;~l^bKJ0luO97s=g5z zMZS*AAh5CcuD+c$I+h(8eCwUn_}v@clI3qH`4sL2H**b~6CcB^+~1|ehuzUcX-`&A z+zafO;%;E)6+dkBg#C~K6aFXI6$H+;RN-gA$4x$N@^K>gT_(TFG7yZH|Z9P^v#msaIxDLdD*fm3J2J59UlQjQh#|6Nq| G_xumVDV!Go diff --git a/HybirdFrameworkRepository/obj/Debug/net6.0/refint/HybirdFrameworkRepository.dll b/HybirdFrameworkRepository/obj/Debug/net6.0/refint/HybirdFrameworkRepository.dll index 76ccfbb731d6d8b66cbfbd85af08c3322101869b..6d7c9c8b0bca94386ba465df841cc51c95de086b 100644 GIT binary patch delta 6528 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 G_xumVDV!Go diff --git a/HybirdFrameworkRepository/obj/HybirdFrameworkRepository.csproj.nuget.g.targets b/HybirdFrameworkRepository/obj/HybirdFrameworkRepository.csproj.nuget.g.targets index 8861a95..6a3c0bd 100644 --- a/HybirdFrameworkRepository/obj/HybirdFrameworkRepository.csproj.nuget.g.targets +++ b/HybirdFrameworkRepository/obj/HybirdFrameworkRepository.csproj.nuget.g.targets @@ -1,6 +1,7 @@  + \ No newline at end of file diff --git a/HybirdFrameworkServices/System/SysUserServices.cs b/HybirdFrameworkServices/System/SysUserServices.cs index bd29278..8663fb1 100644 --- a/HybirdFrameworkServices/System/SysUserServices.cs +++ b/HybirdFrameworkServices/System/SysUserServices.cs @@ -1,9 +1,11 @@ -using HybirdFrameworkEntity.DbModel; +using HybirdFrameworkCore.Autofac.Attribute; +using HybirdFrameworkEntity.DbModel; using HybirdFrameworkRepository.System; using HybirdFrameworkRepository.UnitOfWork; namespace HybirdFrameworkServices.System { + [Scope("SingleInstance")] public class SysUserServices : BaseServices { private readonly SysUserRepository _dal; diff --git a/WpfStarter/App.xaml b/WpfStarter/App.xaml new file mode 100644 index 0000000..9adb9a3 --- /dev/null +++ b/WpfStarter/App.xaml @@ -0,0 +1,8 @@ + + + + + diff --git a/WpfStarter/App.xaml.cs b/WpfStarter/App.xaml.cs new file mode 100644 index 0000000..6974958 --- /dev/null +++ b/WpfStarter/App.xaml.cs @@ -0,0 +1,54 @@ +using System.Windows; +using Autofac; +using HybirdFrameworkCore.Autofac; +using HybirdFrameworkCore.Configuration; +using SqlSugar; +using SqlSugar.IOC; + +namespace WpfStarter +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + public App() + { + ContainerBuilder cb = new ContainerBuilder(); + cb.Register(c => + { + var db = new SqlSugarClient(new ConnectionConfig + { + ConfigId = AppSettingsConstVars.ConfigId, + ConnectionString = AppSettingsConstVars.DbSqlConnection, // 设置数据库连接字符串 + DbType = AppSettingsConstVars.DbDbType == IocDbType.MySql.ToString() + ? DbType.MySql + : DbType.SqlServer, + IsAutoCloseConnection = true, + InitKeyType = InitKeyType.Attribute // 如果使用实体类的属性进行主键标识,请设置为 InitKeyType.Attribute + }); + return db; + }).As().InstancePerLifetimeScope(); + + cb.RegisterModule(new AutofacModuleRegister()); + + var baseType = typeof(Window); + cb.RegisterAssemblyTypes(typeof(App).Assembly) + .Where(t => baseType.IsAssignableFrom(t) && t != baseType) + .InstancePerDependency(); + + // cb.RegisterType(typeof(MainWindow)).SingleInstance(); + + // 构建容器 + var Container = cb.Build(); + AppInfo.Container = Container.BeginLifetimeScope("root"); + } + + protected override void OnStartup(StartupEventArgs e) + { + base.OnStartup(e); + MainWindow mainWindow = AppInfo.Container.Resolve(); + mainWindow.Show(); + } + } +} \ No newline at end of file diff --git a/WpfStarter/AssemblyInfo.cs b/WpfStarter/AssemblyInfo.cs new file mode 100644 index 0000000..4a05c7d --- /dev/null +++ b/WpfStarter/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] \ No newline at end of file diff --git a/WpfStarter/MainWindow.xaml b/WpfStarter/MainWindow.xaml new file mode 100644 index 0000000..dbe325b --- /dev/null +++ b/WpfStarter/MainWindow.xaml @@ -0,0 +1,13 @@ + + + + + + diff --git a/WpfStarter/MainWindow.xaml.cs b/WpfStarter/MainWindow.xaml.cs new file mode 100644 index 0000000..3a2ad63 --- /dev/null +++ b/WpfStarter/MainWindow.xaml.cs @@ -0,0 +1,33 @@ +using System.Collections.Generic; +using System.Windows; +using Autofac; +using HybirdFrameworkCore.Autofac; +using HybirdFrameworkEntity.DbModel; +using HybirdFrameworkServices.System; +using log4net; + +namespace WpfStarter +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + private static readonly ILog Log = LogManager.GetLogger(typeof(MainWindow)); + + private SysUserServices _sysUserServices; + + public MainWindow() + { + InitializeComponent(); + _sysUserServices = AppInfo.Container.Resolve(); + } + + private void TestClick(object sender, RoutedEventArgs e) + { + List sysUsers = _sysUserServices.Query(); + MessageBox.Show($"count={sysUsers.Count}"); + Log.Info($"count={sysUsers.Count}"); + } + } +} \ No newline at end of file diff --git a/WpfStarter/WpfStarter.csproj b/WpfStarter/WpfStarter.csproj new file mode 100644 index 0000000..4f1a594 --- /dev/null +++ b/WpfStarter/WpfStarter.csproj @@ -0,0 +1,35 @@ + + + + WinExe + net6.0-windows + enable + true + + + + + + + + + + + + + Always + + + Always + + + + + + + + + + + + diff --git a/WpfStarter/appsettings.json b/WpfStarter/appsettings.json new file mode 100644 index 0000000..213c6d6 --- /dev/null +++ b/WpfStarter/appsettings.json @@ -0,0 +1,18 @@ +{ + "ConnectionStrings": { + "DbType": "MySql", //数据库将支持两种模式【SqlServer,MySql】 + "SqlConnection": "server=127.0.0.1;Port=3307;Database=winformdevframework;Uid=root;Pwd=w123ee;Charset=utf8;" + }, + "Update": { + "AutoUpdate": "false", + "Version": "1.1.0.1", + "Url": "http://121.4.95.243:8090/Updates/AutoUpdaterStarter.xml"//更新服务器地址 + }, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + } +} \ No newline at end of file diff --git a/WpfStarter/log4net.xml b/WpfStarter/log4net.xml new file mode 100644 index 0000000..e4ee0a2 --- /dev/null +++ b/WpfStarter/log4net.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/hybirdMyFrame.sln b/hybirdMyFrame.sln index 4d13104..9542d02 100644 --- a/hybirdMyFrame.sln +++ b/hybirdMyFrame.sln @@ -11,10 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Repository" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HybirdFramework.Services", "HybirdFramework.Services", "{5F67ED42-6437-4FC6-86D2-0495DE990BC4}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebStart", "WebStart", "{DEE625EC-B6DC-4381-B78C-D89F09C00E7C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinformStart", "WinformStart", "{A0BA21DB-6630-41AB-A0FD-594DBB197E0E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebStarter", "WebStarter\WebStarter.csproj", "{61B1609B-97EE-48E4-ADA6-4F1A832B8D33}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HybirdFrameworkCore", "HybirdFrameworkCore\HybirdFrameworkCore.csproj", "{5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A}" @@ -35,6 +31,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleStarter", "ConsoleSt EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Starter", "Starter", "{E0B949DC-17FE-414D-8898-937A317BB853}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfStarter", "WpfStarter\WpfStarter.csproj", "{17044C11-3794-4938-BA80-C061BD871AE0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,19 +71,24 @@ Global {8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU {8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU {8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8}.Release|Any CPU.Build.0 = Release|Any CPU + {17044C11-3794-4938-BA80-C061BD871AE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {17044C11-3794-4938-BA80-C061BD871AE0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {17044C11-3794-4938-BA80-C061BD871AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {17044C11-3794-4938-BA80-C061BD871AE0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {61B1609B-97EE-48E4-ADA6-4F1A832B8D33} = {DEE625EC-B6DC-4381-B78C-D89F09C00E7C} {5F1D9B39-E50F-4B7C-B1C6-E60B64C4CA1A} = {0E784680-8280-4C47-8D2D-6405AC892164} {01D2CC15-F1FD-4E22-845A-2D2473662860} = {348F9459-2A59-47EB-B801-0CF907DFD8EC} {A6C2AA7F-B2A2-4AE0-AE84-49BE36B990EC} = {5F67ED42-6437-4FC6-86D2-0495DE990BC4} - {A6757DAD-EF5A-41FD-9323-F3FCF05ED777} = {A0BA21DB-6630-41AB-A0FD-594DBB197E0E} {C2380814-15D4-491D-ADF2-ADC68617C3FA} = {6203689E-8261-4814-BFC2-013188AED6A1} {6ACFA707-E72E-4BA1-8262-9F2E5B758D46} = {EF6B2DEC-ADAA-4A6D-AE93-0F98A555B265} {8EAFC092-1C8A-4CF7-B283-FFCB02D58ED8} = {E0B949DC-17FE-414D-8898-937A317BB853} + {17044C11-3794-4938-BA80-C061BD871AE0} = {E0B949DC-17FE-414D-8898-937A317BB853} + {61B1609B-97EE-48E4-ADA6-4F1A832B8D33} = {E0B949DC-17FE-414D-8898-937A317BB853} + {A6757DAD-EF5A-41FD-9323-F3FCF05ED777} = {E0B949DC-17FE-414D-8898-937A317BB853} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3E10BF3D-9914-44B1-A6AA-FCF013C3F155}