excel

src/Masuit.MyBlogs.Core.sln

@@ -18,6 +18,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "工具库", "工具库", "{
 		工具库可用同名nuget包替代 = 工具库可用同名nuget包替代
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.Excel", "..\..\Masuit.Tools\Masuit.Tools.Excel\Masuit.Tools.Excel.csproj", "{99933B01-597A-40F7-81D7-8BDA3CD4D840}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -44,6 +46,10 @@ Global
 		{0661EDB7-12E8-4F8B-AD0B-1CDEF7D03FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0661EDB7-12E8-4F8B-AD0B-1CDEF7D03FAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0661EDB7-12E8-4F8B-AD0B-1CDEF7D03FAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99933B01-597A-40F7-81D7-8BDA3CD4D840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99933B01-597A-40F7-81D7-8BDA3CD4D840}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99933B01-597A-40F7-81D7-8BDA3CD4D840}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99933B01-597A-40F7-81D7-8BDA3CD4D840}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -53,6 +59,7 @@ Global
 		{D0D32A1B-13C8-49E6-AC5A-112AD981FD1A} = {51B677E0-194F-4A0F-9E86-4B147F22728E}
 		{F67A19C8-5ACE-4111-8DB5-51A0159AF5A3} = {51B677E0-194F-4A0F-9E86-4B147F22728E}
 		{0661EDB7-12E8-4F8B-AD0B-1CDEF7D03FAD} = {51B677E0-194F-4A0F-9E86-4B147F22728E}
+		{99933B01-597A-40F7-81D7-8BDA3CD4D840} = {51B677E0-194F-4A0F-9E86-4B147F22728E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2D2DF884-78F6-45E0-80C5-25FAE9F0B5C9}

src/Masuit.MyBlogs.Core/Controllers/AdminController.cs

@@ -48,8 +48,8 @@ public class AdminController : Controller
 		base.OnActionExecuting(filterContext);
 		var user = filterContext.HttpContext.Session.Get<UserInfoDto>(SessionKey.UserInfo);
 #if DEBUG
-			user = UserInfoService.GetByUsername("masuit").Mapper<UserInfoDto>();
-			filterContext.HttpContext.Session.Set(SessionKey.UserInfo, user);
+		user = Mapper.Map<UserInfoDto>(UserInfoService.GetByUsername("masuit"));
+		filterContext.HttpContext.Session.Set(SessionKey.UserInfo, user);
 #endif
 		if (user == null && Request.Cookies.Any(x => x.Key == "username" || x.Key == "password")) //执行自动登录
 		{

src/Masuit.MyBlogs.Core/Controllers/BaseController.cs

@@ -114,8 +114,8 @@ public class BaseController : Controller
 		ViewBag.Desc = CommonHelper.SystemSettings["Description"];
 		var user = filterContext.HttpContext.Session.Get<UserInfoDto>(SessionKey.UserInfo);
 #if DEBUG
-			user = UserInfoService.GetByUsername("masuit").Mapper<UserInfoDto>();
-			filterContext.HttpContext.Session.Set(SessionKey.UserInfo, user);
+		user = Mapper.Map<UserInfoDto>(UserInfoService.GetByUsername("masuit"));
+		filterContext.HttpContext.Session.Set(SessionKey.UserInfo, user);
 #endif
 		if (CommonHelper.SystemSettings.GetOrAdd("CloseSite", "false") == "true" && user?.IsAdmin != true)
 		{

src/Masuit.MyBlogs.Core/Controllers/PassportController.cs

@@ -1,4 +1,5 @@
-using CacheManager.Core;
+using AutoMapper;
+using CacheManager.Core;
 using Hangfire;
 using Masuit.MyBlogs.Core.Configs;
 using Masuit.MyBlogs.Core.Extensions.Firewall;
@@ -24,6 +25,7 @@ public sealed class PassportController : Controller
 	public IUserInfoService UserInfoService { get; set; }
 
 	public IFirewallRepoter FirewallRepoter { get; set; }
+	public IMapper Mapper { get; set; }
 
 	/// <summary>
 	/// 客户端的真实IP
@@ -221,7 +223,7 @@ public sealed class PassportController : Controller
 	{
 		var user = HttpContext.Session.Get<UserInfoDto>(SessionKey.UserInfo);
 #if DEBUG
-			user = UserInfoService.GetByUsername("masuit").Mapper<UserInfoDto>();
+		user = Mapper.Map<UserInfoDto>(UserInfoService.GetByUsername("masuit"));
 #endif
 
 		return ResultData(user);

src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.csproj

@@ -34,6 +34,7 @@
     <ItemGroup>
         <ProjectReference Include="..\..\..\Masuit.LuceneEFCore.SearchEngine\Masuit.LuceneEFCore.SearchEngine\Masuit.LuceneEFCore.SearchEngine.csproj" />
         <ProjectReference Include="..\..\..\Masuit.Tools\Masuit.Tools.AspNetCore\Masuit.Tools.AspNetCore.csproj" />
+        <ProjectReference Include="..\..\..\Masuit.Tools\Masuit.Tools.Excel\Masuit.Tools.Excel.csproj" />
     </ItemGroup>
 
     <ItemGroup>
@@ -52,7 +53,6 @@
         <PackageReference Include="htmldiff.net" Version="1.4.0" />
         <PackageReference Include="Karambolo.AspNetCore.Bundling.NUglify" Version="3.6.0" />
         <PackageReference Include="Markdig" Version="0.30.4" />
-        <PackageReference Include="Masuit.Tools.Excel" Version="1.2.4.2" />
         <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />