Browse Source

upgrade abp framework to 8.1.0

pull/934/head 8.1.0
colin 2 years ago
parent
commit
cc96d9c7b8
  1. 2
      .github/workflows/publish.yml
  2. 4
      .github/workflows/release.yml
  3. 16
      aspnet-core/Directory.Build.props
  4. 4
      aspnet-core/common.props
  5. 3
      aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs
  6. 2
      aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/LanguageController.cs
  7. 2
      aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceController.cs
  8. 2
      aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextController.cs
  9. 2
      aspnet-core/framework/pushplus/LINGYUN.Abp.PushPlus.SettingManagement/LINGYUN/Abp/PushPlus/SettingManagement/PushPlusSettingController.cs
  10. 2
      aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingController.cs
  11. 2
      aspnet-core/framework/wx-pusher/LINGYUN.Abp.WxPusher.SettingManagement/LINGYUN/Abp/WxPusher/SettingManagement/WxPusherSettingController.cs
  12. 1179
      aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/Migrations/20240413021934_Upgrade-Abp-Framework-To-8-1-0.Designer.cs
  13. 62
      aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/Migrations/20240413021934_Upgrade-Abp-Framework-To-8-1-0.cs
  14. 18
      aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/Migrations/AuthServerMigrationsDbContextModelSnapshot.cs
  15. 653
      aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/Migrations/20240413021854_Upgrade-Abp-Framework-To-8-1-0.Designer.cs
  16. 39
      aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/Migrations/20240413021854_Upgrade-Abp-Framework-To-8-1-0.cs
  17. 6
      aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/Migrations/BackendAdminMigrationsDbContextModelSnapshot.cs
  18. 2
      aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN/Abp/Account/AccountController.cs
  19. 7
      aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN/Abp/Account/MyClaimController.cs
  20. 5
      aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN/Abp/Account/MyProfileController.cs
  21. 5
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/AuditLogs/AuditLogController.cs
  22. 3
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/AuditLogs/EntityChangesController.cs
  23. 5
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/Logging/LogController.cs
  24. 5
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/SecurityLogs/SecurityLogController.cs
  25. 4
      aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaServerModule.cs
  26. 5
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/IdentityClaimTypeController.cs
  27. 5
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/IdentityRoleController.cs
  28. 5
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/IdentityUserController.cs
  29. 5
      aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/OrganizationUnitController.cs
  30. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/ApiResources/ApiResourceController.cs
  31. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/ApiScopes/ApiScopeController.cs
  32. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/Clients/ClientController.cs
  33. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/Grants/PersistedGrantController.cs
  34. 2
      aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/IdentityResources/IdentityResourceController.cs
  35. 2
      aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.HttpApi/LINGYUN/Abp/LocalizationManagement/TextController.cs
  36. 2
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/OssContainerController.cs
  37. 2
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/OssObjectController.cs
  38. 2
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/PrivateFilesController.cs
  39. 2
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/PublicFilesController.cs
  40. 2
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/ShareFilesController.cs
  41. 2
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/StaticFilesController.cs
  42. 2
      aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/OssManagementSettingController.cs
  43. 2
      aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN/Platform/Datas/DataController.cs
  44. 2
      aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN/Platform/Layouts/LayoutController.cs
  45. 2
      aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN/Platform/Menus/MenuController.cs
  46. 2
      aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN/Platform/PlatformControllerBase.cs
  47. 2
      aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Chat/ChatController.cs
  48. 2
      aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Chat/MyFriendController.cs
  49. 2
      aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Groups/GroupController.cs
  50. 2
      aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Groups/UserGroupController.cs
  51. 2
      aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.HttpApi/LINGYUN/Abp/Notifications/MyNotificationController.cs
  52. 2
      aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.HttpApi/LINGYUN/Abp/Notifications/MySubscriptionController.cs
  53. 2
      aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.HttpApi/LINGYUN/Abp/Notifications/NotificationController.cs
  54. 31
      aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.Saas/LINGYUN/Abp/MultiTenancy/Saas/TenantStore.cs
  55. 3
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Tenants/Dto/TenantDto.cs
  56. 12
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN/Abp/Saas/Tenants/Tenant.cs
  57. 29
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN/Abp/Saas/Tenants/TenantManager.cs
  58. 7
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN/Abp/Saas/Tenants/TenantStore.cs
  59. 2
      aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN/Abp/Saas/EntityFrameworkCore/AbpSaasDbContextModelCreatingExtensions.cs
  60. 2
      aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/SettingController.cs
  61. 2
      aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/UserSettingController.cs
  62. 5
      aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs
  63. 6
      aspnet-core/services/LY.MicroService.Applications.Single/Pages/Account/EmailConfirmConfirmation.cshtml.cs
  64. 2
      aspnet-core/services/LY.MicroService.Applications.Single/Pages/Account/VerifyAuthenticatorCode.cshtml.cs
  65. 2
      aspnet-core/services/LY.MicroService.Applications.Single/Pages/Account/VerifyCode.cshtml.cs
  66. 2
      aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Controllers/HomeController.cs
  67. 6
      aspnet-core/services/LY.MicroService.AuthServer/Pages/Account/EmailConfirmConfirmation.cshtml.cs
  68. 2
      aspnet-core/services/LY.MicroService.AuthServer/Pages/Account/VerifyAuthenticatorCode.cshtml.cs
  69. 2
      aspnet-core/services/LY.MicroService.AuthServer/Pages/Account/VerifyCode.cshtml.cs
  70. 2
      aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Controllers/HomeController.cs
  71. 2
      aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/Controllers/HomeController.cs
  72. 2
      aspnet-core/services/LY.MicroService.IdentityServer/Pages/Account/VerifyAuthenticatorCode.cshtml.cs
  73. 2
      aspnet-core/services/LY.MicroService.IdentityServer/Pages/Account/VerifyCode.cshtml.cs
  74. 2
      aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Controllers/HomeController.cs
  75. 2
      aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Controllers/HomeController.cs
  76. 2
      aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Controllers/HomeController.cs
  77. 2
      aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Controllers/HomeController.cs
  78. 2
      aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Controllers/HomeController.cs
  79. 2
      aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj
  80. 44
      aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs
  81. 2
      aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Controllers/HomeController.cs
  82. 5
      aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs
  83. 2
      aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/PackageName.CompanyName.ProjectName.HttpApi.Host.csproj
  84. 2
      aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.Configure.cs
  85. 6
      gateways/Directory.Build.props
  86. 2
      gateways/common.props

2
.github/workflows/publish.yml

@ -2,7 +2,7 @@ name: "Publish"
on:
push:
branches: [ rel-8.0.3 ]
branches: [ rel-8.1.0 ]
env:
DOTNET_VERSION: "8.0.200"

4
.github/workflows/release.yml

@ -2,7 +2,7 @@ name: "Tagged Release"
on:
push:
branches: [ rel-8.0.3 ]
branches: [ rel-8.1.0 ]
jobs:
tagged-release:
@ -14,4 +14,4 @@ jobs:
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
automatic_release_tag: "8.0.3"
automatic_release_tag: "8.1.0"

16
aspnet-core/Directory.Build.props

