更新1.4.1

升级 Nuget包到最新版本
升级 vue cli到4.5.3版本
修复 在ie11下无法访问界面，get请求使用缓存导致无法登录的问题
修复 在ie11下文档管理界面无法加载
修复 在ie11下tabs右键菜单无法打开的问题
修复 在ie11下前端时间格式化显示错误
优化 将分页组件加入到全局组件中，界面无需再导入分页组件
调整 将node-sass更改为sass，穿透组件样式统一使用::v-deep
调整 测试项目用户数据，测试时用户能够成功登录

Admin.Core.Common/Admin.Core.Common.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
     <Authors>xiaoxue</Authors>
     <Company>xiaoxue</Company>
     <Description>中台Admin后端通用库</Description>
@@ -22,17 +22,17 @@
 
   <ItemGroup>
     <PackageReference Include="CSRedisCore" Version="3.6.5" />
-    <PackageReference Include="FreeSql" Version="1.6.0" />
-    <PackageReference Include="FreeSql.Provider.MySql" Version="1.6.0" />
-    <PackageReference Include="FreeSql.Provider.Oracle" Version="1.6.0" />
-    <PackageReference Include="FreeSql.Provider.PostgreSQL" Version="1.6.0" />
-    <PackageReference Include="FreeSql.Provider.Sqlite" Version="1.6.0" />
-    <PackageReference Include="FreeSql.Provider.SqlServer" Version="1.6.0" />
-    <PackageReference Include="FreeSql.Repository" Version="1.6.0" />
+    <PackageReference Include="FreeSql" Version="1.7.1" />
+    <PackageReference Include="FreeSql.Provider.MySql" Version="1.7.1" />
+    <PackageReference Include="FreeSql.Provider.Oracle" Version="1.7.1" />
+    <PackageReference Include="FreeSql.Provider.PostgreSQL" Version="1.7.1" />
+    <PackageReference Include="FreeSql.Provider.Sqlite" Version="1.7.1" />
+    <PackageReference Include="FreeSql.Provider.SqlServer" Version="1.7.1" />
+    <PackageReference Include="FreeSql.Repository" Version="1.7.1" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.6" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.7" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.7.1" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.7.1" />

Admin.Core.Model/Admin.Core.Model.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
     <Authors>xiaoxue</Authors>
     <Company>xiaoxue</Company>
     <Description>中台Admin后端实体库</Description>

Admin.Core.Repository/Admin.Core.Repository.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
     <Authors>xiaoxue</Authors>
     <Company>xiaoxue</Company>
     <Description>中台Admin后端仓储库</Description>

Admin.Core.Services/Admin.Core.Service.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
     <Authors>xiaoxue</Authors>
     <Company>xiaoxue</Company>
     <Description>中台Admin后端服务库</Description>

Admin.Core.Services/Admin/User/UserService.cs

@@ -9,13 +9,12 @@ using Admin.Core.Common.Input;
 using Admin.Core.Common.Output;
 using Admin.Core.Model.Admin;
 using Admin.Core.Repository.Admin;
-using Admin.Core.Service.Admin.User;
 using Admin.Core.Service.Admin.User.Input;
 using Admin.Core.Service.Admin.User.Output;
 using Admin.Core.Common.Attributes;
 using Admin.Core.Service.Admin.Auth.Output;
 
-namespace Admin.Core.FrameWork.Service.User
+namespace Admin.Core.Service.Admin.User
 {
     /// <summary>
     /// 用户服务

Admin.Core.Tests/Admin.Core.Tests.csproj

@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Admin.Core.Tests/Controller/BaseControllerTest.cs

@@ -47,7 +47,7 @@ namespace Admin.Core.Tests.Controller
                 var verifyCode = await _cache.GetAsync(verifyCodeKey);
                 input = new AuthLoginInput() 
                 { 
-                    UserName = "xiaoxue",
+                    UserName = "admin",
                     Password = "111111",
                     VerifyCodeKey = res.Data.Key,
                     VerifyCode = verifyCode

Admin.Core/Admin.Core.Service.xml

@@ -1325,6 +1325,11 @@
             创建时间
             </summary>
         </member>
+        <member name="T:Admin.Core.Service.Admin.User.UserService">
+            <summary>
+            用户服务
+            </summary>	
+        </member>
         <member name="T:Admin.Core.Service.Admin.User.MapConfig">
             <summary>
             映射配置
@@ -1453,10 +1458,5 @@
             说明
             </summary>
         </member>
-        <member name="T:Admin.Core.FrameWork.Service.User.UserService">
-            <summary>
-            用户服务
-            </summary>	
-        </member>
     </members>
 </doc>

Admin.Core/Admin.Core.csproj

@@ -5,7 +5,7 @@
     <!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
     <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>xiaoxue</Authors>
     <Company>xiaoxue</Company>
@@ -44,13 +44,13 @@
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Autofac.Extras.DynamicProxy" Version="5.0.0" />
     <PackageReference Include="Caching.CSRedis" Version="3.6.5" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="9.0.1" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="9.1.1" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" />
     <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-    <PackageReference Include="NLog" Version="4.7.2" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
+    <PackageReference Include="NLog" Version="4.7.3" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
   </ItemGroup>
 

Admin.Core/Startup.cs

@@ -61,10 +61,12 @@ namespace Admin.Core
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             if (_appConfig.IdentityServer.Enable)
             {
+                //is4
                 services.TryAddSingleton<IUser, UserIdentiyServer>();
             }
             else
             {
+                //jwt
                 services.TryAddSingleton<IUser, User>();
             }
 
@@ -110,12 +112,13 @@ namespace Admin.Core
             });
             #endregion
 
-            #region Jwt身份认证授权
+            #region 身份认证授权
             var jwtConfig = _configHelper.Get<JwtConfig>("jwtconfig", _env.EnvironmentName);
             services.TryAddSingleton(jwtConfig);
 
             if (_appConfig.IdentityServer.Enable)
             {
+                //is4
                 services.AddAuthentication(options =>
                 {
                     options.DefaultScheme = IdentityServerAuthenticationDefaults.AuthenticationScheme;
@@ -134,6 +137,7 @@ namespace Admin.Core
             }
             else
             {
+                //jwt
                 services.AddAuthentication(options =>
                 {
                     options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -325,6 +329,7 @@ namespace Admin.Core
                 builder.RegisterAssemblyTypes(assemblyCore, assemblyCommon)
                 .Where(t => t.GetCustomAttribute<SingleInstanceAttribute>() != null)
                 .SingleInstance();
+
                 //有接口注入单例
                 builder.RegisterAssemblyTypes(assemblyCore, assemblyCommon)
                 .Where(t => t.GetCustomAttribute<SingleInstanceAttribute>() != null)