Skip to content
This repository was archived by the owner on Dec 29, 2024. It is now read-only.

Commit 51d9926

Browse files
gdlcf88gdlcf88
committed
Upgraded ABP to version 2.7.0
1 parent 6286f73 commit 51d9926

File tree

41 files changed

+2391
-435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2391
-435
lines changed

‎common.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<LangVersion>latest</LangVersion>
4-
<Version>0.1.3</Version>
4+
<Version>0.1.5</Version>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>EasyAbp Team</Authors>

‎host/EasyAbp.UniappManagement.HttpApi.Host/EasyAbp.UniappManagement.HttpApi.Host.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
1717
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.0" />
1818
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.0" />
19-
<PackageReference Include="Volo.Abp.Autofac" Version="2.3.0" />
20-
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="2.3.0" />
21-
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.3.0" />
22-
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="2.3.0" />
23-
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.3.0" />
24-
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.3.0" />
25-
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="2.3.0" />
19+
<PackageReference Include="Volo.Abp.Autofac" Version="2.7.0" />
20+
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="2.7.0" />
21+
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.7.0" />
22+
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="2.7.0" />
23+
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.7.0" />
24+
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.7.0" />
25+
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="2.7.0" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

‎host/EasyAbp.UniappManagement.IdentityServer/EasyAbp.UniappManagement.IdentityServer.csproj

+24-24
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@
1515
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.0" />
1616
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.0" />
1717
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0" />
18-
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="2.3.0" />
19-
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="2.3.0" />
20-
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="2.3.0" />
21-
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="2.3.0" />
22-
<PackageReference Include="Volo.Abp.Autofac" Version="2.3.0" />
23-
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.3.0" />
24-
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="2.3.0" />
25-
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="2.3.0" />
26-
<PackageReference Include="Volo.Abp.Account.Application" Version="2.3.0" />
27-
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.3.0" />
28-
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="2.3.0" />
29-
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="2.3.0" />
30-
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.3.0" />
31-
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="2.3.0" />
32-
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="2.3.0" />
33-
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="2.3.0" />
34-
<PackageReference Include="Volo.Abp.Identity.Application" Version="2.3.0" />
35-
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="2.3.0" />
36-
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="2.3.0" />
37-
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="2.3.0" />
38-
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="2.3.0" />
39-
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="2.3.0" />
40-
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="2.3.0" />
41-
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="2.3.0" />
18+
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="2.7.0" />
19+
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="2.7.0" />
20+
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="2.7.0" />
21+
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="2.7.0" />
22+
<PackageReference Include="Volo.Abp.Autofac" Version="2.7.0" />
23+
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.7.0" />
24+
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="2.7.0" />
25+
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="2.7.0" />
26+
<PackageReference Include="Volo.Abp.Account.Application" Version="2.7.0" />
27+
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="2.7.0" />
28+
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="2.7.0" />
29+
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="2.7.0" />
30+
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.7.0" />
31+
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="2.7.0" />
32+
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="2.7.0" />
33+
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="2.7.0" />
34+
<PackageReference Include="Volo.Abp.Identity.Application" Version="2.7.0" />
35+
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="2.7.0" />
36+
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="2.7.0" />
37+
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="2.7.0" />
38+
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="2.7.0" />
39+
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="2.7.0" />
40+
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="2.7.0" />
41+
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="2.7.0" />
4242
<ProjectReference Include="..\..\src\EasyAbp.UniappManagement.Application.Contracts\EasyAbp.UniappManagement.Application.Contracts.csproj" />
4343
<ProjectReference Include="..\EasyAbp.UniappManagement.Host.Shared\EasyAbp.UniappManagement.Host.Shared.csproj" />
4444
</ItemGroup>

‎host/EasyAbp.UniappManagement.IdentityServer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"name": "my-app-identityserver",
44
"private": true,
55
"dependencies": {
6-
"@abp/aspnetcore.mvc.ui.theme.basic": "^2.2.0"
6+
"@abp/aspnetcore.mvc.ui.theme.basic": "~2.7.0"
77
}
88
}

‎host/EasyAbp.UniappManagement.IdentityServer/wwwroot/libs/abp/core/abp.js

+31-1
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,17 @@ var abp = abp || {};
7676
abp.localization.values = {};
7777

7878
abp.localization.localize = function (key, sourceName) {
79+
if (sourceName === '_') { //A convention to suppress the localization
80+
return key;
81+
}
82+
7983
sourceName = sourceName || abp.localization.defaultResourceName;
84+
if (!sourceName) {
85+
abp.log.warn('Localization source name is not specified and the defaultResourceName was not defined!');
86+
return key;
87+
}
8088

8189
var source = abp.localization.values[sourceName];
82-
8390
if (!source) {
8491
abp.log.warn('Could not find localization source: ' + sourceName);
8592
return key;
@@ -97,6 +104,29 @@ var abp = abp || {};
97104
return abp.utils.formatString.apply(this, copiedArguments);
98105
};
99106

107+
abp.localization.isLocalized = function (key, sourceName) {
108+
if (sourceName === '_') { //A convention to suppress the localization
109+
return true;
110+
}
111+
112+
sourceName = sourceName || abp.localization.defaultResourceName;
113+
if (!sourceName) {
114+
return false;
115+
}
116+
117+
var source = abp.localization.values[sourceName];
118+
if (!source) {
119+
return false;
120+
}
121+
122+
var value = source[key];
123+
if (value === undefined) {
124+
return false;
125+
}
126+
127+
return true;
128+
};
129+
100130
abp.localization.getResource = function (name) {
101131
return function () {
102132
var copiedArguments = Array.prototype.slice.call(arguments, 0);

0 commit comments

Comments
 (0)