@ -1,11 +1,11 @@
<Project>
<PropertyGroup>
<VoloAbpPackageVersion>8.0.4</VoloAbpPackageVersion>
<VoloAbpPackageVersion>8.1.0</VoloAbpPackageVersion>
<VoloAbpLeptonXThemePackageVersion>3.0.0</VoloAbpLeptonXThemePackageVersion>
<LINGYUNAbpPackageVersion>8.0.4</LINGYUNAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.1.0</LINGYUNAbpPackageVersion>
<DaprPackageVersion>1.12.0</DaprPackageVersion>
<DistributedLockRedisPackageVersion>1.0.2</DistributedLockRedisPackageVersion>
<DotNetCoreCAPPackageVersion>8.0.0</DotNetCoreCAPPackageVersion>
<DotNetCoreCAPPackageVersion>8.1.0</DotNetCoreCAPPackageVersion>
<ElsaPackageVersion>2.14.1</ElsaPackageVersion>
<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>
@ -15,11 +15,11 @@
<HangfireMSSQLStoragePackageVersion>1.8.6</HangfireMSSQLStoragePackageVersion>
<NESTPackageVersion>7.15.1</NESTPackageVersion>
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
<OpenTelemetryExtensionsHostingPackageVersion>1.0.0-rc8</OpenTelemetryExtensionsHostingPackageVersion>
<OpenTelemetryExporterZipkinPackageVersion>1.3.1</OpenTelemetryExporterZipkinPackageVersion>
<OpenTelemetryInstrumentationAspNetCorePackageVersion>1.0.0-rc8</OpenTelemetryInstrumentationAspNetCorePackageVersion>
<OpenTelemetryInstrumentationHttpPackageVersion>1.0.0-rc8</OpenTelemetryInstrumentationHttpPackageVersion>
<OpenTelemetryContribInstrumentationEntityFrameworkCorePackageVersion>1.0.0-beta2</OpenTelemetryContribInstrumentationEntityFrameworkCorePackageVersion>
<OpenTelemetryExtensionsHostingPackageVersion>1.8.0</OpenTelemetryExtensionsHostingPackageVersion>
<OpenTelemetryExporterZipkinPackageVersion>1.8.0</OpenTelemetryExporterZipkinPackageVersion>
<OpenTelemetryInstrumentationAspNetCorePackageVersion>1.8.1</OpenTelemetryInstrumentationAspNetCorePackageVersion>
<OpenTelemetryInstrumentationHttpPackageVersion>1.8.1</OpenTelemetryInstrumentationHttpPackageVersion>
<OpenTelemetryInstrumentationEntityFrameworkCorePackageVersion>1.0.0-beta.11</OpenTelemetryInstrumentationEntityFrameworkCorePackageVersion>
<QuartzNETPackageVersion>3.7.0</QuartzNETPackageVersion>
<StackExchangeRedisPackageVersion>2.7.4</StackExchangeRedisPackageVersion>
<SerilogPackageVersion>3.1.1</SerilogPackageVersion>

4
aspnet-core/common.props

@ -1,12 +1,12 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>8.0.4</Version>
<Version>8.1.0</Version>
<Authors>colin</Authors>
<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
<PackageOutputPath>$(SolutionDir)LocalNuget</PackageOutputPath>
<PackageVersion>8.0.3</PackageVersion>
<PackageVersion>8.1.0</PackageVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>

3
aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs

