Skip to content

Commit

Permalink
Merge pull request #973 from colinin/rel-8.2.0
Browse files Browse the repository at this point in the history 
Rel 8.2.0
  • Loading branch information
@colinin
colinin authored Aug 5, 2024
2 parents 7fc5240 + ce96808 commit b49d2a8
Show file tree
Hide file tree
Showing 2,464 changed files with 144,456 additions and 155,369 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Publish"

on:
push:
branches: [ rel-8.1.3 ]
branches: [ rel-8.2.0 ]
env:
DOTNET_VERSION: "8.0.200"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Tagged Release"

on:
push:
branches: [ rel-8.1.3 ]
branches: [ rel-8.2.0 ]

jobs:
tagged-release:
Expand All @@ -14,4 +14,4 @@ jobs:
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
automatic_release_tag: "8.1.3"
automatic_release_tag: "8.2.0"
22 changes: 8 additions & 14 deletions Directory.Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@
<PropertyGroup>
<DotNetCoreCAPPackageVersion>8.1.1</DotNetCoreCAPPackageVersion>
<ElsaPackageVersion>2.14.1</ElsaPackageVersion>
<VoloAbpPackageVersion>8.1.3</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.1.3</LINGYUNAbpPackageVersion>
<VoloAbpPackageVersion>8.2.0</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.2.0</LINGYUNAbpPackageVersion>
<MicrosoftExtensionsPackageVersion>8.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftAspNetCorePackageVersion>8.0.0</MicrosoftAspNetCorePackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>8.0.0</MicrosoftEntityFrameworkCorePackageVersion>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<!-- Abp Framework -->
<ItemGroup>
<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.0.5" />
<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.2.0" />
<PackageVersion Include="Volo.Abp.Core" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.Account.Application" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.Account.Application.Contracts" Version="$(VoloAbpPackageVersion)" />
Expand Down Expand Up @@ -133,10 +132,9 @@
<PackageVersion Include="Volo.Abp.Users.Domain.Shared" Version="$(VoloAbpPackageVersion)" />
<PackageVersion Include="Volo.Abp.Validation" Version="$(VoloAbpPackageVersion)" />
</ItemGroup>

<!-- .NET -->
<ItemGroup>
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCorePackageVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCorePackageVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="$(MicrosoftAspNetCorePackageVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="$(MicrosoftAspNetCorePackageVersion)" />
Expand All @@ -152,9 +150,8 @@
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
</ItemGroup>

<!-- Elsa -->
<ItemGroup>
<PackageVersion Include="Elsa" Version="$(ElsaPackageVersion)" />
Expand All @@ -172,7 +169,6 @@
<PackageVersion Include="Elsa.Webhooks.Persistence.EntityFramework.MySql" Version="$(ElsaPackageVersion)" />
<PackageVersion Include="Elsa.WorkflowSettings.Persistence.EntityFramework.MySql" Version="$(ElsaPackageVersion)" />
</ItemGroup>

<!-- DotNetCore.CAP -->
<ItemGroup>
<PackageVersion Include="DotNetCore.CAP" Version="$(DotNetCoreCAPPackageVersion)" />
Expand All @@ -181,7 +177,6 @@
<PackageVersion Include="DotNetCore.CAP.OpenTelemetry" Version="$(DotNetCoreCAPPackageVersion)" />
<PackageVersion Include="DotNetCore.CAP.RabbitMQ" Version="$(DotNetCoreCAPPackageVersion)" />
</ItemGroup>

<!-- Serilog -->
<ItemGroup>
<PackageVersion Include="Serilog" Version="3.1.1" />
Expand All @@ -198,7 +193,6 @@
<PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
</ItemGroup>

<!-- Test -->
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
Expand All @@ -210,13 +204,11 @@
<PackageVersion Include="xunit.extensibility.execution" Version="2.6.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
</ItemGroup>

<!-- Fody -->
<ItemGroup>
<PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
<PackageVersion Include="Fody" Version="6.8.0" />
</ItemGroup>

<!-- Other -->
<ItemGroup>
<PackageVersion Include="aliyun-net-sdk-core" Version="1.5.10" />
Expand All @@ -228,14 +220,16 @@
<PackageVersion Include="DistributedLock.Core" Version="1.0.5" />
<PackageVersion Include="DistributedLock.Redis" Version="1.0.2" />
<PackageVersion Include="Hangfire.MySqlStorage" Version="2.0.3" />
<PackageVersion Include="HangFire.SqlServer" Version="1.8.6" />
<PackageVersion Include="HangFire.SqlServer" Version="1.8.14" />
<PackageVersion Include="IdentityModel" Version="6.2.0" />
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageVersion Include="Markdig" Version="0.34.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NEST" Version="7.15.1" />
<PackageVersion Include="NRules" Version="0.9.2" />
<PackageVersion Include="Ocelot.Provider.Polly" Version="20.0.0" />
<PackageVersion Include="OpenIddict.Server.DataProtection" Version="5.5.0" />
<PackageVersion Include="OpenIddict.Validation.DataProtection" Version="5.5.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.8.1" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
Expand Down
2 changes: 1 addition & 1 deletion apps/vue/src/api/abp/localization/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const GetAsyncByInput = (input: {
onlyDynamics?: boolean;
}) => {
return defHttp.get<ApplicationLocalizationDto>({
url: 'api/abp/application-localization"',
url: '/api/abp/application-localization"',
params: input,
});
};
23 changes: 23 additions & 0 deletions apps/vue/src/api/account/profiles/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import {
AuthenticatorDto,
VerifyAuthenticatorCodeInput,
AuthenticatorRecoveryCodeDto,
GetUserSessionsInput,
} from './model';
import { IdentitySessionDto } from '../../identity/sessions/model';

