Browse Source

Merge pull request #22495 from abpframework/auto-merge/rel-9-2/3576

Merge branch dev with rel-9.2
pull/22510/head
maliming 1 year ago
committed by GitHub
parent
commit
c2be2da4fb
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 6
      modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.abppkg.analyze.json
  2. 50
      modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json
  3. 6
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.analyze.json
  4. 194
      modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.analyze.json
  5. 11
      modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.analyze.json
  6. 49
      modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.analyze.json
  7. 266
      modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.analyze.json

6
modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.abppkg.analyze.json

@ -36,9 +36,9 @@
"name": "BloggingAdminApplicationModule"
},
{
"declaringAssemblyName": "Volo.BloggingTestApp.EntityFrameworkCore",
"namespace": "Volo.BloggingTestApp.EntityFrameworkCore",
"name": "BloggingTestAppEntityFrameworkCoreModule"
"declaringAssemblyName": "Volo.BloggingTestApp.MongoDB",
"namespace": "Volo.BloggingTestApp.MongoDB",
"name": "BloggingTestAppMongoDbModule"
},
{
"declaringAssemblyName": "Volo.Abp.Account.Web",

50
modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.abppkg.analyze.json

@ -803,6 +803,23 @@
"isOptional": false
}
]
},
{
"returnType": "ListResultDto<PermissionLookupDto>",
"namespace": "Volo.CmsKit.Admin.Menus",
"name": "GetPermissionLookupAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "PermissionLookupInputDto",
"name": "inputDto",
"isOptional": false
}
]
}
],
"contentType": "applicationService",
@ -1328,6 +1345,17 @@
}
]
},
{
"returnType": "ListResultDto<BlogDto>",
"namespace": "Volo.CmsKit.Admin.Blogs",
"name": "GetAllListAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": []
},
{
"returnType": "BlogDto",
"namespace": "Volo.CmsKit.Admin.Blogs",
@ -1367,6 +1395,28 @@
}
]
},
{
"returnType": "Void",
"namespace": "Volo.CmsKit.Admin.Blogs",
"name": "MoveAllBlogPostsAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "Guid",
"name": "blogId",
"isOptional": false
},
{
"type": "Nullable<Guid>",
"name": "assignToBlogId",
"isOptional": false
}
]
},
{
"returnType": "Void",
"namespace": "Volo.CmsKit.Admin.Blogs",

6
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.abppkg.analyze.json

@ -159,6 +159,12 @@
"name": "CreateModalModel",
"summary": null
},
{
"namespace": "Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs",
"contentType": "webPage",
"name": "DeleteBlogModal",
"summary": null
},
{
"namespace": "Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs",
"contentType": "webPage",

194
modules/cms-kit/src/Volo.CmsKit.Domain/Volo.CmsKit.Domain.abppkg.analyze.json

@ -1085,6 +1085,11 @@
"type": "System.Nullable`1[System.Guid]",
"name": "TenantId",
"summary": null
},
{
"type": "System.String",
"name": "RequiredPermissionName",
"summary": null
}
],
"contentType": "aggregateRoot",
@ -2129,6 +2134,23 @@
}
]
},
{
"returnType": "Void",
"namespace": "Volo.CmsKit.Blogs",
"name": "SetBlogId",
"summary": null,
"isAsync": false,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "Guid",
"name": "blogId",
"isOptional": false
}
]
},
{
"returnType": "Void",
"namespace": "Volo.CmsKit.Blogs",
@ -3083,6 +3105,38 @@
"isOptional": false
}
]
},
{
"returnType": "List<String>",
"namespace": "Volo.CmsKit.MarkedItems",
"name": "GetEntityIdsFilteredByUserAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "Guid",
"name": "userId",
"isOptional": false
},
{
"type": "String",
"name": "entityType",
"isOptional": false
},
{
"type": "Nullable<Guid>",
"name": "tenantId",
"isOptional": true
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
}
],
"implementingInterfaces": [
@ -3532,6 +3586,23 @@
"isOptional": false
}
]
},
{
"returnType": "Void",
"namespace": "Volo.CmsKit.Blogs",
"name": "DeleteAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "Guid",
"name": "blogId",
"isOptional": false
}
]
}
],
"implementingInterfaces": [
@ -5026,6 +5097,33 @@
"isOptional": true
}
]
},
{
"returnType": "Void",
"namespace": "Volo.CmsKit.Comments",
"name": "DeleteByEntityTypeAndIdAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "String",
"name": "entityType",
"isOptional": false
},
{
"type": "String",
"name": "entityId",
"isOptional": false
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
}
],
"contentType": "repositoryInterface",
@ -5229,6 +5327,11 @@
"name": "tagId",
"isOptional": true
},
{
"type": "Nullable<Guid>",
"name": "favoriteUserId",
"isOptional": true
},
{
"type": "Nullable<BlogPostStatus>",
"name": "statusFilter",
@ -5271,6 +5374,11 @@
"name": "tagId",
"isOptional": true
},
{
"type": "Nullable<Guid>",
"name": "favoriteUserId",
"isOptional": true
},
{
"type": "Nullable<BlogPostStatus>",
"name": "statusFilter",
@ -5449,6 +5557,55 @@
"isOptional": true
}
]
},
{
"returnType": "Void",
"namespace": "Volo.CmsKit.Blogs",
"name": "UpdateBlogAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "Guid",
"name": "sourceBlogId",
"isOptional": false
},
{
"type": "Nullable<Guid>",
"name": "targetBlogId",
"isOptional": true
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
},
{
"returnType": "Void",
"namespace": "Volo.CmsKit.Blogs",
"name": "DeleteByBlogIdAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "Guid",
"name": "blogId",
"isOptional": false
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
}
],
"contentType": "repositoryInterface",
@ -5535,6 +5692,43 @@
}
]
},
{
"returnType": "List<BlogWithBlogPostCount>",
"namespace": "Volo.CmsKit.Blogs",
"name": "GetListWithBlogPostCountAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "String",
"name": "filter",
"isOptional": true
},
{
"type": "String",
"name": "sorting",
"isOptional": true
},
{
"type": "Int32",
"name": "maxResultCount",
"isOptional": true
},
{
"type": "Int32",
"name": "skipCount",
"isOptional": true
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
},
{
"returnType": "Int64",
"namespace": "Volo.CmsKit.Blogs",

11
modules/docs/src/Volo.Docs.Admin.Application/Volo.Docs.Admin.Application.abppkg.analyze.json

@ -455,6 +455,17 @@
"isPrivate": false,
"isStatic": false,
"parameters": []
},
{
"returnType": "List<ProjectWithoutDetailsDto>",
"namespace": "Volo.Docs.Admin.Documents",
"name": "GetProjectsAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": []
}
],
"contentType": "applicationService",