@ -2,7 +2,6 @@
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.AspNetCore.Mvc;
namespace LINGYUN.Abp.Aliyun.SettingManagement
@ -10,7 +9,7 @@ namespace LINGYUN.Abp.Aliyun.SettingManagement
[RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
[Area("settingManagement")]
[Route("api/setting-management/aliyun")]
public class AliyunSettingController : AbpController, IAliyunSettingAppService
public class AliyunSettingController : AbpControllerBase, IAliyunSettingAppService
{
protected IAliyunSettingAppService AppService { get; }

2
aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/LanguageController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization
[Area("abp")]
[RemoteService(Name = "abp")]
[Route("api/abp/localization/languages")]
public class LanguageController : AbpController, ILanguageAppService
public class LanguageController : AbpControllerBase, ILanguageAppService
{
private readonly ILanguageAppService _service;

2
aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization
[Area("abp")]
[RemoteService(Name = "abp")]
[Route("api/abp/localization/resources")]
public class ResourceController : AbpController, IResourceAppService
public class ResourceController : AbpControllerBase, IResourceAppService
{
private readonly IResourceAppService _service;

2
aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization
[Area("abp")]
[RemoteService(Name = "abp")]
[Route("api/abp/localization/texts")]
public class TextController : AbpController, ITextAppService
public class TextController : AbpControllerBase, ITextAppService
{
private readonly ITextAppService _service;

2
aspnet-core/framework/pushplus/LINGYUN.Abp.PushPlus.SettingManagement/LINGYUN/Abp/PushPlus/SettingManagement/PushPlusSettingController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.PushPlus.SettingManagement
[RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
[Area(AbpSettingManagementRemoteServiceConsts.ModuleName)]
[Route($"api/{AbpSettingManagementRemoteServiceConsts.ModuleName}/push-plus")]
public class WxPusherSettingController : AbpController, IPushPlusSettingAppService
public class WxPusherSettingController : AbpControllerBase, IPushPlusSettingAppService
{
protected IPushPlusSettingAppService Service { get; }

2
aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.WeChat.SettingManagement
[RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
[Area("settingManagement")]
[Route("api/setting-management/wechat")]
public class WeChatSettingController : AbpController, IWeChatSettingAppService
public class WeChatSettingController : AbpControllerBase, IWeChatSettingAppService
{
protected IWeChatSettingAppService WeChatSettingAppService { get; }

2
aspnet-core/framework/wx-pusher/LINGYUN.Abp.WxPusher.SettingManagement/LINGYUN/Abp/WxPusher/SettingManagement/WxPusherSettingController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.WxPusher.SettingManagement
[RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
[Area(AbpSettingManagementRemoteServiceConsts.ModuleName)]
[Route($"api/{AbpSettingManagementRemoteServiceConsts.ModuleName}/wx-pusher")]
public class WxPusherSettingController : AbpController, IWxPusherSettingAppService
public class WxPusherSettingController : AbpControllerBase, IWxPusherSettingAppService
{
protected IWxPusherSettingAppService Service { get; }

1179
aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/Migrations/20240413021934_Upgrade-Abp-Framework-To-8-1-0.Designer.cs

File diff suppressed because it is too large

62
aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/Migrations/20240413021934_Upgrade-Abp-Framework-To-8-1-0.cs

@ -0,0 +1,62 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace LY.MicroService.AuthServer.EntityFrameworkCore.Migrations
{
/// <inheritdoc />
public partial class UpgradeAbpFrameworkTo810 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "Type",
table: "OpenIddictApplications",
newName: "ClientType");
migrationBuilder.AddColumn<string>(
name: "ApplicationType",
table: "OpenIddictApplications",
type: "varchar(50)",
maxLength: 50,
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "JsonWebKeySet",
table: "OpenIddictApplications",
type: "longtext",
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AddColumn<string>(
name: "Settings",
table: "OpenIddictApplications",
type: "longtext",
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ApplicationType",
table: "OpenIddictApplications");
migrationBuilder.DropColumn(
name: "JsonWebKeySet",
table: "OpenIddictApplications");
migrationBuilder.DropColumn(
name: "Settings",
table: "OpenIddictApplications");
migrationBuilder.RenameColumn(
name: "ClientType",
table: "OpenIddictApplications",
newName: "Type");
}
}
}

18
aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/Migrations/AuthServerMigrationsDbContextModelSnapshot.cs

@ -18,7 +18,7 @@ namespace LY.MicroService.AuthServer.DbMigrator.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
.HasAnnotation("ProductVersion", "7.0.10")
.HasAnnotation("ProductVersion", "8.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
@ -689,6 +689,10 @@ namespace LY.MicroService.AuthServer.DbMigrator.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("ApplicationType")
.HasMaxLength(50)
.HasColumnType("varchar(50)");
b.Property<string>("ClientId")
.HasMaxLength(100)
.HasColumnType("varchar(100)");
@ -696,6 +700,10 @@ namespace LY.MicroService.AuthServer.DbMigrator.Migrations
b.Property<string>("ClientSecret")
.HasColumnType("longtext");
b.Property<string>("ClientType")
.HasMaxLength(50)
.HasColumnType("varchar(50)");
b.Property<string>("ClientUri")
.HasColumnType("longtext");
@ -743,6 +751,9 @@ namespace LY.MicroService.AuthServer.DbMigrator.Migrations
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<string>("JsonWebKeySet")
.HasColumnType("longtext");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
.HasColumnName("LastModificationTime");
@ -769,9 +780,8 @@ namespace LY.MicroService.AuthServer.DbMigrator.Migrations
b.Property<string>("Requirements")
.HasColumnType("longtext");
b.Property<string>("Type")
.HasMaxLength(50)
.HasColumnType("varchar(50)");
b.Property<string>("Settings")
.HasColumnType("longtext");
b.HasKey("Id");

653
aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/Migrations/20240413021854_Upgrade-Abp-Framework-To-8-1-0.Designer.cs

@ -0,0 +1,653 @@
// <auto-generated />
using System;
using LY.MicroService.BackendAdmin.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Volo.Abp.EntityFrameworkCore;
#nullable disable
namespace LY.MicroService.BackendAdmin.EntityFrameworkCore.Migrations
{
[DbContext(typeof(BackendAdminMigrationsDbContext))]
[Migration("20240413021854_Upgrade-Abp-Framework-To-8-1-0")]
partial class UpgradeAbpFrameworkTo810
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
.HasAnnotation("ProductVersion", "8.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("LINGYUN.Abp.Saas.Editions.Edition", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("varchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime(6)")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("char(36)")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("char(36)")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime(6)")
.HasColumnName("DeletionTime");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<int>("EntityVersion")
.HasColumnType("int");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("char(36)")
.HasColumnName("LastModifierId");
b.HasKey("Id");
b.HasIndex("DisplayName");
b.ToTable("AbpEditions", (string)null);
});
modelBuilder.Entity("LINGYUN.Abp.Saas.Tenants.Tenant", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("varchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime(6)")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("char(36)")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("char(36)")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime(6)")
.HasColumnName("DeletionTime");
b.Property<DateTime?>("DisableTime")
.HasColumnType("datetime(6)");
b.Property<Guid?>("EditionId")
.HasColumnType("char(36)");
b.Property<DateTime?>("EnableTime")
.HasColumnType("datetime(6)");
b.Property<int>("EntityVersion")
.HasColumnType("int");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("char(36)")
.HasColumnName("LastModifierId");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<string>("NormalizedName")
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.HasKey("Id");
b.HasIndex("EditionId");
b.HasIndex("Name");
b.HasIndex("NormalizedName");
b.ToTable("AbpTenants", (string)null);
});
modelBuilder.Entity("LINGYUN.Abp.Saas.Tenants.TenantConnectionString", b =>
{
b.Property<Guid>("TenantId")
.HasColumnType("char(36)");
b.Property<string>("Name")
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<string>("Value")
.IsRequired()
.HasMaxLength(1024)
.HasColumnType("varchar(1024)");
b.HasKey("TenantId", "Name");
b.ToTable("AbpTenantConnectionStrings", (string)null);
});
modelBuilder.Entity("LINGYUN.Abp.TextTemplating.TextTemplate", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("Content")
.HasMaxLength(1048576)
.HasColumnType("longtext")
.HasColumnName("Content");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime(6)")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("char(36)")
.HasColumnName("CreatorId");
b.Property<string>("Culture")
.HasMaxLength(30)
.HasColumnType("varchar(30)")
.HasColumnName("Culture");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(100)
.HasColumnType("varchar(100)")
.HasColumnName("DisplayName");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("char(36)")
.HasColumnName("LastModifierId");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(100)
.HasColumnType("varchar(100)")
.HasColumnName("Name");
b.Property<Guid?>("TenantId")
.HasColumnType("char(36)")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("TenantId", "Name")
.HasDatabaseName("IX_Tenant_Text_Template_Name");
b.ToTable("AbpTextTemplates", (string)null);
});
modelBuilder.Entity("LINGYUN.Abp.TextTemplating.TextTemplateDefinition", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.IsRequired()
.HasMaxLength(40)
.HasColumnType("varchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<string>("DefaultCultureName")
.HasMaxLength(30)
.HasColumnType("varchar(30)")
.HasColumnName("DefaultCultureName");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(512)
.HasColumnType("varchar(512)")
.HasColumnName("DisplayName");
b.Property<string>("ExtraProperties")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsInlineLocalized")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsLayout")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsStatic")
.HasColumnType("tinyint(1)");
b.Property<string>("Layout")
.HasMaxLength(60)
.HasColumnType("varchar(60)")
.HasColumnName("Layout");
b.Property<string>("LocalizationResourceName")
.HasMaxLength(64)
.HasColumnType("varchar(64)")
.HasColumnName("LocalizationResourceName");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)")
.HasColumnName("Name");
b.Property<string>("RenderEngine")
.HasMaxLength(30)
.HasColumnType("varchar(30)")
.HasColumnName("RenderEngine");
b.HasKey("Id");
b.ToTable("AbpTextTemplateDefinitions", (string)null);
});
modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureDefinitionRecord", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("AllowedProviders")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("DefaultValue")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("Description")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("ExtraProperties")
.HasColumnType("longtext")
.HasColumnName("ExtraProperties");
b.Property<string>("GroupName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<bool>("IsAvailableToHost")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsVisibleToClients")
.HasColumnType("tinyint(1)");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ParentName")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ValueType")
.HasMaxLength(2048)
.HasColumnType("varchar(2048)");
b.HasKey("Id");
b.HasIndex("GroupName");
b.HasIndex("Name")
.IsUnique();
b.ToTable("AbpFeatures", (string)null);
});
modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureGroupDefinitionRecord", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("ExtraProperties")
.HasColumnType("longtext")
.HasColumnName("ExtraProperties");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.HasKey("Id");
b.HasIndex("Name")
.IsUnique();
b.ToTable("AbpFeatureGroups", (string)null);
});
modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ProviderKey")
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<string>("ProviderName")
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<string>("Value")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.HasKey("Id");
b.HasIndex("Name", "ProviderName", "ProviderKey")
.IsUnique();
b.ToTable("AbpFeatureValues", (string)null);
});
modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionDefinitionRecord", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("ExtraProperties")
.HasColumnType("longtext")
.HasColumnName("ExtraProperties");
b.Property<string>("GroupName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<bool>("IsEnabled")
.HasColumnType("tinyint(1)");
b.Property<byte>("MultiTenancySide")
.HasColumnType("tinyint unsigned");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ParentName")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("Providers")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("StateCheckers")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.HasKey("Id");
b.HasIndex("GroupName");
b.HasIndex("Name")
.IsUnique();
b.ToTable("AbpPermissions", (string)null);
});
modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ProviderKey")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<string>("ProviderName")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<Guid?>("TenantId")
.HasColumnType("char(36)")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("TenantId", "Name", "ProviderName", "ProviderKey")
.IsUnique();
b.ToTable("AbpPermissionGrants", (string)null);
});
modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGroupDefinitionRecord", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("ExtraProperties")
.HasColumnType("longtext")
.HasColumnName("ExtraProperties");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.HasKey("Id");
b.HasIndex("Name")
.IsUnique();
b.ToTable("AbpPermissionGroups", (string)null);
});
modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ProviderKey")
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<string>("ProviderName")
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<string>("Value")
.IsRequired()
.HasMaxLength(2048)
.HasColumnType("varchar(2048)");
b.HasKey("Id");
b.HasIndex("Name", "ProviderName", "ProviderKey")
.IsUnique();
b.ToTable("AbpSettings", (string)null);
});
modelBuilder.Entity("Volo.Abp.SettingManagement.SettingDefinitionRecord", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("DefaultValue")
.HasMaxLength(2048)
.HasColumnType("varchar(2048)");
b.Property<string>("Description")
.HasMaxLength(512)
.HasColumnType("varchar(512)");
b.Property<string>("DisplayName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("ExtraProperties")
.HasColumnType("longtext")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsEncrypted")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsInherited")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsVisibleToClients")
.HasColumnType("tinyint(1)");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("Providers")
.HasMaxLength(1024)
.HasColumnType("varchar(1024)");
b.HasKey("Id");
b.HasIndex("Name")
.IsUnique();
b.ToTable("AbpSettingDefinitions", (string)null);
});
modelBuilder.Entity("LINGYUN.Abp.Saas.Tenants.Tenant", b =>
{
b.HasOne("LINGYUN.Abp.Saas.Editions.Edition", "Edition")
.WithMany()
.HasForeignKey("EditionId");
b.Navigation("Edition");
});
modelBuilder.Entity("LINGYUN.Abp.Saas.Tenants.TenantConnectionString", b =>
{
b.HasOne("LINGYUN.Abp.Saas.Tenants.Tenant", null)
.WithMany("ConnectionStrings")
.HasForeignKey("TenantId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("LINGYUN.Abp.Saas.Tenants.Tenant", b =>
{
b.Navigation("ConnectionStrings");
});
#pragma warning restore 612, 618
}
}
}

