Skip to content

Commit 35bc8e6

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

10 files changed

Lines changed: 36 additions & 32 deletions

File tree

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<Version>1.4.0</Version>
6+
<Version>1.4.1</Version>
77
<Authors>xiaoxue</Authors>
88
<Company>xiaoxue</Company>
99
<Description>中台Admin后端通用库</Description>
@@ -22,17 +22,17 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="CSRedisCore" Version="3.6.5" />
25-
<PackageReference Include="FreeSql" Version="1.6.0" />
26-
<PackageReference Include="FreeSql.Provider.MySql" Version="1.6.0" />
27-
<PackageReference Include="FreeSql.Provider.Oracle" Version="1.6.0" />
28-
<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="1.6.0" />
29-
<PackageReference Include="FreeSql.Provider.Sqlite" Version="1.6.0" />
30-
<PackageReference Include="FreeSql.Provider.SqlServer" Version="1.6.0" />
31-
<PackageReference Include="FreeSql.Repository" Version="1.6.0" />
25+
<PackageReference Include="FreeSql" Version="1.7.1" />
26+
<PackageReference Include="FreeSql.Provider.MySql" Version="1.7.1" />
27+
<PackageReference Include="FreeSql.Provider.Oracle" Version="1.7.1" />
28+
<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="1.7.1" />
29+
<PackageReference Include="FreeSql.Provider.Sqlite" Version="1.7.1" />
30+
<PackageReference Include="FreeSql.Provider.SqlServer" Version="1.7.1" />
31+
<PackageReference Include="FreeSql.Repository" Version="1.7.1" />
3232
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
33-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.6" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.6" />
35-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.6" />
33+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.7" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.7" />
35+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.7" />
3636
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.7.1" />
3737
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
3838
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.7.1" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<Version>1.4.0</Version>
6+
<Version>1.4.1</Version>
77
<Authors>xiaoxue</Authors>
88
<Company>xiaoxue</Company>
99
<Description>中台Admin后端实体库</Description>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<Version>1.4.0</Version>
5+
<Version>1.4.1</Version>
66
<Authors>xiaoxue</Authors>
77
<Company>xiaoxue</Company>
88
<Description>中台Admin后端仓储库</Description>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6-
<Version>1.4.0</Version>
6+
<Version>1.4.1</Version>
77
<Authors>xiaoxue</Authors>
88
<Company>xiaoxue</Company>
99
<Description>中台Admin后端服务库</Description>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
using Admin.Core.Common.Output;
1010
using Admin.Core.Model.Admin;
1111
using Admin.Core.Repository.Admin;
12-
using Admin.Core.Service.Admin.User;
1312
using Admin.Core.Service.Admin.User.Input;
1413
using Admin.Core.Service.Admin.User.Output;
1514
using Admin.Core.Common.Attributes;
1615
using Admin.Core.Service.Admin.Auth.Output;
1716

18-
namespace Admin.Core.FrameWork.Service.User
17+
namespace Admin.Core.Service.Admin.User
1918
{
2019
/// <summary>
2120
/// 用户服务

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.6" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
10+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.7" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

‎Admin.Core.Tests/Controller/BaseControllerTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public async Task Login(AuthLoginInput input = null)
4747
var verifyCode = await _cache.GetAsync(verifyCodeKey);
4848
input = new AuthLoginInput()
4949
{
50-
UserName = "xiaoxue",
50+
UserName = "admin",
5151
Password = "111111",
5252
VerifyCodeKey = res.Data.Key,
5353
VerifyCode = verifyCode

‎Admin.Core/Admin.Core.Service.xml‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Admin.Core/Admin.Core.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
66
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
77
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
8-
<Version>1.4.0</Version>
8+
<Version>1.4.1</Version>
99
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1010
<Authors>xiaoxue</Authors>
1111
<Company>xiaoxue</Company>
@@ -44,13 +44,13 @@
4444
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
4545
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="5.0.0" />
4646
<PackageReference Include="Caching.CSRedis" Version="3.6.5" />
47-
<PackageReference Include="FluentValidation.AspNetCore" Version="9.0.1" />
47+
<PackageReference Include="FluentValidation.AspNetCore" Version="9.1.1" />
4848
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
49-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.6" />
50-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
49+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.7" />
50+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" />
5151
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
52-
<PackageReference Include="NLog" Version="4.7.2" />
53-
<PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
52+
<PackageReference Include="NLog" Version="4.7.3" />
53+
<PackageReference Include="NLog.Web.AspNetCore" Version="4.9.3" />
5454
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
5555
</ItemGroup>
5656

‎Admin.Core/Startup.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,12 @@ public void ConfigureServices(IServiceCollection services)
6161
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
6262
if (_appConfig.IdentityServer.Enable)
6363
{
64+
//is4
6465
services.TryAddSingleton<IUser, UserIdentiyServer>();
6566
}
6667
else
6768
{
69+
//jwt
6870
services.TryAddSingleton<IUser, User>();
6971
}
7072

@@ -110,12 +112,13 @@ public void ConfigureServices(IServiceCollection services)
110112
});
111113
#endregion
112114

113-
#region Jwt身份认证授权
115+
#region 身份认证授权
114116
var jwtConfig = _configHelper.Get<JwtConfig>("jwtconfig", _env.EnvironmentName);
115117
services.TryAddSingleton(jwtConfig);
116118

117119
if (_appConfig.IdentityServer.Enable)
118120
{
121+
//is4
119122
services.AddAuthentication(options =>
120123
{
121124
options.DefaultScheme = IdentityServerAuthenticationDefaults.AuthenticationScheme;
@@ -134,6 +137,7 @@ public void ConfigureServices(IServiceCollection services)
134137
}
135138
else
136139
{
140+
//jwt
137141
services.AddAuthentication(options =>
138142
{
139143
options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -325,6 +329,7 @@ public void ConfigureContainer(ContainerBuilder builder)
325329
builder.RegisterAssemblyTypes(assemblyCore, assemblyCommon)
326330
.Where(t => t.GetCustomAttribute<SingleInstanceAttribute>() != null)
327331
.SingleInstance();
332+
328333
//有接口注入单例
329334
builder.RegisterAssemblyTypes(assemblyCore, assemblyCommon)
330335
.Where(t => t.GetCustomAttribute<SingleInstanceAttribute>() != null)

0 commit comments

Comments
 (0)