diff --git a/Yi.Abp.Net8/module/audit-logging/Yi.AuditLogging.SqlSugarCore/SqlSugarCoreAuditLogRepository.cs b/Yi.Abp.Net8/module/audit-logging/Yi.AuditLogging.SqlSugarCore/SqlSugarCoreAuditLogRepository.cs index 920e037f..1d8122d0 100644 --- a/Yi.Abp.Net8/module/audit-logging/Yi.AuditLogging.SqlSugarCore/SqlSugarCoreAuditLogRepository.cs +++ b/Yi.Abp.Net8/module/audit-logging/Yi.AuditLogging.SqlSugarCore/SqlSugarCoreAuditLogRepository.cs @@ -4,6 +4,7 @@ using System.Net; using Mapster; using SqlSugar; using Volo.Abp.Auditing; +using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; using Yi.AuditLogging.SqlSugarCore.Entities; diff --git a/Yi.Abp.Net8/module/audit-logging/Yi.AuditLogging.SqlSugarCore/YiAuditLoggingSqlSugarCoreModule.cs b/Yi.Abp.Net8/module/audit-logging/Yi.AuditLogging.SqlSugarCore/YiAuditLoggingSqlSugarCoreModule.cs index 234c3096..039c8039 100644 --- a/Yi.Abp.Net8/module/audit-logging/Yi.AuditLogging.SqlSugarCore/YiAuditLoggingSqlSugarCoreModule.cs +++ b/Yi.Abp.Net8/module/audit-logging/Yi.AuditLogging.SqlSugarCore/YiAuditLoggingSqlSugarCoreModule.cs @@ -1,4 +1,7 @@ -using Volo.Abp.AuditLogging; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Volo.Abp.AuditLogging; +using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.Modularity; using Yi.Framework.SqlSugarCore; @@ -10,7 +13,9 @@ namespace Yi.AuditLogging.SqlSugarCore { public override void ConfigureServices(ServiceConfigurationContext context) { + context.Services.Replace(new ServiceDescriptor(typeof(IAuditLogRepository), typeof(SqlSugarCoreAuditLogRepository), lifetime: ServiceLifetime.Transient)); context.Services.AddYiDbContext(); + } } } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/SettingService.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/SettingService.cs index 14ec2213..c0c3009a 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/SettingService.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/SettingService.cs @@ -18,5 +18,13 @@ namespace Yi.Framework.Bbs.Application.Services { return Task.FromResult("你好世界"); } + + + public List GetIcon() + { + + return Directory.GetFiles("wwwroot/icon").Select(x => "wwwroot/icon/"+ Path.GetFileName(x)).ToList(); + + } } } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs index a2d2e59e..f98dab39 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/FileService.cs @@ -21,13 +21,11 @@ namespace Yi.Framework.Rbac.Application.Services public class FileService : ApplicationService, IFileService { private readonly IRepository _repository; - private readonly HttpContext _httpContext; private IGuidGenerator _guidGenerator; - public FileService(IRepository repository, IHttpContextAccessor httpContextAccessor, IGuidGenerator guidGenerator) + public FileService(IRepository repository, IGuidGenerator guidGenerator) { _guidGenerator = guidGenerator; _repository = repository; - _httpContext = httpContextAccessor.HttpContext; } /// diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj index 3762bfbb..f8c4237c 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj @@ -27,6 +27,9 @@ Always + + Always + @@ -37,7 +40,7 @@ - + diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs index 151f5d74..83fdecfb 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs @@ -1,5 +1,6 @@ using System.Text; using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Cors; using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; @@ -150,6 +151,11 @@ namespace Yi.Abp.Web //swagger app.UseYiSwagger(); + + //静态资源 + app.UseStaticFiles("/api/app/wwwroot"); + app.UseDefaultFiles(); + app.UseDirectoryBrowser("/api/app/wwwroot"); //工作单元 app.UseUnitOfWork(); diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/0.png b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/0.png new file mode 100644 index 00000000..652bdf37 Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/0.png differ diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/1.png b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/1.png new file mode 100644 index 00000000..1431fa2f Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/1.png differ diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/2.png b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/2.png new file mode 100644 index 00000000..302112b9 Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/2.png differ diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/3.png b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/3.png new file mode 100644 index 00000000..b06ceb01 Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/3.png differ diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/4.png b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/4.png new file mode 100644 index 00000000..bd47b1fe Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/4.png differ diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/5.png b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/5.png new file mode 100644 index 00000000..0d1a1d2a Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/5.png differ diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/6.png b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/6.png new file mode 100644 index 00000000..c116c298 Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/6.png differ diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/8.png b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/8.png new file mode 100644 index 00000000..c3f6dc07 Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/8.png differ diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/9.png b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/9.png new file mode 100644 index 00000000..b7c8410f Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/wwwroot/icon/9.png differ