39
aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/Migrations/20240413021854_Upgrade-Abp-Framework-To-8-1-0.cs

@ -0,0 +1,39 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace LY.MicroService.BackendAdmin.EntityFrameworkCore.Migrations
{
/// <inheritdoc />
public partial class UpgradeAbpFrameworkTo810 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "NormalizedName",
table: "AbpTenants",
type: "varchar(64)",
maxLength: 64,
nullable: true)
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateIndex(
name: "IX_AbpTenants_NormalizedName",
table: "AbpTenants",
column: "NormalizedName");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "IX_AbpTenants_NormalizedName",
table: "AbpTenants");
migrationBuilder.DropColumn(
name: "NormalizedName",
table: "AbpTenants");
}
}
}

6
aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/Migrations/BackendAdminMigrationsDbContextModelSnapshot.cs

@ -152,12 +152,18 @@ namespace LY.MicroService.BackendAdmin.EntityFrameworkCore.Migrations
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.Property<string>("NormalizedName")
.HasMaxLength(64)
.HasColumnType("varchar(64)");
b.HasKey("Id");
b.HasIndex("EditionId");
b.HasIndex("Name");
b.HasIndex("NormalizedName");
b.ToTable("AbpTenants", (string)null);
});

2
aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN/Abp/Account/AccountController.cs