export const get = () => {
return defHttp.get<MyProfile>({
Expand Down Expand Up @@ -92,4 +94,25 @@ export const resetAuthenticator = () => {
return defHttp.post<void>({
url: '/api/account/my-profile/reset-authenticator',
});
}
/**
* 查询当前用户会话列表
* @param { GetUserSessionsInput } input 查询参数
* @returns { Promise<PagedResultDto<IdentitySessionDto>> }
*/
export const getSessions = (input?: GetUserSessionsInput): Promise<PagedResultDto<IdentitySessionDto>> => {
return defHttp.get<PagedResultDto<IdentitySessionDto>>({
url: '/api/account/my-profile/sessions',
params: input,
});
};
/**
* 撤销会话
* @param { string } sessionId 会话id
* @returns { Promise<void> }
*/
export const revokeSession = (sessionId: string): Promise<void> => {
return defHttp.delete<void>({
url: `/api/account/my-profile/sessions/${sessionId}/revoke`,
});
}
5 changes: 5 additions & 0 deletions apps/vue/src/api/account/profiles/model/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,9 @@ interface Profile extends ExtensibleObject, IHasConcurrencyStamp {
export interface VerifyAuthenticatorCodeInput {
authenticatorCode: string;
}

export interface GetUserSessionsInput extends PagedAndSortedResultRequestDto {
device?: string;
clientId?: string;
}

2 changes: 1 addition & 1 deletion apps/vue/src/api/auditing/security-logs/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const getById = (id: string) => {

export const getList = (input: GetSecurityLogPagedRequest) => {
return defHttp.get<PagedResultDto<SecurityLog>>({
url: 'api/auditing/security-log',
url: '/api/auditing/security-log',
params: input,
});
};
2 changes: 1 addition & 1 deletion apps/vue/src/api/identity/claims/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const update = (id: string, input: UpdateIdentityClaimType) => {

export const getById = (id: string) => {
return defHttp.get<IdentityClaimType>({
url: `'/api/identity/claim-types/${id}'`,
url: `/api/identity/claim-types/${id}'`,
});
};

Expand Down
2 changes: 1 addition & 1 deletion apps/vue/src/api/identity/organization-units/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const getAll = () => {

export const move = (id: string, parentId?: string) => {
return defHttp.put<void>({
url: `api/identity/organization-units/${id}/move`,
url: `/api/identity/organization-units/${id}/move`,
data: {
parentId: parentId,
},
Expand Down
27 changes: 27 additions & 0 deletions apps/vue/src/api/identity/sessions/index.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { defHttp } from '/@/utils/http/axios';
import {
IdentitySessionDto,
GetUserSessionsInput
} from './model';

/**
* 查询会话列表
* @param { GetUserSessionsInput } input 查询参数
* @returns { Promise<PagedResultDto<IdentitySessionDto>> }
*/
export const getSessions = (input?: GetUserSessionsInput): Promise<PagedResultDto<IdentitySessionDto>> => {
return defHttp.get<PagedResultDto<IdentitySessionDto>>({
url: '/api/identity/sessions',
params: input,
});
};
/**
* 撤销会话
* @param { string } sessionId 会话id
* @returns { Promise<void> }
*/
export const revokeSession = (sessionId: string): Promise<void> => {
return defHttp.delete<void>({
url: `/api/identity/sessions/${sessionId}/revoke`,
});
}
16 changes: 16 additions & 0 deletions apps/vue/src/api/identity/sessions/model/index.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
export interface IdentitySessionDto extends EntityDto<string> {
sessionId: string;
device: string;
deviceInfo: string;
userId: string;
clientId?: string;
ipAddresses?: string;
signedIn: Date;
lastAccessed?: Date;
}

export interface GetUserSessionsInput extends PagedAndSortedResultRequestDto {
userId?: string;
device?: string;
clientId?: string;
}
2 changes: 1 addition & 1 deletion apps/vue/src/api/localization/languages/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const getByName = (name: string) => {

export const create = (input: LanguageCreate) => {
return defHttp.post<Language>({
url: '/api/abp/localization/languages',
url: '/api/localization/languages',
data: input,
});
};
Expand Down
2 changes: 1 addition & 1 deletion apps/vue/src/api/messages/friends/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {

export const create = (input: FriendCreateRequest) => {
return defHttp.post<void>({
url: 'api/im/my-friends',
url: '/api/im/my-friends',
data: input,
});
};
Expand Down
2 changes: 1 addition & 1 deletion apps/vue/src/api/messages/groups/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ export const search = (input: GroupSearchRequest) => {

export const getById = (groupId: string) => {
return defHttp.get<Group>({
url: `'/api/im/groups/${groupId}`,
url: `/api/im/groups/${groupId}`,
});
};
4 changes: 2 additions & 2 deletions apps/vue/src/api/multi-tenancy/tenants/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { FindTenantResult } from './model';

export const findTenantByName = (name: string) => {
return defHttp.get<FindTenantResult>({
url: `api/abp/multi-tenancy/tenants/by-name/${name}`
url: `/api/abp/multi-tenancy/tenants/by-name/${name}`
});
};

export const findTenantById = (id: string) => {
return defHttp.get<FindTenantResult>({
url: `api/abp/multi-tenancy/tenants/by-id/${id}`
url: `/api/abp/multi-tenancy/tenants/by-id/${id}`
});
};
Loading

0 comments on commit b49d2a8

Please sign in to comment.