49
modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.abppkg.analyze.json

@ -291,6 +291,12 @@
"namespace": "Volo.Abp.Domain.Entities",
"declaringAssemblyName": "Volo.Abp.Data",
"fullName": "Volo.Abp.Domain.Entities.IHasConcurrencyStamp"
},
{
"name": "IHasCreationTime",
"namespace": "Volo.Abp.Auditing",
"declaringAssemblyName": "Volo.Abp.Auditing.Contracts",
"fullName": "Volo.Abp.Auditing.IHasCreationTime"
}
],
"methods": [
@ -351,6 +357,11 @@
"type": "Volo.Abp.Identity.IdentityClaimValueType",
"name": "ValueType",
"summary": null
},
{
"type": "System.DateTime",
"name": "CreationTime",
"summary": null
}
],
"contentType": "aggregateRoot",
@ -488,6 +499,12 @@
"namespace": "Volo.Abp.Auditing",
"declaringAssemblyName": "Volo.Abp.Auditing.Contracts",
"fullName": "Volo.Abp.Auditing.IHasEntityVersion"
},
{
"name": "IHasCreationTime",
"namespace": "Volo.Abp.Auditing",
"declaringAssemblyName": "Volo.Abp.Auditing.Contracts",
"fullName": "Volo.Abp.Auditing.IHasCreationTime"
}
],
"methods": [
@ -649,6 +666,11 @@
"type": "System.Int32",
"name": "EntityVersion",
"summary": "A version value that is increased whenever the entity is changed."
},
{
"type": "System.DateTime",
"name": "CreationTime",
"summary": null
}
],
"contentType": "aggregateRoot",
@ -5656,6 +5678,33 @@
}
]
},
{
"returnType": "List<OrganizationUnit>",
"namespace": "Volo.Abp.Identity",
"name": "GetListByDisplayNamesAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "String[]",
"name": "displayNames",
"isOptional": false
},
{
"type": "Boolean",
"name": "includeDetails",
"isOptional": true
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
},
{
"returnType": "List<IdentityRole>",
"namespace": "Volo.Abp.Identity",

266
modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.abppkg.analyze.json

@ -797,66 +797,7 @@
"isOptional": false
},
{
"type": "Guid",
"name": "client",
"isOptional": false
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
},
{
"returnType": "List<OpenIddictToken>",
"namespace": "Volo.Abp.OpenIddict.Tokens",
"name": "FindAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "String",
"name": "subject",
"isOptional": false
},
{
"type": "Guid",
"name": "client",
"isOptional": false
},
{
"type": "String",
"name": "status",
"isOptional": false
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
},
{
"returnType": "List<OpenIddictToken>",
"namespace": "Volo.Abp.OpenIddict.Tokens",
"name": "FindAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "String",
"name": "subject",
"isOptional": false
},
{
"type": "Guid",
"type": "Nullable<Guid>",
"name": "client",
"isOptional": false
},
@ -1036,6 +977,43 @@
}
]
},
{
"returnType": "ValueTask<Int64>",
"namespace": "Volo.Abp.OpenIddict.Tokens",
"name": "RevokeAsync",
"summary": null,
"isAsync": false,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "String",
"name": "subject",
"isOptional": false
},
{
"type": "Nullable<Guid>",
"name": "applicationId",
"isOptional": false
},
{
"type": "String",
"name": "status",
"isOptional": false
},
{
"type": "String",
"name": "type",
"isOptional": false
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
},
{
"returnType": "ValueTask<Int64>",
"namespace": "Volo.Abp.OpenIddict.Tokens",
@ -1054,7 +1032,51 @@
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
},
{
"returnType": "ValueTask<Int64>",
"namespace": "Volo.Abp.OpenIddict.Tokens",
"name": "RevokeByApplicationIdAsync",
"summary": null,
"isAsync": false,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "Guid",
"name": "applicationId",
"isOptional": false
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
},
{
"returnType": "ValueTask<Int64>",
"namespace": "Volo.Abp.OpenIddict.Tokens",
"name": "RevokeBySubjectAsync",
"summary": null,
"isAsync": false,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "String",
"name": "subject",
"isOptional": false
},
{
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
}
@ -1344,10 +1366,20 @@
"isOptional": false
},
{
"type": "Guid",
"type": "Nullable<Guid>",
"name": "client",
"isOptional": false
},
{
"type": "String",
"name": "status",
"isOptional": false
},
{
"type": "String",
"name": "type",
"isOptional": false
},
{
"type": "CancellationToken",
"name": "cancellationToken",
@ -1358,26 +1390,16 @@
{
"returnType": "List<OpenIddictAuthorization>",
"namespace": "Volo.Abp.OpenIddict.Authorizations",
"name": "FindAsync",
"name": "FindByApplicationIdAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "String",
"name": "subject",
"isOptional": false
},
{
"type": "Guid",
"name": "client",
"isOptional": false
},
{
"type": "String",
"name": "status",
"name": "applicationId",
"isOptional": false
},
{
@ -1388,33 +1410,40 @@
]
},
{
"returnType": "List<OpenIddictAuthorization>",
"returnType": "OpenIddictAuthorization",
"namespace": "Volo.Abp.OpenIddict.Authorizations",
"name": "FindAsync",
"name": "FindByIdAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "String",
"name": "subject",
"isOptional": false
},
{
"type": "Guid",
"name": "client",
"name": "id",
"isOptional": false
},
{
"type": "String",
"name": "status",
"isOptional": false
},
"type": "CancellationToken",
"name": "cancellationToken",
"isOptional": true
}
]
},
{
"returnType": "List<OpenIddictAuthorization>",
"namespace": "Volo.Abp.OpenIddict.Authorizations",
"name": "FindBySubjectAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "String",
"name": "type",
"name": "subject",
"isOptional": false
},
{
@ -1427,7 +1456,7 @@
{
"returnType": "List<OpenIddictAuthorization>",
"namespace": "Volo.Abp.OpenIddict.Authorizations",
"name": "FindByApplicationIdAsync",
"name": "ListAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
@ -1435,8 +1464,13 @@
"isStatic": false,
"parameters": [
{
"type": "Guid",
"name": "applicationId",
"type": "Nullable<Int32>",
"name": "count",
"isOptional": false
},
{
"type": "Nullable<Int32>",
"name": "offset",
"isOptional": false
},
{
@ -1447,9 +1481,9 @@
]
},
{
"returnType": "OpenIddictAuthorization",
"returnType": "Int64",
"namespace": "Volo.Abp.OpenIddict.Authorizations",
"name": "FindByIdAsync",
"name": "PruneAsync",
"summary": null,
"isAsync": true,
"isPublic": true,
@ -1457,8 +1491,8 @@
"isStatic": false,
"parameters": [
{
"type": "Guid",
"name": "id",
"type": "DateTime",
"name": "date",
"isOptional": false
},
{
@ -1469,11 +1503,11 @@
]
},
{
"returnType": "List<OpenIddictAuthorization>",
"returnType": "ValueTask<Int64>",
"namespace": "Volo.Abp.OpenIddict.Authorizations",
"name": "FindBySubjectAsync",
"name": "RevokeAsync",
"summary": null,
"isAsync": true,
"isAsync": false,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
@ -1483,6 +1517,21 @@
"name": "subject",
"isOptional": false
},
{
"type": "Nullable<Guid>",
"name": "applicationId",
"isOptional": false
},
{
"type": "String",
"name": "status",
"isOptional": false
},
{
"type": "String",
"name": "type",
"isOptional": false
},
{
"type": "CancellationToken",
"name": "cancellationToken",
@ -1491,23 +1540,18 @@
]
},
{
"returnType": "List<OpenIddictAuthorization>",
"returnType": "ValueTask<Int64>",
"namespace": "Volo.Abp.OpenIddict.Authorizations",
"name": "ListAsync",
"name": "RevokeByApplicationIdAsync",
"summary": null,
"isAsync": true,
"isAsync": false,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "Nullable<Int32>",
"name": "count",
"isOptional": false
},
{
"type": "Nullable<Int32>",
"name": "offset",
"type": "Guid",
"name": "applicationId",
"isOptional": false
},
{
@ -1518,18 +1562,18 @@
]
},
{
"returnType": "Int64",
"returnType": "ValueTask<Int64>",
"namespace": "Volo.Abp.OpenIddict.Authorizations",
"name": "PruneAsync",
"name": "RevokeBySubjectAsync",
"summary": null,
"isAsync": true,
"isAsync": false,
"isPublic": true,
"isPrivate": false,
"isStatic": false,
"parameters": [
{
"type": "DateTime",
"name": "date",
"type": "String",
"name": "subject",
"isOptional": false
},
{

Loading…
Cancel
Save