@ -10,7 +10,7 @@ namespace LINGYUN.Abp.Account
[RemoteService(Name = AccountRemoteServiceConsts.RemoteServiceName)]
[Area("account")]
[Route("api/account")]
public class AccountController : AbpController, IAccountAppService
public class AccountController : AbpControllerBase, IAccountAppService
{
protected IAccountAppService AccountAppService { get; }
public AccountController(

7
aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN/Abp/Account/MyClaimController.cs

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Asp.Versioning;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Account;
@ -8,9 +9,9 @@ namespace LINGYUN.Abp.Account
{
[RemoteService(Name = AccountRemoteServiceConsts.RemoteServiceName)]
[Area("account")]
[ControllerName("Profile")]
[ControllerName("Claim")]
[Route("/api/account/my-claim")]
public class MyClaimController : AbpController, IMyClaimAppService
public class MyClaimController : AbpControllerBase, IMyClaimAppService
{
private readonly IMyClaimAppService _service;

5
aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN/Abp/Account/MyProfileController.cs

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Asp.Versioning;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Account;
@ -10,7 +11,7 @@ namespace LINGYUN.Abp.Account
[Area("account")]
[ControllerName("Profile")]
[Route("/api/account/my-profile")]
public class MyProfileController : AbpController, IMyProfileAppService
public class MyProfileController : AbpControllerBase, IMyProfileAppService
{
protected IMyProfileAppService MyProfileAppService { get; }

5
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/AuditLogs/AuditLogController.cs

@ -1,4 +1,5 @@
using LINGYUN.Abp.Auditing.Permissions;
using Asp.Versioning;
using LINGYUN.Abp.Auditing.Permissions;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System;
@ -14,7 +15,7 @@ namespace LINGYUN.Abp.Auditing.AuditLogs
[ControllerName("audit-log")]
[Route("api/auditing/audit-log")]
[Authorize(AuditingPermissionNames.AuditLog.Default)]
public class AuditLogController : AbpController, IAuditLogAppService
public class AuditLogController : AbpControllerBase, IAuditLogAppService
{
protected IAuditLogAppService AuditLogAppService { get; }

3
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/AuditLogs/EntityChangesController.cs

@ -1,4 +1,5 @@
using LINGYUN.Abp.Auditing.Permissions;
using Asp.Versioning;
using LINGYUN.Abp.Auditing.Permissions;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System;

5
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/Logging/LogController.cs

@ -1,4 +1,5 @@
using LINGYUN.Abp.Auditing.Permissions;
using Asp.Versioning;
using LINGYUN.Abp.Auditing.Permissions;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
@ -13,7 +14,7 @@ namespace LINGYUN.Abp.Auditing.Logging
[ControllerName("logging")]
[Route("api/auditing/logging")]
[Authorize(AuditingPermissionNames.SystemLog.Default)]
public class LogController : AbpController, ILogAppService
public class LogController : AbpControllerBase, ILogAppService
{
private readonly ILogAppService _service;

5
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN/Abp/Auditing/SecurityLogs/SecurityLogController.cs

@ -1,4 +1,5 @@
using LINGYUN.Abp.Auditing.Permissions;
using Asp.Versioning;
using LINGYUN.Abp.Auditing.Permissions;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using System;
@ -14,7 +15,7 @@ namespace LINGYUN.Abp.Auditing.SecurityLogs
[ControllerName("security-log")]
[Route("api/auditing/security-log")]
[Authorize(AuditingPermissionNames.SecurityLog.Default)]
public class SecurityLogController : AbpController, ISecurityLogAppService
public class SecurityLogController : AbpControllerBase, ISecurityLogAppService
{
protected ISecurityLogAppService SecurityLogAppService { get; }

4
aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN/Abp/Elsa/AbpElsaServerModule.cs

@ -1,7 +1,7 @@
using Elsa.Server.Api;
using Asp.Versioning;
using Elsa.Server.Api;
using Elsa.Server.Api.Mapping;
using Elsa.Server.Api.Services;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.AutoMapper;

5
aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/IdentityClaimTypeController.cs

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Asp.Versioning;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Threading.Tasks;
using Volo.Abp;
@ -12,7 +13,7 @@ namespace LINGYUN.Abp.Identity
[Area("identity")]
[ControllerName("ClaimType")]
[Route("api/identity/claim-types")]
public class IdentityClaimTypeController : AbpController, IIdentityClaimTypeAppService
public class IdentityClaimTypeController : AbpControllerBase, IIdentityClaimTypeAppService
{
protected IIdentityClaimTypeAppService IdentityClaimTypeAppService { get; }
public IdentityClaimTypeController(IIdentityClaimTypeAppService identityClaimTypeAppService)

5
aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/IdentityRoleController.cs

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Asp.Versioning;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Threading.Tasks;
using Volo.Abp;
@ -12,7 +13,7 @@ namespace LINGYUN.Abp.Identity
[Area("identity")]
[ControllerName("Role")]
[Route("api/identity/roles")]
public class IdentityRoleController : AbpController, IIdentityRoleAppService
public class IdentityRoleController : AbpControllerBase, IIdentityRoleAppService
{
protected IIdentityRoleAppService RoleAppService { get; }
public IdentityRoleController(

5
aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/IdentityUserController.cs

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Asp.Versioning;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Threading.Tasks;
using Volo.Abp;
@ -12,7 +13,7 @@ namespace LINGYUN.Abp.Identity
[Area("identity")]
[ControllerName("User")]
[Route("api/identity/users")]
public class IdentityUserController : AbpController, IIdentityUserAppService
public class IdentityUserController : AbpControllerBase, IIdentityUserAppService
{
protected IIdentityUserAppService UserAppService { get; }
public IdentityUserController(

5
aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN/Abp/Identity/OrganizationUnitController.cs

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Asp.Versioning;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Threading.Tasks;
using Volo.Abp;
@ -12,7 +13,7 @@ namespace LINGYUN.Abp.Identity
[Area("identity")]
[ControllerName("organization-units")]
[Route("api/identity/organization-units")]
public class OrganizationUnitController : AbpController, IOrganizationUnitAppService
public class OrganizationUnitController : AbpControllerBase, IOrganizationUnitAppService
{
protected IOrganizationUnitAppService OrganizationUnitAppService { get; }

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/ApiResources/ApiResourceController.cs

@ -10,7 +10,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiResources
[RemoteService(Name = AbpIdentityServerConsts.RemoteServiceName)]
[Area("identity-server")]
[Route("api/identity-server/api-resources")]
public class ApiResourceController : AbpController, IApiResourceAppService
public class ApiResourceController : AbpControllerBase, IApiResourceAppService
{
protected IApiResourceAppService ApiResourceAppService { get; }
public ApiResourceController(

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/ApiScopes/ApiScopeController.cs

@ -10,7 +10,7 @@ namespace LINGYUN.Abp.IdentityServer.ApiScopes
[RemoteService(Name = AbpIdentityServerConsts.RemoteServiceName)]
[Area("identity-server")]
[Route("api/identity-server/api-scopes")]
public class ApiScopeController : AbpController, IApiScopeAppService
public class ApiScopeController : AbpControllerBase, IApiScopeAppService
{
protected IApiScopeAppService ApiScopeAppService { get; }

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/Clients/ClientController.cs

@ -10,7 +10,7 @@ namespace LINGYUN.Abp.IdentityServer.Clients
[RemoteService(Name = AbpIdentityServerConsts.RemoteServiceName)]
[Area("identity-server")]
[Route("api/identity-server/clients")]
public class ClientController : AbpController, IClientAppService
public class ClientController : AbpControllerBase, IClientAppService
{
protected IClientAppService ClientAppService { get; }
public ClientController(IClientAppService clientAppService)

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/Grants/PersistedGrantController.cs

@ -10,7 +10,7 @@ namespace LINGYUN.Abp.IdentityServer.Grants
[RemoteService(Name = AbpIdentityServerConsts.RemoteServiceName)]
[Area("identity-server")]
[Route("api/identity-server/persisted-grants")]
public class PersistedGrantController : AbpController, IPersistedGrantAppService
public class PersistedGrantController : AbpControllerBase, IPersistedGrantAppService
{
protected IPersistedGrantAppService PersistedGrantAppService { get; }

2
aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN/Abp/IdentityServer/IdentityResources/IdentityResourceController.cs

@ -10,7 +10,7 @@ namespace LINGYUN.Abp.IdentityServer.IdentityResources
[RemoteService(Name = AbpIdentityServerConsts.RemoteServiceName)]
[Area("identity-server")]
[Route("api/identity-server/identity-resources")]
public class IdentityResourceController : AbpController, IIdentityResourceAppService
public class IdentityResourceController : AbpControllerBase, IIdentityResourceAppService
{
protected IIdentityResourceAppService IdentityResourceAppService { get; }
public IdentityResourceController(

2
aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.HttpApi/LINGYUN/Abp/LocalizationManagement/TextController.cs

@ -8,7 +8,7 @@ namespace LINGYUN.Abp.LocalizationManagement
[RemoteService(Name = LocalizationRemoteServiceConsts.RemoteServiceName)]
[Area("localization")]
[Route("api/localization/texts")]
public class TextController : AbpController, ITextAppService
public class TextController : AbpControllerBase, ITextAppService
{
private readonly ITextAppService _service;

2
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/OssContainerController.cs

@ -8,7 +8,7 @@ namespace LINGYUN.Abp.OssManagement
[RemoteService(Name = OssManagementRemoteServiceConsts.RemoteServiceName)]
[Area("oss-management")]
[Route("api/oss-management/containes")]
public class OssContainerController : AbpController, IOssContainerAppService
public class OssContainerController : AbpControllerBase, IOssContainerAppService
{
protected IOssContainerAppService OssContainerAppService { get; }

2
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/OssObjectController.cs

@ -12,7 +12,7 @@ namespace LINGYUN.Abp.OssManagement
[RemoteService(Name = OssManagementRemoteServiceConsts.RemoteServiceName)]
[Area("oss-management")]
[Route("api/oss-management/objects")]
public class OssObjectController : AbpController, IOssObjectAppService
public class OssObjectController : AbpControllerBase, IOssObjectAppService
{
protected IFileUploader FileUploader { get; }
protected IOssObjectAppService OssObjectAppService { get; }

2
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/PrivateFilesController.cs

@ -14,7 +14,7 @@ namespace LINGYUN.Abp.OssManagement
[RemoteService(Name = OssManagementRemoteServiceConsts.RemoteServiceName)]
[Area("oss-management")]
[Route("api/files/private")]
public class PrivateFilesController : AbpController, IPrivateFileAppService
public class PrivateFilesController : AbpControllerBase, IPrivateFileAppService
{
private readonly IPrivateFileAppService _service;

2
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/PublicFilesController.cs

@ -11,7 +11,7 @@ namespace LINGYUN.Abp.OssManagement
[RemoteService(Name = OssManagementRemoteServiceConsts.RemoteServiceName)]
[Area("oss-management")]
[Route("api/files/public")]
public class PublicFilesController : AbpController, IPublicFileAppService
public class PublicFilesController : AbpControllerBase, IPublicFileAppService
{
private readonly IPublicFileAppService _publicFileAppService;

2
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/ShareFilesController.cs

@ -11,7 +11,7 @@ namespace LINGYUN.Abp.OssManagement
[Route("api/files/share")]
[RemoteService(false)]
[ApiExplorerSettings(IgnoreApi = true)]
public class ShareFilesController : AbpController, IShareFileAppService
public class ShareFilesController : AbpControllerBase, IShareFileAppService
{
private readonly IShareFileAppService _service;

2
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/StaticFilesController.cs

@ -12,7 +12,7 @@ namespace LINGYUN.Abp.OssManagement
[RemoteService(Name = OssManagementRemoteServiceConsts.RemoteServiceName)]
[Area("oss-management")]
[Route("api/files/static")]
public class StaticFilesController : AbpController, IStaticFilesAppService
public class StaticFilesController : AbpControllerBase, IStaticFilesAppService
{
private readonly IOssObjectAppService _ossObjectAppService;
private readonly IStaticFilesAppService _staticFilesAppServic;

2
aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/OssManagementSettingController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.OssManagement.SettingManagement
[RemoteService(Name = OssManagementRemoteServiceConsts.RemoteServiceName)]
[Area("settingManagement")]
[Route("api/setting-management/oss-management")]
public class OssManagementSettingController : AbpController, IOssManagementSettingAppService
public class OssManagementSettingController : AbpControllerBase, IOssManagementSettingAppService
{
protected IOssManagementSettingAppService WeChatSettingAppService { get; }

2
aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN/Platform/Datas/DataController.cs

@ -10,7 +10,7 @@ namespace LINGYUN.Platform.Datas
[RemoteService(Name = PlatformRemoteServiceConsts.RemoteServiceName)]
[Area("platform")]
[Route("api/platform/datas")]
public class DataController : AbpController, IDataAppService
public class DataController : AbpControllerBase, IDataAppService
{
protected IDataAppService DataAppService { get; }

2
aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN/Platform/Layouts/LayoutController.cs

@ -10,7 +10,7 @@ namespace LINGYUN.Platform.Layouts
[RemoteService(Name = PlatformRemoteServiceConsts.RemoteServiceName)]
[Area("platform")]
[Route("api/platform/layouts")]
public class LayoutController : AbpController, ILayoutAppService
public class LayoutController : AbpControllerBase, ILayoutAppService
{
protected ILayoutAppService LayoutAppService { get; }

2
aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN/Platform/Menus/MenuController.cs

@ -11,7 +11,7 @@ namespace LINGYUN.Platform.Menus
[RemoteService(Name = PlatformRemoteServiceConsts.RemoteServiceName)]
[Area("platform")]
[Route("api/platform/menus")]
public class MenuController : AbpController, IMenuAppService
public class MenuController : AbpControllerBase, IMenuAppService
{
protected IMenuAppService MenuAppService { get; }
protected IUserRoleFinder UserRoleFinder { get; }

2
aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN/Platform/PlatformControllerBase.cs

@ -4,7 +4,7 @@ using Volo.Abp.Settings;
namespace LINGYUN.Platform
{
public abstract class PlatformControllerBase : AbpController
public abstract class PlatformControllerBase : AbpControllerBase
{
protected ISettingProvider SettingProvider => LazyServiceProvider.LazyGetRequiredService<ISettingProvider>();

2
aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Chat/ChatController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.MessageService.Chat
{
[RemoteService(Name = AbpMessageServiceConsts.RemoteServiceName)]
[Route("api/im/chat")]
public class ChatController : AbpController, IChatAppService
public class ChatController : AbpControllerBase, IChatAppService
{
private readonly IChatAppService _chatAppService;

2
aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Chat/MyFriendController.cs

@ -10,7 +10,7 @@ namespace LINGYUN.Abp.MessageService.Chat
{
[RemoteService(Name = AbpMessageServiceConsts.RemoteServiceName)]
[Route("api/im/my-friends")]
public class MyFriendController : AbpController, IMyFriendAppService
public class MyFriendController : AbpControllerBase, IMyFriendAppService
{
protected IMyFriendAppService MyFriendAppService { get; }

2
aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Groups/GroupController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.MessageService.Groups
{
[RemoteService(Name = AbpMessageServiceConsts.RemoteServiceName)]
[Route("api/im/groups")]
public class GroupController : AbpController, IGroupAppService
public class GroupController : AbpControllerBase, IGroupAppService
{
private readonly IGroupAppService _service;

2
aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN/Abp/MessageService/Groups/UserGroupController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.MessageService.Groups
{
[RemoteService(Name = AbpMessageServiceConsts.RemoteServiceName)]
[Route("api/im/user-groups")]
public class UserGroupController : AbpController, IUserGroupAppService
public class UserGroupController : AbpControllerBase, IUserGroupAppService
{
private readonly IUserGroupAppService _service;

2
aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.HttpApi/LINGYUN/Abp/Notifications/MyNotificationController.cs

@ -12,7 +12,7 @@ namespace LINGYUN.Abp.Notifications;
[RemoteService(Name = AbpNotificationsRemoteServiceConsts.RemoteServiceName)]
[Area(AbpNotificationsRemoteServiceConsts.ModuleName)]
[Route("api/notifications/my-notifilers")]
public class MyNotificationController : AbpController, IMyNotificationAppService
public class MyNotificationController : AbpControllerBase, IMyNotificationAppService
{
protected IMyNotificationAppService MyNotificationAppService { get; }

2
aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.HttpApi/LINGYUN/Abp/Notifications/MySubscriptionController.cs

@ -12,7 +12,7 @@ namespace LINGYUN.Abp.Notifications;
[RemoteService(Name = AbpNotificationsRemoteServiceConsts.RemoteServiceName)]
[Area(AbpNotificationsRemoteServiceConsts.ModuleName)]
[Route("api/notifications/my-subscribes")]
public class MySubscriptionController : AbpController, IMySubscriptionAppService
public class MySubscriptionController : AbpControllerBase, IMySubscriptionAppService
{
private readonly IMySubscriptionAppService _subscriptionAppService;

2
aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.HttpApi/LINGYUN/Abp/Notifications/NotificationController.cs

@ -12,7 +12,7 @@ namespace LINGYUN.Abp.Notifications;
[RemoteService(Name = AbpNotificationsRemoteServiceConsts.RemoteServiceName)]
[Area(AbpNotificationsRemoteServiceConsts.ModuleName)]
[Route("api/notifications")]
public class NotificationController : AbpController, INotificationAppService
public class NotificationController : AbpControllerBase, INotificationAppService
{
protected INotificationAppService NotificationAppService { get; }

31
aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.Saas/LINGYUN/Abp/MultiTenancy/Saas/TenantStore.cs

@ -6,6 +6,7 @@ using System.Linq;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Caching;
using Volo.Abp.Data;
using Volo.Abp.DependencyInjection;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Threading;
@ -16,6 +17,7 @@ public class TenantStore : ITenantStore, ITransientDependency
{
protected ICurrentTenant CurrentTenant { get; }
protected ITenantAppService TenantAppService { get; }
protected IDistributedCache<TenantCacheItem> Cache { get; }
public TenantStore(
@ -38,6 +40,33 @@ public class TenantStore : ITenantStore, ITransientDependency
return (await GetCacheItemAsync(id, null)).Value;
}
public async virtual Task<IReadOnlyList<TenantConfiguration>> GetListAsync(bool includeDetails = false)
{
var result = new List<TenantConfiguration>();
var dto = await TenantAppService.GetListAsync(new TenantGetListInput());
foreach (var item in dto.Items)
{
var tenantConfiguration = new TenantConfiguration(item.Id, item.Name, item.NormalizedName)
{
ConnectionStrings = new ConnectionStrings(),
};
if (includeDetails)
{
var connectionStringsResult = await TenantAppService.GetConnectionStringAsync(item.Id);
foreach (var connectionString in connectionStringsResult.Items)
{
tenantConfiguration.ConnectionStrings.Add(
connectionString.Name,
connectionString.Value);
}
}
result.Add(tenantConfiguration);
}
return result;
}
[Obsolete("Use FindAsync method.")]
public virtual TenantConfiguration Find(string name)
{
@ -94,7 +123,7 @@ public class TenantStore : ITenantStore, ITransientDependency
[CanBeNull] IReadOnlyList<TenantConnectionStringDto> connectionStrings)
{
var tenantConfiguration = tenant != null
? new TenantConfiguration(tenant.Id, tenant.Name)
? new TenantConfiguration(tenant.Id, tenant.Name, tenant.NormalizedName)
{
IsActive = tenant.IsActive,
}

3
aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN/Abp/Saas/Tenants/Dto/TenantDto.cs

@ -8,6 +8,8 @@ public class TenantDto : ExtensibleAuditedEntityDto<Guid>, IHasConcurrencyStamp
{
public string Name { get; set; }
public string NormalizedName { get; set; }
public Guid? EditionId { get; set; }
public string EditionName { get; set; }
@ -17,5 +19,6 @@ public class TenantDto : ExtensibleAuditedEntityDto<Guid>, IHasConcurrencyStamp
public DateTime? EnableTime { get; set; }
public DateTime? DisableTime { get; set; }
public string ConcurrencyStamp { get; set; }
}

12
aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN/Abp/Saas/Tenants/Tenant.cs

@ -7,6 +7,7 @@ using System.Linq;
using Volo.Abp;
using Volo.Abp.Auditing;
using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.MultiTenancy;
namespace LINGYUN.Abp.Saas.Tenants;
@ -16,6 +17,8 @@ public class Tenant : FullAuditedAggregateRoot<Guid>, IHasEntityVersion
public virtual string Name { get; protected set; }
public virtual string NormalizedName { get; protected set; }
public virtual bool IsActive { get; set; }
public virtual DateTime? EnableTime { get; protected set; }
@ -35,10 +38,11 @@ public class Tenant : FullAuditedAggregateRoot<Guid>, IHasEntityVersion
ConnectionStrings = new Collection<TenantConnectionString>();
}
protected internal Tenant(Guid id, [NotNull] string name)
protected internal Tenant(Guid id, [NotNull] string name, [CanBeNull] string normalizedName)
: base(id)
{
SetName(name);
SetNormalizedName(normalizedName);
ConnectionStrings = new Collection<TenantConnectionString>();
}
@ -103,4 +107,10 @@ public class Tenant : FullAuditedAggregateRoot<Guid>, IHasEntityVersion
{
Name = Check.NotNullOrWhiteSpace(name, nameof(name), TenantConsts.MaxNameLength);
}
protected internal virtual void SetNormalizedName([CanBeNull] string normalizedName)
{
NormalizedName = normalizedName;
AddLocalEvent(new TenantChangedEvent(Id, NormalizedName));
}
}

29
aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN/Abp/Saas/Tenants/TenantManager.cs

@ -2,43 +2,52 @@
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Domain.Services;
using Volo.Abp.MultiTenancy;
namespace LINGYUN.Abp.Saas.Tenants;
public class TenantManager : DomainService, ITenantManager
{
protected ITenantRepository TenantRepository { get; }
protected ITenantNormalizer TenantNormalizer { get; }
public TenantManager(ITenantRepository tenantRepository)
public TenantManager(
ITenantRepository tenantRepository,
ITenantNormalizer tenantNormalizer)
{
TenantRepository = tenantRepository;
TenantNormalizer = tenantNormalizer;
}
public async virtual Task<Tenant> CreateAsync(string name)
public virtual async Task<Tenant> CreateAsync(string name)
{
Check.NotNull(name, nameof(name));
await ValidateNameAsync(name);
return new Tenant(GuidGenerator.Create(), name);
var normalizedName = TenantNormalizer.NormalizeName(name);
await ValidateNameAsync(normalizedName);
return new Tenant(GuidGenerator.Create(), name, normalizedName);
}
public async virtual Task ChangeNameAsync(Tenant tenant, string name)
public virtual async Task ChangeNameAsync(Tenant tenant, string name)
{
Check.NotNull(tenant, nameof(tenant));
Check.NotNull(name, nameof(name));
await ValidateNameAsync(name, tenant.Id);
var normalizedName = TenantNormalizer.NormalizeName(name);
await ValidateNameAsync(normalizedName, tenant.Id);
tenant.SetName(name);
tenant.SetNormalizedName(normalizedName);
}
protected async virtual Task ValidateNameAsync(string name, Guid? expectedId = null)
protected virtual async Task ValidateNameAsync(string normalizeName, Guid? expectedId = null)
{
var tenant = await TenantRepository.FindByNameAsync(name);
var tenant = await TenantRepository.FindByNameAsync(normalizeName);
if (tenant != null && tenant.Id != expectedId)
{
throw new BusinessException(AbpSaasErrorCodes.DuplicateTenantName)
.WithData(nameof(Tenant.Name), name);
.WithData("Name", normalizeName);
}
}
}

7
aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN/Abp/Saas/Tenants/TenantStore.cs

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using JetBrains.Annotations;
using Volo.Abp;
@ -38,6 +39,12 @@ public class TenantStore : ITenantStore, ITransientDependency
return (await GetCacheItemAsync(id, null)).Value;
}
public async virtual Task<IReadOnlyList<TenantConfiguration>> GetListAsync(bool includeDetails = false)
{
return ObjectMapper.Map<List<Tenant>, List<TenantConfiguration>>(
await TenantRepository.GetListAsync(includeDetails));
}
[Obsolete("Use FindAsync method.")]
public virtual TenantConfiguration Find(string name)
{

2
aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN/Abp/Saas/EntityFrameworkCore/AbpSaasDbContextModelCreatingExtensions.cs

@ -40,10 +40,12 @@ public static class AbpSaasDbContextModelCreatingExtensions
b.ConfigureByConvention();
b.Property(t => t.Name).IsRequired().HasMaxLength(TenantConsts.MaxNameLength);
b.Property(t => t.NormalizedName).HasMaxLength(TenantConsts.MaxNameLength);
b.HasMany(u => u.ConnectionStrings).WithOne().HasForeignKey(uc => uc.TenantId).IsRequired();
b.HasIndex(u => u.Name);
b.HasIndex(u => u.NormalizedName);
b.ApplyObjectExtensionMappings();
});

2
aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/SettingController.cs

@ -9,7 +9,7 @@ namespace LINGYUN.Abp.SettingManagement;
[RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
[Area("SettingManagement")]
[Route("api/setting-management/settings")]
public class SettingController : AbpController, ISettingAppService, ISettingTestAppService
public class SettingController : AbpControllerBase, ISettingAppService, ISettingTestAppService
{
private readonly ISettingAppService _settingAppService;
private readonly ISettingTestAppService _settingTestAppService;

2
aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/UserSettingController.cs

@ -8,7 +8,7 @@ namespace LINGYUN.Abp.SettingManagement;
[RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
[Area("SettingManagement")]
[Route("api/setting-management/settings")]
public class UserSettingController : AbpController, IUserSettingAppService
public class UserSettingController : AbpControllerBase, IUserSettingAppService
{
private readonly IUserSettingAppService _service;

5
aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs

@ -288,8 +288,9 @@ public partial class MicroServiceApplicationsSingleModule
//options.ApiVersionReader = new HeaderApiVersionReader("api-version"); //Supports header too
//options.ApiVersionReader = new MediaTypeApiVersionReader(); //Supports accept header too
options.ConfigureAbp(preActions.Configure());
}, mvcOptions =>
{
mvcOptions.ConfigureAbp(preActions.Configure());
});
//services.AddApiVersioning(config =>

6
aspnet-core/services/LY.MicroService.Applications.Single/Pages/Account/EmailConfirmConfirmation.cshtml.cs

@ -14,10 +14,10 @@ public class EmailConfirmConfirmationModel : AccountPageModel
[BindProperty(SupportsGet = true)]
public string ReturnUrlHash { get; set; }
public virtual Task<IActionResult> OnGetAsync()
public async virtual Task<IActionResult> OnGetAsync()
{
ReturnUrl = GetRedirectUrl(ReturnUrl, ReturnUrlHash);
ReturnUrl = await GetRedirectUrlAsync(ReturnUrl, ReturnUrlHash);
return Task.FromResult<IActionResult>(Page());
return Page();
}
}

2
aspnet-core/services/LY.MicroService.Applications.Single/Pages/Account/VerifyAuthenticatorCode.cshtml.cs

@ -37,7 +37,7 @@ namespace LY.MicroService.Applications.Single.Pages.Account
var result = await SignInManager.TwoFactorAuthenticatorSignInAsync(Input.VerifyCode, RememberMe, RememberBrowser);
if (result.Succeeded)
{
return RedirectSafely(ReturnUrl, ReturnUrlHash);
return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash);
}
if (result.IsLockedOut)
{

2
aspnet-core/services/LY.MicroService.Applications.Single/Pages/Account/VerifyCode.cshtml.cs

@ -61,7 +61,7 @@ namespace LY.MicroService.Applications.Single.Pages.Account
var result = await SignInManager.TwoFactorSignInAsync(Provider, Input.VerifyCode, RememberMe, Input.RememberBrowser);
if (result.Succeeded)
{
return RedirectSafely(ReturnUrl, ReturnUrlHash);
return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash);
}
if (result.IsLockedOut)
{

2
aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Controllers/HomeController.cs

@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc;
namespace LY.MicroService.AuthServer.Controllers;
public class HomeController : AbpController
public class HomeController : AbpControllerBase
{
public ActionResult Index()
{

6
aspnet-core/services/LY.MicroService.AuthServer/Pages/Account/EmailConfirmConfirmation.cshtml.cs

@ -14,10 +14,10 @@ public class EmailConfirmConfirmationModel : AccountPageModel
[BindProperty(SupportsGet = true)]
public string ReturnUrlHash { get; set; }
public virtual Task<IActionResult> OnGetAsync()
public async virtual Task<IActionResult> OnGetAsync()
{
ReturnUrl = GetRedirectUrl(ReturnUrl, ReturnUrlHash);
ReturnUrl = await GetRedirectUrlAsync(ReturnUrl, ReturnUrlHash);
return Task.FromResult<IActionResult>(Page());
return Page();
}
}

2
aspnet-core/services/LY.MicroService.AuthServer/Pages/Account/VerifyAuthenticatorCode.cshtml.cs

@ -37,7 +37,7 @@ namespace LY.MicroService.AuthServer.Pages.Account
var result = await SignInManager.TwoFactorAuthenticatorSignInAsync(Input.VerifyCode, RememberMe, RememberBrowser);
if (result.Succeeded)
{
return RedirectSafely(ReturnUrl, ReturnUrlHash);
return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash);
}
if (result.IsLockedOut)
{

2
aspnet-core/services/LY.MicroService.AuthServer/Pages/Account/VerifyCode.cshtml.cs

@ -61,7 +61,7 @@ namespace LY.MicroService.AuthServer.Pages.Account
var result = await SignInManager.TwoFactorSignInAsync(Provider, Input.VerifyCode, RememberMe, Input.RememberBrowser);
if (result.Succeeded)
{
return RedirectSafely(ReturnUrl, ReturnUrlHash);
return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash);
}
if (result.IsLockedOut)
{

2
aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Controllers/HomeController.cs

@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc;
namespace LY.MicroService.BackendAdmin.Controllers;
public class HomeController : AbpController
public class HomeController : AbpControllerBase
{
public ActionResult Index()
{

2
aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/Controllers/HomeController.cs

@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc;
namespace LY.MicroService.IdentityServer.Controllers;
public class HomeController : AbpController
public class HomeController : AbpControllerBase
{
public ActionResult Index()
{

2
aspnet-core/services/LY.MicroService.IdentityServer/Pages/Account/VerifyAuthenticatorCode.cshtml.cs

@ -37,7 +37,7 @@ namespace LY.MicroService.IdentityServer.Pages.Account
var result = await SignInManager.TwoFactorAuthenticatorSignInAsync(Input.VerifyCode, RememberMe, RememberBrowser);
if (result.Succeeded)
{
return RedirectSafely(ReturnUrl, ReturnUrlHash);
return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash);
}
if (result.IsLockedOut)
{

2
aspnet-core/services/LY.MicroService.IdentityServer/Pages/Account/VerifyCode.cshtml.cs

@ -61,7 +61,7 @@ namespace LY.MicroService.IdentityServer.Pages.Account
var result = await SignInManager.TwoFactorSignInAsync(Provider, Input.VerifyCode, RememberMe, Input.RememberBrowser);
if (result.Succeeded)
{
return RedirectSafely(ReturnUrl, ReturnUrlHash);
return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash);
}
if (result.IsLockedOut)
{

2
aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Controllers/HomeController.cs

@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc;
namespace LY.MicroService.LocalizationManagement.Controllers;
public class HomeController : AbpController
public class HomeController : AbpControllerBase
{
public ActionResult Index()
{

2
aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Controllers/HomeController.cs

@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc;
namespace LY.MicroService.PlatformManagement.Controllers;
public class HomeController : AbpController
public class HomeController : AbpControllerBase
{
public ActionResult Index()
{

2
aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Controllers/HomeController.cs

@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc;
namespace LY.MicroService.RealtimeMessage.Controllers;
public class HomeController : AbpController
public class HomeController : AbpControllerBase
{
public ActionResult Index()
{

2
aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Controllers/HomeController.cs

@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc;
namespace LY.MicroService.TaskManagement.Controllers;
public class HomeController : AbpController
public class HomeController : AbpControllerBase
{
public IActionResult Index()
{

2
aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Controllers/HomeController.cs

@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc;
namespace LY.MicroService.WebhooksManagement.Controllers;
public class HomeController : AbpController
public class HomeController : AbpControllerBase
{
public IActionResult Index()
{

2
aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj

@ -17,7 +17,7 @@
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryExporterZipkinPackageVersion)" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OpenTelemetryInstrumentationAspNetCorePackageVersion)" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryInstrumentationHttpPackageVersion)" />
<PackageReference Include="OpenTelemetry.Contrib.Instrumentation.EntityFrameworkCore" Version="$(OpenTelemetryContribInstrumentationEntityFrameworkCorePackageVersion)" />
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="$(OpenTelemetryInstrumentationEntityFrameworkCorePackageVersion)" />
<PackageReference Include="Quartz.Serialization.Json" Version="$(QuartzNETPackageVersion)" />
<PackageReference Include="Serilog.AspNetCore" Version="$(SerilogAspNetCorePackageVersion)" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="$(SerilogEnrichersEnvironmentPackageVersion)" />

44
aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs

@ -22,6 +22,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.IdentityModel.Logging;
using Microsoft.OpenApi.Models;
using OpenTelemetry.Metrics;
using OpenTelemetry.Resources;
using OpenTelemetry.Trace;
using Quartz;
@ -212,24 +213,31 @@ public partial class WebhooksManagementHttpApiHostModule
var openTelemetryEnabled = configuration["OpenTelemetry:IsEnabled"];
if (openTelemetryEnabled.IsNullOrEmpty() || bool.Parse(openTelemetryEnabled))
{
services.AddOpenTelemetryTracing(cfg =>
{
cfg.AddSource(ApplicationName)
.SetResourceBuilder(
ResourceBuilder.CreateDefault().AddService(ApplicationName))
.AddHttpClientInstrumentation()
.AddAspNetCoreInstrumentation()
.AddEntityFrameworkCoreInstrumentation()
.AddCapInstrumentation()
.AddZipkinExporter(zipKinOptions =>
{
var endpoint = configuration["OpenTelemetry:ZipKin:Endpoint"];
if (!endpoint.IsNullOrWhiteSpace())
{
zipKinOptions.Endpoint = new Uri(configuration["OpenTelemetry:ZipKin:Endpoint"]);
}
});
});
services.AddOpenTelemetry()
.ConfigureResource(builder =>
{
builder.AddService(ApplicationName);
})
.WithTracing(builder =>
{
builder.AddHttpClientInstrumentation();
builder.AddAspNetCoreInstrumentation();
builder.AddCapInstrumentation();
builder.AddEntityFrameworkCoreInstrumentation();
builder.AddZipkinExporter(zipKinOptions =>
{
var endpoint = configuration["OpenTelemetry:ZipKin:Endpoint"];
if (!endpoint.IsNullOrWhiteSpace())
{
zipKinOptions.Endpoint = new Uri(configuration["OpenTelemetry:ZipKin:Endpoint"]);
}
});
})
.WithMetrics(builder =>
{
builder.AddHttpClientInstrumentation();
builder.AddAspNetCoreInstrumentation();
});
}
}

2
aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Controllers/HomeController.cs

@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc;
namespace LY.MicroService.WorkflowManagement.Controllers;
public class HomeController : AbpController
public class HomeController : AbpControllerBase
{
public IActionResult Index()
{

5
aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs

@ -205,8 +205,9 @@ public partial class WorkflowManagementHttpApiHostModule
//options.ApiVersionReader = new HeaderApiVersionReader("api-version"); //Supports header too
//options.ApiVersionReader = new MediaTypeApiVersionReader(); //Supports accept header too
options.ConfigureAbp(preActions.Configure());
}, mvcOptions =>
{
mvcOptions.ConfigureAbp(preActions.Configure());
});
}

2
aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/PackageName.CompanyName.ProjectName.HttpApi.Host.csproj

@ -40,7 +40,7 @@
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryExporterZipkinPackageVersion)" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OpenTelemetryInstrumentationAspNetCorePackageVersion)" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryInstrumentationHttpPackageVersion)" />
<PackageReference Include="OpenTelemetry.Contrib.Instrumentation.EntityFrameworkCore" Version="$(OpenTelemetryContribInstrumentationEntityFrameworkCorePackageVersion)" />
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="$(OpenTelemetryInstrumentationEntityFrameworkCorePackageVersion)" />
<PackageReference Include="Serilog.AspNetCore" Version="$(SerilogAspNetCorePackageVersion)" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="$(SerilogEnrichersEnvironmentPackageVersion)" />
<PackageReference Include="Serilog.Enrichers.Assembly" Version="$(SerilogEnrichersAssemblyPackageVersion)" />

2
aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.Configure.cs

@ -146,7 +146,7 @@ public partial class ProjectNameHttpApiHostModule
ResourceBuilder.CreateDefault().AddService(ApplicationName))
.AddHttpClientInstrumentation()
.AddAspNetCoreInstrumentation()
.AddEntityFrameworkCoreInstrumentation()
//.AddEntityFrameworkCoreInstrumentation()
.AddCapInstrumentation()
.AddZipkinExporter(zipKinOptions =>
{

6
gateways/Directory.Build.props

@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<VoloAbpPackageVersion>8.0.4</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.0.4</LINGYUNAbpPackageVersion>
<VoloAbpPackageVersion>8.1.0</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.1.0</LINGYUNAbpPackageVersion>
<DaprPackageVersion>1.12.0</DaprPackageVersion>
<DotNetCoreCAPPackageVersion>8.0.0</DotNetCoreCAPPackageVersion>
<DotNetCoreCAPPackageVersion>8.1.0</DotNetCoreCAPPackageVersion>
<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>
<AgileConfigClientPackageVersion>1.6.9</AgileConfigClientPackageVersion>

2
gateways/common.props

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>8.0.4</Version>
<Version>8.1.0</Version>
<Authors>colin</Authors>
<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>

Loading…
Cancel
Save