diff --git a/aspnet-core/CompanyName.ProjectName.sln b/aspnet-core/CompanyName.ProjectName.sln index f5106908..5f2346c6 100644 --- a/aspnet-core/CompanyName.ProjectName.sln +++ b/aspnet-core/CompanyName.ProjectName.sln @@ -131,8 +131,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateways", "gateways", "{5C EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.WebGateway", "gateways\CompanyName.ProjectName.WebGateway\CompanyName.ProjectName.WebGateway.csproj", "{D9108313-8D05-4F5F-9AA0-B443EC3374B6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.FreeSqlRepository", "services\src\CompanyName.ProjectName.FreeSqlRepository\CompanyName.ProjectName.FreeSqlRepository.csproj", "{FC30B17B-F671-4E55-90C6-9F37E40B483D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.Extension", "frameworks\Extensions\src\CompanyName.ProjectName.Extension\CompanyName.ProjectName.Extension.csproj", "{4C65690E-2C17-46A1-BB35-A51BAB2EA3B7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.ProjectName.CAP", "frameworks\CAP\src\CompanyName.ProjectName.CAP\CompanyName.ProjectName.CAP.csproj", "{3C3FF821-E43D-4D58-8B3C-1E97F4518EF7}" @@ -307,10 +305,6 @@ Global {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Release|Any CPU.ActiveCfg = Release|Any CPU {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Release|Any CPU.Build.0 = Release|Any CPU - {FC30B17B-F671-4E55-90C6-9F37E40B483D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC30B17B-F671-4E55-90C6-9F37E40B483D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC30B17B-F671-4E55-90C6-9F37E40B483D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC30B17B-F671-4E55-90C6-9F37E40B483D}.Release|Any CPU.Build.0 = Release|Any CPU {4C65690E-2C17-46A1-BB35-A51BAB2EA3B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C65690E-2C17-46A1-BB35-A51BAB2EA3B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C65690E-2C17-46A1-BB35-A51BAB2EA3B7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -379,7 +373,6 @@ Global {A091AE9B-3A1E-49AC-9AD5-D29310512A3D} = {6434E3F2-B352-4B30-839A-88C2BA166D96} {C018EFF9-579E-43B3-9181-543BE95E2E03} = {6434E3F2-B352-4B30-839A-88C2BA166D96} {D9108313-8D05-4F5F-9AA0-B443EC3374B6} = {5C304CBC-F30D-413C-A0AF-8B6814A2D4A3} - {FC30B17B-F671-4E55-90C6-9F37E40B483D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {4C65690E-2C17-46A1-BB35-A51BAB2EA3B7} = {C4AC9352-C9F5-4096-8D73-13638232CFB9} {3C3FF821-E43D-4D58-8B3C-1E97F4518EF7} = {11ED8435-B5AE-4BF3-9D4B-51FA1E4A18A6} EndGlobalSection diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj b/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj index f86290c5..041fe660 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/CompanyName.ProjectName.Application.csproj @@ -11,7 +11,6 @@ - diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs index bdb1fd4a..ba2c56a9 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/ProjectNameApplicationModule.cs @@ -1,5 +1,4 @@ using CompanyName.ProjectName.DataDictionaryManagement; -using CompanyName.ProjectName.FreeSqlRepository; using CompanyName.ProjectName.NotificationManagement; using Volo.Abp.Account; using Volo.Abp.AuditLogging; @@ -24,8 +23,7 @@ namespace CompanyName.ProjectName typeof(AbpSettingManagementApplicationModule), typeof(AbpAuditLoggingDomainModule), typeof(DataDictionaryManagementApplicationModule), - typeof(NotificationManagementApplicationModule), - typeof(FreeSqlRepositoryModule) + typeof(NotificationManagementApplicationModule) )] public class ProjectNameApplicationModule : AbpModule { diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Application/Settings/SettingAppService.cs b/aspnet-core/services/src/CompanyName.ProjectName.Application/Settings/SettingAppService.cs index a775f498..832d746f 100644 --- a/aspnet-core/services/src/CompanyName.ProjectName.Application/Settings/SettingAppService.cs +++ b/aspnet-core/services/src/CompanyName.ProjectName.Application/Settings/SettingAppService.cs @@ -6,7 +6,6 @@ using CompanyName.ProjectName.Localization; using CompanyName.ProjectName.Permissions; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Localization; -using Volo.Abp.Localization; using Volo.Abp.SettingManagement; using Volo.Abp.Settings; @@ -34,9 +33,6 @@ namespace CompanyName.ProjectName.Settings public async Task> GetAsync() { - var ss = _localizer.GetAllStrings(); - var s = _localizer["Setting:Group:System"]; - var s2 = _localizer["Volo.Abp.Identity:PasswordRequiresDigit"]; var allSettings = _settingDefinitionManager.GetAll().ToList(); var settings = allSettings .Where(e => e.Properties.ContainsKey(ProjectNameSettings.Group.Defalut)).ToList(); diff --git a/aspnet-core/services/src/CompanyName.ProjectName.FreeSqlRepository/CompanyName.ProjectName.FreeSqlRepository.csproj b/aspnet-core/services/src/CompanyName.ProjectName.FreeSqlRepository/CompanyName.ProjectName.FreeSqlRepository.csproj deleted file mode 100644 index 329d62b5..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.FreeSqlRepository/CompanyName.ProjectName.FreeSqlRepository.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net5.0 - - - - - - - - - - diff --git a/aspnet-core/services/src/CompanyName.ProjectName.FreeSqlRepository/FreeSqlBasicRepository.cs b/aspnet-core/services/src/CompanyName.ProjectName.FreeSqlRepository/FreeSqlBasicRepository.cs deleted file mode 100644 index bfcfefaa..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.FreeSqlRepository/FreeSqlBasicRepository.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Threading; -using Volo.Abp.Domain.Services; -using Volo.Abp.Threading; - -namespace CompanyName.ProjectName.FreeSqlRepository -{ - public abstract class FreeSqlBasicRepository : DomainService - { - - protected IFreeSql FreeSql => LazyServiceProvider.LazyGetRequiredService(); - - private ICancellationTokenProvider CancellationTokenProvider => LazyServiceProvider.LazyGetService(NullCancellationTokenProvider.Instance); - - protected virtual CancellationToken GetCancellationToken(CancellationToken preferredValue = default) - { - return CancellationTokenProvider.FallbackToProvider(preferredValue); - } - } -} \ No newline at end of file diff --git a/aspnet-core/services/src/CompanyName.ProjectName.FreeSqlRepository/FreeSqlRepositoryModule.cs b/aspnet-core/services/src/CompanyName.ProjectName.FreeSqlRepository/FreeSqlRepositoryModule.cs deleted file mode 100644 index 7a952c97..00000000 --- a/aspnet-core/services/src/CompanyName.ProjectName.FreeSqlRepository/FreeSqlRepositoryModule.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Modularity; - -namespace CompanyName.ProjectName.FreeSqlRepository -{ - public class FreeSqlRepositoryModule : AbpModule - { - public override void ConfigureServices(ServiceConfigurationContext context) - { - var configuration = context.Services.GetConfiguration(); - var connectionString = - configuration.GetConnectionString("Default"); - var freeSql = new FreeSql.FreeSqlBuilder() - .UseConnectionString(FreeSql.DataType.MySql, connectionString) - .UseMonitorCommand(cmd => Console.WriteLine($"线程：{cmd.CommandText}\r\n")) - .UseNoneCommandParameter(true) - .Build(); - - context.Services.AddSingleton(freeSql); - } - } -} \ No newline at end of file