diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 081275ca08..1d9a8750e6 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch dev with rel-5.3 +name: Merge branch dev with rel-6.0 on: push: branches: - - rel-5.3 + - rel-6.0 permissions: contents: read jobs: - merge-rel-5-3-with-rel-5-2: + merge-dev-with-rel-6-0: permissions: contents: write # for peter-evans/create-pull-request to create branch pull-requests: write # for peter-evans/create-pull-request to create a PR @@ -18,13 +18,13 @@ jobs: ref: dev - name: Reset promotion branch run: | - git fetch origin rel-5.3:rel-5.3 - git reset --hard rel-5.3 + git fetch origin rel-6.0:rel-6.0 + git reset --hard rel-6.0 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-5-3/${{github.run_number}} - title: Merge branch dev with rel-5.3 - body: This PR generated automatically to merge dev with rel-5.3. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-6-0/${{github.run_number}} + title: Merge branch dev with rel-6.0 + body: This PR generated automatically to merge dev with rel-6.0. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json index 22ef0df894..7a064a8ce7 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json @@ -397,6 +397,8 @@ "BookDiscountDeletionConfirmationMessage": "Are you sure you want to delete this book discount?", "CustomPaymentFlexSwitchDescription": "With license", "AllowFeatureUpgradeOnLicenseExpire": "Allow feature upgrade on license expire", - "Deleted{0}": "[Deleted {0}]" + "Deleted{0}": "[Deleted {0}]", + "Tags": "Tags", + "SetTagsInfo": "Tags should be comma-separated. Eg: CSharp, Entity Framework" } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/ro-RO.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/ro-RO.json index 44ac964263..409ab816a5 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/ro-RO.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/ro-RO.json @@ -30,7 +30,7 @@ "NugetPackageDeletionWarningMessage": "Sunteţi sigur(ă) că doriţi să ştergeţi acest pachet de tip Nuget?", "ModuleDeletionWarningMessage": "Sunteţi sigur(ă) că doriţi să ştergeţi acest modul?", "Name": "Nume", - "DisplayName": "Nume de afişare", + "DisplayName": "Nume afişat", "ShortDescription": "Descriere scurtă", "NameFilter": "Nume", "CreationTime": "Data şi ora creării", @@ -317,7 +317,7 @@ "TrialLicenseStartDateFilter": "Data de început", "TrialLicenseEndDateFilter": "Data de încheiere", "FirsName": "Nume", - "LastName": "Nume", + "LastName": "Nume de familie", "StartDate": "Data de început", "EndDate": "Data de încheiere", "PurchasedDate": "Data achiziției", @@ -350,4 +350,4 @@ "Volo.AbpIo.Commercial:030010": "Pentru a achiziționa licența de probă, mai întâi trebuie să vă activați licența de probă!", "Volo.AbpIo.Commercial:030011": "Nu puteți șterge o licență de probă atunci când este achiziționată!" } -} \ No newline at end of file +} diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json index 3a1b574d21..6583ae731f 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json @@ -164,6 +164,13 @@ "Books": "Books", "ABPDiscordServer": "ABP Discord Server", "ABPCommunityTalks": "ABP Community Talks", - "ABPCommunityPosts": "ABP Community Posts" + "ABPCommunityPosts": "ABP Community Posts", + "BuyAndGetMonths": "BUY 12 MONTHS, GET 14 MONTHS!", + "GetYourDeal": "Get Your Deal", + "BuyOrRenewLicense": "Buy or Renew License Now and Get 2 Extra Months!", + "BuyOrRenewLicenseToGetExtra2Months": "Buy or Renew License Now and Get 2 Extra Months! HURRY UP! ⏰ Last Day: {0}", + "HurryUp": "HURRY UP!", + "LastDay": "Last Day: {0}", + "BuyNewLicenseBetweenDatesToGetBenefit": "Buy a new license between {0} and {1} to get benefit for extra 2 months!" } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json index 2ea126df0f..c4aa5f4926 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json @@ -161,6 +161,13 @@ "Error_Page_500_Title": "好像出了什么问题!", "Error_Page_500_Description_1": "我们会自动跟踪这些错误,但如果问题仍然存在,请随时
联系我们。 与此同时,尝试刷新。", "Error_Page_500_Description_2": "通过 info@abp.io 与我们联系。", - "Books": "书籍" + "Books": "书籍", + "BuyAndGetMonths": "购买 12 个月,获得 14 个月!", + "GetYourDeal": "得到你的交易", + "BuyOrRenewLicense": "立即购买或续订许可证并额外获得 2 个月!", + "BuyOrRenewLicenseToGetExtra2Months": "立即购买或续订 ABP 商业许可证(适用于所有版本)并额外获得 2 个月!", + "HurryUp": "赶快下单!", + "LastDay": "活动截止日期: {0}", + "BuyNewLicenseBetweenDatesToGetBenefit": "在 {0} 和 {1} 之间购买一个新的许可证以获得额外 2 个月的收益!" } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ar.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ar.json index 1a9aa7cba2..c7b91a99a0 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ar.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ar.json @@ -89,7 +89,7 @@ "Blogging": "التدوين", "Identity": "هوية", "IdentityServer": "خادم الهوية", - "Saas": "ساس", + "Saas": "البرمجيات كخدمة", "LanguageManagement": "إدارة اللغة", "TextTemplateManagement": "إدارة قالب النص", "See All Modules": "انظر جميع الوحدات", @@ -382,4 +382,4 @@ "RenewLicenseEarly": "إذا قمت بتجديد رخصتي في وقت مبكر ، هل سأحصل على السنة كاملة؟", "RenewLicenseEarylExplanation": "عند تجديد الترخيص الخاص بك قبل تاريخ انتهاء الترخيص الخاص بك ، ستتم إضافة سنة واحدة إلى تاريخ انتهاء الترخيص الخاص بك. على سبيل المثال ، إذا انتهت صلاحية ترخيصك في {0} -06-06 وقمت بتجديده في {0} -01-01 ، فسيكون تاريخ انتهاء صلاحية الترخيص الجديد {1} -06-06." } -} \ No newline at end of file +} diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index caf4a9dbbe..64cefef9af 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -735,6 +735,14 @@ "ConfirmedEmailAddressRequiredToStartTrial": "You should have a confirmed email address in order to start a trial license.", "EmailVerificationMailNotSent": "Email verification mail couldn't send.", "GetConfirmationEmail": "Click here to get a confirmation email if you haven't got it before.", - "WhichLicenseTypeYouAreInterestedIn": "Which license type you are interested in?" + "WhichLicenseTypeYouAreInterestedIn": "Which license type you are interested in?", + "DontTakeOurWordForIt": "Don't take our word for it...", + "ReadAbpCommercialUsersWantYouToKnow": "Read what ABP Commercial users want you to know", + "Testimonial_ShortDescription_1": "The modularity of ABP made it possible for the team to deliver in time.", + "Testimonial_ShortDescription_2": "Build new features faster than before.", + "Testimonial_ShortDescription_3": "We start from out-of-the-box features and just focus on what we really need to write.", + "Testimonial_ShortDescription_4": "ABP Commercial was the best fit for our needs.", + "OnlineReviewersOnAbpCommercial": "Online Reviews on ABP Commercial", + "SeeWhatToldAboutAbpCommercial": "See what has been told about ABP Commercial and write your thoughts if you want." } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ro-RO.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ro-RO.json index 44b6f66037..be56afbb43 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ro-RO.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ro-RO.json @@ -341,7 +341,7 @@ "SignIn": "Autentificare", "Or": "Sau", "TellUsAboutYourself": "Spuneţi-ne despre dumneavoastră", - "Surname": "Nume", + "Surname": "Nume de familie", "DoYouAgreePrivacyPolicy": "Sunt de acord cu Termenii şi condiţiile şi Politica de confidenţialitate.", "VolosoftMarketingInformationMessage": "Sunt de acord să primesc informaţii, sfaturi şi oferte despre soluţii pentru afaceri şi organizaţii şi alte produse şi servicii Volosoft.", "VolosoftSharingInformationMessage": "Sunt de acord ca Volosoft să partajeze informaţiile mele cu partenerii selectaţi astfel încât să primesc informaţii relevante despre produsele şi serviciile lor.", @@ -380,4 +380,4 @@ "TrialLicenseExpiredInfo": "Perioada de licență de probă a expirat!", "CommercialNewsletterConfirmationMessage": "Sunt de acord cu Termenii și condițiile și cu Politica de confidențialitate ." } -} \ No newline at end of file +} diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json index 0ed3eda832..b8e8d9b135 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json @@ -184,6 +184,7 @@ "Post_Index_Page_MetaDescription": "ABP Community's purpose is to create a contribution environment for developers who use the ABP framework.", "Layout_Title": "{0} | ABP Community", "Layout_MetaDescription": "ABP Community is an environment where people can share posts about ABP framework and follows the projects.", - "Index_Page_CommunityIntroduction": "This is a hub for ABP Framework, .NET and software development. You can read the articles, watch the video tutorials, get informed about ABP’s development progress and ABP-related events, help other developers and share your expertise with the ABP community." + "Index_Page_CommunityIntroduction": "This is a hub for ABP Framework, .NET and software development. You can read the articles, watch the video tutorials, get informed about ABP’s development progress and ABP-related events, help other developers and share your expertise with the ABP community.", + "TagsInArticle": "Tags in article" } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/AbpIoWwwResource.cs b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/AbpIoWwwResource.cs index 552b5949e1..f64552be30 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/AbpIoWwwResource.cs +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/AbpIoWwwResource.cs @@ -1,5 +1,8 @@ -namespace AbpIoLocalization.Www +using Volo.Abp.Localization; + +namespace AbpIoLocalization.Www { + [LocalizationResourceName("AbpIoWww")] public class AbpIoWwwResource { diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index 41eda60de6..2a5f9a2584 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -372,6 +372,20 @@ "MasteringAbpFramework_Book_What_You_Will_Learn_8": "Write unit, integration, and UI tests using ABP Framework.", "MasteringAbpFramework_Book_WhoIsThisBookFor": "Who's this book for", "MasteringAbpFramework_Book_WhoIsThisBookFor_Description": "This book is for web developers who want to learn software architectures and best practices for building\n maintainable web-based solutions using Microsoft technologies and ABP Framework. Basic knowledge of C#\n and ASP.NET Core is necessary to get started with this book.", - "ComputersAndTechnology": "Computers & Technology" + "ComputersAndTechnology": "Computers & Technology", + "BuildingMicroserviceSolutions": "Building Microservice Solutions", + "MicroserviceBookPracticalGuide": "This book is a reference guide for developing and managing microservice-based applications using the ABP Framework. It references the .NET Microservice Sample Reference Application: eShopOnContainers and discusses the architectural design and implementation approaches using the ABP Framework. By the end of this book, you'll learn how ABP approaches the common microservice complexities such as authorization, distributed transactions, inter-microservice communications, deployment, etc.", + "IntroducingTheSolution": "Introducing the eShopOnAbp Solution", + "RunningTheSolution": "Running the Solution", + "UnderstandingTheAuthenticationSystem": "Understanding the Authentication System", + "Authors": "Authors", + "MicroserviceEBook": "Microservice E-Book", + "SelectUITheme": "Select UI Theme", + "LeptonXLiteTheme": "LeptonX Lite Theme", + "BasicTheme": "Basic Theme", + "LeptonXLiteThemeInfo": " A modern and stylish Bootstrap UI theme. Ideal if you want to have a production ready UI theme. This is the newest theme and is the default.", + "BasicThemeInfo": "Minimalist UI theme with plain Bootstrap colors and styles. Ideal if you will build your own UI theme.", + "SeeDocumentation": "See documentation.", + "SeeFullScreen": "🖼️ See the screenshot" } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ro-RO.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ro-RO.json index bd04ba7f49..a1ff5f58ad 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ro-RO.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ro-RO.json @@ -253,18 +253,18 @@ "Or": "Sau", "TellUsAboutYourself": "Spuneţi-ne un pic despre dumneavoastră", "Name": "Nume", - "Surname": "Nume", + "Surname": "Nume de familie", "CompanyName": "Nume companie", "DoYouAgreePrivacyPolicy": "Sunt de acord cu Termenii & condiţiile şi Politica de confidenţialitate.", "Free": "Gratuit", "DDDEBook": "E-book DDD", "PracticalGuideForImplementingDDD": "Această carte este un ghid practic pentru implementarea Domain Driven Design în framework-ul ABP.", "IntroducingDDD": "Introducere în Domain Driven Design", - "DDDLayersAndCleanArchitecture": "Straturile DDD & Arhitectură curată", + "DDDLayersAndCleanArchitecture": "Straturile DDD şi Arhitectură curată", "LayeringOfADotnetSolution": "Stratificarea unei soluţii .NET", "ImplementingDDDBuildingBlocks": "Implementând DDD Building Blocks", "DomainVsApplicationLogic": "Domain Logic vs Application Logic", - "SamplesAndDiscussions": "Exemple & Discuţii", + "SamplesAndDiscussions": "Exemple şi Discuţii", "EmailNotValid": "Vă rugăm să introduceţi o adresa de email validă.", "WeWillSendYouADownloadLink": "Un link care conţine e-book-ul a fost trimis către {0}. Verificaţi-vă folderele de inbox, junk sau spam!", "GoHome": "Pagina principală", diff --git a/common.props b/common.props index e6c9c40c28..f8b7c620c2 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 6.0.0 + 7.0.0 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ diff --git a/docs/en/Background-Jobs-RabbitMq.md b/docs/en/Background-Jobs-RabbitMq.md index 16b8b0981a..8eec3733fb 100644 --- a/docs/en/Background-Jobs-RabbitMq.md +++ b/docs/en/Background-Jobs-RabbitMq.md @@ -126,25 +126,31 @@ By default, all the job types use the `Default` RabbitMQ connection. Configure(options => { options.DefaultQueueNamePrefix = "my_app_jobs."; + options.DefaultDelayedQueueNamePrefix = "my_app_jobs.delayed" + options.PrefetchCount = 1; options.JobQueues[typeof(EmailSendingArgs)] = new JobQueueConfiguration( typeof(EmailSendingArgs), queueName: "my_app_jobs.emails", - connectionName: "SecondConnection" + connectionName: "SecondConnection", + delayedQueueName:"my_app_jobs.emails.delayed" ); }); ```` -* This example sets the default queue name prefix to `my_app_jobs.`. If different applications use the same RabbitMQ server, it would be important to use different prefixes for each application to not consume jobs of each other. +* This example sets the default queue name prefix to `my_app_jobs.` and default delayed queue name prefix to `my_app_jobs.delayed`. If different applications use the same RabbitMQ server, it would be important to use different prefixes for each application to not consume jobs of each other. +* Sets `PrefetchCount` for all queues. * Also specifies a different connection string for the `EmailSendingArgs`. `JobQueueConfiguration` class has some additional options in its constructor; * `queueName`: The queue name that is used for this job. The prefix is not added, so you need to specify the full name of the queue. +* `DelayedQueueName`: The delayed queue name that is used for delayed execution of job. The prefix is not added, so you need to specify the full name of the queue. * `connectionName`: The RabbitMQ connection name (see the connection configuration above). This is optional and the default value is `Default`. * `durable` (optional, default: `true`). * `exclusive` (optional, default: `false`). -* `autoDelete` (optional, default: `false`) +* `autoDelete` (optional, default: `false`). +* `PrefetchCount` (optional, default: null) See the RabbitMQ documentation if you want to understand the `durable`, `exclusive` and `autoDelete` options better, while most of the times the default configuration is what you want. diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md index 286d6ab7b0..6206e2fbd1 100644 --- a/docs/en/Background-Workers.md +++ b/docs/en/Background-Workers.md @@ -128,7 +128,7 @@ Be careful if you run multiple instances of your application simultaneously in a If that's a problem for your workers, you have the following options: -* Implement your background workers so that they work in a clustered environment without any problem. Using the [distributed lock](../Distributed-Locking.md) to ensure concurrency control is a way of doing that. A background worker in an application instance may handle a distributed lock, so the workers in other application instances will wait for the lock. In this way, only one worker does the actual work, while others wait in idle. If you implement this, your workers run safely without caring about how the application is deployed. +* Implement your background workers so that they work in a clustered environment without any problem. Using the [distributed lock](Distributed-Locking.md) to ensure concurrency control is a way of doing that. A background worker in an application instance may handle a distributed lock, so the workers in other application instances will wait for the lock. In this way, only one worker does the actual work, while others wait in idle. If you implement this, your workers run safely without caring about how the application is deployed. * Stop the background workers (set `AbpBackgroundWorkerOptions.IsEnabled` to `false`) in all application instances except one of them, so only the single instance runs the workers. * Stop the background workers (set `AbpBackgroundWorkerOptions.IsEnabled` to `false`) in all application instances and create a dedicated application (maybe a console application running in its own container or a Windows Service running in the background) to execute all the background tasks. This can be a good option if your background workers consume high system resources (CPU, RAM or Disk), so you can deploy that background application to a dedicated server and your background tasks don't affect your application's performance. diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/POST.md b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/POST.md new file mode 100644 index 0000000000..2b756f2958 --- /dev/null +++ b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/POST.md @@ -0,0 +1,380 @@ +# ABP.IO Platform 6.0 RC Has Been Released + +Today, we are happy to release the [ABP Framework](https://abp.io/) and [ABP Commercial](https://commercial.abp.io/) version **6.0 RC** (release candidate). This blog post introduces the new features and important changes in this new version. + +> **The planned release date for the [6.0.0 Stable](https://github.com/abpframework/abp/milestone/71) version is September 06, 2022**. + +Try this version and provide feedback for the stable ABP v6.0! Thank you to all. + +## Get Started with the 6.0 RC + +Follow the steps below to try version 6.0.0 RC today: + +1) **Upgrade** the ABP CLI to version `6.0.0-rc.1` using a command line terminal: + +````bash +dotnet tool update Volo.Abp.Cli -g --version 6.0.0-rc.1 +```` + +**or install** it if you haven't before: + +````bash +dotnet tool install Volo.Abp.Cli -g --version 6.0.0-rc.1 +```` + +2) Create a **new application** with the `--preview` option: + +````bash +abp new BookStore --preview +```` + +See the [ABP CLI documentation](https://docs.abp.io/en/abp/latest/CLI) for all the available options. + +> You can also use the *Direct Download* tab on the [Get Started](https://abp.io/get-started) page by selecting the **Preview checkbox**. + +You can use any IDE that supports .NET 6.x, like **[Visual Studio 2022](https://visualstudio.microsoft.com/downloads/)**. + +## Migration Guides + +There are breaking changes in this version that may affect your application. +Please see the following migration documents, if you are upgrading from v5.3.0: + +* [ABP Framework 5.3 to 6.0 Migration Guide](https://docs.abp.io/en/abp/6.0/Migration-Guides/Abp-6_0) +* [ABP Commercial 5.3 to 6.0 Migration Guide](https://docs.abp.io/en/commercial/6.0/migration-guides/v6_0) + +## What's New with ABP Framework 6.0? + +In this section, I will introduce some major features released in this version. Here is a brief list of titles explained in the next sections: + +* **LeptonX Lite** is now the **default theme** for startup templates. +* Optional PWA support is added to [*Get Started*](https://abp.io/get-started) page. +* Introducing the **OpenIddict Module** and switching to OpenIddict for the startup templates. +* New **.NET MAUI** Startup Template. +* Introducing the `ITransientCachedServiceProvider` interface. +* Introducing the dynamic components for Blazor UI. +* Improvements on ABP CLI. +* Introducing the `Volo.Abp.RemoteServices` package. +* Create/Update user accounts for external logins. +* Sending test email in the setting page for MVC and Blazor user interfaces. +* Improvements on the **eShopOnAbp** project. +* Other news... + +### LeptonX Lite Theme on Startup Templates + +![](leptonx-lite-theme.png) + +With this version, startup templates (`app` and `app-nolayers` templates) use the **LeptonX Lite** as the default theme. However, it's still possible to create a project with **Basic Theme** either using the **ABP CLI** or downloading the project via [*Get Started*](https://abp.io/get-started) page on the [abp.io](https://abp.io/) website. + +#### via ABP CLI + +To create a new project with **Basic Theme**, you can use the `--theme` option as below: + +```bash +abp new Acme.BookStore --theme basic --preview +``` + +#### via Get Started page + +Also, you can create a new project with **LeptonX Lite** or **Basic Theme** on *Get Started* page. + +![](get-started-page.png) + +> The "Preview" checkbox should be checked to be able to see the theme selection section on the *Get Started* page. + + + +### Optional PWA Support is Added to the Get Started Page + +We've introduced the PWA (Progressive Web Application) support for the startup templates for Angular & Blazor WASM UIs in **v5.3**. In this version, we also added this PWA support to the [*Get Started*](https://abp.io/get-started) page on the [abp.io](https://abp.io/) website. + +![](pwa-support-get-started-page.png) + +If you check the "Progressive Web Application" checkbox while creating an application, the all required configurations will be done for you and you will get the benefit of PWA features in your application. + + + +### Introducing the **OpenIddict Module** and Switching to OpenIddict in the Startup Templates + +We already [announced the plan of replacing the IdentityServer with OpenIddict](https://github.com/abpframework/abp/issues/11989). + +Therefore, we have created the `OpenIddict` module in this version and switched to **OpenIddict** in the startup templates. The ABP Framework uses this module to add **OAuth** features to the applications. We created documentation for the **OpenIddict Module**. + +- You can see the following document to **learn about the OpenIddict Module**: + [https://docs.abp.io/en/abp/6.0/Modules/OpenIddict](https://docs.abp.io/en/abp/6.0/Modules/OpenIddict) +- You can check out the following migration guide to learn **how to migrate to OpenIddict**: + [https://docs.abp.io/en/abp/6.0/Migration-Guides/IdentityServer_To_OpenIddict](https://docs.abp.io/en/abp/6.0/Migration-Guides/IdentityServer_To_OpenIddict) + + + +> We will continue to ship Identity Server packages for a while but in the long term, you may need to replace it, because Identity Server support ends at the end of 2022. Please see the [announcement]((https://github.com/abpframework/abp/issues/11989)) for more info. + + + +### New .NET MAUI Startup Template + +![](maui-template.png) + +ABP Framework provides .NET MAUI startup templates with **v6.0.0**. You can create a new .NET MAUI project with the command below: + +```bash +abp new Acme.BookStore -t maui +``` + + + +### Introducing the `ITransientCachedServiceProvider` + +`ICachedServiceProvider` interface is used to resolve the cached services within a new scope. We created a new interface to resolve cached services **without creating scopes**. It's called `ITransientCachedServiceProvider`. The difference between `ICachedServiceProvider` and `ITransientCachedServiceProvider` is; `ITransientCachedServiceProvider` is transient. Check out [this issue](https://github.com/abpframework/abp/issues/12918) for more information. + + + +### Introducing the dynamic layout components for Blazor UI + +ABP Framework provides different ways of customizing the UI and one of them is to use [Layout Hooks](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Layout-Hooks) in MVC. The **Layout Hook System** allows you to add code to some specific parts of the layout and all layouts of the themes provided by the ABP Framework implement these hooks. + +However, Blazor UI doesn't have such a system yet and we are planning to implement [Layout Hooks for the Blazor UI](https://github.com/abpframework/abp/issues/6261) in version 7.0. + +We are introducing the dynamic layout components for the Blazor UI to be able to add components to the Blazor layouts. + +You can configure the `AbpDynamicLayoutComponentOptions` to render your components in the layout, as below: + +```csharp +Configure(options => +{ + options.Components.Add(typeof(MyBlazorComponent), null); +}); +``` + + + +### Improvements in ABP CLI + +There are some enhancements in [ABP CLI](https://docs.abp.io/en/abp/6.0/CLI). You can see the brief list of some of these improvements below: + +* You can list all available templates by using the `abp list-templates` command with v6.0. See [#13083](https://github.com/abpframework/abp/pull/13083). +* You can select the theme when creating a new project by specifying the `--theme` option. You can see the *LeptonX Lite Theme on the Startup Templates* section above for an example. +* `abp update` command has been updating the version of the main application until now. With v6.0.0, this command updates all package versions **inside all solutions in the sub-folders**. Checkout the issue [#12735](https://github.com/abpframework/abp/pull/12738) for more information. + + + +### Introducing the `Volo.Abp.RemoteService` Package + +A new `Volo.Abp.RemoteService` package has been added to the framework. Some of the classes that are related to the remote service configurations such as `AbpRemoteServiceOptions` class moved from `Volo.Abp.Http.Client` to this package. In this way, it became more reusable for further usages. + + + +### Create/Update User Accounts For External Logins + +If a user authenticates from an external provider like `Keycloak`, the user is being redirected to this external provider, and comes back to the main application. In this process, the user's data is not being saved in the main application's database. With this version, ABP saves the user information and lists in the users page. And this fixes permission management, user information mismatches and other issues. For more info, see [the related issue](https://github.com/abpframework/abp/issues/12203). + + + +### Sending test email in the setting page for MVC and Blazor UIs + +"Sending Test Email" feature is added to the [Setting Management](https://docs.abp.io/en/abp/6.0/Modules/Setting-Management) module, which allows checking the email settings are configured properly and sending emails successfully to the target email address. + +![](setting-management-emailing.png) + +After configuring the email settings such as the target email address, you can click the "Send" button to send a test email to see if everything went well. + +> Note that this feature will be implemented for the Angular UI in the stable v6.0. + + + +### Improvements on eShopOnAbp Project + +The following improvements have been made on [eShopOnAbp project](https://github.com/abpframework/eShopOnAbp) with this version: + +* Some improvements have been made on the Admin Application for Order Management for Angular UI. See [#110](https://github.com/abpframework/eShopOnAbp/pull/110). +* `SignalR` error on Kubernetes & Docker Compose has been fixed. See [#113](https://github.com/abpframework/eShopOnAbp/pull/113). +* eShopOnAbp project has been deployed to Azure Kubernetes Service. See [#114](https://github.com/abpframework/eShopOnAbp/pull/114). The live demo can be seen from [eshoponabp.com](https://eshoponabp.com/). +* Configurations have been made for some services on the `docker-compose.yml` file. See [#112](https://github.com/abpframework/eShopOnAbp/pull/112). +* Gateway Redirect Loop problem on Kubernetes has been fixed. See [the commit](https://github.com/abpframework/eShopOnAbp/commit/6413ef15c91cd8a5309050b63bb4dbca23587607). + + + +### Other News + +* Autofac library has been upgraded to **v6.4.0**. Please see [#12816](https://github.com/abpframework/abp/pull/12816) for more info. +* Performance Improvements have been made in the **Settings Module** and tabs on the *Settings* page are lazy loading now. +* Some improvements have been made in the CMS Kit Module. You can see the improvements from [here](https://github.com/abpframework/abp/issues/11965). + +If you want to see more details, you can check [the release on GitHub](https://github.com/abpframework/abp/releases/tag/6.0.0-rc.1), which contains a list of all the issues and pull requests closed in this version. + + + +## What's New with ABP Commercial 6.0? + + + +### LeptonX Theme is the Default Theme + +With this version, the startup templates (`app-pro`, `app-nolayers-pro` and `microservice-pro` templates) use the **LeptonX Theme** as the default theme. However, it's still possible to create a new project with **Lepton Theme** or **Basic Theme**, either using the **ABP CLI** or **ABP Suite**. + +#### via ABP CLI + +To create a new project with **Lepton Theme** or **Basic Theme**, you can use the `--theme` option as below. For "Basic Theme" specify the theme name as `--theme basic`. + +```bash +abp new Acme.BookStore --theme lepton --preview +``` + + + +#### via ABP Suite + +Also, you can create a new project with **Lepton Theme** or **Basic Theme** from ABP Suite. + +![](suite-create-new-solution.png) + +### Switching to OpenIddict in the Startup Templates + +We have also switched to the **OpenIddict** for the startup templates for ABP Commercial as explained above. + + + +### New .NET MAUI Mobile + +![](maui-mobile-option.gif) + +ABP Commercial has been providing a [React Native](https://docs.abp.io/en/commercial/latest/getting-started-react-native) mobile app since with the very early versions. Alternative to this application, we created a new .NET MAUI mobile app. To create a new `app-pro` ABP project with the .NET MAUI mobile app, you can use the command below: + +```bash +abp new Acme.BookStore -t app-pro --mobile maui +``` + +> Note that, when Microsoft supports `WebAuthenticator` on Windows, we'll also support it to work on Windows OS. + + + +### GDPR: Cookie Consent + +![](cookie-banner.png) + +With this version, the **Cookie Consent** feature has been added to the **GDPR** module. It's enabled by default for the new startup templates. There are two pages in the templates: "Cookie Policy" page and "Privacy Policy" page. + +If you want to disable/hide the "Cookie Consent", you can simply open the startup project module class and set the `IsEnabled` property as **false** for the **AddAbpCookieConsent** method as below: + +```csharp +context.Services.AddAbpCookieConsent(options => +{ + options.IsEnabled = false; //disabled + options.CookiePolicyUrl = "/CookiePolicy"; + options.PrivacyPolicyUrl = "/PrivacyPolicy"; +}); +``` + +> These pages are used to build up the cookie consent text and you can change the content or url of these pages by your needs. + +If you want to use the Cookie Consent feature of the GDPR module in your existing project, please see the [GDPR Module](https://docs.abp.io/en/commercial/6.0/modules/gdpr) documentation for configurations. + +### Improvements/Developments on CMS Kit Poll + +Some improvements have been made on the Poll System of CMS Kit module as listed below: + +* The Widget rendering and Admin side for the Blazor UI improvements. +* A Widget can be picked from the editor as seen in the image below. + +![](poll-add-widget.png) + + + +### Blazor UI for the Chat Module + +Chat Module is now also available for the Blazor UI after the MVC and Angular UIs. You can read the [Chat Module](https://docs.abp.io/en/commercial/6.0/modules/chat) documentation to get the overall knowledge about the module and add to your application. + +![](blazor-chat-module-1.png) +![](blazor-chat-module-2.png) + + + +### Blazor Admin UI for CMS Kit Module + +All admin side **CMS Kit** and **CMS Kit Pro** features have been implemented for the Blazor UI. Blazor UI will only be available to ABP Commercial customers. + +![](cms-blog-blazor.png) + +![](cms-blog-post-blazor.png) + + +### Suite: Excel Export + +With v6.0, now it's possible to export the records as Excel for Blazor & MVC UIs. Angular UI is still in-progress, and we will implement it with the stable v6.0 release. Check the "Excel export" checkbox to add this feature. + +![](excel-export.png) + + + +A new Excel Export button is being located at the top of the generated page as seen below: + +![](export-excel-page.png) + +Then, you can download the records as `.xlsx` format by clicking the "Excel Export" button. Note that the exported Excel list is the filtered list. + + + +### ABP Suite: Optional PWA Support + +With this version, it's possible to add the [PWA (Progressive Web App)](https://web.dev/progressive-web-apps/?gclid=Cj0KCQjwxIOXBhCrARIsAL1QFCY0IB-W5k-lsXmRCbm00sl4nyBIYynAX3IdJkjyizyNUjuCE8zeu24aApxtEALw_wcB) support for Blazor & Angular UIs while creating the application via Suite. + +![](suite-pwa-support.png) + +You just need to check the "Progressive web application" checkbox, when creating a new application. Then, ABP Suite will add the PWA support to your application. When you publish your application, you get the full benefits of PWA features such as offline support. + + + +### Other News + +#### Explainer Videos + +We are creating explainer videos for the ABP Commercial Modules to provide an overview. Within this milestone, we've created four new explainer videos: + +* [Audit Logging Module](https://www.youtube.com/watch?v=NzSuFBpqfsc) +* [Identity Module](https://www.youtube.com/watch?v=W87jA_GBE54) +* [SaaS Module](https://www.youtube.com/watch?v=xXlaaXP6qqQ) +* [Forms Module](https://www.youtube.com/watch?v=MousWEPfrA8) + +You can subscribe to [Volosoft's YouTube channel](https://www.youtube.com/channel/UCO3XKlpvq8CA5MQNVS6b3dQ) to be informed about the future ABP events and videos. + + + +### Trial License is now available! + +![](pricing-page.png) + +If you are considering purchasing a new ABP Commercial license, and you want to see ABP in action then, check out https://commercial.abp.io/pricing and click FREE TRIAL button. + + + +## Community News + +### New ABP Community Posts + +* [Alper Ebicoglu](https://twitter.com/alperebicoglu) has created a new community article to give a full overview of .NET MAUI. You can read it [here](https://community.abp.io/posts/all-about-.net-maui-gb4gkdg5). +* [Anto Subash](https://twitter.com/antosubash) has created a new video content to show "State Management in Blazor with Fluxor". You can read it [here](https://community.abp.io/posts/blazor-state-management-with-fluxor-raskpv19). +* [Learn ABP Framework](https://community.abp.io/members/learnabp) has also created a new video content to show "How to install LeptonX Lite Theme for ABP Framework 5.3 MVC UI". You can read it [here](https://community.abp.io/posts/how-to-install-leptonx-lite-theme-on-abp-framework-5.3-mvc-ui-epzng137). +* [Kirti Kulkarni](https://twitter.com/kirtimkulkarni) has created three new community articles. You can use the links below to read the articles: + * [Integrating the file management module with ABP Commercial application](https://community.abp.io/posts/integrating-the-file-management-module-with-abp-commercial-application-qd6v4dsr) + * [Work with PDF's in ABP Commercial Project using PDFTron](https://community.abp.io/posts/work-with-pdfs-in-abp-commercial-project-using-pdftron-tjw0hlgu) + * [Create a custom login page in ABP Commercial Angular app](https://community.abp.io/posts/create-a-custom-login-page-in-abp-commercial-angular-app-r2huidx7) +* [Don Boutwell](https://community.abp.io/members/dboutwell) has created his first ABP Community article. You can read it from [here](https://community.abp.io/posts/password-required-redis-with-abp-framework-and-docker-94old5rm). + + + +### Volosoft Has Attended the DNF Summit 2022 + +![](dnf-summit.png) + +Core team members of ABP Framework, [Halil Ibrahim Kalkan](https://twitter.com/hibrahimkalkan) and [Alper Ebicoglu](https://twitter.com/alperebicoglu) have attended the [DNF Summit](https://t.co/ngWnBLiAn5) on the 20th of July. Halil Ibrahim Kalkan talked about the creation of the ABP Framework and Alper Ebicoglu showed how easy to create a project with ABP Framework within 15 minutes. + +Watch DNF Summit session 👉 https://www.youtube.com/embed/VL0ewZ-0ruo + +![](dnf-summit-attendees.jpg) + + + +## Conclusion + +This version comes with some features and enhancements to the existing features. You can see the [Road Map](https://docs.abp.io/en/abp/6.0/Road-Map) documentation to learn about the release schedule and planned features for the next releases. The planned release date for the [6.0.0 Stable](https://github.com/abpframework/abp/milestone/71) version is September 06, 2022. Please try the ABP v6.0 RC and provide feedback to us. + +Thanks for being a part of this community! \ No newline at end of file diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-1.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-1.png new file mode 100644 index 0000000000..6d847c9065 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-1.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-2.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-2.png new file mode 100644 index 0000000000..24f0688319 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/blazor-chat-module-2.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-blazor.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-blazor.png new file mode 100644 index 0000000000..5d169aa322 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-blazor.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-post-blazor.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-post-blazor.png new file mode 100644 index 0000000000..1722a85b10 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cms-blog-post-blazor.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cookie-banner.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cookie-banner.png new file mode 100644 index 0000000000..cbfafbc907 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cookie-banner.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cover-image.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cover-image.png new file mode 100644 index 0000000000..1a6e267b86 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/cover-image.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit-attendees.jpg b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit-attendees.jpg new file mode 100644 index 0000000000..42df8aaf4e Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit-attendees.jpg differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit.png new file mode 100644 index 0000000000..dff3609c20 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/dnf-summit.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/excel-export.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/excel-export.png new file mode 100644 index 0000000000..393ea33ada Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/excel-export.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/export-excel-page.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/export-excel-page.png new file mode 100644 index 0000000000..243752969e Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/export-excel-page.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/get-started-page.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/get-started-page.png new file mode 100644 index 0000000000..5ae76b1398 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/get-started-page.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/leptonx-lite-theme.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/leptonx-lite-theme.png new file mode 100644 index 0000000000..e87a06f4fb Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/leptonx-lite-theme.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-mobile-option.gif b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-mobile-option.gif new file mode 100644 index 0000000000..645346abc6 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-mobile-option.gif differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-template.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-template.png new file mode 100644 index 0000000000..0d9df0e63f Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/maui-template.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/poll-add-widget.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/poll-add-widget.png new file mode 100644 index 0000000000..51cd34b9bf Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/poll-add-widget.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pricing-page.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pricing-page.png new file mode 100644 index 0000000000..21b19b4ed7 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pricing-page.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pwa-support-get-started-page.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pwa-support-get-started-page.png new file mode 100644 index 0000000000..e91e4e5223 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/pwa-support-get-started-page.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/setting-management-emailing.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/setting-management-emailing.png new file mode 100644 index 0000000000..f2c5475655 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/setting-management-emailing.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-create-new-solution.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-create-new-solution.png new file mode 100644 index 0000000000..5756a65ad0 Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-create-new-solution.png differ diff --git a/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-pwa-support.png b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-pwa-support.png new file mode 100644 index 0000000000..bf5982b68a Binary files /dev/null and b/docs/en/Blog-Posts/2022-07-26 v6_0_Preview/suite-pwa-support.png differ diff --git a/docs/en/CLI-New-Command-Samples.md b/docs/en/CLI-New-Command-Samples.md index 614fb24a5f..26d098c98e 100644 --- a/docs/en/CLI-New-Command-Samples.md +++ b/docs/en/CLI-New-Command-Samples.md @@ -1,6 +1,6 @@ # ABP CLI - New Solution Sample Commands -The `abp new` command creates an ABP solution or other artifacts based on an ABP template. [ABP CLI](CLI.md) has several parameters to create a new ABP solution. In this document we will show you some sample commands to create a new solution. All the project names are `Acme.BookStore`. Currently, the only available mobile project is a `React Native` mobile app. Available database providers are `Entity Framework Core` and `MongoDB`. All the commands starts with `abp new`. +The `abp new` command creates an ABP solution or other artifacts based on an ABP template. [ABP CLI](CLI.md) has several parameters to create a new ABP solution. In this document we will show you some sample commands to create a new solution. All the project names are `Acme.BookStore`. Currently, the available mobile projects are `React Native` and `MAUI` mobile app. Available database providers are `Entity Framework Core` and `MongoDB`. All the commands starts with `abp new`. ## Angular diff --git a/docs/en/CLI.md b/docs/en/CLI.md index ffde52eff0..8dc6d425dc 100644 --- a/docs/en/CLI.md +++ b/docs/en/CLI.md @@ -124,6 +124,7 @@ For more samples, go to [ABP CLI Create Solution Samples](CLI-New-Command-Sample * `--separate-auth-server`: The Identity Server project comes as a separate project and runs at a different endpoint. It separates the Identity Server from the API Host application. If not specified, you will have a single endpoint in the server side. * `--mobile` or `-m`: Specifies the mobile application framework. If not specified, no mobile application will be created. Available options: * `react-native`: React Native. + * `maui`: MAUI. * `--database-provider` or `-d`: Specifies the database provider. Default provider is `ef`. Available providers: * `ef`: Entity Framework Core. * `mongodb`: MongoDB. diff --git a/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md b/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md index 049171731b..f412ca3170 100644 --- a/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md +++ b/docs/en/Community-Articles/2020-09-09-Replacing-Email-Template-and-Sending-Emails/POST.md @@ -335,7 +335,7 @@ After sending the email we should see the template like below.
-

Share your experiences with the ABP Framework!
ABP is an open source and community driven project. This guide is aims to help anyone wants to contribute to the project.

+

Share your experiences with the ABP Framework!
ABP is an open source and community driven project. This guide is aimed to help anyone who wants to contribute to the project.

If you want to write articles or "how to" guides related to the ABP Framework and ASP.NET Core, please submit your article to the community.abp.io web site.

diff --git a/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md b/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md index 3d99e1e3cf..1961726b8f 100644 --- a/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md +++ b/docs/en/Distributed-Event-Bus-RabbitMQ-Integration.md @@ -141,13 +141,14 @@ Configure(options => }); ```` -**Example: Configure the client and exchange names** +**Example: Configure the client, exchange names and prefetchCount** ````csharp Configure(options => { options.ClientName = "TestApp1"; options.ExchangeName = "TestMessages"; + options.PrefetchCount = 1; }); ```` diff --git a/docs/en/Migration-Guides/Abp-6_0.md b/docs/en/Migration-Guides/Abp-6_0.md new file mode 100644 index 0000000000..1436990e56 --- /dev/null +++ b/docs/en/Migration-Guides/Abp-6_0.md @@ -0,0 +1,29 @@ +# ABP Version 6.0 Migration Guide + +This document is a guide for upgrading ABP v5.3 solutions to ABP v6.0. There is a change in this version that may affect your applications, please read it carefully and apply the necessary changes to your application. + +## Added IsActive property + +`IsActive` property is added to `IUserData`. This property is set to **true** by default. **Cmskit** and **Blog** modules are affected by this change. You need to add new migration to your existing application if you are using any of these modules. Please see [#11417](https://github.com/abpframework/abp/pull/11417) for more info. + +## Default behavior change in MultiTenancyMiddlewareErrorPageBuilder + +If you have customized the `MultiTenancyMiddlewareErrorPageBuilder` of `AbpMultiTenancyOptions`, the pipeline now returns **true** to stop the pipeline as the default behavior. See [AbpMultiTenancyOptions: Handle inactive and non-existent tenants](https://github.com/abpframework/abp/blob/dev/docs/en/Multi-Tenancy.md#abpmultitenancyoptions-handle-inactive-and-non-existent-tenants) for more info. + +## Migrating to LeptonX Lite + +LeptonX Lite is now being introduced and you can follow the guides below to migrate your existing applications: + +- [Migrating to LeptonX MVC UI](../themes/LeptonXLite/AspNetCore.md) +- [Migrating to LeptonX Angular UI](../themes/LeptonXLite/angular.md) +- [Migrating to LeptonX Blazor UI](../themes/LeptonXLite/blazor.md) + +## Migrating to OpenIddict + +After the [announcement of plan to replace the IdentityServer](https://github.com/abpframework/abp/issues/11989), we have successfully implemented [Openiddict](https://github.com/openiddict/openiddict-core) as a replacement for IdentityServer4 as an OpenID-Provider. + +You can follow the [IdentityServer to OpenIddict Step by Step Guide](OpenIddict-Step-by-Step.md) for migrating your existing application in detail with a sample projects. + +## See Also + +* [Official blog post for the 6.0 release](https://blog.abp.io/abp/ABP.IO-Platform-6.0-RC-Has-Been-Published) diff --git a/docs/en/Migration-Guides/IdentityServer_To_OpenIddict.md b/docs/en/Migration-Guides/IdentityServer_To_OpenIddict.md new file mode 100644 index 0000000000..a4baa79d9f --- /dev/null +++ b/docs/en/Migration-Guides/IdentityServer_To_OpenIddict.md @@ -0,0 +1,78 @@ +# Migration Identity Server to OpenIddict Guide + +This document explains how to migrate to [OpenIddict](https://github.com/openiddict/openiddict-core) from Identity Server. From now on the ABP startup templates uses `OpenIddict` as the auth server by default since version v6.0.0. + +## History +We are not removing Identity Server packages and we will continue to release new versions of Identity Server related NuGet/NPM packages. That means you won't have an issue while upgrading to v6.0 when the stable version releases. We will continue to fix bugs in our packages for a while. ABP 7.0 will be based on .NET 7. If Identity Server continues to work with .NET 7, we will also continue to ship NuGet packages for our IDS integration. + +On the other hand, Identity Server ends support for the open-source Identity Server in the end of 2022. The Identity Server team has decided to move to Duende IDS and ABP will not be migrated to the commercial Duende IDS. You can see the Duende Identity Server announcement from [this link](https://blog.duendesoftware.com/posts/20220111_fair_trade). + +## OpenIddict Migration Steps + +* Update all `Volo's` packages to `6.x`. +* Replace all `Volo's` `IdentityServer.*` packages with corresponding `OpenIddict.*` packages. eg `Volo.Abp.IdentityServer.Domain` to `Volo.Abp.OpenIddict.Domain`, `Volo.Abp.Account.Web.IdentityServer` to `Volo.Abp.Account.Web.OpenIddict`. +* Replace all `IdentityServer` modules with corresponding `OpenIddict` modules. eg `AbpIdentityServerDomainModule` to `AbpOpenIddictDomainModule`, `AbpAccountWebIdentityServerModule` to `AbpAccountWebOpenIddictModule`. +* Rename the `ConfigureIdentityServer` to `ConfigureOpenIddict` in your `ProjectNameDbContext` class. +* Remove the `UseIdentityServer` and add `UseAbpOpenIddictValidation` after `UseAuthentication`. +* Add follow code to your startup module. + +```cs +public override void PreConfigureServices(ServiceConfigurationContext context) +{ + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("ProjectName"); // Change ProjectName to your project name. + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); +} +``` + +* If your project is not separate AuthServer please also add `ForwardIdentityAuthenticationForBearer` + +```cs +private void ConfigureAuthentication(ServiceConfigurationContext context) +{ + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); +} +``` + +* Remove the `IdentityServerDataSeedContributor` from the `Domain` project. +* Create a new version of the project, with the same name as your existing project. +* Copy the `ProjectName.Domain\OpenIddict\OpenIddictDataSeedContributor.cs` of new project into your project and update `appsettings.json` base on `ProjectName.DbMigrator\appsettings.json`, Be careful to change the port number. +* Copy the `Index.cshtml.cs` and `Index.cs` of new project to your project if you're using `IClientRepository` in `IndexModel`. +* Update the scope name from `role` to `roles` in `AddAbpOpenIdConnect` method. +* Remove `options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);` from `HttpApi.Host` project. +* AuthServer no longer requires `JWT bearer authentication`. Please remove it. eg `AddJwtBearer` and `UseJwtTokenMiddleware`. +* Try compiling the project in the IDE and following the errors to remove and reference the code and namespaces. +* Add migrations and update the database if you are using EF Core as the database provider. + +## Module packages +### Open source side +* Volo.Abp.OpenIddict.Domain (`AbpOpenIddictDomainModule`) +* Volo.Abp.OpenIddict.Domain.Shared (`AbpOpenIddictDomainSharedModule`) +* Volo.Abp.OpenIddict.EntityFrameworkCore (`AbpOpenIddictEntityFrameworkCoreModule`) +* Volo.Abp.OpenIddict.AspNetCore (`AbpOpenIddictAspNetCoreModule`) +* Volo.Abp.OpenIddict.MongoDB (`AbpOpenIddictMongoDbModule`) +* Volo.Abp.Account.Web.OpenIddict (`AbpAccountWebOpenIddictModule`) +* Volo.Abp.PermissionManagement.Domain.OpenIddict (`AbpPermissionManagementDomainOpenIddictModule`) + +### Commercial side +* Volo.Abp.OpenIddict.Pro.Application.Contracts (`AbpOpenIddictProApplicationContractsModule`) +* Volo.Abp.OpenIddict.Pro.Application (`AbpOpenIddictProApplicationModule`) +* Volo.Abp.OpenIddict.Pro.HttpApi.Client (`AbpOpenIddictProHttpApiClientModule`) +* Volo.Abp.OpenIddict.Pro.HttpApi (`AbpOpenIddictProHttpApiModule`) +* Volo.Abp.OpenIddict.Pro.Blazor(`AbpOpenIddictProBlazorModule`) +* Volo.Abp.OpenIddict.Pro.Blazor.Server (`AbpOpenIddictProBlazorServerModule`) +* Volo.Abp.OpenIddict.Pro.Blazor.WebAssembly (`AbpOpenIddictProBlazorWebAssemblyModule`) +* Volo.Abp.OpenIddict.Pro.Web (`AbpOpenIddictProWebModule`) + +## Source code of samples and module + +* [Open source tiered & separate auth server application migrate Identity Server to OpenIddct](https://github.com/abpframework/abp-samples/tree/master/Ids2OpenId) +* [Commercial tiered & separate auth server application migrate Identity Server to OpenIddct](https://abp.io/Account/Login?returnUrl=/api/download/samples/Ids2OpenId) +* [OpenIddict module document](https://docs.abp.io/en/abp/6.0/Modules/OpenIddict) +* [OpenIddict module source code](https://github.com/abpframework/abp/tree/rel-6.0/modules/openiddict) diff --git a/docs/en/Migration-Guides/Index.md b/docs/en/Migration-Guides/Index.md index c24ac09eee..e3ea77db1f 100644 --- a/docs/en/Migration-Guides/Index.md +++ b/docs/en/Migration-Guides/Index.md @@ -2,6 +2,7 @@ The following documents explain how to migrate your existing ABP applications. We write migration documents only if you need to take an action while upgrading your solution. Otherwise, you can easily upgrade your solution using the [abp update command](../Upgrading.md). +- [5.3 to 6.0](Abp-6_0.md) - [5.2 to 5.3](Abp-5_3.md) - [5.1 to 5.2](Abp-5_2.md) - [4.x to 5.0](Abp-5_0.md) diff --git a/docs/en/Migration-Guides/OpenIddict-Angular.md b/docs/en/Migration-Guides/OpenIddict-Angular.md new file mode 100644 index 0000000000..e8d34cb5fc --- /dev/null +++ b/docs/en/Migration-Guides/OpenIddict-Angular.md @@ -0,0 +1,170 @@ +# OpenIddict Angular UI Migration Guide + +## Angular Project + +- In `environment.ts` and `environment.prod.ts` **add a trailing slash at the end of the issuer**: + + ```typescript + oAuthConfig: { + issuer: 'https://localhost:44377/', + ... + }, + ``` + +## Http.Api.Host (Non-Separated IdentityServer) + +- In **MyApplication.HttpApi.Host.csproj** replace **project references**: + + ```csharp + + + ``` + + with + + ```csharp + + ``` + +- In the **MyApplicationHttpApiHostModule.cs** replace usings and **module dependencies**: + + ```csharp + using Volo.Abp.AspNetCore.Authentication.JwtBearer; + ... + typeof(AbpAspNetCoreAuthenticationJwtBearerModule), + typeof(AbpAccountWebIdentityServerModule), + ``` + + with + + ```csharp + using OpenIddict.Validation.AspNetCore; + ... + typeof(AbpAccountWebOpenIddictModule), + ``` + +- In the **MyApplicationHttpApiHostModule.cs** add `PreConfigureServices` like below with your application name as the audience: + + ```csharp + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("MyApplication"); // Replace with your application name + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); + } + ``` + +- In the **MyApplicationHttpApiHostModule.cs** `ConfigureServices` method, **replace the method call**: + + From `ConfigureAuthentication(context, configuration);` to `ConfigureAuthentication(context);` and update the method as: + + ```csharp + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + ``` + +- In the **MyApplicationHttpApiHostModule.cs** `OnApplicationInitialization` method, **replace the midware**: + + ```csharp + app.UseJwtTokenMiddleware(); + app.UseIdentityServer(); + ``` + + with + + ```csharp + app.UseAbpOpenIddictValidation(); + ``` + +- In the **MyApplicationHttpApiHostModule.cs** `OnApplicationInitialization` method, delete `c.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);` in `app.UseAbpSwaggerUI` options configurations which is no longer needed. + +- In `appsettings.json` delete **SwaggerClientSecret** from the *AuthServer* section like below: + + ```json + "AuthServer": { + "Authority": "https://localhost:44345", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "MyApplication_Swagger" + }, + ``` + +## Http.Api.Host (Separated IdentityServer) + +- In the **MyApplicationHttpApiHostModule.cs** `OnApplicationInitialization` method, delete `c.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);` in `app.UseAbpSwaggerUI` options configurations which is no longer needed. + +- In `appsettings.json` delete **SwaggerClientSecret** from the *AuthServer* section like below: + + ```json + "AuthServer": { + "Authority": "https://localhost:44345", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "MyApplication_Swagger" + }, + ``` + +## IdentityServer + +This project is renamed to **AuthServer** after v6.0.0-rc1. You can also refactor and rename your project to *AuthServer* for easier updates in the future. + +- In **MyApplication.IdentityServer.csproj** replace **project references**: + + ```csharp + + ``` + + with + + ```csharp + + ``` + +- In the **MyApplicationIdentityServerModule.cs** replace usings and **module dependencies**: + + ```csharp + typeof(AbpAccountWebIdentityServerModule), + ``` + + with + + ```csharp + typeof(AbpAccountWebOpenIddictModule), + ``` + +- In the **MyApplicationIdentityServerModule.cs** add `PreConfigureServices` like below with your application name as the audience: + + ```csharp + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("MyApplication"); // Replace with your application name + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); + } + ``` + +- In the **MyApplicationIdentityServerModule.cs** `OnApplicationInitialization` method, **remove the midware**: + + ```csharp + app.UseIdentityServer(); + ``` + +- To use the new AuthServer page, replace **Index.cshtml.cs** with [AuthServer Index.cshtml.cs](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.IdentityServer/Pages/Index.cshtml) and **Index.cshtml** file with [AuthServer Index.cshtml](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.IdentityServer/Pages/Index.cshtml.cs) and rename **Ids2OpenId** with your application namespace. + + > Note: It can be found under the *Pages* folder. + +## See Also + +* [OpenIddict Step-by-Step Guide](OpenIddict-Step-by-Step.md) diff --git a/docs/en/Migration-Guides/OpenIddict-Blazor-Server.md b/docs/en/Migration-Guides/OpenIddict-Blazor-Server.md new file mode 100644 index 0000000000..4db4556479 --- /dev/null +++ b/docs/en/Migration-Guides/OpenIddict-Blazor-Server.md @@ -0,0 +1,175 @@ +# OpenIddict Blazor-Server UI Migration Guide + +## Blazor Project (Non-Tiered Solution) + +- In the **MyApplication.Blazor.csproj** replace **project references**: + + ```csharp + + + ``` + + with + + ```csharp + + ``` + +- In the **MyApplicationBlazorModule.cs** replace usings and **module dependencies**: + + ```csharp + using System; + using System.Net.Http; + using Volo.Abp.AspNetCore.Authentication.JwtBearer; + ... + typeof(AbpAspNetCoreAuthenticationJwtBearerModule), + typeof(AbpAccountWebIdentityServerModule), + ``` + + with + + ```csharp + using OpenIddict.Validation.AspNetCore; + ... + typeof(AbpAccountWebOpenIddictModule), + ``` + +- In the **MyApplicationBlazorModule.cs** add `PreConfigureServices` like below with your application name as the audience: + + ```csharp + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("MyApplication"); // Replace with your application name + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); + } + ``` + +- In the **MyApplicationBlazorModule.cs** `ConfigureServices` method, **replace the method call**: + + From `ConfigureAuthentication(context, configuration);` to `ConfigureAuthentication(context);` and update the method as: + + ```csharp + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + ``` + +- In the **MyApplicationBlazorModule.cs** `OnApplicationInitialization` method, **replace the midware**: + + ```csharp + app.UseJwtTokenMiddleware(); + app.UseIdentityServer(); + ``` + + with + + ```csharp + app.UseAbpOpenIddictValidation(); + ``` + +## Blazor Project (Tiered Solution) + +- In the **MyApplicationWebModule.cs** update the `AddAbpOpenIdConnect` configurations: + + ```csharp + .AddAbpOpenIdConnect("oidc", options => + { + options.Authority = configuration["AuthServer:Authority"]; + options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); + options.ResponseType = OpenIdConnectResponseType.CodeIdToken; + + options.ClientId = configuration["AuthServer:ClientId"]; + options.ClientSecret = configuration["AuthServer:ClientSecret"]; + + options.SaveTokens = true; + options.GetClaimsFromUserInfoEndpoint = true; + + options.Scope.Add("roles"); // Replace "role" with "roles" + options.Scope.Add("email"); + options.Scope.Add("phone"); + options.Scope.Add("MyApplication"); + }); + ``` + + Replace **role** scope with **roles**. + +## IdentityServer + +This project is renamed to **AuthServer** after v6.0.0-rc1. You can also refactor and rename your project to *AuthServer* for easier updates in the future. + +- In **MyApplication.IdentityServer.csproj** replace **project references**: + + ```csharp + + ``` + + with + + ```csharp + + ``` + +- In **MyApplicationIdentityServerModule.cs** replace usings and **module dependencies**: + + ```csharp + typeof(AbpAccountWebIdentityServerModule), + ``` + + with + + ```csharp + typeof(AbpAccountWebOpenIddictModule), + ``` + +- In the **MyApplicationIdentityServerModule.cs** add `PreConfigureServices` like below with your application name as the audience: + + ```csharp + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("MyApplication"); // Replace with your application name + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); + } + ``` + +- In **MyApplicationIdentityServerModule.cs** `OnApplicationInitialization` method **remove IdentityServer midware**: + + ```csharp + app.UseIdentityServer(); + ``` + +## Http.Api.Host + +- In the **MyApplicationHttpApiHostModule.cs** `OnApplicationInitialization` method, delete `c.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);` in `app.UseAbpSwaggerUI` options configurations which is no longer needed. + +- In `appsettings.json` delete **SwaggerClientSecret** from the *AuthServer* section like below: + +```json +"AuthServer": { + "Authority": "https://localhost:44345", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "MyApplication_Swagger" +}, +``` + +- To use the new AuthServer page, replace **Index.cshtml.cs** with [AuthServer Index.cshtml.cs](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.IdentityServer/Pages/Index.cshtml) and **Index.cshtml** file with [AuthServer Index.cshtml](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.IdentityServer/Pages/Index.cshtml.cs) and rename **Ids2OpenId** with your application namespace. + + > Note: It can be found under the *Pages* folder. + +## See Also + +* [OpenIddict Step-by-Step Guide](OpenIddict-Step-by-Step.md) diff --git a/docs/en/Migration-Guides/OpenIddict-Blazor.md b/docs/en/Migration-Guides/OpenIddict-Blazor.md new file mode 100644 index 0000000000..0dc1c0f123 --- /dev/null +++ b/docs/en/Migration-Guides/OpenIddict-Blazor.md @@ -0,0 +1,189 @@ +# OpenIddict Blazor Wasm UI Migration Guide + +## Blazor Project + +- In the **MyApplicationBlazorModule.cs** update the `ConfigureAuthentication` method: + + ```csharp + builder.Services.AddOidcAuthentication(options => + { + ... + options.UserOptions.RoleClaim = JwtClaimTypes.Role; + + options.ProviderOptions.DefaultScopes.Add("role"); + ... + }); + ``` + + Update **UserOptions** and **role scope** as below + + ```csharp + builder.Services.AddOidcAuthentication(options => + { + ... + options.UserOptions.NameClaim = OpenIddictConstants.Claims.Name; + options.UserOptions.RoleClaim = OpenIddictConstants.Claims.Role; + + options.ProviderOptions.DefaultScopes.Add("roles"); + ... + }); + ``` + +## Http.Api.Host (Non-Separated IdentityServer) + +- In the **MyApplication.HttpApi.Host.csproj** replace **project references**: + + ```csharp + + + ``` + + with + + ```csharp + + ``` + +- In the **MyApplicationHttpApiHostModule.cs** replace usings and **module dependencies**: + + ```csharp + using System.Net.Http; + using Volo.Abp.AspNetCore.Authentication.JwtBearer; + ... + typeof(AbpAspNetCoreAuthenticationJwtBearerModule), + typeof(AbpAccountWebIdentityServerModule), + ``` + + with + + ```csharp + using OpenIddict.Validation.AspNetCore; + ... + typeof(AbpAccountWebOpenIddictModule), + ``` + +- In the **MyApplicationBlazorModule.cs** add `PreConfigureServices` like below with your application name as the audience: + + ```csharp + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("MyApplication"); // Replace with your application name + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); + } + ``` + +- In the **MyApplicationBlazorModule.cs** `ConfigureServices` method, **replace the method call**: + + From `ConfigureAuthentication(context, configuration);` to `ConfigureAuthentication(context);` and update the method as: + + ```csharp + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + ``` + +- In the **MyApplicationBlazorModule.cs** `OnApplicationInitialization` method, **replace the midware**: + + ```csharp + app.UseJwtTokenMiddleware(); + app.UseIdentityServer(); + ``` + + with + + ```csharp + app.UseAbpOpenIddictValidation(); + ``` + +- Delete `c.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);` in `app.UseAbpSwaggerUI` options configurations which is no longer needed. + +- In `appsettings.json` delete **SwaggerClientSecret** from the *AuthServer* section like below: + + ```json + "AuthServer": { + "Authority": "https://localhost:44345", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "MyApplication_Swagger" + }, + ``` + +## Http.Api.Host (Separated IdentityServer) + +- In the **MyApplicationHttpApiHostModule.cs** `OnApplicationInitialization` method, delete `c.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);` in `app.UseAbpSwaggerUI` options configurations which is no longer needed. + +- In `appsettings.json` delete **SwaggerClientSecret** from the *AuthServer* section like below: + + ```json + "AuthServer": { + "Authority": "https://localhost:44345", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "MyApplication_Swagger" + }, + ``` + +## IdentityServer + +This project is renamed to **AuthServer** after v6.0.0-rc1. You can also refactor and rename your project to *AuthServer* for easier updates in the future. + +- In **MyApplication.IdentityServer.csproj** replace **project references**: + + ```csharp + + ``` + + with + + ```csharp + + ``` + +- In the **MyApplicationIdentityServerModule.cs** replace usings and **module dependencies**: + + ```csharp + typeof(AbpAccountWebIdentityServerModule), + ``` + + with + + ```csharp + typeof(AbpAccountWebOpenIddictModule), + ``` + +- In the **MyApplicationIdentityServerModule.cs** add `PreConfigureServices` like below with your application name as the audience: + + ```csharp + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("MyApplication"); // Replace with your application name + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); + } + ``` + +- In the **MyApplicationIdentityServerModule.cs** `OnApplicationInitialization` method, **remove the midware**: + + ```csharp + app.UseIdentityServer(); + ``` + +- To use the new AuthServer page, replace **Index.cshtml.cs** with [AuthServer Index.cshtml.cs](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.IdentityServer/Pages/Index.cshtml) and **Index.cshtml** file with [AuthServer Index.cshtml](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.IdentityServer/Pages/Index.cshtml.cs) and rename **Ids2OpenId** with your application namespace. + + > Note: It can be found under the *Pages* folder. + +## See Also + +* [OpenIddict Step-by-Step Guide](OpenIddict-Step-by-Step.md) diff --git a/docs/en/Migration-Guides/OpenIddict-Mvc.md b/docs/en/Migration-Guides/OpenIddict-Mvc.md new file mode 100644 index 0000000000..e772de272c --- /dev/null +++ b/docs/en/Migration-Guides/OpenIddict-Mvc.md @@ -0,0 +1,166 @@ +# OpenIddict MVC/Razor UI Migration Guide + +## Web Project (Non-Tiered Solution) + +- In **MyApplication.Web.csproj** replace **project references**: + + ```csharp + + + ``` + + with + + ```csharp + + ``` + +- In **MyApplicationWebModule.cs** replace usings and **module dependencies**: + + ```csharp + using Volo.Abp.AspNetCore.Authentication.JwtBearer; + ... + typeof(AbpAccountWebIdentityServerModule), + typeof(AbpAspNetCoreAuthenticationJwtBearerModule), + ``` + + with + + ```csharp + typeof(AbpAccountWebModule), + ``` + +- In **MyApplicationWebModule.cs** `ConfigureServices` method **update authentication configuration**: + + ```csharp + ConfigureAuthentication(context, configuration); + ``` + + with + + ```csharp + ConfigureAuthentication(context); + ``` + + and update the `ConfigureAuthentication` private method to: + + ```csharp + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } + ``` + +- In **MyApplicationWebModule.cs** `OnApplicationInitialization` method **replace IdentityServer and JwtToken midwares**: + + ```csharp + app.UseJwtTokenMiddleware(); + app.UseIdentityServer(); + ``` + + with + + ```csharp + app.UseAbpOpenIddictValidation(); + ``` + + +## Web Project (Tiered Solution) + +- In the **MyApplicationWebModule.cs** update the `AddAbpOpenIdConnect` configurations: + + ```csharp + .AddAbpOpenIdConnect("oidc", options => + { + options.Authority = configuration["AuthServer:Authority"]; + options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); + options.ResponseType = OpenIdConnectResponseType.CodeIdToken; + + options.ClientId = configuration["AuthServer:ClientId"]; + options.ClientSecret = configuration["AuthServer:ClientSecret"]; + + options.UsePkce = true; // Add this line + options.SaveTokens = true; + options.GetClaimsFromUserInfoEndpoint = true + + options.Scope.Add("roles"); // Replace "role" with "roles" + options.Scope.Add("email"); + options.Scope.Add("phone"); + options.Scope.Add("MyApplication"); + }); + ``` + +Replace role scope to **roles** and add **UsePkce** and **SignoutScheme** options. + +## IdentityServer + +This project is renamed to **AuthServer** after v6.0.0-rc1. You can also refactor and rename your project to *AuthServer* for easier updates in the future. + +- In **MyApplication.IdentityServer.csproj** replace **project references**: + + ```csharp + + ``` + + with + + ```csharp + + ``` + +- In **MyApplicationIdentityServerModule.cs** replace usings and **module dependencies**: + + ```csharp + typeof(AbpAccountWebIdentityServerModule), + ``` + + with + + ```csharp + typeof(AbpAccountWebOpenIddictModule), + ``` + +- In the **MyApplicationIdentityServerModule.cs** add `PreConfigureServices` like below with your application name as the audience: + + ```csharp + public override void PreConfigureServices(ServiceConfigurationContext context) + { + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("MyApplication"); // Replace with your application name + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); + } + ``` + +- In **MyApplicationIdentityServerModule.cs** `OnApplicationInitialization` method **remove IdentityServer midware**: + + ```csharp + app.UseIdentityServer(); + ``` + +- To use the new AuthServer page, replace **Index.cshtml.cs** with [AuthServer Index.cshtml.cs](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.IdentityServer/Pages/Index.cshtml) and **Index.cshtml** file with [AuthServer Index.cshtml](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.IdentityServer/Pages/Index.cshtml.cs) and rename **Ids2OpenId** with your application namespace. + + > Note: It can be found under the *Pages* folder. + +## Http.Api.Host + +- In the **MyApplicationHttpApiHostModule.cs** `OnApplicationInitialization` method, delete `c.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);` in `app.UseAbpSwaggerUI` options configurations which is no longer needed. + +- In `appsettings.json` delete **SwaggerClientSecret** from the *AuthServer* section like below: + + ```json + "AuthServer": { + "Authority": "https://localhost:44345", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "MyApplication_Swagger" + }, + ``` + +## See Also + +* [OpenIddict Step-by-Step Guide](OpenIddict-Step-by-Step.md) diff --git a/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md b/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md new file mode 100644 index 0000000000..e8c0f65c7c --- /dev/null +++ b/docs/en/Migration-Guides/OpenIddict-Step-by-Step.md @@ -0,0 +1,229 @@ +# Migrating from IdentityServer to OpenIddict Step by Step Guide + +This guide provides layer-by-layer guidance for migrating your existing application to [OpenIddict](https://github.com/openiddict/openiddict-core) from IdentityServer. ABP startup templates use `OpenIddict` OpenId provider from v6.0.0-rc1 by default and `IdentityServer` projects are renamed to `AuthServer` in tiered/separated solutions. Since OpenIddict is only available with ABP v6.0, you will need to update your existing application in order to apply OpenIddict changes. + +## History +We are not removing Identity Server packages and we will continue to release new versions of IdentityServer-related NuGet/NPM packages. That means you won't have an issue while upgrading to v6.0 when the stable version releases. We will continue to fix bugs in our packages for a while. ABP 7.0 will be based on .NET 7. If Identity Server continues to work with .NET 7, we will also continue to ship NuGet packages for our IDS integration. + +On the other hand, Identity Server ends support for the open-source Identity Server at the end of 2022. The Identity Server team has decided to move to Duende IDS and ABP will not be migrated to the commercial Duende IDS. You can see the Duende Identity Server announcement from [this link](https://blog.duendesoftware.com/posts/20220111_fair_trade). + +## OpenIddict Migration Steps + +Use the `abp update` command to update your existing application. See [Upgrading docs](../Upgrading.md) for more info. Apply required migrations by following the [Migration Guides](Index.md) based on your application version. + +### Domain.Shared Layer + +- In **MyApplication.Domain.Shared.csproj** replace **project reference**: + ```csharp + + ``` + with + ```csharp + + ``` + +- In **MyApplicationDomainSharedModule.cs** replace usings and **module dependencies:** + + ```csharp + using Volo.Abp.IdentityServer; + ... + typeof(AbpIdentityServerDomainSharedModule) + ``` + with + ```csharp + using Volo.Abp.OpenIddict; + ... + typeof(AbpOpenIddictDomainSharedModule) + +### Domain Layer + +- In **MyApplication.Domain.csproj** replace **project references**: + + ```csharp + + + ``` + + with + + ```csharp + + + ``` + +- In **MyApplicationDomainModule.cs** replace usings and **module dependencies**: + + ```csharp + using Volo.Abp.IdentityServer; + using Volo.Abp.PermissionManagement.IdentityServer; + ... + typeof(AbpIdentityServerDomainModule), + typeof(AbpPermissionManagementDomainIdentityServerModule), + ``` + + with + + ```csharp + using Volo.Abp.OpenIddict; + using Volo.Abp.PermissionManagement.OpenIddict; + ... + typeof(AbpOpenIddictDomainModule), + typeof(AbpPermissionManagementDomainOpenIddictModule), + ``` + +#### OpenIddictDataSeedContributor + +- Create a folder named *OpenIddict* under the Domain project and copy the [OpenIddictDataSeedContributor.cs](https://github.com/abpframework/abp-samples/blob/master/Ids2OpenId/src/Ids2OpenId.Domain/OpenIddict/OpenIddictDataSeedContributor.cs) under this folder. Rename all the `Ids2OpenId` with your project name. +- Delete *IdentityServer* folder that contains `IdentityServerDataSeedContributor.cs` which is no longer needed. + +### EntityFrameworkCore Layer + +If you are using MongoDB, skip this step and check the *MongoDB* layer section. + +- In **MyApplication.EntityFrameworkCore.csproj** replace **project reference**: + + ```csharp + + ``` + + with + + ```csharp + + ``` + +- In **MyApplicationEntityFrameworkCoreModule.cs** replace usings and **module dependencies**: + + ```csharp + using Volo.Abp.IdentityServer.EntityFrameworkCore; + ... + typeof(AbpIdentityServerEntityFrameworkCoreModule), + ``` + + with + + ```csharp + using Volo.Abp.OpenIddict.EntityFrameworkCore; + ... + typeof(AbpOpenIddictEntityFrameworkCoreModule), + ``` + +- In **MyApplicationDbContext.cs** replace usings and **fluent api configurations**: + + ```csharp + using Volo.Abp.IdentityServer.EntityFrameworkCore; + ... + using Volo.Abp.OpenIddict.EntityFrameworkCore; + ... + protected override void OnModelCreating(ModelBuilder builder) + { + base.OnModelCreating(builder); + + /* Include modules to your migration db context */ + + ... + builder.ConfigureIdentityServer(); + ``` + + with + + ```csharp + using Volo.Abp.OpenIddict.EntityFrameworkCore; + ... + protected override void OnModelCreating(ModelBuilder builder) + { + base.OnModelCreating(builder); + + /* Include modules to your migration db context */ + + ... + builder.ConfigureOpenIddict(); + ``` + +### MongoDB Layer + +If you are using EntityFrameworkCore, skip this step and check the *EntityFrameworkCore* layer section. + +- In **MyApplication.MongoDB.csproj** replace **project reference**: + + ```csharp + + ``` + + with + + ```csharp + + ``` + +- In **MyApplicationMongoDbModule.cs** replace usings and **module dependencies**: + + ```csharp + using Volo.Abp.IdentityServer.MongoDB; + ... + typeof(AbpIdentityServerMongoDbModule), + ``` + + with + + ```csharp + using Volo.Abp.OpenIddict.MongoDB; + ... + typeof(AbpOpenIddictMongoDbModule), + ``` + +### DbMigrator Project + +- In **MyApplication.DbMigrator.csproj** **add project reference**: + + ```csharp + + ``` + +for creating the host builder. + +- In `appsettings.json` **replace IdentityServer section with OpenIddict:** + + ```json + "OpenIddict": { + "Applications": { + "MyApplication_Web": { + "ClientId": "MyApplication_Web", + "ClientSecret": "1q2w3e*", + "RootUrl": "https://localhost:44384" + }, + "MyApplication_App": { + "ClientId": "MyApplication_App", + "RootUrl": "http://localhost:4200" + }, + "MyApplication_BlazorServerTiered": { + "ClientId": "MyApplication_BlazorServerTiered", + "ClientSecret": "1q2w3e*", + "RootUrl": "https://localhost:44346" + }, + "MyApplication_Swagger": { + "ClientId": "MyApplication_Swagger", + "RootUrl": "https://localhost:44391" + } + } + } + ``` + + Replace **MyApplication** with your application name. + +### UI Layer + +- [Angular UI Migration](OpenIddict-Angular.md) +- [MVC/Razor UI Migration](OpenIddict-Mvc.md) +- [Blazor-Server UI Migration](OpenIddict-Blazor-Server.md) +- [Blazor-Wasm UI Migration](OpenIddict-Blazor.md) + +## Source code of samples and module + +* [Open source tiered & separate auth server application migrate Identity Server to OpenIddct](https://github.com/abpframework/abp-samples/tree/master/Ids2OpenId) +* [OpenIddict module document](https://docs.abp.io/en/abp/6.0/Modules/OpenIddict) +* [OpenIddict module source code](https://github.com/abpframework/abp/tree/rel-6.0/modules/openiddict) + +## See Also + +* [ABP Version 6.0 Migration Guide](Abp-6_0.md) \ No newline at end of file diff --git a/docs/en/Modules/Cms-Kit/Dynamic-Widget.md b/docs/en/Modules/Cms-Kit/Dynamic-Widget.md new file mode 100644 index 0000000000..88c0be6750 --- /dev/null +++ b/docs/en/Modules/Cms-Kit/Dynamic-Widget.md @@ -0,0 +1,137 @@ +# Dynamic Widget + +CMS kit provides a dynamic [widget](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Widgets) used to render the components previously developed by the software in the content of the pages and blog posts. Its means, that in static content you can use dynamic content. We will mention how you can do it. You have two choices to define the widget in the system: Writing and UI. + +### Adding the widget +Firstly we will show how to use the widget system via writing manually in the page and blogpost contents. + +Let's define the view component + +```csharp +[Widget] +[ViewComponent(Name = "CmsToday")] +public class TodayViewComponent : AbpViewComponent +{ + public IViewComponentResult Invoke() + { + return View("~/ViewComponents/Today.cshtml", + new TodayViewComponent()); + } +} +``` + +```html +@model Volo.CmsKit.ViewComponents.TodayViewComponent + +

Welcome Today Component

+

@DateTime.Now.ToString()

+ +``` + +Now configuration time on YourModule.cs +```csharp +Configure(options => + { + options.AddWidget("Today","CmsToday"); + }); +``` + +Now you're ready to add your widget by writing. +[Widget Type="Today"] + +After completing the above steps, you can see the output at the right of the below screenshot. +![cmskit-without-parameter.png](../../images/cmskit-without-parameter.png) + +### Adding by using UI +Now we will mention the second option, using UI. +Once writing these definitions can make some mistakes hence we added a new feature to use the widget system easily. To the right of the editor, you will see the customized `W` button to add a dynamic widget like the below image. Don't forget please this is design mode and you need to view your page in view mode after saving. Also `Preview` tab on the editor will be ready to check your output easily for widget configurations in the next features. + +![cms-kit-page-editor](../../images/cms-kit-page-editor.png) + +### Adding by using UI with parameters +Let's improve the above example by adding a new parameter named format. Via this feature, we can use the widget system with many different scenarios but not prolong the document. Also, these examples can be expandable with dependency injection and getting values from the database, but we will use a basic example. We will add the format parameter to customize the date. + +```csharp +[Widget] +[ViewComponent(Name = "CmsToday")] +public class TodayViewComponent : AbpViewComponent +{ + public string Format { get; set; } + + public IViewComponentResult Invoke(string format) + { + return View("~/ViewComponents/Today.cshtml", + new TodayViewComponent() { Format = format }); + } +} +``` + +```html +@model Volo.CmsKit.ViewComponents.TodayViewComponent + +

Welcome Today Component

+

@DateTime.Now.ToString(Format)

+ +``` + +Let's define the format component. +```csharp +[Widget] +[ViewComponent(Name = "Format")] +public class FormatViewComponent : AbpViewComponent +{ + public IViewComponentResult Invoke() + { + return View("~/ViewComponents/Format.cshtml", + new FormatViewModel()); + } +} + +public class FormatViewModel +{ + [DisplayName("Format your date in the component")] + public string Format { get; set; } +} +``` +> Important Note: To get properties properly you should set the `name` property on the razor page or you may use the ABP component. ABP handles that automatically. + +```html +@using Volo.CmsKit.ViewComponents +@model FormatViewModel + +
+ +
+``` + +```csharp +Configure(options => + { + options.AddWidget("Today", "CmsToday", "Format"); + }); +``` + +![cmskit-module-editor-parameter](../../images/cmskit-module-editor-parameter.png) + +In this image, after choosing your widget (on the other case, it changes automatically up to your configuration, mine is `Today`. Its parameter name `parameterWidgetName` and its value is `Format`) you will see the next widget. Enter input values or choose them and click `Add`. You will see the underlined output in the editor. Right of the image, also you can see its previewed output. + +You can edit this output manually if do any wrong coding for that (wrong value or typo) you won't see the widget, even so, your page will be viewed successfully. + +## Options +To configure the widget, you should define the below code in YourModule.cs + +```csharp +Configure(options => + { + options.AddWidget(widgetType: "Today", widgetName: "CmsToday", parameterWidgetName: "Format"); + }); +``` + +Let's look at these parameters in detail +* `widgetType` is used for end-user and more readable names. The following bold word represents widgetType. +[Widget Type="**Today**" Format="yyyy-dd-mm HH:mm:ss"]. + +* `widgetName` is used for your widget name used in code for the name of the `ViewComponent`. + +* `parameterWidgetName` is used the for editor component side to see on the `Add Widget` modal. +After choosing the widget type from listbox (now just defined `Format`) and renders this widget automatically. It's required only to see UI once using parameters \ No newline at end of file diff --git a/docs/en/Modules/Cms-Kit/Index.md b/docs/en/Modules/Cms-Kit/Index.md index 072f196f10..b8cbe89d20 100644 --- a/docs/en/Modules/Cms-Kit/Index.md +++ b/docs/en/Modules/Cms-Kit/Index.md @@ -14,6 +14,7 @@ The following features are currently available: * Provides a [**rating**](Ratings.md) system to add rating feature to any kind of resource. * Provides a [**menu**](Menus.md) system to manage public menus dynamically. * Provides a [**global resources**](Global-Resources.md) system to add global styles and scripts dynamically. +* Provides a [**Dynamic Widget**](Dynamic-Widget.md) system to create dynamic widgets for page and blog posts. Click to a feature to understand and learn how to use it. diff --git a/docs/en/Modules/OpenIddict.md b/docs/en/Modules/OpenIddict.md index ed25147be2..9e603f76a8 100644 --- a/docs/en/Modules/OpenIddict.md +++ b/docs/en/Modules/OpenIddict.md @@ -1,9 +1,5 @@ ## ABP OpenIddict Modules -## How to Install - -TODO: - ## User Interface This module implements the domain logic and database integrations, but not provides any UI. Management UI is useful if you need to add applications and scopes on the fly. In this case, you may build the management UI yourself or consider to purchase the [ABP Commercial](https://commercial.abp.io/) which provides the management UI for this module. diff --git a/docs/en/SMS-Sending.md b/docs/en/SMS-Sending.md index 0dca487a69..efe63c3c91 100644 --- a/docs/en/SMS-Sending.md +++ b/docs/en/SMS-Sending.md @@ -80,7 +80,7 @@ The given `SendAsync` method in the example is an extension method to send an SM ## NullSmsSender -`NullSmsSender` is a the default implementation of the `ISmsSender`. It writes SMS content to the [standard logler](Logging.md), rather than actually sending the SMS. +`NullSmsSender` is a the default implementation of the `ISmsSender`. It writes SMS content to the [standard logger](Logging.md), rather than actually sending the SMS. This class can be useful especially in development time where you generally don't want to send real SMS. **However, if you want to actually send SMS, you should implement the `ISmsSender` in your application code.** diff --git a/docs/en/Themes/LeptonXLite/angular.md b/docs/en/Themes/LeptonXLite/Angular.md similarity index 92% rename from docs/en/Themes/LeptonXLite/angular.md rename to docs/en/Themes/LeptonXLite/Angular.md index 3edb7e6b1a..506ffaf753 100644 --- a/docs/en/Themes/LeptonXLite/angular.md +++ b/docs/en/Themes/LeptonXLite/Angular.md @@ -7,6 +7,8 @@ LeptonX Lite has implementation for the ABP Framework Angular Client. It's a sim ## Installation +This theme is **already installed** when you create a new solution using the startup templates. If you are using any other template, you can install this theme by following the steps below: + To add `LeptonX-lite` into your project, * Install `@abp/ng.theme.lepton-x` diff --git a/docs/en/Themes/LeptonXLite/AspNetCore.md b/docs/en/Themes/LeptonXLite/AspNetCore.md index 5c2c515613..eeaf55f545 100644 --- a/docs/en/Themes/LeptonXLite/AspNetCore.md +++ b/docs/en/Themes/LeptonXLite/AspNetCore.md @@ -7,6 +7,8 @@ LeptonX Lite has implementation for the ABP Framework Razor Pages. It's a simpli ## Installation +This theme is **already installed** when you create a new solution using the startup templates. If you are using any other template, you can install this theme by following the steps below: + - Add **Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite** package to your **Web** application. ```bash diff --git a/docs/en/Themes/LeptonXLite/blazor.md b/docs/en/Themes/LeptonXLite/Blazor.md similarity index 96% rename from docs/en/Themes/LeptonXLite/blazor.md rename to docs/en/Themes/LeptonXLite/Blazor.md index 22bc4af285..636c33ef28 100644 --- a/docs/en/Themes/LeptonXLite/blazor.md +++ b/docs/en/Themes/LeptonXLite/Blazor.md @@ -15,6 +15,8 @@ LeptonX Lite has implementation for the ABP Framework Blazor WebAssembly & Blazo ## Installation +This theme is **already installed** when you create a new solution using the startup templates. If you are using any other template, you can install this theme by following the steps below: + {{if UI == "Blazor"}} - Complete the [MVC Razor Pages Installation](AspNetCore.md#installation) for the **HttpApi.Host** application first. _If the solution is tiered/micro-service, complete the MVC steps for all MVC applications such as **HttpApi.Host** and if identity server is separated, install to the **OpenIddict**_. diff --git a/docs/en/Tutorials/Part-2.md b/docs/en/Tutorials/Part-2.md index 50b90b516d..3e7a1bc735 100644 --- a/docs/en/Tutorials/Part-2.md +++ b/docs/en/Tutorials/Part-2.md @@ -135,22 +135,22 @@ Open the `en.json` (*the English translations*) file and change the content as s "CreationTime": "Creation time", "AreYouSure": "Are you sure?", "AreYouSureToDelete": "Are you sure you want to delete this item?", - "Enum:BookType:0": "Undefined", - "Enum:BookType:1": "Adventure", - "Enum:BookType:2": "Biography", - "Enum:BookType:3": "Dystopia", - "Enum:BookType:4": "Fantastic", - "Enum:BookType:5": "Horror", - "Enum:BookType:6": "Science", - "Enum:BookType:7": "Science fiction", - "Enum:BookType:8": "Poetry" + "Enum:BookType.Undefined": "Undefined", + "Enum:BookType.Adventure": "Adventure", + "Enum:BookType.Biography": "Biography", + "Enum:BookType.Dystopia": "Dystopia", + "Enum:BookType.Fantastic": "Fantastic", + "Enum:BookType.Horror": "Horror", + "Enum:BookType.Science": "Science", + "Enum:BookType.ScienceFiction": "Science fiction", + "Enum:BookType.Poetry": "Poetry" } } ```` * Localization key names are arbitrary. You can set any name. We prefer some conventions for specific text types; * Add `Menu:` prefix for menu items. - * Use `Enum::` naming convention to localize the enum members. When you do it like that, ABP can automatically localize the enums in some proper cases. + * Use `Enum:.` or `.` or `` naming convention to localize the enum members. When you do it like that, ABP can automatically localize the enums in some proper cases. If a text is not defined in the localization file, it **falls back** to the localization key (as ASP.NET Core's standard behavior). @@ -624,7 +624,7 @@ Open the `Books.razor` and replace the content as the following: Field="@nameof(BookDto.Type)" Caption="@L["Type"]"> - @L[$"Enum:BookType:{(int)context.Type}"] + @L[$"Enum:BookType.{Enum.GetName(context.Type)}"] - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1322,7 +1322,7 @@ We can now define a modal to edit the book. Add the following code to the end of @foreach (int bookTypeValue in Enum.GetValues(typeof(BookType))) { - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1459,7 +1459,7 @@ Here's the complete code to create the book management CRUD page, that has been Field="@nameof(BookDto.Type)" Caption="@L["Type"]"> - @L[$"Enum:BookType:{(int) context.Type}"] + @L[$"Enum:BookType.{Enum.GetName(context.Type)}"] - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1564,7 +1564,7 @@ Here's the complete code to create the book management CRUD page, that has been @foreach (int bookTypeValue in Enum.GetValues(typeof(BookType))) { - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } diff --git a/docs/en/UI/Angular/Basic-Theme.md b/docs/en/UI/Angular/Basic-Theme.md index 7b6c98fdcc..6b9ffcfeb1 100644 --- a/docs/en/UI/Angular/Basic-Theme.md +++ b/docs/en/UI/Angular/Basic-Theme.md @@ -8,7 +8,7 @@ The Basic Theme is a theme implementation for the Angular UI. It is a minimalist ## Installation -**This theme is already installed** when you create a new solution using the [startup templates](../../Startup-Templates/Index.md). If you need to manually install it, follow the steps below: +If you need to manually this theme, follow the steps below: * Install the [@abp/ng.theme.basic](https://www.npmjs.com/package/@abp/ng.theme.basic) NPM package to your Angular project. * Open the `src/app/app.module.ts` file, import `ThemeBasicModule` (it can be imported from `@abp/ng.theme.basic` package), and add `ThemeBasicModule.forRoot()` to the `imports` array. diff --git a/docs/en/UI/Angular/Config-State-Service.md b/docs/en/UI/Angular/Config-State-Service.md index b3884f65e1..c457184fc2 100644 --- a/docs/en/UI/Angular/Config-State-Service.md +++ b/docs/en/UI/Angular/Config-State-Service.md @@ -120,10 +120,10 @@ Please refer to `ApplicationConfigurationDto` type for all the properties you ca You can get the application configuration response and set the `ConfigStateService` state value as shown below: ```js -import {ApplicationConfigurationService, ConfigStateService} from '@abp/ng.core'; +import {AbpApplicationConfigurationService, ConfigStateService} from '@abp/ng.core'; -constructor(private applicationConfigurationService: ApplicationConfigurationService, private config: ConfigStateService) { - this.applicationConfigurationService.getConfiguration().subscribe(config => { +constructor(private abpApplicationConfigurationService: AbpApplicationConfigurationService, private config: ConfigStateService) { + this.abpApplicationConfigurationService.get().subscribe(config => { this.config.setState(config); }) } diff --git a/docs/en/UI/AspNetCore/Basic-Theme.md b/docs/en/UI/AspNetCore/Basic-Theme.md index e74799a423..903231a20a 100644 --- a/docs/en/UI/AspNetCore/Basic-Theme.md +++ b/docs/en/UI/AspNetCore/Basic-Theme.md @@ -10,7 +10,7 @@ The Basic Theme has RTL (Right-to-Left language) support. ## Installation -**This theme is already installed** when you create a new solution using the [startup templates](../../Startup-Templates/Index.md). If you need to manually install it, follow the steps below: +If you need to manually this theme, follow the steps below: * Install the [Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic) NuGet package to your web project. * Add `AbpAspNetCoreMvcUiBasicThemeModule` into the `[DependsOn(...)]` attribute for your [module class](../../Module-Development-Basics.md) in the web project. diff --git a/docs/en/UI/AspNetCore/Modals.md b/docs/en/UI/AspNetCore/Modals.md index 3824c45983..b0a0ba922e 100644 --- a/docs/en/UI/AspNetCore/Modals.md +++ b/docs/en/UI/AspNetCore/Modals.md @@ -9,7 +9,7 @@ While you can continue to use the standard [Bootstrap way](https://getbootstrap. ABP Framework provides the following benefits for such a modal with a form inside it; * **Lazy loads** the modal HTML into the page and **removes** it from the DOM once its closed. This makes easy to consume a reusable modal dialog. Also, every time you open the modal, it will be a fresh new modal, so you don't have to deal with resetting the modal content. -* **Auto-focuses** the first input of the form once the modal has been opened. +* **Auto-focuses** the first input of the form once the modal has been opened. You can also specify it using a `function` or `jquery selector`. * Automatically determines the **form** inside a modal and posts the form via **AJAX** instead of normal page post. * Automatically checks if the form inside the modal **has changed, but not saved**. It warns the user in this case. * Automatically **disables the modal buttons** (save & cancel) until the AJAX operation completes. @@ -429,6 +429,7 @@ Here, the list of all available options; * `viewUrl` (required, `string`): The URL to lazy load the HTML of the modal. * `scriptUrl` (optional, `string`): A URL to lazy load a JavaScript file. It is loaded only once, when the modal first opened. * `modalClass` (optional, `string`): A JavaScript class defined in the `abp.modals` namespace that can be used to execute code related to the modal. +* `focusElement` (optional, `function or string`): Specifies the element that gets focus. ### Functions diff --git a/docs/en/UI/AspNetCore/Theming.md b/docs/en/UI/AspNetCore/Theming.md index fd2e7312de..050228de2d 100644 --- a/docs/en/UI/AspNetCore/Theming.md +++ b/docs/en/UI/AspNetCore/Theming.md @@ -16,10 +16,12 @@ In order to accomplish these goals, ABP Framework; ### Current Themes -Currently, two themes are **officially provided**: +Currently, four themes are **officially provided**: * The [Basic Theme](Basic-Theme.md) is the minimalist theme with the plain Bootstrap style. It is **open source and free**. +* The [LeptonX Lite Theme](../../Themes/LeptonXLite/AspNetCore.md) is modern and stylish Bootstrap UI theme. It is ideal if you want to have a production ready UI theme. It is also **open source and free**. * The [Lepton Theme](https://commercial.abp.io/themes) is a **commercial** theme developed by the core ABP team and is a part of the [ABP Commercial](https://commercial.abp.io/) license. +* The [LeptonX Theme](https://docs.abp.io/en/commercial/6.0/themes/leptonx) is also a **commercial** theme developed by the core ABP theme and is a part of the [ABP Commercial](https://commercial.abp.io/) license. This is the default theme after ABP v6.0.0. There are also some community-driven themes for the ABP Framework (you can search on the web). diff --git a/docs/en/UI/Blazor/Basic-Theme.md b/docs/en/UI/Blazor/Basic-Theme.md index 2cd0914e2f..4060f097ba 100644 --- a/docs/en/UI/Blazor/Basic-Theme.md +++ b/docs/en/UI/Blazor/Basic-Theme.md @@ -15,7 +15,7 @@ The Basic Theme is a theme implementation for the Blazor UI. It is a minimalist ## Installation -**This theme is already installed** when you create a new solution using the [startup templates](../../Startup-Templates/Index.md). If you need to manually install it, follow the steps below: +If you need to manually this theme, follow the steps below: {{if UI == "Blazor"}} diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index de33694c1d..db63a7136b 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -1322,6 +1322,12 @@ }, { "text": "OpenIddict", + "items": [ + { + "text": "OpenIddict Migration Guide", + "path": "Migration-Guides/OpenIddict-Step-by-Step.md" + } + ], "path": "Modules/OpenIddict.md" }, { diff --git a/docs/en/images/cms-kit-page-editor.png b/docs/en/images/cms-kit-page-editor.png new file mode 100644 index 0000000000..2906da8663 Binary files /dev/null and b/docs/en/images/cms-kit-page-editor.png differ diff --git a/docs/en/images/cms-kit-widget-preview.png b/docs/en/images/cms-kit-widget-preview.png new file mode 100644 index 0000000000..df071adc65 Binary files /dev/null and b/docs/en/images/cms-kit-widget-preview.png differ diff --git a/docs/en/images/cmskit-module-editor-parameter.png b/docs/en/images/cmskit-module-editor-parameter.png new file mode 100644 index 0000000000..1424716591 Binary files /dev/null and b/docs/en/images/cmskit-module-editor-parameter.png differ diff --git a/docs/en/images/cmskit-without-parameter.png b/docs/en/images/cmskit-without-parameter.png new file mode 100644 index 0000000000..49ec3b754f Binary files /dev/null and b/docs/en/images/cmskit-without-parameter.png differ diff --git a/docs/es/Getting-Started-AspNetCore-Application.md b/docs/es/Getting-Started-AspNetCore-Application.md new file mode 100644 index 0000000000..c4d124d827 --- /dev/null +++ b/docs/es/Getting-Started-AspNetCore-Application.md @@ -0,0 +1,140 @@ +# Empezando con ABP y una Aplicacion AspNet Core MVC Web + +Este tutorial explica como empezar una aplicacion ABP desde cero usando las dependencias minimas. Uno generalmente desea +empezar con la **[plantilla de inicio](Getting-Started-AspNetCore-MVC-Template.md)**. + +## Crea un Proyecto Nuevo + +1. Crea una Aplicacion Web AspNet Core nueva usando Visual Studio 2022 (17.0.0+): + +![](images/create-new-aspnet-core-application-v2.png) + +2. Configura el nuevo proyecto: + +![](images/select-empty-web-application-v2.png) + +3. Presione el boton Create: + +![create-aspnet-core-application](images/create-aspnet-core-application.png) + +## Instale el paquete Volo.Abp.AspNetCore.Mvc + +Volo.Abp.AspNetCore.Mvc es el paquete de integracion con AspNet Core MVC para ABP. Siendo asi, instalalo en su proyecto: + +```` +Install-Package Volo.Abp.AspNetCore.Mvc +```` + +## Crea el primer modulo ABP + +ABP es un marco de referencia modular y require una clase de **inicio (raíz) tipo modulo** derivada de ``AbpModule``: + +````C# +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Hosting; +using Volo.Abp; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Modularity; + +namespace BasicAspNetCoreApplication +{ + [DependsOn(typeof(AbpAspNetCoreMvcModule))] + public class AppModule : AbpModule + { + public override void OnApplicationInitialization(ApplicationInitializationContext context) + { + var app = context.GetApplicationBuilder(); + var env = context.GetEnvironment(); + + // Configura la canalización de peticiones HTTP. + if (env.IsDevelopment()) + { + app.UseExceptionHandler("/Error"); + // El valor por defecto de HSTS es 30 dias. Debes cambiar esto en ambientes productivos. Referencia https://aka.ms/aspnetcore-hsts. + app.UseHsts(); + } + + app.UseHttpsRedirection(); + app.UseStaticFiles(); + app.UseRouting(); + app.UseConfiguredEndpoints(); + } + } +} +```` + +``AppModule`` es un buen nombre para el modulo de inicio de una aplicacion. + +Los paquetes de ABP definen clases de tipo modulo y cada modulo puede depender de otro. +En el codigo anterior, el ``AppModule`` depende de el modulo ``AbpAspNetCoreMvcModule`` (definido por el paquete [Volo.Abp.AspNetCore.Mvc](https://www.nuget.org/packages/Volo.Abp.AspNetCore.Mvc)). Es comun agregar el atributo ``DependsOn`` despues de instalar un paquete ABP nuevo. + +En vez de la clase de inicion Startup, estamos configurando una canalizacion de ASP.NET Core en este modulo. + +## La clase Program + +El proximo paso es modificar la clase Program para integrate el sistema de modulos ABP: + +````C# +using BasicAspNetCoreApplication; + +var builder = WebApplication.CreateBuilder(args); + +await builder.Services.AddApplicationAsync(); + +var app = builder.Build(); + +await app.InitializeApplicationAsync(); +await app.RunAsync(); +```` + +``builder.Services.AddApplicationAsync();`` Agrega todos los servicios definidos en todos los modulos empezando desde ``AppModule``. + +``app.InitializeApplicationAsync()`` inicializa y empieza la aplicacion. + +## Ejecutar la Aplicación + +Es todo! Ejecuta la aplicación, debe funcionar como esperado. + +## Uso de Autofac como Marco de Inyección de Dependencia + +Mientras el sistema de Inyección de Dependencia de ASP.NET Core es suficiente para requerimientos basico, [Autofac](https://autofac.org/) proporciona características avanzadas como Inyección de Propiedades e Intercepcion de Metodos, los cuales son necesarios para que ABP pueda llevar a cabo funciones avanzadas. + +El acto de remplazar el sistema DI de ASP.NET Core por Autofac e integrarlo con ABP es facil. + +1. Instala el paquete [Volo.Abp.Autofac](https://www.nuget.org/packages/Volo.Abp.Autofac) + +```` +Install-Package Volo.Abp.Autofac +```` + +2. Agrega la dependencia sobre el modulo ``AbpAutofacModule`` + +````C# +[DependsOn(typeof(AbpAspNetCoreMvcModule))] +[DependsOn(typeof(AbpAutofacModule))] //Agrega la dependencia sobre el modulo ABP Autofac +public class AppModule : AbpModule +{ + ... +} +```` + +3. Actualiza `Program.cs` para que use Autofac: + +````C# +using BasicAspNetCoreApplication; + +var builder = WebApplication.CreateBuilder(args); + +builder.Host.UseAutofac(); //Agrega esta linea + +await builder.Services.AddApplicationAsync(); + +var app = builder.Build(); + +await app.InitializeApplicationAsync(); +await app.RunAsync(); +```` + +## Codigo fuente + + Obten el codigo fuente del ejemplo creado en este tutorial de [aqui](https://github.com/abpframework/abp-samples/tree/master/BasicAspNetCoreApplication). diff --git a/docs/es/images/create-aspnet-core-application.png b/docs/es/images/create-aspnet-core-application.png new file mode 100644 index 0000000000..b8b98f5c32 Binary files /dev/null and b/docs/es/images/create-aspnet-core-application.png differ diff --git a/docs/es/images/create-new-aspnet-core-application-v2.png b/docs/es/images/create-new-aspnet-core-application-v2.png new file mode 100644 index 0000000000..f8274ae2a4 Binary files /dev/null and b/docs/es/images/create-new-aspnet-core-application-v2.png differ diff --git a/docs/es/images/select-empty-web-application-v2.png b/docs/es/images/select-empty-web-application-v2.png new file mode 100644 index 0000000000..da32f71857 Binary files /dev/null and b/docs/es/images/select-empty-web-application-v2.png differ diff --git a/docs/zh-Hans/Background-Jobs-RabbitMq.md b/docs/zh-Hans/Background-Jobs-RabbitMq.md index 0f9fb21d8a..8bf61846e7 100644 --- a/docs/zh-Hans/Background-Jobs-RabbitMq.md +++ b/docs/zh-Hans/Background-Jobs-RabbitMq.md @@ -126,25 +126,31 @@ Configure(options => Configure(options => { options.DefaultQueueNamePrefix = "my_app_jobs."; + options.DefaultDelayedQueueNamePrefix = "my_app_jobs.delayed" + options.PrefetchCount = 1; options.JobQueues[typeof(EmailSendingArgs)] = new JobQueueConfiguration( typeof(EmailSendingArgs), queueName: "my_app_jobs.emails", - connectionName: "SecondConnection" + connectionName: "SecondConnection", + delayedQueueName:"my_app_jobs.emails.delayed" ); }); ``` -- 这个示例将默认的队列名前缀设置为 `my_app_jobs.`,如果多个项目都使用的同一个 RabbitMQ 服务,设置不同的前缀可以避免执行其他项目的后台作业. +- 这个示例将默认的队列名前缀设置为 `my_app_jobs.`并且设置默认的延迟队列名为 `my_app_jobs.delayed`,如果多个项目都使用的同一个 RabbitMQ 服务,设置不同的前缀可以避免执行其他项目的后台作业. +- 设置了预取数量, 用于所有队列. - 这里还设置了 `EmailSendingArgs` 绑定的 RabbitMQ 连接. `JobQueueConfiguration` 类的构造函数中,还有一些其他的可选参数. - `queueName`: 指定后台作业对应的队列名称(全名). +* `DelayedQueueName`: 指定后台延迟执行的作业对于的队列名称(全名). - `connectionName`: 后台作业对应的 RabbitMQ 连接名称,默认是 `Default`. - `durable`: 可选参数,默认为 `true`. - `exclusive`: 可选参数,默认为 `false`. - `autoDelete`: 可选参数,默认为 `false`. +* `PrefetchCount` (可选参数, 默认为: null) 如果你想要更多地了解 `durable`,`exclusive`,`autoDelete` 的用法,请阅读 RabbitMQ 提供的文档. diff --git a/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md b/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md index 1cd6b5b9dd..f45d4d90bf 100644 --- a/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md +++ b/docs/zh-Hans/Distributed-Event-Bus-RabbitMQ-Integration.md @@ -141,13 +141,14 @@ Configure(options => }); ```` -**示例: 配置客户端和交换机名称** +**示例: 配置客户端,交换机名称和预取数量** ````csharp Configure(options => { options.ClientName = "TestApp1"; options.ExchangeName = "TestMessages"; + options.PrefetchCount = 1; }); ```` diff --git a/docs/zh-Hans/Modules/Cms-Kit/Dynamic-Widget.md b/docs/zh-Hans/Modules/Cms-Kit/Dynamic-Widget.md new file mode 100644 index 0000000000..14e861b204 --- /dev/null +++ b/docs/zh-Hans/Modules/Cms-Kit/Dynamic-Widget.md @@ -0,0 +1,47 @@ +# 动态部件 + +CMS kit提供了组件系统在页面和博客文章和生成动态部件. 这是一个在 `Page` 端的示例投票部件截图 + +> 重要提示: 投票部件是ABP Commercial实现的唯一部件 +![cmskit-example-output-on-page](../../images/cmskit-example-output-on-page.png) + +> 你也可以对其他小部件执行相同的操作.这只是一个例子. +要添加部件,你应该去页面或博客创建或更新, 然后单击 `W` 按钮添加一个动态部件, 如下图所示. 不要忘了这是设计模态框,你需要在保存后查看你的页面. 此外 `预览` 选项卡可以轻松的查看部件配置的部件输出. + +![cmskit-add-widget-on-page](../../images/cmskit-add-widget-on-page.png) + +在这张图中, 选择投票后(在其他情况下,它根据你的配置自动改变, 这里是投票组件,它的参数名是 `editorWidgetName`),你看到下一个部件, 输入值或选择值或选择并单击 `添加`. 你将看到以下输出 + +> [Widget Type="Poll" Code="SelectedValue"] +如果编码有任何错误(错误的值或拼写错误)你可以手动修改输出. + +## 选项 + +使添加的部件工作,你必须在模块类中进行配置: + +```csharp +Configure(options => +{ + options.AddWidget("widgetKey", "widgetName", "editorWidgetName"); +}); +``` + +* `widgetKey` 用于最终用户更具有可读性的名称. + [Widget Type="**Poll**" Code="SelectedValue"] +* `widgetName` 用于代码中通过 `[widget]` Attribute使用的小部件名称 + +```csharp +[Widget] +public class WidgetNameViewComponent : AbpViewComponent +{ + public IViewComponentResult Invoke() + { + return View(); + } +} + +``` + +* `editorWidgetName` 用于编辑器组件端,在 `添加部件` 模态框中查看. + +另请参阅[部件](https://docs.abp.io/zh-Hans/abp/latest/UI/AspNetCore/Widgets). \ No newline at end of file diff --git a/docs/zh-Hans/Modules/Cms-Kit/Index.md b/docs/zh-Hans/Modules/Cms-Kit/Index.md index 0751eb0ad0..2409a98156 100644 --- a/docs/zh-Hans/Modules/Cms-Kit/Index.md +++ b/docs/zh-Hans/Modules/Cms-Kit/Index.md @@ -13,6 +13,7 @@ * 提供 [**反应**](Reactions.md) 系统来添加对任何资源的反应 (表情符号) 功能, 如博客文章或评论. * 提供 [**评级**](Ratings.md) 系统来添加对任何资源的评级功能. * 提供 [**菜单**](Menus.md) 系统来动态管理公共菜单. +* 提供 [**动态部件**](Dynamic-Widget.md) 系统在页面和博客文章中创建动态部件. 点击功能以了解和学习如何去使用它. diff --git a/docs/zh-Hans/Tutorials/Part-2.md b/docs/zh-Hans/Tutorials/Part-2.md index 346927acbe..dc8d804d5e 100644 --- a/docs/zh-Hans/Tutorials/Part-2.md +++ b/docs/zh-Hans/Tutorials/Part-2.md @@ -135,15 +135,15 @@ successfully created the book with id: 439b0ea8-923e-8e1e-5d97-39f2c7ac4246 "CreationTime": "Creation time", "AreYouSure": "Are you sure?", "AreYouSureToDelete": "Are you sure you want to delete this item?", - "Enum:BookType:0": "Undefined", - "Enum:BookType:1": "Adventure", - "Enum:BookType:2": "Biography", - "Enum:BookType:3": "Dystopia", - "Enum:BookType:4": "Fantastic", - "Enum:BookType:5": "Horror", - "Enum:BookType:6": "Science", - "Enum:BookType:7": "Science fiction", - "Enum:BookType:8": "Poetry" + "Enum:BookType.Undefined": "Undefined", + "Enum:BookType.Adventure": "Adventure", + "Enum:BookType.Biography": "Biography", + "Enum:BookType.Dystopia": "Dystopia", + "Enum:BookType.Fantastic": "Fantastic", + "Enum:BookType.Horror": "Horror", + "Enum:BookType.Science": "Science", + "Enum:BookType.ScienceFiction": "Science fiction", + "Enum:BookType.Poetry": "Poetry" } } ```` @@ -152,7 +152,7 @@ successfully created the book with id: 439b0ea8-923e-8e1e-5d97-39f2c7ac4246 * 本地化关键字名称是任意的. 你可以设置任何名称. 对于特定的文本类型,我们更喜欢遵循一些约定: * 为按钮项添加 `Menu:` 前缀. - * 使用 `Enum::` 命名约定来本地化枚举成员. 当您这样做时ABP可以在某些适当的情况下自动将枚举本地化. + * 使用 `Enum::` 或 `.` 或 `` 命名约定来本地化枚举成员. 当您这样做时ABP可以在某些适当的情况下自动将枚举本地化. 如果未在本地化文件中定义文本,则文本将**回退**到本地化键(ASP.NET Core的标准行为). @@ -626,7 +626,7 @@ ABP提供了一个通用的基类,`AbpCrudPageBase<...>`,用来创建CRUD风格 Field="@nameof(BookDto.Type)" Caption="@L["Type"]"> - @L[$"Enum:BookType:{(int)context.Type}"] + @L[$"Enum:BookType.{Enum.GetName(context.Type)}"] - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1323,7 +1323,7 @@ delete(id: string) { @foreach (int bookTypeValue in Enum.GetValues(typeof(BookType))) { - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1460,7 +1460,7 @@ namespace Acme.BookStore.Blazor Field="@nameof(BookDto.Type)" Caption="@L["Type"]"> - @L[$"Enum:BookType:{(int) context.Type}"] + @L[$"Enum:BookType.{Enum.GetName(context.Type)}"] - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } @@ -1565,7 +1565,7 @@ namespace Acme.BookStore.Blazor @foreach (int bookTypeValue in Enum.GetValues(typeof(BookType))) { - @L[$"Enum:BookType:{bookTypeValue}"] + @L[$"Enum:BookType.{Enum.GetName((BookType)bookTypeValue)}"] } diff --git a/docs/zh-Hans/images/cmskit-add-widget-on-page.png b/docs/zh-Hans/images/cmskit-add-widget-on-page.png new file mode 100644 index 0000000000..8e03964477 Binary files /dev/null and b/docs/zh-Hans/images/cmskit-add-widget-on-page.png differ diff --git a/docs/zh-Hans/images/cmskit-example-output-on-page.png b/docs/zh-Hans/images/cmskit-example-output-on-page.png new file mode 100644 index 0000000000..bdc5c52278 Binary files /dev/null and b/docs/zh-Hans/images/cmskit-example-output-on-page.png differ diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarManager.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarManager.cs index 05531096d4..00f7f5da23 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarManager.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarManager.cs @@ -3,16 +3,17 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.DependencyInjection; namespace Volo.Abp.AspNetCore.Components.Web.Theming.PageToolbars; public class PageToolbarManager : IPageToolbarManager, ITransientDependency { - protected IHybridServiceScopeFactory ServiceScopeFactory { get; } + protected IServiceScopeFactory ServiceScopeFactory { get; } public PageToolbarManager( - IHybridServiceScopeFactory serviceScopeFactory) + IServiceScopeFactory serviceScopeFactory) { ServiceScopeFactory = serviceScopeFactory; } diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs index 33716d8383..229831141e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs @@ -7,6 +7,7 @@ using Volo.Abp.AspNetCore.Components.Web; using Volo.Abp.AspNetCore.Components.Web.ExceptionHandling; using Volo.Abp.AspNetCore.Components.Web.Security; using Volo.Abp.AspNetCore.Mvc.Client; +using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Client; using Volo.Abp.Modularity; using Volo.Abp.Threading; @@ -46,8 +47,8 @@ public class AbpAspNetCoreComponentsWebAssemblyModule : AbpModule public async override Task OnApplicationInitializationAsync(ApplicationInitializationContext context) { - await context.ServiceProvider.GetRequiredService().InitializeAsync(); - await context.ServiceProvider.GetRequiredService().InitializeAsync(); + await context.ServiceProvider.GetRequiredService().ServiceProvider.GetRequiredService().InitializeAsync(); + await context.ServiceProvider.GetRequiredService().ServiceProvider.GetRequiredService().InitializeAsync(); await SetCurrentLanguageAsync(context.ServiceProvider); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs index 7a9168eefb..1d95297a88 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/AbpAspNetCoreMvcClientModule.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.DependencyInjection; using Volo.Abp.EventBus; using Volo.Abp.Modularity; using Volo.Abp.Threading; @@ -19,6 +20,6 @@ public class AbpAspNetCoreMvcClientModule : AbpModule public async override Task OnApplicationInitializationAsync(ApplicationInitializationContext context) { - await context.ServiceProvider.GetRequiredService().InitializeAsync(); + await context.ServiceProvider.GetRequiredService().ServiceProvider.GetRequiredService().InitializeAsync(); } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarManager.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarManager.cs index b795c62c39..ec27b8087c 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarManager.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/PageToolbars/PageToolbarManager.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Volo.Abp.DependencyInjection; @@ -10,11 +11,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars; public class PageToolbarManager : IPageToolbarManager, ITransientDependency { protected AbpPageToolbarOptions Options { get; } - protected IHybridServiceScopeFactory ServiceScopeFactory { get; } + protected IServiceScopeFactory ServiceScopeFactory { get; } public PageToolbarManager( IOptions options, - IHybridServiceScopeFactory serviceScopeFactory) + IServiceScopeFactory serviceScopeFactory) { Options = options.Value; ServiceScopeFactory = serviceScopeFactory; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js index 75d080feda..e524881176 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js @@ -96,21 +96,28 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f }); _$modal.on('shown.bs.modal', function () { - //focuses first element if it's a typeable input. - var $firstVisibleInput = _$modal.find('input:not([type=hidden]):first'); + if (!options.focusElement) { + //focuses first element if it's a typeable input. + var $firstVisibleInput = _$modal.find('input:not([type=hidden]):first'); - _onOpenCallbacks.triggerAll(_publicApi); + _onOpenCallbacks.triggerAll(_publicApi); - if ($firstVisibleInput.hasClass("datepicker")) { - return; //don't pop-up date pickers... - } + if ($firstVisibleInput.hasClass("datepicker")) { + return; //don't pop-up date pickers... + } - var focusableInputs = ["text", "password", "email", "number", "search", "tel", "url"]; - if (!focusableInputs.includes($firstVisibleInput.prop("type"))) { - return; - } + var focusableInputs = ["text", "password", "email", "number", "search", "tel", "url"]; + if (!focusableInputs.includes($firstVisibleInput.prop("type"))) { + return; + } - $firstVisibleInput.focus(); + $firstVisibleInput.focus(); + } else if (typeof options.focusElement === 'function') { + var focusElement = options.focusElement(); + focusElement.focus(); + } else if (typeof options.focusElement === 'string') { + $(options.focusElement).focus(); + } }); var modalClass = abp.modals[options.modalClass]; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionFilter.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionFilter.cs index 7b5e2aee2e..fdaf0e8ff1 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionFilter.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionFilter.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling; public class AbpExceptionFilter : IAsyncExceptionFilter, ITransientDependency { - public async Task OnExceptionAsync(ExceptionContext context) + public virtual async Task OnExceptionAsync(ExceptionContext context) { if (!ShouldHandleException(context)) { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionPageFilter.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionPageFilter.cs index eb335d6fd9..c60a00bbe9 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionPageFilter.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/AbpExceptionPageFilter.cs @@ -25,7 +25,7 @@ public class AbpExceptionPageFilter : IAsyncPageFilter, ITransientDependency return Task.CompletedTask; } - public async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next) + public virtual async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next) { if (context.HandlerMethod == null || !ShouldHandleException(context)) { diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/DependencyInjection/HttpContextServiceScopeFactory.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/DependencyInjection/HttpContextServiceScopeFactory.cs deleted file mode 100644 index a7f00f7451..0000000000 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/DependencyInjection/HttpContextServiceScopeFactory.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; - -namespace Volo.Abp.AspNetCore.DependencyInjection; - -[ExposeServices( - typeof(IHybridServiceScopeFactory), - typeof(HttpContextServiceScopeFactory) - )] -[Dependency(ReplaceServices = true)] -public class HttpContextServiceScopeFactory : IHybridServiceScopeFactory, ITransientDependency -{ - protected IHttpContextAccessor HttpContextAccessor { get; } - - protected IServiceScopeFactory ServiceScopeFactory { get; } - - public HttpContextServiceScopeFactory( - IHttpContextAccessor httpContextAccessor, - IServiceScopeFactory serviceScopeFactory) - { - HttpContextAccessor = httpContextAccessor; - ServiceScopeFactory = serviceScopeFactory; - } - - public virtual IServiceScope CreateScope() - { - var httpContext = HttpContextAccessor.HttpContext; - if (httpContext == null) - { - return ServiceScopeFactory.CreateScope(); - } - - return new NonDisposedHttpContextServiceScope(httpContext.RequestServices); - } - - protected class NonDisposedHttpContextServiceScope : IServiceScope - { - public IServiceProvider ServiceProvider { get; } - - public NonDisposedHttpContextServiceScope(IServiceProvider serviceProvider) - { - ServiceProvider = serviceProvider; - } - - public void Dispose() - { - - } - } -} diff --git a/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IDeletionAuditedObject.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IDeletionAuditedObject.cs index be59ea0431..a7be0c29a1 100644 --- a/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IDeletionAuditedObject.cs +++ b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IDeletionAuditedObject.cs @@ -10,7 +10,7 @@ public interface IDeletionAuditedObject : IHasDeletionTime /// /// Id of the deleter user. /// - Guid? DeleterId { get; set; } + Guid? DeleterId { get; } } /// @@ -22,5 +22,5 @@ public interface IDeletionAuditedObject : IDeletionAuditedObject /// /// Reference to the deleter user. /// - TUser Deleter { get; set; } + TUser Deleter { get; } } diff --git a/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasDeletionTime.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasDeletionTime.cs index a84fc78c41..ef45b1b057 100644 --- a/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasDeletionTime.cs +++ b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasDeletionTime.cs @@ -11,5 +11,5 @@ public interface IHasDeletionTime : ISoftDelete /// /// Deletion time. /// - DateTime? DeletionTime { get; set; } + DateTime? DeletionTime { get; } } diff --git a/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasModificationTime.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasModificationTime.cs index b7b7494081..001d07d617 100644 --- a/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasModificationTime.cs +++ b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IHasModificationTime.cs @@ -10,5 +10,5 @@ public interface IHasModificationTime /// /// The last modified time for this entity. /// - DateTime? LastModificationTime { get; set; } + DateTime? LastModificationTime { get; } } diff --git a/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IModificationAuditedObject.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IModificationAuditedObject.cs index 5ba4fd1e02..48f26b6299 100644 --- a/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IModificationAuditedObject.cs +++ b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/IModificationAuditedObject.cs @@ -10,7 +10,7 @@ public interface IModificationAuditedObject : IHasModificationTime /// /// Last modifier user for this entity. /// - Guid? LastModifierId { get; set; } + Guid? LastModifierId { get; } } /// @@ -22,5 +22,5 @@ public interface IModificationAuditedObject : IModificationAuditedObject /// /// Reference to the last modifier user of this entity. /// - TUser LastModifier { get; set; } + TUser LastModifier { get; } } diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditPropertySetter.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditPropertySetter.cs index d85bad82eb..16632420d7 100644 --- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditPropertySetter.cs +++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditPropertySetter.cs @@ -99,7 +99,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency { if (targetObject is IHasModificationTime objectWithModificationTime) { - objectWithModificationTime.LastModificationTime = Clock.Now; + ObjectHelper.TrySetProperty(objectWithModificationTime, x => x.LastModificationTime, () => Clock.Now); } } @@ -112,7 +112,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency if (!CurrentUser.Id.HasValue) { - modificationAuditedObject.LastModifierId = null; + ObjectHelper.TrySetProperty(modificationAuditedObject, x => x.LastModifierId, () => null); return; } @@ -120,7 +120,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency { if (multiTenantEntity.TenantId != CurrentUser.TenantId) { - modificationAuditedObject.LastModifierId = null; + ObjectHelper.TrySetProperty(modificationAuditedObject, x => x.LastModifierId, () => null); return; } } @@ -134,7 +134,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency } */ - modificationAuditedObject.LastModifierId = CurrentUser.Id; + ObjectHelper.TrySetProperty(modificationAuditedObject, x => x.LastModifierId, () => CurrentUser.Id); } protected virtual void SetDeletionTime(object targetObject) @@ -143,7 +143,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency { if (objectWithDeletionTime.DeletionTime == null) { - objectWithDeletionTime.DeletionTime = Clock.Now; + ObjectHelper.TrySetProperty(objectWithDeletionTime, x => x.DeletionTime, () => Clock.Now); } } } @@ -162,7 +162,7 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency if (!CurrentUser.Id.HasValue) { - deletionAuditedObject.DeleterId = null; + ObjectHelper.TrySetProperty(deletionAuditedObject, x => x.DeleterId, () => null); return; } @@ -170,11 +170,11 @@ public class AuditPropertySetter : IAuditPropertySetter, ITransientDependency { if (multiTenantEntity.TenantId != CurrentUser.TenantId) { - deletionAuditedObject.DeleterId = null; + ObjectHelper.TrySetProperty(deletionAuditedObject, x => x.DeleterId, () => null); return; } } - deletionAuditedObject.DeleterId = CurrentUser.Id; + ObjectHelper.TrySetProperty(deletionAuditedObject, x => x.DeleterId, () => CurrentUser.Id); } } diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs index 83efe8ff31..540d848412 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs @@ -19,6 +19,8 @@ public class AbpRabbitMqBackgroundJobOptions /// Default value: "AbpBackgroundJobsDelayed." /// public string DefaultDelayedQueueNamePrefix { get; set; } + + public ushort? PrefetchCount { get; set; } public AbpRabbitMqBackgroundJobOptions() { diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs index 208d7ecd9f..9c3bf26e62 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs @@ -66,7 +66,8 @@ public class JobQueue : IJobQueue new JobQueueConfiguration( typeof(TArgs), AbpRabbitMqBackgroundJobOptions.DefaultQueueNamePrefix + JobConfiguration.JobName, - AbpRabbitMqBackgroundJobOptions.DefaultDelayedQueueNamePrefix + JobConfiguration.JobName + AbpRabbitMqBackgroundJobOptions.DefaultDelayedQueueNamePrefix + JobConfiguration.JobName, + prefetchCount: AbpRabbitMqBackgroundJobOptions.PrefetchCount ); } @@ -140,9 +141,14 @@ public class JobQueue : IJobQueue if (AbpBackgroundJobOptions.IsJobExecutionEnabled) { + if (QueueConfiguration.PrefetchCount.HasValue) + { + ChannelAccessor.Channel.BasicQos(0, QueueConfiguration.PrefetchCount.Value, false); + } + Consumer = new AsyncEventingBasicConsumer(ChannelAccessor.Channel); Consumer.Received += MessageReceived; - + //TODO: What BasicConsume returns? ChannelAccessor.Channel.BasicConsume( queue: QueueConfiguration.QueueName, diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueConfiguration.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueConfiguration.cs index 792eb9815e..ee706ab864 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueConfiguration.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueConfiguration.cs @@ -20,12 +20,14 @@ public class JobQueueConfiguration : QueueDeclareConfiguration string connectionName = null, bool durable = true, bool exclusive = false, - bool autoDelete = false) + bool autoDelete = false, + ushort? prefetchCount = null) : base( queueName, durable, exclusive, - autoDelete) + autoDelete, + prefetchCount) { JobArgsType = jobArgsType; ConnectionName = connectionName; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs index bf8e2e3028..7874fddb86 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GenerateProxyCommand.cs @@ -1,4 +1,5 @@ using System.Text; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Volo.Abp.Cli.ServiceProxying; using Volo.Abp.DependencyInjection; @@ -13,7 +14,7 @@ public class GenerateProxyCommand : ProxyCommandBase public GenerateProxyCommand( IOptions serviceProxyOptions, - IHybridServiceScopeFactory serviceScopeFactory) + IServiceScopeFactory serviceScopeFactory) : base(serviceProxyOptions, serviceScopeFactory) { } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 026b4ca48c..fa0cc26d11 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -103,18 +103,6 @@ public abstract class ProjectCreationCommandBase Logger.LogInformation("UI Framework: " + uiFramework); } - var theme = uiFramework == UiFramework.None ? (Theme?)null : GetThemeByTemplateOrNull(commandLineArgs, template); - if (theme.HasValue) - { - Logger.LogInformation("Theme: " + theme); - } - - var themeStyle = theme.HasValue ? GetThemeStyleOrNull(commandLineArgs, theme.Value) : (ThemeStyle?)null; - if(themeStyle.HasValue) - { - Logger.LogInformation("Theme Style: " + themeStyle); - } - var publicWebSite = uiFramework != UiFramework.None && commandLineArgs.Options.ContainsKey(Options.PublicWebSite.Long); if (publicWebSite) { @@ -210,6 +198,9 @@ public abstract class ProjectCreationCommandBase } commandLineArgs.Options.Add(CliConsts.Command, commandLineArgs.Command); + + var theme = uiFramework == UiFramework.None ? (Theme?)null : GetThemeByTemplateOrNull(commandLineArgs, template); + var themeStyle = theme.HasValue ? GetThemeStyleOrNull(commandLineArgs, theme.Value) : (ThemeStyle?)null; return new ProjectBuildArgs( solutionName, @@ -493,6 +484,8 @@ public abstract class ProjectCreationCommandBase return MobileApp.None; case "react-native": return MobileApp.ReactNative; + case "maui": + return MobileApp.Maui; default: throw new CliUsageException(ExceptionMessageHelper.GetInvalidOptionExceptionMessage("Mobile App")); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs index 22311bb986..67c61b2a28 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs @@ -2,6 +2,7 @@ using System.IO; using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; @@ -19,11 +20,11 @@ public abstract class ProxyCommandBase : IConsoleCommand, ITransientDependenc protected AbpCliServiceProxyOptions ServiceProxyOptions { get; } - protected IHybridServiceScopeFactory ServiceScopeFactory { get; } + protected IServiceScopeFactory ServiceScopeFactory { get; } public ProxyCommandBase( IOptions serviceProxyOptions, - IHybridServiceScopeFactory serviceScopeFactory) + IServiceScopeFactory serviceScopeFactory) { ServiceScopeFactory = serviceScopeFactory; ServiceProxyOptions = serviceProxyOptions.Value; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/RemoveProxyCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/RemoveProxyCommand.cs index d89c19c892..3372584f1a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/RemoveProxyCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/RemoveProxyCommand.cs @@ -1,4 +1,5 @@ using System.Text; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Volo.Abp.Cli.ServiceProxying; using Volo.Abp.DependencyInjection; @@ -13,7 +14,7 @@ public class RemoveProxyCommand : ProxyCommandBase public RemoveProxyCommand( IOptions serviceProxyOptions, - IHybridServiceScopeFactory serviceScopeFactory) + IServiceScopeFactory serviceScopeFactory) : base(serviceProxyOptions, serviceScopeFactory) { } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/MobileApp.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/MobileApp.cs index 882cb9166c..641740bce0 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/MobileApp.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/MobileApp.cs @@ -7,7 +7,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building; public enum MobileApp { None, - ReactNative + ReactNative, + Maui } public static class MobileAppExtensions @@ -18,6 +19,8 @@ public static class MobileAppExtensions { case MobileApp.ReactNative: return "react-native"; + case MobileApp.Maui: + return "MAUI"; } throw new Exception("Mobile app folder name is not set!"); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs index 126e9bdbf9..33c2237773 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs @@ -71,6 +71,8 @@ public class TemplateProjectBuilder : IProjectBuilder, ITransientDependency args.ExtraProperties.ContainsKey(NewCommand.Options.Preview.Long) ); + ConfigureThemeOptions(args, templateFile.Version); + DeveloperApiKeyResult apiKeyResult = null; #if DEBUG @@ -207,4 +209,37 @@ public class TemplateProjectBuilder : IProjectBuilder, ITransientDependency return TemplateInfoProvider.Get(args.TemplateName); } } + + private bool IsThemeOptionEnabled(ProjectBuildArgs args, string templateVersion) + { + var version = string.IsNullOrWhiteSpace(args.Version) + ? templateVersion + : args.Version; + + if (!SemanticVersion.TryParse(version, out var semanticVersion)) + { + return false; + } + + return semanticVersion >= SemanticVersion.Parse("6.0.0-rc.1"); + } + + private void ConfigureThemeOptions(ProjectBuildArgs args, string templateVersion) + { + if (!IsThemeOptionEnabled(args, templateVersion)) + { + args.Theme = null; + args.ThemeStyle = null; + } + + if (args.Theme.HasValue) + { + Logger.LogInformation("Theme: " + args.Theme); + } + + if(args.ThemeStyle.HasValue) + { + Logger.LogInformation("Theme Style: " + args.ThemeStyle); + } + } } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index fb1fc79399..397a35222a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -5,6 +5,7 @@ using NuGet.Versioning; using Volo.Abp.Cli.Commands; using Volo.Abp.Cli.ProjectBuilding.Building; using Volo.Abp.Cli.ProjectBuilding.Building.Steps; +using Volo.Abp.Cli.ProjectBuilding.Templates.Maui; using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice; namespace Volo.Abp.Cli.ProjectBuilding.Templates.App; @@ -161,6 +162,15 @@ public abstract class AppTemplateBase : TemplateInfo steps.Add(new RemoveFolderStep(MobileApp.ReactNative.GetFolderName().EnsureStartsWith('/'))); } + if (context.BuildArgs.MobileApp == MobileApp.Maui) + { + steps.Add(new MauiChangeApplicationIdGuidStep()); + } + else + { + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Maui")); + } + if (!context.BuildArgs.PublicWebSite) { steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Public")); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionPackageVersionFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionPackageVersionFinder.cs index f33d7f8ff1..060a8cb8f2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionPackageVersionFinder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionPackageVersionFinder.cs @@ -1,5 +1,6 @@ -using System.IO; -using System.Text.RegularExpressions; +using System.Collections.Generic; +using System.IO; +using System.Linq; using System.Xml; using NuGet.Versioning; using Volo.Abp.Cli.Utils; @@ -9,13 +10,13 @@ namespace Volo.Abp.Cli.ProjectModification; public class SolutionPackageVersionFinder : ITransientDependency { - public string Find(string solutionFile, string packagePrefix = "Volo.Abp") + public string Find(string solutionFile, string packagePrefix = "Volo.Abp", string excludedKeywords = "LeptonX") { var projectFilesUnderSrc = GetProjectFilesOfSolution(solutionFile); foreach (var projectFile in projectFilesUnderSrc) { var content = File.ReadAllText(projectFile); - if (TryParseVersionFromCsprojViaXmlDocument(content, out var s, packagePrefix)) + if (TryParseVersionFromCsprojViaXmlDocument(content, out var s, packagePrefix, excludedKeywords)) { return s; } @@ -24,14 +25,35 @@ public class SolutionPackageVersionFinder : ITransientDependency return null; } - private static bool TryParseVersionFromCsprojViaXmlDocument(string content, out string version, string packagePrefix) + private static bool TryParseVersionFromCsprojViaXmlDocument(string content, out string version, string packagePrefix, string excludedKeywords) { var doc = new XmlDocument() { PreserveWhitespace = true }; using (var stream = StreamHelper.GenerateStreamFromString(content)) { doc.Load(stream); var nodes = doc.SelectNodes($"/Project/ItemGroup/PackageReference[starts-with(@Include, '{packagePrefix}')]"); - var value = nodes?[0]?.Attributes?["Version"]?.Value; + + var targetNodes = new List(); + + foreach (XmlNode node in nodes!) + { + var packageId = node!.Attributes["Include"]?.Value; + + if (excludedKeywords.Split(',').Any(ek => packageId!.Contains(ek))) + { + continue; + } + + targetNodes.Add(node); + } + + if (!targetNodes.Any()) + { + version = null; + return false; + } + + var value = targetNodes.First().Attributes?["Version"]?.Value; if (value == null) { version = null; @@ -43,40 +65,17 @@ public class SolutionPackageVersionFinder : ITransientDependency } } - public static bool TryParseVersionFromCsprojFile(string csprojContent, out string version, string packagePrefix = "Volo.Abp") + public static bool TryParseVersionFromCsprojFile(string csprojContent, out string version, string packagePrefix = "Volo.Abp", string excludedKeywords = "LeptonX") { - try - { - var matches = Regex.Matches(csprojContent, - @"PackageReference\s*Include\s*=\s*\""" + packagePrefix + @"(.*?)\""\s*Version\s*=\s*\""(.*?)\""", - RegexOptions.IgnoreCase | - RegexOptions.IgnorePatternWhitespace | - RegexOptions.Singleline | RegexOptions.Multiline); - - foreach (Match match in matches) - { - if (match.Groups.Count > 2) - { - version = match.Groups[2].Value; - return true; - } - } - } - catch - { - //ignored - } - - version = null; - return false; + return TryParseVersionFromCsprojViaXmlDocument(csprojContent, out version, packagePrefix, excludedKeywords); } - public static bool TryParseSemanticVersionFromCsprojFile(string csprojContent, out SemanticVersion version, string packagePrefix = "Volo.Abp") + public static bool TryParseSemanticVersionFromCsprojFile(string csprojContent, out SemanticVersion version, string packagePrefix = "Volo.Abp", string excludedKeywords = "LeptonX") { try { - if (TryParseVersionFromCsprojFile(csprojContent, out var versionText, packagePrefix)) + if (TryParseVersionFromCsprojViaXmlDocument(csprojContent, out var versionText, packagePrefix, excludedKeywords)) { return SemanticVersion.TryParse(versionText, out version); } @@ -90,51 +89,6 @@ public class SolutionPackageVersionFinder : ITransientDependency return false; } - public static bool TryFind(string solutionFile, out string version, string packagePrefix = "Volo.Abp") - { - var projectFiles = GetProjectFilesOfSolution(solutionFile); - foreach (var projectFile in projectFiles) - { - var csprojContent = File.ReadAllText(projectFile); - if (TryParseVersionFromCsprojFile(csprojContent, out var parsedVersion, packagePrefix)) - { - version = parsedVersion; - return true; - } - } - - version = null; - return false; - } - - public static bool TryFindSemanticVersion(string solutionFile, out SemanticVersion version, string packagePrefix = "Volo.Abp") - { - var projectFiles = GetProjectFilesOfSolution(solutionFile); - foreach (var projectFile in projectFiles) - { - var csprojContent = File.ReadAllText(projectFile); - if (TryParseSemanticVersionFromCsprojFile(csprojContent, out var parsedVersion, packagePrefix)) - { - version = parsedVersion; - return true; - } - } - - version = null; - return false; - } - - //public static bool TryFindSemanticVersion(string solutionFile, out SemanticVersion version) - //{ - // if (TryFind(solutionFile, out var versionText)) - // { - // return SemanticVersion.TryParse(versionText, out version); - // } - - // version = null; - // return false; - //} - private static string[] GetProjectFilesOfSolution(string solutionFile) { var solutionDirectory = Path.GetDirectoryName(solutionFile); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs index 98ad57f4b4..578d010214 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/VoloNugetPackagesVersionUpdater.cs @@ -183,11 +183,18 @@ public class VoloNugetPackagesVersionUpdater : ITransientDependency var versionAttribute = package.Attributes["Version"]; var currentVersion = versionAttribute.Value; var currentSemanticVersion = SemanticVersion.Parse(currentVersion); + + var isLeptonXPackage = packageId.Contains("LeptonX"); Logger.LogDebug("Checking package: \"{0}\" - Current version: {1}", packageId, currentSemanticVersion); if (!specifiedVersion.IsNullOrWhiteSpace()) { + if (isLeptonXPackage) + { + continue; + } + if (await SpecifiedVersionExists(specifiedVersion, packageId)) { var specifiedSemanticVersion = SemanticVersion.Parse(specifiedVersion); @@ -210,7 +217,8 @@ public class VoloNugetPackagesVersionUpdater : ITransientDependency { if ((includeNightlyPreviews || (currentVersion.Contains("-preview") && !switchToStable)) && !includeReleaseCandidates) { - var latestVersion = latestMyGetVersion ?? await GetLatestVersionFromMyGet(packageId); + var latestVersion = latestMyGetVersion == null || isLeptonXPackage ? + await GetLatestVersionFromMyGet(packageId) : latestMyGetVersion; if (currentVersion != latestVersion) { @@ -227,11 +235,13 @@ public class VoloNugetPackagesVersionUpdater : ITransientDependency SemanticVersion latestVersion; if (currentSemanticVersion.IsPrerelease && !switchToStable) { - latestVersion = latestNugetReleaseCandidateVersion ?? await _nuGetService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: true); + latestVersion = latestNugetReleaseCandidateVersion == null || isLeptonXPackage ? + await _nuGetService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: true) : latestNugetReleaseCandidateVersion; } else { - latestVersion = latestNugetVersion ?? await _nuGetService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: includeReleaseCandidates); + latestVersion = latestNugetVersion == null || isLeptonXPackage ? + await _nuGetService.GetLatestVersionOrNullAsync(packageId, includeReleaseCandidates: includeReleaseCandidates) : latestNugetVersion; } if (latestVersion != null && (currentSemanticVersion < latestVersion || (currentSemanticVersion.IsPrerelease && switchToStable))) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/NpmHelper.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/NpmHelper.cs index 8923d2ebae..a2d75d48d9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/NpmHelper.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/NpmHelper.cs @@ -1,4 +1,6 @@ -using Microsoft.Extensions.Logging; +using System; +using System.Linq; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using NuGet.Versioning; using Volo.Abp.DependencyInjection; @@ -19,15 +21,30 @@ public class NpmHelper : ITransientDependency public bool IsNpmInstalled() { var output = CmdHelper.RunCmdAndGetOutput("npm -v").Trim(); - return SemanticVersion.TryParse(output, out _); + var outputLines = output.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); + + return outputLines.Any(ol => SemanticVersion.TryParse(ol, out _)); } public bool IsYarnAvailable() { var output = CmdHelper.RunCmdAndGetOutput("yarn -v").Trim(); - if (!SemanticVersion.TryParse(output, out var version)){ + var outputLines = output.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries); + SemanticVersion version = null; + + foreach (var outputLine in outputLines) + { + if (SemanticVersion.TryParse(outputLine, out version)) + { + break; + } + } + + if (version == null) + { return false; } + return version > SemanticVersion.Parse("1.20.0"); } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/DefaultServiceScopeFactory.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/DefaultServiceScopeFactory.cs deleted file mode 100644 index befcf7951e..0000000000 --- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/DefaultServiceScopeFactory.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; - -namespace Volo.Abp.DependencyInjection; - -[ExposeServices( - typeof(IHybridServiceScopeFactory), - typeof(DefaultServiceScopeFactory) - )] -public class DefaultServiceScopeFactory : IHybridServiceScopeFactory, ITransientDependency -{ - protected IServiceScopeFactory Factory { get; } - - public DefaultServiceScopeFactory(IServiceScopeFactory factory) - { - Factory = factory; - } - - public IServiceScope CreateScope() - { - return Factory.CreateScope(); - } -} diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IHybridServiceScopeFactory.cs b/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IHybridServiceScopeFactory.cs deleted file mode 100644 index 62c3707352..0000000000 --- a/framework/src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IHybridServiceScopeFactory.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; - -namespace Volo.Abp.DependencyInjection; - -public interface IHybridServiceScopeFactory : IServiceScopeFactory -{ - -} diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/ISoftDelete.cs b/framework/src/Volo.Abp.Core/Volo/Abp/ISoftDelete.cs index 1d7ba66d81..704dd3ba11 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/ISoftDelete.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/ISoftDelete.cs @@ -9,7 +9,7 @@ public interface ISoftDelete { /// - /// Used to mark an Entity as 'Deleted'. + /// Used to mark an Entity as 'Deleted'. /// - bool IsDeleted { get; set; } + bool IsDeleted { get; } } diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs index 8f9be2318f..20556f16ff 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangeEventHelper.cs @@ -42,18 +42,6 @@ public class EntityChangeEventHelper : IEntityChangeEventHelper, ITransientDepen Logger = NullLogger.Instance; } - public virtual void PublishEntityCreatingEvent(object entity) - { - TriggerEventWithEntity( - LocalEventBus, -#pragma warning disable 618 - typeof(EntityCreatingEventData<>), -#pragma warning restore 618 - entity, - entity - ); - } - public virtual void PublishEntityCreatedEvent(object entity) { TriggerEventWithEntity( @@ -89,18 +77,6 @@ public class EntityChangeEventHelper : IEntityChangeEventHelper, ITransientDepen ); } - public virtual void PublishEntityUpdatingEvent(object entity) - { - TriggerEventWithEntity( - LocalEventBus, -#pragma warning disable 618 - typeof(EntityUpdatingEventData<>), -#pragma warning restore 618 - entity, - entity - ); - } - public virtual void PublishEntityUpdatedEvent(object entity) { TriggerEventWithEntity( @@ -125,18 +101,6 @@ public class EntityChangeEventHelper : IEntityChangeEventHelper, ITransientDepen } } - public virtual void PublishEntityDeletingEvent(object entity) - { - TriggerEventWithEntity( - LocalEventBus, -#pragma warning disable 618 - typeof(EntityDeletingEventData<>), -#pragma warning restore 618 - entity, - entity - ); - } - public virtual void PublishEntityDeletedEvent(object entity) { TriggerEventWithEntity( diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangingEventData.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangingEventData.cs deleted file mode 100644 index ae24163966..0000000000 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityChangingEventData.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; - -namespace Volo.Abp.Domain.Entities.Events; - -/// -/// Used to pass data for an event when an entity () is being changed (creating, updating or deleting). -/// See , and classes. -/// -/// Entity type -[Serializable] -[Obsolete("This event is no longer needed and identical to EntityChangedEventData. Please use EntityChangedEventData instead.")] -public class EntityChangingEventData : EntityEventData -{ - /// - /// Constructor. - /// - /// Changing entity in this event - public EntityChangingEventData(TEntity entity) - : base(entity) - { - - } -} diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityCreatingEventData.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityCreatingEventData.cs deleted file mode 100644 index 914c8ca7c7..0000000000 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityCreatingEventData.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; - -namespace Volo.Abp.Domain.Entities.Events; - -/// -/// This type of event is used to notify just before creation of an Entity. -/// -/// Entity type -[Serializable] -[Obsolete("This event is no longer needed and identical to EntityCreatedEventData. Please use EntityCreatedEventData instead.")] -public class EntityCreatingEventData : EntityChangingEventData -{ - /// - /// Constructor. - /// - /// The entity which is being created - public EntityCreatingEventData(TEntity entity) - : base(entity) - { - - } -} diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityDeletingEventData.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityDeletingEventData.cs deleted file mode 100644 index af0d1218f7..0000000000 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityDeletingEventData.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; - -namespace Volo.Abp.Domain.Entities.Events; - -/// -/// This type of event is used to notify just before deletion of an Entity. -/// -/// Entity type -[Serializable] -[Obsolete("This event is no longer needed and identical to EntityDeletedEventData. Please use EntityDeletedEventData instead.")] -public class EntityDeletingEventData : EntityChangingEventData -{ - /// - /// Constructor. - /// - /// The entity which is being deleted - public EntityDeletingEventData(TEntity entity) - : base(entity) - { - - } -} diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityUpdatingEventData.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityUpdatingEventData.cs deleted file mode 100644 index 703304fefb..0000000000 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/EntityUpdatingEventData.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; - -namespace Volo.Abp.Domain.Entities.Events; - -/// -/// This type of event is used to notify just before update of an Entity. -/// -/// Entity type -[Serializable] -[Obsolete("This event is no longer needed and identical to EntityUpdatedEventData. Please use EntityUpdatedEventData instead.")] -public class EntityUpdatingEventData : EntityChangingEventData -{ - /// - /// Constructor. - /// - /// The entity which is being updated - public EntityUpdatingEventData(TEntity entity) - : base(entity) - { - - } -} diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/IEntityChangeEventHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/IEntityChangeEventHelper.cs index db580a0682..aa63c7e3c9 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/IEntityChangeEventHelper.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/IEntityChangeEventHelper.cs @@ -5,12 +5,9 @@ namespace Volo.Abp.Domain.Entities.Events; /// public interface IEntityChangeEventHelper { - void PublishEntityCreatingEvent(object entity); void PublishEntityCreatedEvent(object entity); - void PublishEntityUpdatingEvent(object entity); void PublishEntityUpdatedEvent(object entity); - void PublishEntityDeletingEvent(object entity); void PublishEntityDeletedEvent(object entity); } diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/NullEntityChangeEventHelper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/NullEntityChangeEventHelper.cs index d428f84d6f..4d849f2f27 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/NullEntityChangeEventHelper.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/NullEntityChangeEventHelper.cs @@ -14,26 +14,14 @@ public class NullEntityChangeEventHelper : IEntityChangeEventHelper { } - public void PublishEntityCreatingEvent(object entity) - { - } - public void PublishEntityCreatedEvent(object entity) { } - public void PublishEntityUpdatingEvent(object entity) - { - } - public void PublishEntityUpdatedEvent(object entity) { } - public void PublishEntityDeletingEvent(object entity) - { - } - public void PublishEntityDeletedEvent(object entity) { } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs index 1f55bce770..fd998510af 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs @@ -292,7 +292,6 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, { case EntityState.Added: ApplyAbpConceptsForAddedEntity(entry); - EntityChangeEventHelper.PublishEntityCreatingEvent(entry.Entity); EntityChangeEventHelper.PublishEntityCreatedEvent(entry.Entity); break; case EntityState.Modified: @@ -301,12 +300,10 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, { if (entry.Entity is ISoftDelete && entry.Entity.As().IsDeleted) { - EntityChangeEventHelper.PublishEntityDeletingEvent(entry.Entity); EntityChangeEventHelper.PublishEntityDeletedEvent(entry.Entity); } else { - EntityChangeEventHelper.PublishEntityUpdatingEvent(entry.Entity); EntityChangeEventHelper.PublishEntityUpdatedEvent(entry.Entity); } } @@ -314,7 +311,6 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, break; case EntityState.Deleted: ApplyAbpConceptsForDeletedEntity(entry); - EntityChangeEventHelper.PublishEntityDeletingEvent(entry.Entity); EntityChangeEventHelper.PublishEntityDeletedEvent(entry.Entity); break; } @@ -485,7 +481,7 @@ public abstract class AbpDbContext : DbContext, IAbpEfCoreDbContext, } entry.Reload(); - entry.Entity.As().IsDeleted = true; + ObjectHelper.TrySetProperty(entry.Entity.As(), x => x.IsDeleted, () => true); SetDeletionAuditProperties(entry); } diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs index addbc49171..bac9bdf0c9 100644 --- a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs +++ b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs @@ -13,6 +13,8 @@ public class AbpRabbitMqEventBusOptions public string ExchangeName { get; set; } public string ExchangeType { get; set; } + + public ushort? PrefetchCount { get; set; } public string GetExchangeTypeOrDefault() { diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs index c9ec49bc7e..7e352ca530 100644 --- a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs +++ b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs @@ -78,7 +78,8 @@ public class RabbitMqDistributedEventBus : DistributedEventBusBase, ISingletonDe AbpRabbitMqEventBusOptions.ClientName, durable: true, exclusive: false, - autoDelete: false + autoDelete: false, + prefetchCount: AbpRabbitMqEventBusOptions.PrefetchCount ), AbpRabbitMqEventBusOptions.ConnectionName ); diff --git a/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToEnumConverter.cs b/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToEnumConverter.cs index c4720c92db..6b7f32807e 100644 --- a/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToEnumConverter.cs +++ b/framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpStringToEnumConverter.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text.Json; using System.Text.Json.Serialization; @@ -48,4 +47,14 @@ public class AbpStringToEnumConverter : JsonConverter JsonSerializer.Serialize(writer, value, _writeJsonSerializerOptions); } + + public override T ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + return (T)Enum.Parse(typeToConvert, reader.GetString()); + } + + public override void WriteAsPropertyName(Utf8JsonWriter writer, T value, JsonSerializerOptions options) + { + writer.WritePropertyName(Enum.GetName(typeof(T), value)); + } } diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs index 4180121a9f..61bb9745e2 100644 --- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs +++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/Domain/Repositories/MemoryDb/MemoryDbRepository.cs @@ -159,19 +159,16 @@ public class MemoryDbRepository : RepositoryBase : RepositoryBase x.IsDeleted, () => true); (await GetCollectionAsync()).Update(entity); } else diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs index 0485dd74bc..e128c8dee8 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs @@ -294,7 +294,7 @@ public class MongoDbRepository if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && !IsHardDeleted(entity)) { - ((ISoftDelete)entity).IsDeleted = true; + ObjectHelper.TrySetProperty(((ISoftDelete)entity), x => x.IsDeleted, () => true); ApplyAbpConceptsForDeletedEntity(entity); ReplaceOneResult result; @@ -365,8 +365,7 @@ public class MongoDbRepository { if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && !IsHardDeleted(entity)) { - ((ISoftDelete)entity).IsDeleted = true; - + ObjectHelper.TrySetProperty(((ISoftDelete)entity), x => x.IsDeleted, () => true); softDeletedEntities.Add(entity, SetNewConcurrencyStamp(entity)); } else @@ -598,13 +597,11 @@ public class MongoDbRepository private void TriggerEntityCreateEvents(TEntity entity) { - EntityChangeEventHelper.PublishEntityCreatingEvent(entity); EntityChangeEventHelper.PublishEntityCreatedEvent(entity); } protected virtual void TriggerEntityUpdateEvents(TEntity entity) { - EntityChangeEventHelper.PublishEntityUpdatingEvent(entity); EntityChangeEventHelper.PublishEntityUpdatedEvent(entity); } @@ -617,7 +614,6 @@ public class MongoDbRepository protected virtual void TriggerEntityDeleteEvents(TEntity entity) { - EntityChangeEventHelper.PublishEntityDeletingEvent(entity); EntityChangeEventHelper.PublishEntityDeletedEvent(entity); } diff --git a/framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IMultiLingualObjectManager.cs b/framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IMultiLingualObjectManager.cs index 81b7646a1c..904f3abd32 100644 --- a/framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IMultiLingualObjectManager.cs +++ b/framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/IMultiLingualObjectManager.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; namespace Volo.Abp.MultiLingualObjects; @@ -10,4 +11,10 @@ public interface IMultiLingualObjectManager bool fallbackToParentCultures = true) where TMultiLingual : IMultiLingualObject where TTranslation : class, IObjectTranslation; + + Task GetTranslationAsync( + ICollection translations, + string culture = null, + bool fallbackToParentCultures = true) + where TTranslation : class, IObjectTranslation; } diff --git a/framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager.cs b/framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager.cs index b60e137e76..afb4509917 100644 --- a/framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager.cs +++ b/framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager.cs @@ -19,22 +19,21 @@ public class MultiLingualObjectManager : IMultiLingualObjectManager, ITransientD { SettingProvider = settingProvider; } - - public virtual async Task GetTranslationAsync( - TMultiLingual multiLingual, - string culture = null, - bool fallbackToParentCultures = true) - where TMultiLingual : IMultiLingualObject + public virtual async Task GetTranslationAsync( + ICollection translations, + string culture, + bool fallbackToParentCultures) where TTranslation : class, IObjectTranslation + { culture ??= CultureInfo.CurrentUICulture.Name; - if (multiLingual.Translations.IsNullOrEmpty()) + if (translations.IsNullOrEmpty()) { return null; } - var translation = multiLingual.Translations.FirstOrDefault(pt => pt.Language == culture); + var translation = translations.FirstOrDefault(pt => pt.Language == culture); if (translation != null) { return translation; @@ -44,7 +43,7 @@ public class MultiLingualObjectManager : IMultiLingualObjectManager, ITransientD { translation = GetTranslationBasedOnCulturalRecursive( CultureInfo.CurrentUICulture.Parent, - multiLingual.Translations, + translations, 0 ); @@ -56,16 +55,26 @@ public class MultiLingualObjectManager : IMultiLingualObjectManager, ITransientD var defaultLanguage = await SettingProvider.GetOrNullAsync(LocalizationSettingNames.DefaultLanguage); - translation = multiLingual.Translations.FirstOrDefault(pt => pt.Language == defaultLanguage); + translation = translations.FirstOrDefault(pt => pt.Language == defaultLanguage); if (translation != null) { return translation; } - translation = multiLingual.Translations.FirstOrDefault(); + translation = translations.FirstOrDefault(); return translation; } + public virtual Task GetTranslationAsync( + TMultiLingual multiLingual, + string culture = null, + bool fallbackToParentCultures = true) + where TMultiLingual : IMultiLingualObject + where TTranslation : class, IObjectTranslation + { + return GetTranslationAsync(multiLingual.Translations, culture: culture, fallbackToParentCultures: fallbackToParentCultures); + } + protected virtual TTranslation GetTranslationBasedOnCulturalRecursive( CultureInfo culture, ICollection translations, int currentDepth) where TTranslation : class, IObjectTranslation diff --git a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs index 36f638668c..4b03c788c6 100644 --- a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs +++ b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/QueueDeclareConfiguration.cs @@ -13,6 +13,8 @@ public class QueueDeclareConfiguration public bool Exclusive { get; set; } public bool AutoDelete { get; set; } + + public ushort? PrefetchCount { get; set; } public IDictionary Arguments { get; } @@ -20,13 +22,15 @@ public class QueueDeclareConfiguration [NotNull] string queueName, bool durable = true, bool exclusive = false, - bool autoDelete = false) + bool autoDelete = false, + ushort? prefetchCount = null) { QueueName = queueName; Durable = durable; Exclusive = exclusive; AutoDelete = autoDelete; Arguments = new Dictionary(); + PrefetchCount = prefetchCount; } public virtual QueueDeclareOk Declare(IModel channel) diff --git a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqMessageConsumer.cs b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqMessageConsumer.cs index 8ce184295a..5c45b6aefc 100644 --- a/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqMessageConsumer.cs +++ b/framework/src/Volo.Abp.RabbitMQ/Volo/Abp/RabbitMQ/RabbitMqMessageConsumer.cs @@ -165,9 +165,14 @@ public class RabbitMqMessageConsumer : IRabbitMqMessageConsumer, ITransientDepen arguments: Queue.Arguments ); + if (Queue.PrefetchCount.HasValue) + { + Channel.BasicQos(0, Queue.PrefetchCount.Value, false); + } + var consumer = new AsyncEventingBasicConsumer(Channel); consumer.Received += HandleIncomingMessageAsync; - + Channel.BasicConsume( queue: Queue.QueueName, autoAck: false, diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs index d325708175..aa933c6e09 100644 --- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs +++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Volo.Abp.Authorization.Permissions; using Volo.Abp.DependencyInjection; @@ -13,11 +14,11 @@ namespace Volo.Abp.UI.Navigation; public class MenuManager : IMenuManager, ITransientDependency { protected AbpNavigationOptions Options { get; } - protected IHybridServiceScopeFactory ServiceScopeFactory { get; } + protected IServiceScopeFactory ServiceScopeFactory { get; } protected ISimpleStateCheckerManager SimpleStateCheckerManager { get; } public MenuManager( IOptions options, - IHybridServiceScopeFactory serviceScopeFactory, + IServiceScopeFactory serviceScopeFactory, ISimpleStateCheckerManager simpleStateCheckerManager) { Options = options.Value; diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json index 7e667c1bbc..4717b1fe9b 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json @@ -11,7 +11,7 @@ "Close": "أغلق", "Save": "حفظ", "SavingWithThreeDot": "حفظ...", - "Actions": "أجراءات", + "Actions": "الإجراءات", "Delete": "حذف", "SuccessfullyDeleted": "تم الحذف بنجاح", "Edit": "تعديل", @@ -50,4 +50,4 @@ "ItemWillBeDeletedMessage": "سوف يتم حذف هذا البند!", "ManageYourAccount": "إدارة حسابك" } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json index 94e56a66f3..7064064671 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ro-RO.json @@ -31,14 +31,14 @@ "PagerPrevious": "Anterior", "PagerFirst": "Primul", "PagerLast": "Ultimul", - "PagerInfo": "Afişate _START_ to _END_ of _TOTAL_ înregistrări", - "PagerInfo{0}{1}{2}": "Afişate {0} to {1} of {2} înregistrări", - "PagerInfoEmpty": "Afişate 0 to 0 of 0 înregistrări", + "PagerInfo": "Afişate de la _START_ la _END_ din _TOTAL_ înregistrări", + "PagerInfo{0}{1}{2}": "Afişate de la {0} la {1} din {2} înregistrări", + "PagerInfoEmpty": "Afişate 0 din 0 înregistrări", "PagerInfoFiltered": "(filtrate de la _MAX_ înregistrări totale)", "NoDataAvailableInDatatable": "Nicio informaţie disponibilă", "Total": "total", "Selected": "selectate", - "PagerShowMenuEntries": "Arată _MENU_ intrări", + "PagerShowMenuEntries": "Afişează _MENU_ intrări", "DatatableActionDropdownDefaultText": "Acţiuni", "ChangePassword": "Schimbă parola", "PersonalInfo": "Profilul meu", @@ -50,4 +50,4 @@ "ItemWillBeDeletedMessage": "Acest articol va fi şters!", "ManageYourAccount": "Administraţi-vă contul" } -} \ No newline at end of file +} diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj index 91ca2b1312..d917afa97f 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj @@ -4,6 +4,7 @@ net6.0 Library true + true
diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs index fdba79f1af..7908dd3d96 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs +++ b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs @@ -947,4 +947,19 @@ public class DistributedCache_Tests : AbpIntegratedTest cacheValue[0].Value.ShouldBeNull(); cacheValue[1].Value.ShouldBeNull(); } + + [Fact] + public async Task Should_Get_Same_Cache_Set_When_Resolve_With_Or_Without_Key() + { + var cache1 = GetRequiredService>(); + var cache2 = GetRequiredService>(); + + await cache1.SetAsync("john", new PersonCacheItem("John Doe")); + + var item1 = await cache1.GetAsync("john"); + item1.Name.ShouldBe("John Doe"); + + var item2 = await cache2.GetAsync("john"); + item2.Name.ShouldBe("John Doe"); + } } diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectVersionParse_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectVersionParse_Tests.cs index d132bdf0d8..d0569de4c7 100644 --- a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectVersionParse_Tests.cs +++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectVersionParse_Tests.cs @@ -19,8 +19,8 @@ public class ProjectVersionParse_Tests "" + "" + "" + - "< PackageReference Include = \"Volo.Abp.Emailing\" Version = \"4.4.0-rc.1\" />" + - "" + + "" + + "" + "" + "" + "" + @@ -54,7 +54,7 @@ public class ProjectVersionParse_Tests "" + "" + "" + - "< PackageReference Include = \"Volo.Abp.Emailing\" Version= \"12.8.3-beta.1\" />" + + "" + "" + "
"; diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/HybridServiceScopeFactory_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/HybridServiceScopeFactory_Tests.cs deleted file mode 100644 index 6a3f059ba8..0000000000 --- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/DependencyInjection/HybridServiceScopeFactory_Tests.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Shouldly; -using Volo.Abp.Modularity; -using Xunit; - -namespace Volo.Abp.DependencyInjection; - -public class HybridServiceScopeFactory_Tests -{ - [Fact] - public async Task Should_Use_Default_ServiceScopeFactory_By_Default_Async() - { - using (var application = await AbpApplicationFactory.CreateAsync()) - { - application.Services.AddType(typeof(MyServiceAsync)); - - await application.InitializeAsync(); - - var serviceScopeFactory = application.ServiceProvider.GetRequiredService(); - - using (var scope = serviceScopeFactory.CreateScope()) - { - scope.ServiceProvider.GetRequiredService(); - } - - MyServiceAsync.DisposeCount.ShouldBe(1); - } - } - - [Fact] - public void Should_Use_Default_ServiceScopeFactory_By_Default() - { - using (var application = AbpApplicationFactory.Create()) - { - application.Services.AddType(typeof(MyService)); - - application.Initialize(); - - var serviceScopeFactory = application.ServiceProvider.GetRequiredService(); - - using (var scope = serviceScopeFactory.CreateScope()) - { - scope.ServiceProvider.GetRequiredService(); - } - - MyService.DisposeCount.ShouldBe(1); - } - } - - private class MyServiceAsync : ITransientDependency, IDisposable - { - public static int DisposeCount { get; private set; } - - public void Dispose() - { - ++DisposeCount; - } - } - - private class MyService : ITransientDependency, IDisposable - { - public static int DisposeCount { get; private set; } - - public void Dispose() - { - ++DisposeCount; - } - } -} diff --git a/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpStringToEnum_Tests.cs b/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpStringToEnum_Tests.cs index d3bba36534..8336b4ce7d 100644 --- a/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpStringToEnum_Tests.cs +++ b/framework/test/Volo.Abp.Json.Tests/Volo/Abp/Json/AbpStringToEnum_Tests.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Text.Json; using Shouldly; using Volo.Abp.Json.SystemTextJson.JsonConverters; @@ -26,6 +27,16 @@ namespace Volo.Abp.Json testClass = JsonSerializer.Deserialize("{\"Day\": 1}", options); testClass.ShouldNotBeNull(); testClass.Day.ShouldBe(DayOfWeek.Monday); + + var dictionary = JsonSerializer.Deserialize>("{\"Monday\":\"Mo\"}", options); + dictionary.ShouldNotBeNull(); + dictionary.Keys.ShouldContain(DayOfWeek.Monday); + dictionary.Values.ShouldContain("Mo"); + + dictionary = JsonSerializer.Deserialize>("{\"1\":\"Mo\"}", options); + dictionary.ShouldNotBeNull(); + dictionary.Keys.ShouldContain(DayOfWeek.Monday); + dictionary.Values.ShouldContain("Mo"); } [Fact] @@ -45,6 +56,13 @@ namespace Volo.Abp.Json }); testClassJson.ShouldBe("{\"Day\":1}"); + + testClassJson = JsonSerializer.Serialize(new Dictionary + { + {DayOfWeek.Monday, "Mo"} + }, options); + + testClassJson.ShouldBe("{\"Monday\":\"Mo\"}"); } class TestClass diff --git a/framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager_Tests.cs b/framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager_Tests.cs index 1b26b06297..afe15bff99 100644 --- a/framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager_Tests.cs +++ b/framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager_Tests.cs @@ -51,6 +51,17 @@ public class MultiLingualObjectManager_Tests : AbpIntegratedTest net6.0 + true diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs index a94c722faf..12b3fa01c0 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/EntityChangeEvents_Tests.cs @@ -32,37 +32,18 @@ public abstract class EntityChangeEvents_Tests : TestAppTestBase { var personName = Guid.NewGuid().ToString("N"); - var creatingEventTriggered = false; var createdEventTriggered = false; var createdEtoTriggered = false; using (var uow = GetRequiredService().Begin()) { -#pragma warning disable 618 - LocalEventBus.Subscribe>(data => -#pragma warning restore 618 - { - creatingEventTriggered.ShouldBeFalse(); - createdEventTriggered.ShouldBeFalse(); - - creatingEventTriggered = true; - - data.Entity.Name.ShouldBe(personName); - - /* Want to change age from 15 to 18 */ - data.Entity.Age.ShouldBe(15); - data.Entity.Age = 18; - return Task.CompletedTask; - }); - LocalEventBus.Subscribe>(data => { - creatingEventTriggered.ShouldBeTrue(); createdEventTriggered.ShouldBeFalse(); createdEventTriggered = true; - data.Entity.Age.ShouldBe(18); + data.Entity.Age.ShouldBe(15); data.Entity.Name.ShouldBe(personName); return Task.CompletedTask; @@ -81,8 +62,7 @@ public abstract class EntityChangeEvents_Tests : TestAppTestBase await uow.CompleteAsync(); } - - creatingEventTriggered.ShouldBeTrue(); + createdEventTriggered.ShouldBeTrue(); createdEtoTriggered.ShouldBeTrue(); } diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json index c753009bb0..149ad71d95 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/ro-RO.json @@ -27,7 +27,7 @@ "DisplayName:UserName": "Nume de utilizator", "DisplayName:Email": "Email", "DisplayName:Name": "Nume", - "DisplayName:Surname": "Surname", + "DisplayName:Surname": "Nume de familie", "DisplayName:Password": "Parolă", "DisplayName:EmailAddress": "Adresa de email", "DisplayName:PhoneNumber": "Număr de telefon", diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobsDbProperties.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDbProperties.cs similarity index 86% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobsDbProperties.cs rename to modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDbProperties.cs index 401aa379a7..85e44815a2 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobsDbProperties.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDbProperties.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.BackgroundJobs; -public static class BackgroundJobsDbProperties +public static class AbpBackgroundJobsDbProperties { public static string DbTablePrefix { get; set; } = AbpCommonDbProperties.DbTablePrefix; diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContext.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContext.cs index fb01736cfa..0beef8d3ea 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContext.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContext.cs @@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore; [IgnoreMultiTenancy] -[ConnectionStringName(BackgroundJobsDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpBackgroundJobsDbProperties.ConnectionStringName)] public class BackgroundJobsDbContext : AbpDbContext, IBackgroundJobsDbContext { public DbSet BackgroundJobs { get; set; } diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContextModelCreatingExtensions.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContextModelCreatingExtensions.cs index bf9f8d5ea3..849ac3c5d5 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContextModelCreatingExtensions.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsDbContextModelCreatingExtensions.cs @@ -18,7 +18,7 @@ public static class BackgroundJobsDbContextModelCreatingExtensions builder.Entity(b => { - b.ToTable(BackgroundJobsDbProperties.DbTablePrefix + "BackgroundJobs", BackgroundJobsDbProperties.DbSchema); + b.ToTable(AbpBackgroundJobsDbProperties.DbTablePrefix + "BackgroundJobs", AbpBackgroundJobsDbProperties.DbSchema); b.ConfigureByConvention(); diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/IBackgroundJobsDbContext.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/IBackgroundJobsDbContext.cs index b091ac126a..a6276e37f8 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/IBackgroundJobsDbContext.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/IBackgroundJobsDbContext.cs @@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore; [IgnoreMultiTenancy] -[ConnectionStringName(BackgroundJobsDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpBackgroundJobsDbProperties.ConnectionStringName)] public interface IBackgroundJobsDbContext : IEfCoreDbContext { DbSet BackgroundJobs { get; } diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContext.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContext.cs index 42b8a44f0d..8a94e26650 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContext.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContext.cs @@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.BackgroundJobs.MongoDB; [IgnoreMultiTenancy] -[ConnectionStringName(BackgroundJobsDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpBackgroundJobsDbProperties.ConnectionStringName)] public class BackgroundJobsMongoDbContext : AbpMongoDbContext, IBackgroundJobsMongoDbContext { public IMongoCollection BackgroundJobs { get; set; } diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContextExtensions.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContextExtensions.cs index b687bf8f90..a4f255c724 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContextExtensions.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContextExtensions.cs @@ -11,7 +11,7 @@ public static class BackgroundJobsMongoDbContextExtensions builder.Entity(b => { - b.CollectionName = BackgroundJobsDbProperties.DbTablePrefix + "BackgroundJobs"; + b.CollectionName = AbpBackgroundJobsDbProperties.DbTablePrefix + "BackgroundJobs"; }); } } diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/IBackgroundJobsMongoDbContext.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/IBackgroundJobsMongoDbContext.cs index 4f93e1cbe5..d8a94b740d 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/IBackgroundJobsMongoDbContext.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/IBackgroundJobsMongoDbContext.cs @@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.BackgroundJobs.MongoDB; [IgnoreMultiTenancy] -[ConnectionStringName(BackgroundJobsDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpBackgroundJobsDbProperties.ConnectionStringName)] public interface IBackgroundJobsMongoDbContext : IAbpMongoDbContext { IMongoCollection BackgroundJobs { get; } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json index a2a3bf48fd..ce0c493e42 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json @@ -3,7 +3,7 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "^5.3.2", + "@abp/aspnetcore.mvc.ui.theme.shared": "^6.0.0-rc.1", "highlight.js": "^9.13.1" }, "devDependencies": {} diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock index bb5a7948db..541f9566e3 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock @@ -2,30 +2,30 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.shared@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.shared@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -34,144 +34,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Logs/logs.txt b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Logs/logs.txt deleted file mode 100644 index 4a2b7f19c3..0000000000 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Logs/logs.txt +++ /dev/null @@ -1,2242 +0,0 @@ -2021-06-01 16:47:06.126 +08:00 [INF] Starting web host. -2021-06-01 16:47:06.283 +08:00 [FTL] Host terminated unexpectedly! -System.IO.FileNotFoundException: Could not load file or assembly 'Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null'. The system cannot find the file specified. -File name: 'Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null' - at System.Reflection.CustomAttribute._CreateCaObject(RuntimeModule pModule, RuntimeType type, IRuntimeMethodInfo pCtor, Byte** ppBlob, Byte* pEndBlob, Int32* pcNamedArgs) - at System.Reflection.CustomAttribute.CreateCaObject(RuntimeModule module, RuntimeType type, IRuntimeMethodInfo ctor, IntPtr& blob, IntPtr blobEnd, Int32& namedArgs) - at System.Reflection.CustomAttribute.AddCustomAttributes(ListBuilder`1& attributes, RuntimeModule decoratedModule, Int32 decoratedMetadataToken, RuntimeType attributeFilterType, Boolean mustBeInheritable, ListBuilder`1 derivedAttributes) - at System.Reflection.CustomAttribute.GetCustomAttributes(RuntimeType type, RuntimeType caType, Boolean inherit) - at System.RuntimeType.GetCustomAttributes(Type attributeType, Boolean inherit) - at System.Attribute.GetCustomAttributes(MemberInfo element, Boolean inherit) - at System.Reflection.CustomAttributeExtensions.GetCustomAttributes(MemberInfo element) - at Volo.Abp.Modularity.AbpModuleHelper.FindDependedModuleTypes(Type moduleType) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\AbpModuleHelper.cs:line 25 - at Volo.Abp.Modularity.AbpModuleHelper.AddModuleAndDependenciesRecursively(List`1 moduleTypes, Type moduleType, ILogger logger, Int32 depth) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\AbpModuleHelper.cs:line 56 - at Volo.Abp.Modularity.AbpModuleHelper.FindAllModuleTypes(Type startupModuleType, ILogger logger) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\AbpModuleHelper.cs:line 15 - at Volo.Abp.Modularity.ModuleLoader.FillModules(List`1 modules, IServiceCollection services, Type startupModuleType, PlugInSourceList plugInSources) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleLoader.cs:line 49 - at Volo.Abp.Modularity.ModuleLoader.GetDescriptors(IServiceCollection services, Type startupModuleType, PlugInSourceList plugInSources) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleLoader.cs:line 34 - at Volo.Abp.Modularity.ModuleLoader.LoadModules(IServiceCollection services, Type startupModuleType, PlugInSourceList plugInSources) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleLoader.cs:line 20 - at Volo.Abp.AbpApplicationBase.LoadModules(IServiceCollection services, AbpApplicationCreationOptions options) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 103 - at Volo.Abp.AbpApplicationBase..ctor(Type startupModuleType, IServiceCollection services, Action`1 optionsAction) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 47 - at Volo.Abp.AbpApplicationWithExternalServiceProvider..ctor(Type startupModuleType, IServiceCollection services, Action`1 optionsAction) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 13 - at Volo.Abp.AbpApplicationFactory.Create(Type startupModuleType, IServiceCollection services, Action`1 optionsAction) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationFactory.cs:line 37 - at Volo.Abp.AbpApplicationFactory.Create[TStartupModule](IServiceCollection services, Action`1 optionsAction) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationFactory.cs:line 29 - at Microsoft.Extensions.DependencyInjection.ServiceCollectionApplicationExtensions.AddApplication[TStartupModule](IServiceCollection services, Action`1 optionsAction) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Microsoft\Extensions\DependencyInjection\ServiceCollectionApplicationExtensions.cs:line 15 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.ConfigureServices(IServiceCollection services) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 11 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureServicesBuilder.InvokeCore(Object instance, IServiceCollection services) - at Microsoft.AspNetCore.Hosting.ConfigureServicesBuilder.<>c__DisplayClass9_0.g__Startup|0(IServiceCollection serviceCollection) - at Microsoft.AspNetCore.Hosting.ConfigureServicesBuilder.Invoke(Object instance, IServiceCollection services) - at Microsoft.AspNetCore.Hosting.ConfigureServicesBuilder.<>c__DisplayClass8_0.b__0(IServiceCollection services) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.UseStartup(Type startupType, HostBuilderContext context, IServiceCollection services, Object instance) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass13_0.b__0(HostBuilderContext context, IServiceCollection services) - at Microsoft.Extensions.Hosting.HostBuilder.CreateServiceProvider() - at Microsoft.Extensions.Hosting.HostBuilder.Build() - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Program.Main(String[] args) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Program.cs:line 23 -2021-06-01 16:47:41.930 +08:00 [INF] Starting web host. -2021-06-01 16:47:42.553 +08:00 [INF] Loaded ABP modules: -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.AbpAspNetCoreMvcUiBasicThemeModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.AbpAspNetCoreMvcUiThemeSharedModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.AbpAspNetCoreMvcUiBootstrapModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.AbpAspNetCoreMvcUiModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.AbpAspNetCoreModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Auditing.AbpAuditingModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Data.AbpDataModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.ObjectExtending.AbpObjectExtendingModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationAbstractionsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Validation.AbpValidationAbstractionsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Uow.AbpUnitOfWorkModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Json.AbpJsonModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Timing.AbpTimingModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Settings.AbpSettingsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Security.AbpSecurityModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.MultiTenancy.AbpMultiTenancyModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Threading.AbpThreadingModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Http.AbpHttpModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Http.AbpHttpAbstractionsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Minify.AbpMinifyModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Validation.AbpValidationModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationContractsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.UI.Navigation.AbpUiNavigationModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.UI.AbpUiModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Domain.AbpDddDomainModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.EventBus.AbpEventBusModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Guids.AbpGuidsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.ObjectMapping.AbpObjectMappingModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Specifications.AbpSpecificationsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Features.AbpFeaturesModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Packages.AbpAspNetCoreMvcUiPackagesModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingAbstractionsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Widgets.AbpAspNetCoreMvcUiWidgetsModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.AbpAspNetCoreMvcUiMultiTenancyModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.MultiTenancy.AbpAspNetCoreMultiTenancyModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.AbpAspNetCoreMvcUiThemeSharedDemoModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Autofac.AbpAutofacModule -2021-06-01 16:47:42.554 +08:00 [INF] - Volo.Abp.Castle.AbpCastleCoreModule -2021-06-01 16:47:42.575 +08:00 [FTL] Application startup exception -Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'. - ---> System.IO.DirectoryNotFoundException: D:\Github\volo\volo5\abp\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo\ - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root, ExclusionFilters filters) - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root) - at Volo.Abp.VirtualFileSystem.VirtualFileSetListExtensions.ReplaceEmbeddedByPhysical[T](VirtualFileSetList fileSets, String physicalPath) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileSetListExtensions.cs:line 86 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule.<>c__DisplayClass0_0.b__0(AbpVirtualFileSystemOptions options) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\AbpAspNetCoreMvcUiThemeBasicDemoModule.cs:line 31 - at Microsoft.Extensions.Options.ConfigureNamedOptions`1.Configure(String name, TOptions options) - at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name) - at Microsoft.Extensions.Options.OptionsManager`1.<>c__DisplayClass5_0.b__0() - at System.Lazy`1.ViaFactory(LazyThreadSafetyMode mode) - at System.Lazy`1.ExecutionAndPublication(LazyHelper executionAndPublication, Boolean useDefaultConstructor) - at System.Lazy`1.CreateValue() - at System.Lazy`1.get_Value() - at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd(String name, Func`1 createOptions) - at Microsoft.Extensions.Options.OptionsManager`1.Get(String name) - at Microsoft.Extensions.Options.OptionsManager`1.get_Value() - at Volo.Abp.VirtualFileSystem.VirtualFileProvider..ctor(IOptions`1 options, IDynamicFileProvider dynamicFileProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileProvider.cs:line 19 - at lambda_method619(Closure , Object[] ) - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - --- End of inner exception stack trace --- - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters) - at Autofac.Core.Activators.Reflection.ReflectionActivator.b__11_0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.DisposalTrackingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Builder.RegistrationBuilder`3.<>c__DisplayClass41_0.b__0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - --- End of inner exception stack trace --- - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.RegistrationPipelineInvokeMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.<>c__DisplayClass5_0.b__0() - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid id, Func`1 creator) - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid primaryId, Nullable`1 qualifyingId, Func`1 creator) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.CircularDependencyDetectorMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.ExecuteOperation(ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.Execute(ResolveRequest request) - at Autofac.Core.Lifetime.LifetimeScope.ResolveComponent(ResolveRequest request) - at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance) - at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType) - at Autofac.Extensions.DependencyInjection.AutofacServiceProvider.GetRequiredService(Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService[T](IServiceProvider provider) - at Volo.Abp.AspNetCore.AbpAspNetCoreModule.OnApplicationInitialization(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Volo\Abp\AspNetCore\AbpAspNetCoreModule.cs:line 61 - at Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor.Initialize(ApplicationInitializationContext context, IAbpModule module) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\DefaultModuleLifecycleContributor.cs:line 7 - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 41 - --- End of inner exception stack trace --- - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 45 - at Volo.Abp.AbpApplicationBase.InitializeModules() in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 77 - at Volo.Abp.AbpApplicationWithExternalServiceProvider.Initialize(IServiceProvider serviceProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 44 - at Microsoft.AspNetCore.Builder.AbpApplicationBuilderExtensions.InitializeApplication(IApplicationBuilder app) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Microsoft\AspNetCore\Builder\AbpApplicationBuilderExtensions.cs:line 39 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 16 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.<>c__DisplayClass4_0.b__0(IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass15_0.b__1(IApplicationBuilder app) - at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.g__MiddlewareFilterBuilder|0(IApplicationBuilder builder) - at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.b__0(IApplicationBuilder app) - at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken) -2021-06-01 16:47:42.599 +08:00 [FTL] Host terminated unexpectedly! -Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'. - ---> System.IO.DirectoryNotFoundException: D:\Github\volo\volo5\abp\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo\ - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root, ExclusionFilters filters) - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root) - at Volo.Abp.VirtualFileSystem.VirtualFileSetListExtensions.ReplaceEmbeddedByPhysical[T](VirtualFileSetList fileSets, String physicalPath) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileSetListExtensions.cs:line 86 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule.<>c__DisplayClass0_0.b__0(AbpVirtualFileSystemOptions options) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\AbpAspNetCoreMvcUiThemeBasicDemoModule.cs:line 31 - at Microsoft.Extensions.Options.ConfigureNamedOptions`1.Configure(String name, TOptions options) - at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name) - at Microsoft.Extensions.Options.OptionsManager`1.<>c__DisplayClass5_0.b__0() - at System.Lazy`1.ViaFactory(LazyThreadSafetyMode mode) - at System.Lazy`1.ExecutionAndPublication(LazyHelper executionAndPublication, Boolean useDefaultConstructor) - at System.Lazy`1.CreateValue() - at System.Lazy`1.get_Value() - at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd(String name, Func`1 createOptions) - at Microsoft.Extensions.Options.OptionsManager`1.Get(String name) - at Microsoft.Extensions.Options.OptionsManager`1.get_Value() - at Volo.Abp.VirtualFileSystem.VirtualFileProvider..ctor(IOptions`1 options, IDynamicFileProvider dynamicFileProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileProvider.cs:line 19 - at lambda_method619(Closure , Object[] ) - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - --- End of inner exception stack trace --- - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters) - at Autofac.Core.Activators.Reflection.ReflectionActivator.b__11_0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.DisposalTrackingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Builder.RegistrationBuilder`3.<>c__DisplayClass41_0.b__0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - --- End of inner exception stack trace --- - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.RegistrationPipelineInvokeMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.<>c__DisplayClass5_0.b__0() - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid id, Func`1 creator) - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid primaryId, Nullable`1 qualifyingId, Func`1 creator) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.CircularDependencyDetectorMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.ExecuteOperation(ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.Execute(ResolveRequest request) - at Autofac.Core.Lifetime.LifetimeScope.ResolveComponent(ResolveRequest request) - at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance) - at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType) - at Autofac.Extensions.DependencyInjection.AutofacServiceProvider.GetRequiredService(Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService[T](IServiceProvider provider) - at Volo.Abp.AspNetCore.AbpAspNetCoreModule.OnApplicationInitialization(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Volo\Abp\AspNetCore\AbpAspNetCoreModule.cs:line 61 - at Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor.Initialize(ApplicationInitializationContext context, IAbpModule module) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\DefaultModuleLifecycleContributor.cs:line 7 - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 41 - --- End of inner exception stack trace --- - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 45 - at Volo.Abp.AbpApplicationBase.InitializeModules() in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 77 - at Volo.Abp.AbpApplicationWithExternalServiceProvider.Initialize(IServiceProvider serviceProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 44 - at Microsoft.AspNetCore.Builder.AbpApplicationBuilderExtensions.InitializeApplication(IApplicationBuilder app) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Microsoft\AspNetCore\Builder\AbpApplicationBuilderExtensions.cs:line 39 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 16 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.<>c__DisplayClass4_0.b__0(IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass15_0.b__1(IApplicationBuilder app) - at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.g__MiddlewareFilterBuilder|0(IApplicationBuilder builder) - at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.b__0(IApplicationBuilder app) - at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.Internal.Host.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.Run(IHost host) - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Program.Main(String[] args) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Program.cs:line 23 -2021-06-01 16:48:00.999 +08:00 [INF] Starting web host. -2021-06-01 16:48:01.586 +08:00 [INF] Loaded ABP modules: -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.AbpAspNetCoreMvcUiBasicThemeModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.AbpAspNetCoreMvcUiThemeSharedModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.AbpAspNetCoreMvcUiBootstrapModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.AbpAspNetCoreMvcUiModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.AbpAspNetCoreModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Auditing.AbpAuditingModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Data.AbpDataModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.ObjectExtending.AbpObjectExtendingModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationAbstractionsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Validation.AbpValidationAbstractionsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Uow.AbpUnitOfWorkModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Json.AbpJsonModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Timing.AbpTimingModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Settings.AbpSettingsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Security.AbpSecurityModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.MultiTenancy.AbpMultiTenancyModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Threading.AbpThreadingModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Http.AbpHttpModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Http.AbpHttpAbstractionsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Minify.AbpMinifyModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Validation.AbpValidationModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationContractsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.UI.Navigation.AbpUiNavigationModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.UI.AbpUiModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Domain.AbpDddDomainModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.EventBus.AbpEventBusModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Guids.AbpGuidsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.ObjectMapping.AbpObjectMappingModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Specifications.AbpSpecificationsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Features.AbpFeaturesModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Packages.AbpAspNetCoreMvcUiPackagesModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingAbstractionsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Widgets.AbpAspNetCoreMvcUiWidgetsModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.AbpAspNetCoreMvcUiMultiTenancyModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.MultiTenancy.AbpAspNetCoreMultiTenancyModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.AbpAspNetCoreMvcUiThemeSharedDemoModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Autofac.AbpAutofacModule -2021-06-01 16:48:01.587 +08:00 [INF] - Volo.Abp.Castle.AbpCastleCoreModule -2021-06-01 16:48:01.606 +08:00 [FTL] Application startup exception -Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'. - ---> System.IO.DirectoryNotFoundException: D:\Github\volo\volo5\abp\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo\ - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root, ExclusionFilters filters) - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root) - at Volo.Abp.VirtualFileSystem.VirtualFileSetListExtensions.ReplaceEmbeddedByPhysical[T](VirtualFileSetList fileSets, String physicalPath) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileSetListExtensions.cs:line 86 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule.<>c__DisplayClass0_0.b__0(AbpVirtualFileSystemOptions options) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\AbpAspNetCoreMvcUiThemeBasicDemoModule.cs:line 31 - at Microsoft.Extensions.Options.ConfigureNamedOptions`1.Configure(String name, TOptions options) - at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name) - at Microsoft.Extensions.Options.OptionsManager`1.<>c__DisplayClass5_0.b__0() - at System.Lazy`1.ViaFactory(LazyThreadSafetyMode mode) - at System.Lazy`1.ExecutionAndPublication(LazyHelper executionAndPublication, Boolean useDefaultConstructor) - at System.Lazy`1.CreateValue() - at System.Lazy`1.get_Value() - at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd(String name, Func`1 createOptions) - at Microsoft.Extensions.Options.OptionsManager`1.Get(String name) - at Microsoft.Extensions.Options.OptionsManager`1.get_Value() - at Volo.Abp.VirtualFileSystem.VirtualFileProvider..ctor(IOptions`1 options, IDynamicFileProvider dynamicFileProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileProvider.cs:line 19 - at lambda_method619(Closure , Object[] ) - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - --- End of inner exception stack trace --- - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters) - at Autofac.Core.Activators.Reflection.ReflectionActivator.b__11_0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.DisposalTrackingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Builder.RegistrationBuilder`3.<>c__DisplayClass41_0.b__0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - --- End of inner exception stack trace --- - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.RegistrationPipelineInvokeMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.<>c__DisplayClass5_0.b__0() - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid id, Func`1 creator) - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid primaryId, Nullable`1 qualifyingId, Func`1 creator) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.CircularDependencyDetectorMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.ExecuteOperation(ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.Execute(ResolveRequest request) - at Autofac.Core.Lifetime.LifetimeScope.ResolveComponent(ResolveRequest request) - at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance) - at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType) - at Autofac.Extensions.DependencyInjection.AutofacServiceProvider.GetRequiredService(Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService[T](IServiceProvider provider) - at Volo.Abp.AspNetCore.AbpAspNetCoreModule.OnApplicationInitialization(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Volo\Abp\AspNetCore\AbpAspNetCoreModule.cs:line 61 - at Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor.Initialize(ApplicationInitializationContext context, IAbpModule module) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\DefaultModuleLifecycleContributor.cs:line 7 - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 41 - --- End of inner exception stack trace --- - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 45 - at Volo.Abp.AbpApplicationBase.InitializeModules() in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 77 - at Volo.Abp.AbpApplicationWithExternalServiceProvider.Initialize(IServiceProvider serviceProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 44 - at Microsoft.AspNetCore.Builder.AbpApplicationBuilderExtensions.InitializeApplication(IApplicationBuilder app) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Microsoft\AspNetCore\Builder\AbpApplicationBuilderExtensions.cs:line 39 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 16 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.<>c__DisplayClass4_0.b__0(IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass15_0.b__1(IApplicationBuilder app) - at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.g__MiddlewareFilterBuilder|0(IApplicationBuilder builder) - at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.b__0(IApplicationBuilder app) - at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken) -2021-06-01 16:48:01.630 +08:00 [FTL] Host terminated unexpectedly! -Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'. - ---> System.IO.DirectoryNotFoundException: D:\Github\volo\volo5\abp\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo\ - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root, ExclusionFilters filters) - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root) - at Volo.Abp.VirtualFileSystem.VirtualFileSetListExtensions.ReplaceEmbeddedByPhysical[T](VirtualFileSetList fileSets, String physicalPath) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileSetListExtensions.cs:line 86 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule.<>c__DisplayClass0_0.b__0(AbpVirtualFileSystemOptions options) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\AbpAspNetCoreMvcUiThemeBasicDemoModule.cs:line 31 - at Microsoft.Extensions.Options.ConfigureNamedOptions`1.Configure(String name, TOptions options) - at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name) - at Microsoft.Extensions.Options.OptionsManager`1.<>c__DisplayClass5_0.b__0() - at System.Lazy`1.ViaFactory(LazyThreadSafetyMode mode) - at System.Lazy`1.ExecutionAndPublication(LazyHelper executionAndPublication, Boolean useDefaultConstructor) - at System.Lazy`1.CreateValue() - at System.Lazy`1.get_Value() - at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd(String name, Func`1 createOptions) - at Microsoft.Extensions.Options.OptionsManager`1.Get(String name) - at Microsoft.Extensions.Options.OptionsManager`1.get_Value() - at Volo.Abp.VirtualFileSystem.VirtualFileProvider..ctor(IOptions`1 options, IDynamicFileProvider dynamicFileProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileProvider.cs:line 19 - at lambda_method619(Closure , Object[] ) - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - --- End of inner exception stack trace --- - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters) - at Autofac.Core.Activators.Reflection.ReflectionActivator.b__11_0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.DisposalTrackingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Builder.RegistrationBuilder`3.<>c__DisplayClass41_0.b__0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - --- End of inner exception stack trace --- - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.RegistrationPipelineInvokeMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.<>c__DisplayClass5_0.b__0() - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid id, Func`1 creator) - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid primaryId, Nullable`1 qualifyingId, Func`1 creator) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.CircularDependencyDetectorMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.ExecuteOperation(ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.Execute(ResolveRequest request) - at Autofac.Core.Lifetime.LifetimeScope.ResolveComponent(ResolveRequest request) - at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance) - at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType) - at Autofac.Extensions.DependencyInjection.AutofacServiceProvider.GetRequiredService(Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService[T](IServiceProvider provider) - at Volo.Abp.AspNetCore.AbpAspNetCoreModule.OnApplicationInitialization(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Volo\Abp\AspNetCore\AbpAspNetCoreModule.cs:line 61 - at Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor.Initialize(ApplicationInitializationContext context, IAbpModule module) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\DefaultModuleLifecycleContributor.cs:line 7 - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 41 - --- End of inner exception stack trace --- - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 45 - at Volo.Abp.AbpApplicationBase.InitializeModules() in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 77 - at Volo.Abp.AbpApplicationWithExternalServiceProvider.Initialize(IServiceProvider serviceProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 44 - at Microsoft.AspNetCore.Builder.AbpApplicationBuilderExtensions.InitializeApplication(IApplicationBuilder app) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Microsoft\AspNetCore\Builder\AbpApplicationBuilderExtensions.cs:line 39 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 16 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.<>c__DisplayClass4_0.b__0(IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass15_0.b__1(IApplicationBuilder app) - at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.g__MiddlewareFilterBuilder|0(IApplicationBuilder builder) - at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.b__0(IApplicationBuilder app) - at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.Internal.Host.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.Run(IHost host) - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Program.Main(String[] args) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Program.cs:line 23 -2021-06-01 16:49:56.102 +08:00 [INF] Starting web host. -2021-06-01 16:49:56.699 +08:00 [INF] Loaded ABP modules: -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.AbpAspNetCoreMvcUiBasicThemeModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.AbpAspNetCoreMvcUiThemeSharedModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.AbpAspNetCoreMvcUiBootstrapModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.AbpAspNetCoreMvcUiModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.AbpAspNetCoreModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Auditing.AbpAuditingModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Data.AbpDataModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.ObjectExtending.AbpObjectExtendingModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationAbstractionsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Validation.AbpValidationAbstractionsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Uow.AbpUnitOfWorkModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Json.AbpJsonModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Timing.AbpTimingModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Settings.AbpSettingsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Security.AbpSecurityModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.MultiTenancy.AbpMultiTenancyModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Threading.AbpThreadingModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Http.AbpHttpModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Http.AbpHttpAbstractionsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Minify.AbpMinifyModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Validation.AbpValidationModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationContractsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.UI.Navigation.AbpUiNavigationModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.UI.AbpUiModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Domain.AbpDddDomainModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.EventBus.AbpEventBusModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Guids.AbpGuidsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.ObjectMapping.AbpObjectMappingModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Specifications.AbpSpecificationsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Features.AbpFeaturesModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Packages.AbpAspNetCoreMvcUiPackagesModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingAbstractionsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Widgets.AbpAspNetCoreMvcUiWidgetsModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.AbpAspNetCoreMvcUiMultiTenancyModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.MultiTenancy.AbpAspNetCoreMultiTenancyModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.AbpAspNetCoreMvcUiThemeSharedDemoModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Autofac.AbpAutofacModule -2021-06-01 16:49:56.701 +08:00 [INF] - Volo.Abp.Castle.AbpCastleCoreModule -2021-06-01 16:49:56.720 +08:00 [FTL] Application startup exception -Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'. - ---> System.IO.DirectoryNotFoundException: D:\Github\volo\volo5\abp\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo\ - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root, ExclusionFilters filters) - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root) - at Volo.Abp.VirtualFileSystem.VirtualFileSetListExtensions.ReplaceEmbeddedByPhysical[T](VirtualFileSetList fileSets, String physicalPath) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileSetListExtensions.cs:line 86 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule.<>c__DisplayClass0_0.b__0(AbpVirtualFileSystemOptions options) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\AbpAspNetCoreMvcUiThemeBasicDemoModule.cs:line 31 - at Microsoft.Extensions.Options.ConfigureNamedOptions`1.Configure(String name, TOptions options) - at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name) - at Microsoft.Extensions.Options.OptionsManager`1.<>c__DisplayClass5_0.b__0() - at System.Lazy`1.ViaFactory(LazyThreadSafetyMode mode) - at System.Lazy`1.ExecutionAndPublication(LazyHelper executionAndPublication, Boolean useDefaultConstructor) - at System.Lazy`1.CreateValue() - at System.Lazy`1.get_Value() - at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd(String name, Func`1 createOptions) - at Microsoft.Extensions.Options.OptionsManager`1.Get(String name) - at Microsoft.Extensions.Options.OptionsManager`1.get_Value() - at Volo.Abp.VirtualFileSystem.VirtualFileProvider..ctor(IOptions`1 options, IDynamicFileProvider dynamicFileProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileProvider.cs:line 19 - at lambda_method619(Closure , Object[] ) - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - --- End of inner exception stack trace --- - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters) - at Autofac.Core.Activators.Reflection.ReflectionActivator.b__11_0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.DisposalTrackingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Builder.RegistrationBuilder`3.<>c__DisplayClass41_0.b__0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - --- End of inner exception stack trace --- - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.RegistrationPipelineInvokeMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.<>c__DisplayClass5_0.b__0() - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid id, Func`1 creator) - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid primaryId, Nullable`1 qualifyingId, Func`1 creator) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.CircularDependencyDetectorMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.ExecuteOperation(ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.Execute(ResolveRequest request) - at Autofac.Core.Lifetime.LifetimeScope.ResolveComponent(ResolveRequest request) - at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance) - at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType) - at Autofac.Extensions.DependencyInjection.AutofacServiceProvider.GetRequiredService(Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService[T](IServiceProvider provider) - at Volo.Abp.AspNetCore.AbpAspNetCoreModule.OnApplicationInitialization(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Volo\Abp\AspNetCore\AbpAspNetCoreModule.cs:line 61 - at Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor.Initialize(ApplicationInitializationContext context, IAbpModule module) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\DefaultModuleLifecycleContributor.cs:line 7 - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 41 - --- End of inner exception stack trace --- - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 45 - at Volo.Abp.AbpApplicationBase.InitializeModules() in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 77 - at Volo.Abp.AbpApplicationWithExternalServiceProvider.Initialize(IServiceProvider serviceProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 44 - at Microsoft.AspNetCore.Builder.AbpApplicationBuilderExtensions.InitializeApplication(IApplicationBuilder app) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Microsoft\AspNetCore\Builder\AbpApplicationBuilderExtensions.cs:line 39 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 16 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.<>c__DisplayClass4_0.b__0(IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass15_0.b__1(IApplicationBuilder app) - at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.g__MiddlewareFilterBuilder|0(IApplicationBuilder builder) - at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.b__0(IApplicationBuilder app) - at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken) -2021-06-01 16:49:56.744 +08:00 [FTL] Host terminated unexpectedly! -Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'. - ---> System.IO.DirectoryNotFoundException: D:\Github\volo\volo5\abp\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo\ - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root, ExclusionFilters filters) - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root) - at Volo.Abp.VirtualFileSystem.VirtualFileSetListExtensions.ReplaceEmbeddedByPhysical[T](VirtualFileSetList fileSets, String physicalPath) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileSetListExtensions.cs:line 86 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule.<>c__DisplayClass0_0.b__0(AbpVirtualFileSystemOptions options) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\AbpAspNetCoreMvcUiThemeBasicDemoModule.cs:line 31 - at Microsoft.Extensions.Options.ConfigureNamedOptions`1.Configure(String name, TOptions options) - at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name) - at Microsoft.Extensions.Options.OptionsManager`1.<>c__DisplayClass5_0.b__0() - at System.Lazy`1.ViaFactory(LazyThreadSafetyMode mode) - at System.Lazy`1.ExecutionAndPublication(LazyHelper executionAndPublication, Boolean useDefaultConstructor) - at System.Lazy`1.CreateValue() - at System.Lazy`1.get_Value() - at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd(String name, Func`1 createOptions) - at Microsoft.Extensions.Options.OptionsManager`1.Get(String name) - at Microsoft.Extensions.Options.OptionsManager`1.get_Value() - at Volo.Abp.VirtualFileSystem.VirtualFileProvider..ctor(IOptions`1 options, IDynamicFileProvider dynamicFileProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileProvider.cs:line 19 - at lambda_method619(Closure , Object[] ) - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - --- End of inner exception stack trace --- - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters) - at Autofac.Core.Activators.Reflection.ReflectionActivator.b__11_0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.DisposalTrackingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Builder.RegistrationBuilder`3.<>c__DisplayClass41_0.b__0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - --- End of inner exception stack trace --- - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.RegistrationPipelineInvokeMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.<>c__DisplayClass5_0.b__0() - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid id, Func`1 creator) - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid primaryId, Nullable`1 qualifyingId, Func`1 creator) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.CircularDependencyDetectorMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.ExecuteOperation(ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.Execute(ResolveRequest request) - at Autofac.Core.Lifetime.LifetimeScope.ResolveComponent(ResolveRequest request) - at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance) - at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType) - at Autofac.Extensions.DependencyInjection.AutofacServiceProvider.GetRequiredService(Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService[T](IServiceProvider provider) - at Volo.Abp.AspNetCore.AbpAspNetCoreModule.OnApplicationInitialization(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Volo\Abp\AspNetCore\AbpAspNetCoreModule.cs:line 61 - at Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor.Initialize(ApplicationInitializationContext context, IAbpModule module) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\DefaultModuleLifecycleContributor.cs:line 7 - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 41 - --- End of inner exception stack trace --- - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 45 - at Volo.Abp.AbpApplicationBase.InitializeModules() in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 77 - at Volo.Abp.AbpApplicationWithExternalServiceProvider.Initialize(IServiceProvider serviceProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 44 - at Microsoft.AspNetCore.Builder.AbpApplicationBuilderExtensions.InitializeApplication(IApplicationBuilder app) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Microsoft\AspNetCore\Builder\AbpApplicationBuilderExtensions.cs:line 39 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 16 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.<>c__DisplayClass4_0.b__0(IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass15_0.b__1(IApplicationBuilder app) - at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.g__MiddlewareFilterBuilder|0(IApplicationBuilder builder) - at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.b__0(IApplicationBuilder app) - at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.Internal.Host.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.Run(IHost host) - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Program.Main(String[] args) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Program.cs:line 23 -2021-06-01 16:53:47.920 +08:00 [INF] Starting web host. -2021-06-01 16:53:48.484 +08:00 [DBG] Hosting starting -2021-06-01 16:53:48.505 +08:00 [INF] User profile is available. Using 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys' as key repository and Windows DPAPI to encrypt keys at rest. -2021-06-01 16:53:48.519 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-00882981-b76a-49b5-97d9-cba33d1b2fac.xml'. -2021-06-01 16:53:48.524 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-16f92a94-47c6-46c3-8316-64624f1d6374.xml'. -2021-06-01 16:53:48.524 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-1c739fbe-ac37-4841-96ff-95f2e8e442b6.xml'. -2021-06-01 16:53:48.524 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-57b510d8-7687-4faf-9958-44ff9cb04f85.xml'. -2021-06-01 16:53:48.524 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-5c61addd-ecc0-4e6c-a356-8f093efb281c.xml'. -2021-06-01 16:53:48.524 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-62bbda5c-8775-40d5-9b98-5e1d890c023f.xml'. -2021-06-01 16:53:48.525 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-932dc0fd-9093-43a6-8a06-44006a08abea.xml'. -2021-06-01 16:53:48.525 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-98010c23-29bf-4f0d-8110-366f7c36adb0.xml'. -2021-06-01 16:53:48.525 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-9a3631e8-55e8-43d3-9d4b-5fd16c26d658.xml'. -2021-06-01 16:53:48.525 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-d7ba675e-ffb5-4484-b396-0913c3c07df2.xml'. -2021-06-01 16:53:48.528 +08:00 [DBG] Found key {00882981-b76a-49b5-97d9-cba33d1b2fac}. -2021-06-01 16:53:48.532 +08:00 [DBG] Found key {16f92a94-47c6-46c3-8316-64624f1d6374}. -2021-06-01 16:53:48.532 +08:00 [DBG] Found key {1c739fbe-ac37-4841-96ff-95f2e8e442b6}. -2021-06-01 16:53:48.532 +08:00 [DBG] Found key {57b510d8-7687-4faf-9958-44ff9cb04f85}. -2021-06-01 16:53:48.532 +08:00 [DBG] Found key {5c61addd-ecc0-4e6c-a356-8f093efb281c}. -2021-06-01 16:53:48.533 +08:00 [DBG] Found key {62bbda5c-8775-40d5-9b98-5e1d890c023f}. -2021-06-01 16:53:48.533 +08:00 [DBG] Found key {932dc0fd-9093-43a6-8a06-44006a08abea}. -2021-06-01 16:53:48.533 +08:00 [DBG] Found key {98010c23-29bf-4f0d-8110-366f7c36adb0}. -2021-06-01 16:53:48.533 +08:00 [DBG] Found key {9a3631e8-55e8-43d3-9d4b-5fd16c26d658}. -2021-06-01 16:53:48.533 +08:00 [DBG] Found key {d7ba675e-ffb5-4484-b396-0913c3c07df2}. -2021-06-01 16:53:48.539 +08:00 [DBG] Considering key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} with expiration date 2021-08-29 01:43:16Z as default key. -2021-06-01 16:53:48.551 +08:00 [DBG] Forwarded activator type request from Microsoft.AspNetCore.DataProtection.XmlEncryption.DpapiXmlDecryptor, Microsoft.AspNetCore.DataProtection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60 to Microsoft.AspNetCore.DataProtection.XmlEncryption.DpapiXmlDecryptor, Microsoft.AspNetCore.DataProtection, Culture=neutral, PublicKeyToken=adb9793829ddae60 -2021-06-01 16:53:48.553 +08:00 [DBG] Decrypting secret element using Windows DPAPI. -2021-06-01 16:53:48.553 +08:00 [DBG] Forwarded activator type request from Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60 to Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Culture=neutral, PublicKeyToken=adb9793829ddae60 -2021-06-01 16:53:48.556 +08:00 [DBG] Opening CNG algorithm 'AES' from provider 'null' with chaining mode CBC. -2021-06-01 16:53:48.557 +08:00 [DBG] Opening CNG algorithm 'SHA256' from provider 'null' with HMAC. -2021-06-01 16:53:48.559 +08:00 [DBG] Using key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} as the default key. -2021-06-01 16:53:48.559 +08:00 [DBG] Key ring with default key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} was loaded during application startup. -2021-06-01 16:53:48.564 +08:00 [INF] Loaded ABP modules: -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.AbpAspNetCoreMvcUiBasicThemeModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.AbpAspNetCoreMvcUiThemeSharedModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.AbpAspNetCoreMvcUiBootstrapModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.AbpAspNetCoreMvcUiModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.AbpAspNetCoreModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Auditing.AbpAuditingModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Data.AbpDataModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.ObjectExtending.AbpObjectExtendingModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationAbstractionsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Validation.AbpValidationAbstractionsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Uow.AbpUnitOfWorkModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Json.AbpJsonModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Timing.AbpTimingModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Settings.AbpSettingsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Security.AbpSecurityModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.MultiTenancy.AbpMultiTenancyModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Threading.AbpThreadingModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Http.AbpHttpModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Http.AbpHttpAbstractionsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Minify.AbpMinifyModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Validation.AbpValidationModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationContractsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.UI.Navigation.AbpUiNavigationModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.UI.AbpUiModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Domain.AbpDddDomainModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.EventBus.AbpEventBusModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Guids.AbpGuidsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.ObjectMapping.AbpObjectMappingModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Specifications.AbpSpecificationsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Features.AbpFeaturesModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Packages.AbpAspNetCoreMvcUiPackagesModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingAbstractionsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Widgets.AbpAspNetCoreMvcUiWidgetsModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.AbpAspNetCoreMvcUiMultiTenancyModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.MultiTenancy.AbpAspNetCoreMultiTenancyModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.AbpAspNetCoreMvcUiThemeSharedDemoModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Autofac.AbpAutofacModule -2021-06-01 16:53:48.564 +08:00 [INF] - Volo.Abp.Castle.AbpCastleCoreModule -2021-06-01 16:53:48.585 +08:00 [FTL] Application startup exception -Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'. - ---> System.IO.DirectoryNotFoundException: D:\Github\volo\volo5\abp\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo\ - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root, ExclusionFilters filters) - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root) - at Volo.Abp.VirtualFileSystem.VirtualFileSetListExtensions.ReplaceEmbeddedByPhysical[T](VirtualFileSetList fileSets, String physicalPath) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileSetListExtensions.cs:line 86 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule.<>c__DisplayClass0_0.b__0(AbpVirtualFileSystemOptions options) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\AbpAspNetCoreMvcUiThemeBasicDemoModule.cs:line 31 - at Microsoft.Extensions.Options.ConfigureNamedOptions`1.Configure(String name, TOptions options) - at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name) - at Microsoft.Extensions.Options.OptionsManager`1.<>c__DisplayClass5_0.b__0() - at System.Lazy`1.ViaFactory(LazyThreadSafetyMode mode) - at System.Lazy`1.ExecutionAndPublication(LazyHelper executionAndPublication, Boolean useDefaultConstructor) - at System.Lazy`1.CreateValue() - at System.Lazy`1.get_Value() - at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd(String name, Func`1 createOptions) - at Microsoft.Extensions.Options.OptionsManager`1.Get(String name) - at Microsoft.Extensions.Options.OptionsManager`1.get_Value() - at Volo.Abp.VirtualFileSystem.VirtualFileProvider..ctor(IOptions`1 options, IDynamicFileProvider dynamicFileProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileProvider.cs:line 19 - at lambda_method619(Closure , Object[] ) - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - --- End of inner exception stack trace --- - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters) - at Autofac.Core.Activators.Reflection.ReflectionActivator.b__11_0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.DisposalTrackingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Builder.RegistrationBuilder`3.<>c__DisplayClass41_0.b__0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - --- End of inner exception stack trace --- - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.RegistrationPipelineInvokeMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.<>c__DisplayClass5_0.b__0() - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid id, Func`1 creator) - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid primaryId, Nullable`1 qualifyingId, Func`1 creator) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.CircularDependencyDetectorMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.ExecuteOperation(ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.Execute(ResolveRequest request) - at Autofac.Core.Lifetime.LifetimeScope.ResolveComponent(ResolveRequest request) - at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance) - at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType) - at Autofac.Extensions.DependencyInjection.AutofacServiceProvider.GetRequiredService(Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService[T](IServiceProvider provider) - at Volo.Abp.AspNetCore.AbpAspNetCoreModule.OnApplicationInitialization(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Volo\Abp\AspNetCore\AbpAspNetCoreModule.cs:line 61 - at Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor.Initialize(ApplicationInitializationContext context, IAbpModule module) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\DefaultModuleLifecycleContributor.cs:line 7 - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 41 - --- End of inner exception stack trace --- - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 45 - at Volo.Abp.AbpApplicationBase.InitializeModules() in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 77 - at Volo.Abp.AbpApplicationWithExternalServiceProvider.Initialize(IServiceProvider serviceProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 44 - at Microsoft.AspNetCore.Builder.AbpApplicationBuilderExtensions.InitializeApplication(IApplicationBuilder app) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Microsoft\AspNetCore\Builder\AbpApplicationBuilderExtensions.cs:line 39 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 16 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.<>c__DisplayClass4_0.b__0(IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass15_0.b__1(IApplicationBuilder app) - at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.g__MiddlewareFilterBuilder|0(IApplicationBuilder builder) - at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.b__0(IApplicationBuilder app) - at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.Internal.Host.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.Run(IHost host) - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Program.Main(String[] args) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Program.cs:line 23 -2021-06-01 16:53:48.590 +08:00 [FTL] Host terminated unexpectedly! -Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'. - ---> System.IO.DirectoryNotFoundException: D:\Github\volo\volo5\abp\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo\ - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root, ExclusionFilters filters) - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root) - at Volo.Abp.VirtualFileSystem.VirtualFileSetListExtensions.ReplaceEmbeddedByPhysical[T](VirtualFileSetList fileSets, String physicalPath) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileSetListExtensions.cs:line 86 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule.<>c__DisplayClass0_0.b__0(AbpVirtualFileSystemOptions options) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\AbpAspNetCoreMvcUiThemeBasicDemoModule.cs:line 31 - at Microsoft.Extensions.Options.ConfigureNamedOptions`1.Configure(String name, TOptions options) - at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name) - at Microsoft.Extensions.Options.OptionsManager`1.<>c__DisplayClass5_0.b__0() - at System.Lazy`1.ViaFactory(LazyThreadSafetyMode mode) - at System.Lazy`1.ExecutionAndPublication(LazyHelper executionAndPublication, Boolean useDefaultConstructor) - at System.Lazy`1.CreateValue() - at System.Lazy`1.get_Value() - at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd(String name, Func`1 createOptions) - at Microsoft.Extensions.Options.OptionsManager`1.Get(String name) - at Microsoft.Extensions.Options.OptionsManager`1.get_Value() - at Volo.Abp.VirtualFileSystem.VirtualFileProvider..ctor(IOptions`1 options, IDynamicFileProvider dynamicFileProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileProvider.cs:line 19 - at lambda_method619(Closure , Object[] ) - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - --- End of inner exception stack trace --- - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters) - at Autofac.Core.Activators.Reflection.ReflectionActivator.b__11_0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.DisposalTrackingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Builder.RegistrationBuilder`3.<>c__DisplayClass41_0.b__0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - --- End of inner exception stack trace --- - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.RegistrationPipelineInvokeMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.<>c__DisplayClass5_0.b__0() - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid id, Func`1 creator) - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid primaryId, Nullable`1 qualifyingId, Func`1 creator) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.CircularDependencyDetectorMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.ExecuteOperation(ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.Execute(ResolveRequest request) - at Autofac.Core.Lifetime.LifetimeScope.ResolveComponent(ResolveRequest request) - at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance) - at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType) - at Autofac.Extensions.DependencyInjection.AutofacServiceProvider.GetRequiredService(Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService[T](IServiceProvider provider) - at Volo.Abp.AspNetCore.AbpAspNetCoreModule.OnApplicationInitialization(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Volo\Abp\AspNetCore\AbpAspNetCoreModule.cs:line 61 - at Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor.Initialize(ApplicationInitializationContext context, IAbpModule module) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\DefaultModuleLifecycleContributor.cs:line 7 - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 41 - --- End of inner exception stack trace --- - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 45 - at Volo.Abp.AbpApplicationBase.InitializeModules() in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 77 - at Volo.Abp.AbpApplicationWithExternalServiceProvider.Initialize(IServiceProvider serviceProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 44 - at Microsoft.AspNetCore.Builder.AbpApplicationBuilderExtensions.InitializeApplication(IApplicationBuilder app) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Microsoft\AspNetCore\Builder\AbpApplicationBuilderExtensions.cs:line 39 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 16 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.<>c__DisplayClass4_0.b__0(IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass15_0.b__1(IApplicationBuilder app) - at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.g__MiddlewareFilterBuilder|0(IApplicationBuilder builder) - at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.b__0(IApplicationBuilder app) - at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.Internal.Host.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.Run(IHost host) - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Program.Main(String[] args) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Program.cs:line 23 -2021-06-01 16:58:25.730 +08:00 [INF] Starting web host. -2021-06-01 16:58:26.416 +08:00 [DBG] Hosting starting -2021-06-01 16:58:26.441 +08:00 [INF] User profile is available. Using 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys' as key repository and Windows DPAPI to encrypt keys at rest. -2021-06-01 16:58:26.457 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-00882981-b76a-49b5-97d9-cba33d1b2fac.xml'. -2021-06-01 16:58:26.462 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-16f92a94-47c6-46c3-8316-64624f1d6374.xml'. -2021-06-01 16:58:26.462 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-1c739fbe-ac37-4841-96ff-95f2e8e442b6.xml'. -2021-06-01 16:58:26.463 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-57b510d8-7687-4faf-9958-44ff9cb04f85.xml'. -2021-06-01 16:58:26.463 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-5c61addd-ecc0-4e6c-a356-8f093efb281c.xml'. -2021-06-01 16:58:26.463 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-62bbda5c-8775-40d5-9b98-5e1d890c023f.xml'. -2021-06-01 16:58:26.463 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-932dc0fd-9093-43a6-8a06-44006a08abea.xml'. -2021-06-01 16:58:26.463 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-98010c23-29bf-4f0d-8110-366f7c36adb0.xml'. -2021-06-01 16:58:26.464 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-9a3631e8-55e8-43d3-9d4b-5fd16c26d658.xml'. -2021-06-01 16:58:26.464 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-d7ba675e-ffb5-4484-b396-0913c3c07df2.xml'. -2021-06-01 16:58:26.470 +08:00 [DBG] Found key {00882981-b76a-49b5-97d9-cba33d1b2fac}. -2021-06-01 16:58:26.474 +08:00 [DBG] Found key {16f92a94-47c6-46c3-8316-64624f1d6374}. -2021-06-01 16:58:26.474 +08:00 [DBG] Found key {1c739fbe-ac37-4841-96ff-95f2e8e442b6}. -2021-06-01 16:58:26.474 +08:00 [DBG] Found key {57b510d8-7687-4faf-9958-44ff9cb04f85}. -2021-06-01 16:58:26.475 +08:00 [DBG] Found key {5c61addd-ecc0-4e6c-a356-8f093efb281c}. -2021-06-01 16:58:26.475 +08:00 [DBG] Found key {62bbda5c-8775-40d5-9b98-5e1d890c023f}. -2021-06-01 16:58:26.475 +08:00 [DBG] Found key {932dc0fd-9093-43a6-8a06-44006a08abea}. -2021-06-01 16:58:26.475 +08:00 [DBG] Found key {98010c23-29bf-4f0d-8110-366f7c36adb0}. -2021-06-01 16:58:26.475 +08:00 [DBG] Found key {9a3631e8-55e8-43d3-9d4b-5fd16c26d658}. -2021-06-01 16:58:26.475 +08:00 [DBG] Found key {d7ba675e-ffb5-4484-b396-0913c3c07df2}. -2021-06-01 16:58:26.485 +08:00 [DBG] Considering key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} with expiration date 2021-08-29 01:43:16Z as default key. -2021-06-01 16:58:26.502 +08:00 [DBG] Forwarded activator type request from Microsoft.AspNetCore.DataProtection.XmlEncryption.DpapiXmlDecryptor, Microsoft.AspNetCore.DataProtection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60 to Microsoft.AspNetCore.DataProtection.XmlEncryption.DpapiXmlDecryptor, Microsoft.AspNetCore.DataProtection, Culture=neutral, PublicKeyToken=adb9793829ddae60 -2021-06-01 16:58:26.504 +08:00 [DBG] Decrypting secret element using Windows DPAPI. -2021-06-01 16:58:26.505 +08:00 [DBG] Forwarded activator type request from Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60 to Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Culture=neutral, PublicKeyToken=adb9793829ddae60 -2021-06-01 16:58:26.507 +08:00 [DBG] Opening CNG algorithm 'AES' from provider 'null' with chaining mode CBC. -2021-06-01 16:58:26.509 +08:00 [DBG] Opening CNG algorithm 'SHA256' from provider 'null' with HMAC. -2021-06-01 16:58:26.511 +08:00 [DBG] Using key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} as the default key. -2021-06-01 16:58:26.512 +08:00 [DBG] Key ring with default key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} was loaded during application startup. -2021-06-01 16:58:26.519 +08:00 [INF] Loaded ABP modules: -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.AbpAspNetCoreMvcUiBasicThemeModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.AbpAspNetCoreMvcUiThemeSharedModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.AbpAspNetCoreMvcUiBootstrapModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.AbpAspNetCoreMvcUiModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.AbpAspNetCoreModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Auditing.AbpAuditingModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Data.AbpDataModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.ObjectExtending.AbpObjectExtendingModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationAbstractionsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Validation.AbpValidationAbstractionsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Uow.AbpUnitOfWorkModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Json.AbpJsonModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Timing.AbpTimingModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Settings.AbpSettingsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Security.AbpSecurityModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.MultiTenancy.AbpMultiTenancyModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Threading.AbpThreadingModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Http.AbpHttpModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Http.AbpHttpAbstractionsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Minify.AbpMinifyModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Validation.AbpValidationModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationContractsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.UI.Navigation.AbpUiNavigationModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.UI.AbpUiModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Domain.AbpDddDomainModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.EventBus.AbpEventBusModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Guids.AbpGuidsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.ObjectMapping.AbpObjectMappingModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Specifications.AbpSpecificationsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Features.AbpFeaturesModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Packages.AbpAspNetCoreMvcUiPackagesModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingAbstractionsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Widgets.AbpAspNetCoreMvcUiWidgetsModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.AbpAspNetCoreMvcUiMultiTenancyModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.MultiTenancy.AbpAspNetCoreMultiTenancyModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.AbpAspNetCoreMvcUiThemeSharedDemoModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Autofac.AbpAutofacModule -2021-06-01 16:58:26.519 +08:00 [INF] - Volo.Abp.Castle.AbpCastleCoreModule -2021-06-01 16:58:26.552 +08:00 [FTL] Application startup exception -Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'. - ---> System.IO.DirectoryNotFoundException: D:\Github\volo\volo5\abp\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo\ - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root, ExclusionFilters filters) - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root) - at Volo.Abp.VirtualFileSystem.VirtualFileSetListExtensions.ReplaceEmbeddedByPhysical[T](VirtualFileSetList fileSets, String physicalPath) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileSetListExtensions.cs:line 86 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule.<>c__DisplayClass0_0.b__0(AbpVirtualFileSystemOptions options) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\AbpAspNetCoreMvcUiThemeBasicDemoModule.cs:line 31 - at Microsoft.Extensions.Options.ConfigureNamedOptions`1.Configure(String name, TOptions options) - at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name) - at Microsoft.Extensions.Options.OptionsManager`1.<>c__DisplayClass5_0.b__0() - at System.Lazy`1.ViaFactory(LazyThreadSafetyMode mode) - at System.Lazy`1.ExecutionAndPublication(LazyHelper executionAndPublication, Boolean useDefaultConstructor) - at System.Lazy`1.CreateValue() - at System.Lazy`1.get_Value() - at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd(String name, Func`1 createOptions) - at Microsoft.Extensions.Options.OptionsManager`1.Get(String name) - at Microsoft.Extensions.Options.OptionsManager`1.get_Value() - at Volo.Abp.VirtualFileSystem.VirtualFileProvider..ctor(IOptions`1 options, IDynamicFileProvider dynamicFileProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileProvider.cs:line 19 - at lambda_method619(Closure , Object[] ) - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - --- End of inner exception stack trace --- - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters) - at Autofac.Core.Activators.Reflection.ReflectionActivator.b__11_0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.DisposalTrackingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Builder.RegistrationBuilder`3.<>c__DisplayClass41_0.b__0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - --- End of inner exception stack trace --- - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.RegistrationPipelineInvokeMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.<>c__DisplayClass5_0.b__0() - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid id, Func`1 creator) - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid primaryId, Nullable`1 qualifyingId, Func`1 creator) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.CircularDependencyDetectorMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.ExecuteOperation(ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.Execute(ResolveRequest request) - at Autofac.Core.Lifetime.LifetimeScope.ResolveComponent(ResolveRequest request) - at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance) - at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType) - at Autofac.Extensions.DependencyInjection.AutofacServiceProvider.GetRequiredService(Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService[T](IServiceProvider provider) - at Volo.Abp.AspNetCore.AbpAspNetCoreModule.OnApplicationInitialization(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Volo\Abp\AspNetCore\AbpAspNetCoreModule.cs:line 61 - at Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor.Initialize(ApplicationInitializationContext context, IAbpModule module) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\DefaultModuleLifecycleContributor.cs:line 7 - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 41 - --- End of inner exception stack trace --- - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 45 - at Volo.Abp.AbpApplicationBase.InitializeModules() in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 77 - at Volo.Abp.AbpApplicationWithExternalServiceProvider.Initialize(IServiceProvider serviceProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 44 - at Microsoft.AspNetCore.Builder.AbpApplicationBuilderExtensions.InitializeApplication(IApplicationBuilder app) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Microsoft\AspNetCore\Builder\AbpApplicationBuilderExtensions.cs:line 39 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 16 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.<>c__DisplayClass4_0.b__0(IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass15_0.b__1(IApplicationBuilder app) - at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.g__MiddlewareFilterBuilder|0(IApplicationBuilder builder) - at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.b__0(IApplicationBuilder app) - at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.Internal.Host.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.Run(IHost host) - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Program.Main(String[] args) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Program.cs:line 23 -2021-06-01 16:58:26.561 +08:00 [FTL] Host terminated unexpectedly! -Volo.Abp.AbpInitializationException: An error occurred during the initialize Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor phase of the module Volo.Abp.AspNetCore.AbpAspNetCoreModule, Volo.Abp.AspNetCore, Version=4.4.0.0, Culture=neutral, PublicKeyToken=null: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider.. See the inner exception for details. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while activating λ:Volo.Abp.AspNetCore.VirtualFileSystem.IWebContentFileProvider -> Volo.Abp.AspNetCore.VirtualFileSystem.WebContentFileProvider -> λ:Volo.Abp.VirtualFileSystem.IVirtualFileProvider -> Volo.Abp.VirtualFileSystem.VirtualFileProvider. - ---> Autofac.Core.DependencyResolutionException: An exception was thrown while invoking the constructor 'Void .ctor(Microsoft.Extensions.Options.IOptions`1[Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemOptions], Volo.Abp.VirtualFileSystem.IDynamicFileProvider)' on type 'VirtualFileProvider'. - ---> System.IO.DirectoryNotFoundException: D:\Github\volo\volo5\abp\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo\ - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root, ExclusionFilters filters) - at Microsoft.Extensions.FileProviders.PhysicalFileProvider..ctor(String root) - at Volo.Abp.VirtualFileSystem.VirtualFileSetListExtensions.ReplaceEmbeddedByPhysical[T](VirtualFileSetList fileSets, String physicalPath) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileSetListExtensions.cs:line 86 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule.<>c__DisplayClass0_0.b__0(AbpVirtualFileSystemOptions options) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\AbpAspNetCoreMvcUiThemeBasicDemoModule.cs:line 31 - at Microsoft.Extensions.Options.ConfigureNamedOptions`1.Configure(String name, TOptions options) - at Microsoft.Extensions.Options.OptionsFactory`1.Create(String name) - at Microsoft.Extensions.Options.OptionsManager`1.<>c__DisplayClass5_0.b__0() - at System.Lazy`1.ViaFactory(LazyThreadSafetyMode mode) - at System.Lazy`1.ExecutionAndPublication(LazyHelper executionAndPublication, Boolean useDefaultConstructor) - at System.Lazy`1.CreateValue() - at System.Lazy`1.get_Value() - at Microsoft.Extensions.Options.OptionsCache`1.GetOrAdd(String name, Func`1 createOptions) - at Microsoft.Extensions.Options.OptionsManager`1.Get(String name) - at Microsoft.Extensions.Options.OptionsManager`1.get_Value() - at Volo.Abp.VirtualFileSystem.VirtualFileProvider..ctor(IOptions`1 options, IDynamicFileProvider dynamicFileProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.VirtualFileSystem\Volo\Abp\VirtualFileSystem\VirtualFileProvider.cs:line 19 - at lambda_method619(Closure , Object[] ) - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - --- End of inner exception stack trace --- - at Autofac.Core.Activators.Reflection.BoundConstructor.Instantiate() - at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters) - at Autofac.Core.Activators.Reflection.ReflectionActivator.b__11_0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.DisposalTrackingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Builder.RegistrationBuilder`3.<>c__DisplayClass41_0.b__0(ResolveRequestContext ctxt, Action`1 next) - at Autofac.Core.Resolving.Middleware.DelegateMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - --- End of inner exception stack trace --- - at Autofac.Core.Resolving.Middleware.ActivatorErrorHandlingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.RegistrationPipelineInvokeMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.<>c__DisplayClass5_0.b__0() - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid id, Func`1 creator) - at Autofac.Core.Lifetime.LifetimeScope.CreateSharedInstance(Guid primaryId, Nullable`1 qualifyingId, Func`1 creator) - at Autofac.Core.Resolving.Middleware.SharingMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.Middleware.CircularDependencyDetectorMiddleware.Execute(ResolveRequestContext context, Action`1 next) - at Autofac.Core.Resolving.Pipeline.ResolvePipelineBuilder.<>c__DisplayClass14_0.b__1(ResolveRequestContext ctxt) - at Autofac.Core.Pipeline.ResolvePipeline.Invoke(ResolveRequestContext ctxt) - at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.ExecuteOperation(ResolveRequest request) - at Autofac.Core.Resolving.ResolveOperation.Execute(ResolveRequest request) - at Autofac.Core.Lifetime.LifetimeScope.ResolveComponent(ResolveRequest request) - at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance) - at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType, IEnumerable`1 parameters) - at Autofac.ResolutionExtensions.Resolve(IComponentContext context, Type serviceType) - at Autofac.Extensions.DependencyInjection.AutofacServiceProvider.GetRequiredService(Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(IServiceProvider provider, Type serviceType) - at Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService[T](IServiceProvider provider) - at Volo.Abp.AspNetCore.AbpAspNetCoreModule.OnApplicationInitialization(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Volo\Abp\AspNetCore\AbpAspNetCoreModule.cs:line 61 - at Volo.Abp.Modularity.OnApplicationInitializationModuleLifecycleContributor.Initialize(ApplicationInitializationContext context, IAbpModule module) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\DefaultModuleLifecycleContributor.cs:line 7 - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 41 - --- End of inner exception stack trace --- - at Volo.Abp.Modularity.ModuleManager.InitializeModules(ApplicationInitializationContext context) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\Modularity\ModuleManager.cs:line 45 - at Volo.Abp.AbpApplicationBase.InitializeModules() in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationBase.cs:line 77 - at Volo.Abp.AbpApplicationWithExternalServiceProvider.Initialize(IServiceProvider serviceProvider) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.Core\Volo\Abp\AbpApplicationWithExternalServiceProvider.cs:line 44 - at Microsoft.AspNetCore.Builder.AbpApplicationBuilderExtensions.InitializeApplication(IApplicationBuilder app) in D:\Github\volo\volo5\abp\framework\src\Volo.Abp.AspNetCore\Microsoft\AspNetCore\Builder\AbpApplicationBuilderExtensions.cs:line 39 - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Startup.Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Startup.cs:line 16 - at System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) - at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.Invoke(Object instance, IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.ConfigureBuilder.<>c__DisplayClass4_0.b__0(IApplicationBuilder builder) - at Microsoft.AspNetCore.Hosting.GenericWebHostBuilder.<>c__DisplayClass15_0.b__1(IApplicationBuilder app) - at Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterBuilderStartupFilter.<>c__DisplayClass0_0.g__MiddlewareFilterBuilder|0(IApplicationBuilder builder) - at Microsoft.AspNetCore.HostFilteringStartupFilter.<>c__DisplayClass0_0.b__0(IApplicationBuilder app) - at Microsoft.AspNetCore.Hosting.GenericWebHostService.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.Internal.Host.StartAsync(CancellationToken cancellationToken) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.RunAsync(IHost host, CancellationToken token) - at Microsoft.Extensions.Hosting.HostingAbstractionsHostExtensions.Run(IHost host) - at Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Program.Main(String[] args) in D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\Program.cs:line 23 -2021-06-01 16:59:42.514 +08:00 [INF] Starting web host. -2021-06-01 16:59:43.181 +08:00 [DBG] Hosting starting -2021-06-01 16:59:43.206 +08:00 [INF] User profile is available. Using 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys' as key repository and Windows DPAPI to encrypt keys at rest. -2021-06-01 16:59:43.223 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-00882981-b76a-49b5-97d9-cba33d1b2fac.xml'. -2021-06-01 16:59:43.228 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-16f92a94-47c6-46c3-8316-64624f1d6374.xml'. -2021-06-01 16:59:43.229 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-1c739fbe-ac37-4841-96ff-95f2e8e442b6.xml'. -2021-06-01 16:59:43.229 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-57b510d8-7687-4faf-9958-44ff9cb04f85.xml'. -2021-06-01 16:59:43.229 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-5c61addd-ecc0-4e6c-a356-8f093efb281c.xml'. -2021-06-01 16:59:43.229 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-62bbda5c-8775-40d5-9b98-5e1d890c023f.xml'. -2021-06-01 16:59:43.229 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-932dc0fd-9093-43a6-8a06-44006a08abea.xml'. -2021-06-01 16:59:43.229 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-98010c23-29bf-4f0d-8110-366f7c36adb0.xml'. -2021-06-01 16:59:43.229 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-9a3631e8-55e8-43d3-9d4b-5fd16c26d658.xml'. -2021-06-01 16:59:43.230 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-d7ba675e-ffb5-4484-b396-0913c3c07df2.xml'. -2021-06-01 16:59:43.234 +08:00 [DBG] Found key {00882981-b76a-49b5-97d9-cba33d1b2fac}. -2021-06-01 16:59:43.238 +08:00 [DBG] Found key {16f92a94-47c6-46c3-8316-64624f1d6374}. -2021-06-01 16:59:43.238 +08:00 [DBG] Found key {1c739fbe-ac37-4841-96ff-95f2e8e442b6}. -2021-06-01 16:59:43.238 +08:00 [DBG] Found key {57b510d8-7687-4faf-9958-44ff9cb04f85}. -2021-06-01 16:59:43.239 +08:00 [DBG] Found key {5c61addd-ecc0-4e6c-a356-8f093efb281c}. -2021-06-01 16:59:43.239 +08:00 [DBG] Found key {62bbda5c-8775-40d5-9b98-5e1d890c023f}. -2021-06-01 16:59:43.239 +08:00 [DBG] Found key {932dc0fd-9093-43a6-8a06-44006a08abea}. -2021-06-01 16:59:43.239 +08:00 [DBG] Found key {98010c23-29bf-4f0d-8110-366f7c36adb0}. -2021-06-01 16:59:43.239 +08:00 [DBG] Found key {9a3631e8-55e8-43d3-9d4b-5fd16c26d658}. -2021-06-01 16:59:43.239 +08:00 [DBG] Found key {d7ba675e-ffb5-4484-b396-0913c3c07df2}. -2021-06-01 16:59:43.248 +08:00 [DBG] Considering key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} with expiration date 2021-08-29 01:43:16Z as default key. -2021-06-01 16:59:43.261 +08:00 [DBG] Forwarded activator type request from Microsoft.AspNetCore.DataProtection.XmlEncryption.DpapiXmlDecryptor, Microsoft.AspNetCore.DataProtection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60 to Microsoft.AspNetCore.DataProtection.XmlEncryption.DpapiXmlDecryptor, Microsoft.AspNetCore.DataProtection, Culture=neutral, PublicKeyToken=adb9793829ddae60 -2021-06-01 16:59:43.263 +08:00 [DBG] Decrypting secret element using Windows DPAPI. -2021-06-01 16:59:43.264 +08:00 [DBG] Forwarded activator type request from Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60 to Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Culture=neutral, PublicKeyToken=adb9793829ddae60 -2021-06-01 16:59:43.267 +08:00 [DBG] Opening CNG algorithm 'AES' from provider 'null' with chaining mode CBC. -2021-06-01 16:59:43.268 +08:00 [DBG] Opening CNG algorithm 'SHA256' from provider 'null' with HMAC. -2021-06-01 16:59:43.270 +08:00 [DBG] Using key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} as the default key. -2021-06-01 16:59:43.271 +08:00 [DBG] Key ring with default key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} was loaded during application startup. -2021-06-01 16:59:43.277 +08:00 [INF] Loaded ABP modules: -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.AbpAspNetCoreMvcUiBasicThemeModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.AbpAspNetCoreMvcUiThemeSharedModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.AbpAspNetCoreMvcUiBootstrapModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.AbpAspNetCoreMvcUiModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.AspNetCore.AbpAspNetCoreModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Auditing.AbpAuditingModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Data.AbpDataModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.ObjectExtending.AbpObjectExtendingModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationAbstractionsModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Validation.AbpValidationAbstractionsModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Uow.AbpUnitOfWorkModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Json.AbpJsonModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Timing.AbpTimingModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Settings.AbpSettingsModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Security.AbpSecurityModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.MultiTenancy.AbpMultiTenancyModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Threading.AbpThreadingModule -2021-06-01 16:59:43.277 +08:00 [INF] - Volo.Abp.Http.AbpHttpModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Http.AbpHttpAbstractionsModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Minify.AbpMinifyModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Validation.AbpValidationModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationContractsModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.UI.Navigation.AbpUiNavigationModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.UI.AbpUiModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Domain.AbpDddDomainModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.EventBus.AbpEventBusModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Guids.AbpGuidsModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.ObjectMapping.AbpObjectMappingModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Specifications.AbpSpecificationsModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Features.AbpFeaturesModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Packages.AbpAspNetCoreMvcUiPackagesModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingAbstractionsModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Widgets.AbpAspNetCoreMvcUiWidgetsModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.AbpAspNetCoreMvcUiMultiTenancyModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.AspNetCore.MultiTenancy.AbpAspNetCoreMultiTenancyModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.AbpAspNetCoreMvcUiThemeSharedDemoModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Autofac.AbpAutofacModule -2021-06-01 16:59:43.278 +08:00 [INF] - Volo.Abp.Castle.AbpCastleCoreModule -2021-06-01 16:59:43.797 +08:00 [INF] Initialized all ABP modules. -2021-06-01 16:59:43.828 +08:00 [INF] Now listening on: http://localhost:5000 -2021-06-01 16:59:43.828 +08:00 [DBG] Loaded hosting startup assembly Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo -2021-06-01 16:59:43.828 +08:00 [INF] Application started. Press Ctrl+C to shut down. -2021-06-01 16:59:43.828 +08:00 [INF] Hosting environment: Development -2021-06-01 16:59:43.828 +08:00 [INF] Content root path: D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo -2021-06-01 16:59:43.828 +08:00 [DBG] Hosting started -2021-06-01 16:59:43.900 +08:00 [DBG] Connection id "0HM94RECLNFIB" received FIN. -2021-06-01 16:59:43.909 +08:00 [DBG] Connection id "0HM94RECLNFIB" accepted. -2021-06-01 16:59:43.909 +08:00 [DBG] Connection id "0HM94RECLNFIB" started. -2021-06-01 16:59:43.914 +08:00 [DBG] Connection id "0HM94RECLNFIB" sending FIN because: "The client closed the connection." -2021-06-01 16:59:43.916 +08:00 [DBG] Connection id "0HM94RECLNFIB" disconnecting. -2021-06-01 16:59:43.918 +08:00 [DBG] Connection id "0HM94RECLNFIB" stopped. -2021-06-01 16:59:44.116 +08:00 [DBG] Connection id "0HM94RECLNFIC" accepted. -2021-06-01 16:59:44.116 +08:00 [DBG] Connection id "0HM94RECLNFIC" started. -2021-06-01 16:59:44.116 +08:00 [DBG] Connection id "0HM94RECLNFID" accepted. -2021-06-01 16:59:44.116 +08:00 [DBG] Connection id "0HM94RECLNFID" started. -2021-06-01 16:59:44.154 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/ - - -2021-06-01 16:59:44.155 +08:00 [DBG] Wildcard detected, all requests with hosts will be allowed. -2021-06-01 16:59:44.156 +08:00 [DBG] The request path / does not match a supported file type -2021-06-01 16:59:44.189 +08:00 [DBG] 1 candidate(s) found for the request path '/' -2021-06-01 16:59:44.192 +08:00 [DBG] Endpoint 'Page: /Index' with route pattern '' is valid for the request path '/' -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Alerts/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Badges/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Borders/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Breadcrumbs/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/ButtonGroups/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Buttons/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Cards/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Carousel/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Collapse/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Dropdowns/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/DynamicForms/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/FormElements/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Grids/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/ListGroups/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Modals/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Navbars/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Navs/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Paginator/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Popovers/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/ProgressBars/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Tables/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Tabs/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Tooltips/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Index.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/_ViewImports.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/_ViewImports.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Brand/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/MainNavbar/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Menu/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Menu/_MenuItem.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/PageAlerts/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Toolbar/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Layouts/Account.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Layouts/Application.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Layouts/Empty.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/_ViewImports.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Views/_ViewImports.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Abp/MultiTenancy/_ViewImports.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Areas/_ViewStart.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Account/_ViewStart.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpApplicationPath/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpPageSearchBox/_ViewImports.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpPageToolbar/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpPageToolbar/_ViewImports.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/_ViewStart.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Views/Error/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Views/_ViewStart.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetScripts/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetStyles/Default.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/_ViewImports.cshtml'. -2021-06-01 16:59:44.196 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/Default.cshtml'. -2021-06-01 16:59:44.210 +08:00 [DBG] Request matched endpoint '/Index' -2021-06-01 16:59:44.210 +08:00 [INF] Executing endpoint '/Index' -2021-06-01 16:59:44.221 +08:00 [DBG] Registered model binder providers, in the following order: ["Volo.Abp.AspNetCore.Mvc.ModelBinding.AbpDateTimeModelBinderProvider","Volo.Abp.AspNetCore.Mvc.ModelBinding.AbpExtraPropertiesDictionaryModelBinderProvider","Volo.Abp.AspNetCore.Mvc.ContentFormatters.AbpRemoteStreamContentModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.BinderTypeModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ServicesModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.BodyModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.HeaderModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FloatingPointTypeModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.EnumTypeModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.DateTimeModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.SimpleTypeModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.CancellationTokenModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ByteArrayModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FormFileModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FormCollectionModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.KeyValuePairModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.DictionaryModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ArrayModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.CollectionModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ComplexObjectModelBinderProvider"] -2021-06-01 16:59:44.260 +08:00 [INF] Route matched with {page = "/Index", area = "", action = "", controller = ""}. Executing page /Index -2021-06-01 16:59:44.261 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter","Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.AutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 16:59:44.261 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:44.261 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 16:59:44.261 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 16:59:44.261 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:44.262 +08:00 [INF] Skipping the execution of current filter as its not the most effective filter implementing the policy Microsoft.AspNetCore.Mvc.ViewFeatures.IAntiforgeryPolicy -2021-06-01 16:59:44.264 +08:00 [DBG] Executing page model factory for page AspNetCore.Pages_Index (Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Views) -2021-06-01 16:59:44.264 +08:00 [DBG] Executed page model factory for page AspNetCore.Pages_Index (Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Views) -2021-06-01 16:59:44.307 +08:00 [INF] Executing handler method Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.IndexModel.OnGet - ModelState is "Valid" -2021-06-01 16:59:44.307 +08:00 [INF] Executed handler method OnGet, returned result . -2021-06-01 16:59:44.310 +08:00 [INF] Executing an implicit handler method - ModelState is "Valid" -2021-06-01 16:59:44.310 +08:00 [INF] Executed an implicit handler method, returned result Microsoft.AspNetCore.Mvc.RazorPages.PageResult. -2021-06-01 16:59:44.438 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Header.First","Application"]). -2021-06-01 16:59:44.443 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.7006ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.491 +08:00 [DBG] Added bundle 'Basic.Global' to the page in 13.07 ms. -2021-06-01 16:59:44.492 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles.WidgetStylesViewComponent with arguments ([]). -2021-06-01 16:59:44.493 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles.WidgetStylesViewComponent in 1.0895ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.498 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Header.Last","Application"]). -2021-06-01 16:59:44.498 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.008ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.501 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Body.First","Application"]). -2021-06-01 16:59:44.501 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0066ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.502 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNavbar.MainNavbarViewComponent with arguments ([]). -2021-06-01 16:59:44.502 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNavbar.MainNavbarViewComponent in 0.1375ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.506 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand.MainNavbarBrandViewComponent with arguments ([]). -2021-06-01 16:59:44.506 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand.MainNavbarBrandViewComponent in 0.1416ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.524 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu.MainNavbarMenuViewComponent with arguments ([]). -2021-06-01 16:59:44.570 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu.MainNavbarMenuViewComponent in 45.6548ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.588 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.MainNavbarToolbarViewComponent with arguments ([]). -2021-06-01 16:59:44.596 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.MainNavbarToolbarViewComponent in 7.6763ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.603 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts.PageAlertsViewComponent with arguments ([""]). -2021-06-01 16:59:44.604 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts.PageAlertsViewComponent in 0.4479ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.608 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["PageContent.First","Application"]). -2021-06-01 16:59:44.608 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0102ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.608 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["PageContent.Last","Application"]). -2021-06-01 16:59:44.608 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0056ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.618 +08:00 [DBG] Added bundle 'Basic.Global' to the page in 7.72 ms. -2021-06-01 16:59:44.620 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts.WidgetScriptsViewComponent with arguments ([]). -2021-06-01 16:59:44.620 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts.WidgetScriptsViewComponent in 0.3236ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.624 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Body.Last","Application"]). -2021-06-01 16:59:44.624 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0086ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:44.634 +08:00 [INF] Executed page /Index in 368.9355ms -2021-06-01 16:59:44.634 +08:00 [INF] Executed endpoint '/Index' -2021-06-01 16:59:44.634 +08:00 [DBG] Connection id "0HM94RECLNFIC" completed keep alive response. -2021-06-01 16:59:44.640 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/ - - - 200 - text/html;+charset=utf-8 486.4731ms -2021-06-01 16:59:44.682 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/core/abp.css?_v=637543906070000000 - - -2021-06-01 16:59:44.686 +08:00 [DBG] Connection id "0HM94RECLNFIE" accepted. -2021-06-01 16:59:44.686 +08:00 [DBG] Connection id "0HM94RECLNFIE" started. -2021-06-01 16:59:44.687 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/bootstrap/css/bootstrap.css?_v=637543906070000000 - - -2021-06-01 16:59:44.687 +08:00 [DBG] Connection id "0HM94RECLNFIF" accepted. -2021-06-01 16:59:44.687 +08:00 [DBG] Connection id "0HM94RECLNFIF" started. -2021-06-01 16:59:44.687 +08:00 [DBG] Connection id "0HM94RECLNFIG" accepted. -2021-06-01 16:59:44.687 +08:00 [DBG] Connection id "0HM94RECLNFIG" started. -2021-06-01 16:59:44.687 +08:00 [DBG] Connection id "0HM94RECLNFIH" accepted. -2021-06-01 16:59:44.688 +08:00 [DBG] Connection id "0HM94RECLNFIH" started. -2021-06-01 16:59:44.688 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/@fortawesome/fontawesome-free/css/all.css?_v=637543906070000000 - - -2021-06-01 16:59:44.689 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/toastr/toastr.min.css?_v=637543906070000000 - - -2021-06-01 16:59:44.689 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/select2/css/select2.min.css?_v=637543906070000000 - - -2021-06-01 16:59:44.689 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/@fortawesome/fontawesome-free/css/v4-shims.css?_v=637543906070000000 - - -2021-06-01 16:59:44.690 +08:00 [INF] Sending file. Request path: '/libs/select2/css/select2.min.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\select2\css\select2.min.css' -2021-06-01 16:59:44.690 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:44.690 +08:00 [INF] Sending file. Request path: '/libs/abp/core/abp.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\abp\core\abp.css' -2021-06-01 16:59:44.690 +08:00 [INF] Sending file. Request path: '/libs/toastr/toastr.min.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\toastr\toastr.min.css' -2021-06-01 16:59:44.690 +08:00 [DBG] Connection id "0HM94RECLNFIC" completed keep alive response. -2021-06-01 16:59:44.690 +08:00 [DBG] Connection id "0HM94RECLNFIG" completed keep alive response. -2021-06-01 16:59:44.690 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/core/abp.css?_v=637543906070000000 - - - 200 1331 text/css 8.0071ms -2021-06-01 16:59:44.690 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/toastr/toastr.min.css?_v=637543906070000000 - - - 200 6454 text/css 1.3430ms -2021-06-01 16:59:44.690 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/select2/css/select2.min.css?_v=637543906070000000 - - - 200 14967 text/css 1.1877ms -2021-06-01 16:59:44.696 +08:00 [INF] Sending file. Request path: '/libs/bootstrap/css/bootstrap.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\bootstrap\css\bootstrap.css' -2021-06-01 16:59:44.696 +08:00 [INF] Sending file. Request path: '/libs/@fortawesome/fontawesome-free/css/all.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\@fortawesome\fontawesome-free\css\all.css' -2021-06-01 16:59:44.696 +08:00 [INF] Sending file. Request path: '/libs/@fortawesome/fontawesome-free/css/v4-shims.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\@fortawesome\fontawesome-free\css\v4-shims.css' -2021-06-01 16:59:44.697 +08:00 [DBG] Connection id "0HM94RECLNFIE" completed keep alive response. -2021-06-01 16:59:44.697 +08:00 [DBG] Connection id "0HM94RECLNFID" completed keep alive response. -2021-06-01 16:59:44.697 +08:00 [DBG] Connection id "0HM94RECLNFIF" completed keep alive response. -2021-06-01 16:59:44.697 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/bootstrap/css/bootstrap.css?_v=637543906070000000 - - - 200 209709 text/css 10.3143ms -2021-06-01 16:59:44.697 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/@fortawesome/fontawesome-free/css/all.css?_v=637543906070000000 - - - 200 77703 text/css 8.8328ms -2021-06-01 16:59:44.697 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/@fortawesome/fontawesome-free/css/v4-shims.css?_v=637543906070000000 - - - 200 43484 text/css 7.9251ms -2021-06-01 16:59:44.704 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css?_v=637543906070000000 - - -2021-06-01 16:59:44.705 +08:00 [INF] Sending file. Request path: '/libs/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\malihu-custom-scrollbar-plugin\jquery.mCustomScrollbar.css' -2021-06-01 16:59:44.705 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/datatables.net-bs4/css/dataTables.bootstrap4.css?_v=637543906070000000 - - -2021-06-01 16:59:44.706 +08:00 [DBG] Connection id "0HM94RECLNFIC" completed keep alive response. -2021-06-01 16:59:44.706 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css?_v=637543906070000000 - - - 200 54850 text/css 1.3867ms -2021-06-01 16:59:44.706 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/bootstrap-datepicker/bootstrap-datepicker.min.css?_v=637543906070000000 - - -2021-06-01 16:59:44.706 +08:00 [INF] Sending file. Request path: '/libs/datatables.net-bs4/css/dataTables.bootstrap4.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\datatables.net-bs4\css\dataTables.bootstrap4.css' -2021-06-01 16:59:44.706 +08:00 [DBG] Connection id "0HM94RECLNFIF" completed keep alive response. -2021-06-01 16:59:44.706 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/datatables.net-bs4/css/dataTables.bootstrap4.css?_v=637543906070000000 - - - 200 6206 text/css 0.7286ms -2021-06-01 16:59:44.706 +08:00 [INF] Sending file. Request path: '/libs/bootstrap-datepicker/bootstrap-datepicker.min.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\bootstrap-datepicker\bootstrap-datepicker.min.css' -2021-06-01 16:59:44.706 +08:00 [DBG] Connection id "0HM94RECLNFIG" completed keep alive response. -2021-06-01 16:59:44.706 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/bootstrap-datepicker/bootstrap-datepicker.min.css?_v=637543906070000000 - - - 200 15737 text/css 0.4869ms -2021-06-01 16:59:44.707 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css?_v=637581344238055428 - - -2021-06-01 16:59:44.707 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/demo/styles/main.css?_v=637543906070000000 - - -2021-06-01 16:59:44.707 +08:00 [INF] Sending file. Request path: '/demo/styles/main.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\demo\styles\main.css' -2021-06-01 16:59:44.707 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:44.707 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/demo/styles/main.css?_v=637543906070000000 - - - 200 572 text/css 0.6064ms -2021-06-01 16:59:44.708 +08:00 [INF] Sending file. Request path: '/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css'. Physical path: 'N/A' -2021-06-01 16:59:44.708 +08:00 [DBG] Connection id "0HM94RECLNFIE" completed keep alive response. -2021-06-01 16:59:44.708 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css?_v=637581344238055428 - - - 200 467 text/css 1.5342ms -2021-06-01 16:59:44.716 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/themes/basic/layout.css?_v=637581347776351428 - - -2021-06-01 16:59:44.716 +08:00 [INF] Sending file. Request path: '/themes/basic/layout.css'. Physical path: 'N/A' -2021-06-01 16:59:44.716 +08:00 [DBG] Connection id "0HM94RECLNFID" completed keep alive response. -2021-06-01 16:59:44.716 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/themes/basic/layout.css?_v=637581347776351428 - - - 200 1735 text/css 0.5265ms -2021-06-01 16:59:44.721 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/utils/abp-utils.umd.min.js?_v=637543906070000000 - - -2021-06-01 16:59:44.721 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/core/abp.js?_v=637543906070000000 - - -2021-06-01 16:59:44.721 +08:00 [INF] Sending file. Request path: '/libs/abp/utils/abp-utils.umd.min.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\abp\utils\abp-utils.umd.min.js' -2021-06-01 16:59:44.721 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/jquery/abp.jquery.js?_v=637543906070000000 - - -2021-06-01 16:59:44.721 +08:00 [DBG] Connection id "0HM94RECLNFIC" completed keep alive response. -2021-06-01 16:59:44.721 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/jquery/jquery.js?_v=637543906070000000 - - -2021-06-01 16:59:44.721 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/utils/abp-utils.umd.min.js?_v=637543906070000000 - - - 200 8257 application/javascript 0.6245ms -2021-06-01 16:59:44.721 +08:00 [INF] Sending file. Request path: '/libs/abp/jquery/abp.jquery.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\abp\jquery\abp.jquery.js' -2021-06-01 16:59:44.721 +08:00 [DBG] Connection id "0HM94RECLNFIF" completed keep alive response. -2021-06-01 16:59:44.721 +08:00 [INF] Sending file. Request path: '/libs/abp/core/abp.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\abp\core\abp.js' -2021-06-01 16:59:44.722 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:44.722 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/jquery/abp.jquery.js?_v=637543906070000000 - - - 200 13191 application/javascript 0.4493ms -2021-06-01 16:59:44.722 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/core/abp.js?_v=637543906070000000 - - - 200 23271 application/javascript 0.6623ms -2021-06-01 16:59:44.722 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/bootstrap/js/bootstrap.bundle.js?_v=637543906070000000 - - -2021-06-01 16:59:44.723 +08:00 [INF] Sending file. Request path: '/libs/bootstrap/js/bootstrap.bundle.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\bootstrap\js\bootstrap.bundle.js' -2021-06-01 16:59:44.723 +08:00 [DBG] Connection id "0HM94RECLNFIG" completed keep alive response. -2021-06-01 16:59:44.724 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/bootstrap/js/bootstrap.bundle.js?_v=637543906070000000 - - - 200 243909 application/javascript 1.4505ms -2021-06-01 16:59:44.727 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/lodash/lodash.min.js?_v=637543906070000000 - - -2021-06-01 16:59:44.729 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/jquery-validation/jquery.validate.js?_v=637543906070000000 - - -2021-06-01 16:59:44.730 +08:00 [INF] Sending file. Request path: '/libs/lodash/lodash.min.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\lodash\lodash.min.js' -2021-06-01 16:59:44.730 +08:00 [DBG] Connection id "0HM94RECLNFID" completed keep alive response. -2021-06-01 16:59:44.730 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/lodash/lodash.min.js?_v=637543906070000000 - - - 200 73397 application/javascript 3.3133ms -2021-06-01 16:59:44.730 +08:00 [INF] Sending file. Request path: '/libs/jquery/jquery.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\jquery\jquery.js' -2021-06-01 16:59:44.730 +08:00 [DBG] Connection id "0HM94RECLNFIE" completed keep alive response. -2021-06-01 16:59:44.730 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/jquery/jquery.js?_v=637543906070000000 - - - 200 282115 application/javascript 9.3333ms -2021-06-01 16:59:44.731 +08:00 [INF] Sending file. Request path: '/libs/jquery-validation/jquery.validate.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\jquery-validation\jquery.validate.js' -2021-06-01 16:59:44.731 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:44.731 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/jquery-validation/jquery.validate.js?_v=637543906070000000 - - - 200 48696 application/javascript 1.7908ms -2021-06-01 16:59:44.731 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js?_v=637543906070000000 - - -2021-06-01 16:59:44.731 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/jquery-form/jquery.form.min.js?_v=637543906070000000 - - -2021-06-01 16:59:44.732 +08:00 [INF] Sending file. Request path: '/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\jquery-validation-unobtrusive\jquery.validate.unobtrusive.js' -2021-06-01 16:59:44.732 +08:00 [DBG] Connection id "0HM94RECLNFIC" completed keep alive response. -2021-06-01 16:59:44.732 +08:00 [INF] Sending file. Request path: '/libs/jquery-form/jquery.form.min.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\jquery-form\jquery.form.min.js' -2021-06-01 16:59:44.732 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js?_v=637543906070000000 - - - 200 19798 application/javascript 0.9676ms -2021-06-01 16:59:44.732 +08:00 [DBG] Connection id "0HM94RECLNFIF" completed keep alive response. -2021-06-01 16:59:44.732 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/jquery-form/jquery.form.min.js?_v=637543906070000000 - - - 200 17117 application/javascript 0.8753ms -2021-06-01 16:59:44.741 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/select2/js/select2.min.js?_v=637543906070000000 - - -2021-06-01 16:59:44.743 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/select2/js/select2-bootstrap-modal-patch.js?_v=637543906070000000 - - -2021-06-01 16:59:44.744 +08:00 [INF] Sending file. Request path: '/libs/select2/js/select2.min.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\select2\js\select2.min.js' -2021-06-01 16:59:44.744 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:44.744 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/select2/js/select2.min.js?_v=637543906070000000 - - - 200 70852 application/javascript 3.7431ms -2021-06-01 16:59:44.744 +08:00 [INF] Sending file. Request path: '/libs/select2/js/select2-bootstrap-modal-patch.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\select2\js\select2-bootstrap-modal-patch.js' -2021-06-01 16:59:44.745 +08:00 [DBG] Connection id "0HM94RECLNFID" completed keep alive response. -2021-06-01 16:59:44.745 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/select2/js/select2-bootstrap-modal-patch.js?_v=637543906070000000 - - - 200 130 application/javascript 2.0735ms -2021-06-01 16:59:44.745 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/datatables.net/js/jquery.dataTables.js?_v=637543906070000000 - - -2021-06-01 16:59:44.748 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/datatables.net-bs4/js/dataTables.bootstrap4.js?_v=637543906070000000 - - -2021-06-01 16:59:44.748 +08:00 [INF] Sending file. Request path: '/libs/datatables.net-bs4/js/dataTables.bootstrap4.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\datatables.net-bs4\js\dataTables.bootstrap4.js' -2021-06-01 16:59:44.748 +08:00 [DBG] Connection id "0HM94RECLNFIF" completed keep alive response. -2021-06-01 16:59:44.748 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/datatables.net-bs4/js/dataTables.bootstrap4.js?_v=637543906070000000 - - - 200 4886 application/javascript 0.7070ms -2021-06-01 16:59:44.750 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/sweetalert/sweetalert.min.js?_v=637543906070000000 - - -2021-06-01 16:59:44.751 +08:00 [INF] Sending file. Request path: '/libs/sweetalert/sweetalert.min.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\sweetalert\sweetalert.min.js' -2021-06-01 16:59:44.751 +08:00 [DBG] Connection id "0HM94RECLNFID" completed keep alive response. -2021-06-01 16:59:44.751 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/sweetalert/sweetalert.min.js?_v=637543906070000000 - - - 200 40808 application/javascript 1.0615ms -2021-06-01 16:59:44.751 +08:00 [INF] Sending file. Request path: '/libs/datatables.net/js/jquery.dataTables.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\datatables.net\js\jquery.dataTables.js' -2021-06-01 16:59:44.751 +08:00 [DBG] Connection id "0HM94RECLNFIC" completed keep alive response. -2021-06-01 16:59:44.751 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/datatables.net/js/jquery.dataTables.js?_v=637543906070000000 - - - 200 464600 application/javascript 6.0564ms -2021-06-01 16:59:44.753 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/toastr/toastr.min.js?_v=637543906070000000 - - -2021-06-01 16:59:44.754 +08:00 [INF] Sending file. Request path: '/libs/toastr/toastr.min.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\toastr\toastr.min.js' -2021-06-01 16:59:44.754 +08:00 [DBG] Connection id "0HM94RECLNFIG" completed keep alive response. -2021-06-01 16:59:44.754 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/toastr/toastr.min.js?_v=637543906070000000 - - - 200 5253 application/javascript 1.0496ms -2021-06-01 16:59:44.756 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js?_v=637543906070000000 - - -2021-06-01 16:59:44.756 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/luxon/luxon.min.js?_v=637543906070000000 - - -2021-06-01 16:59:44.756 +08:00 [INF] Sending file. Request path: '/libs/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\malihu-custom-scrollbar-plugin\jquery.mCustomScrollbar.concat.min.js' -2021-06-01 16:59:44.756 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:44.756 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js?_v=637543906070000000 - - - 200 45483 application/javascript 0.7728ms -2021-06-01 16:59:44.756 +08:00 [INF] Sending file. Request path: '/libs/luxon/luxon.min.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\luxon\luxon.min.js' -2021-06-01 16:59:44.756 +08:00 [DBG] Connection id "0HM94RECLNFIF" completed keep alive response. -2021-06-01 16:59:44.756 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/luxon/luxon.min.js?_v=637543906070000000 - - - 200 70063 application/javascript 0.9127ms -2021-06-01 16:59:44.757 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/luxon/abp.luxon.js?_v=637543906070000000 - - -2021-06-01 16:59:44.758 +08:00 [INF] Sending file. Request path: '/libs/abp/luxon/abp.luxon.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\abp\luxon\abp.luxon.js' -2021-06-01 16:59:44.758 +08:00 [DBG] Connection id "0HM94RECLNFID" completed keep alive response. -2021-06-01 16:59:44.758 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/luxon/abp.luxon.js?_v=637543906070000000 - - - 200 1361 application/javascript 0.7110ms -2021-06-01 16:59:44.766 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/timeago/jquery.timeago.js?_v=637543906070000000 - - -2021-06-01 16:59:44.766 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/bootstrap-datepicker/bootstrap-datepicker.min.js?_v=637543906070000000 - - -2021-06-01 16:59:44.766 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js?_v=637581344238055428 - - -2021-06-01 16:59:44.767 +08:00 [INF] Sending file. Request path: '/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js'. Physical path: 'N/A' -2021-06-01 16:59:44.767 +08:00 [DBG] Connection id "0HM94RECLNFIG" completed keep alive response. -2021-06-01 16:59:44.767 +08:00 [INF] Sending file. Request path: '/libs/timeago/jquery.timeago.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\timeago\jquery.timeago.js' -2021-06-01 16:59:44.767 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:44.767 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js?_v=637581344238055428 - - - 200 10592 application/javascript 0.6870ms -2021-06-01 16:59:44.767 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/timeago/jquery.timeago.js?_v=637543906070000000 - - - 200 7636 application/javascript 0.7293ms -2021-06-01 16:59:44.767 +08:00 [INF] Sending file. Request path: '/libs/bootstrap-datepicker/bootstrap-datepicker.min.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\bootstrap-datepicker\bootstrap-datepicker.min.js' -2021-06-01 16:59:44.767 +08:00 [DBG] Connection id "0HM94RECLNFID" completed keep alive response. -2021-06-01 16:59:44.767 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/bootstrap-datepicker/bootstrap-datepicker.min.js?_v=637543906070000000 - - - 200 33700 application/javascript 1.1213ms -2021-06-01 16:59:44.769 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js?_v=637581344238055428 - - -2021-06-01 16:59:44.769 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js?_v=637581344238055428 - - -2021-06-01 16:59:44.770 +08:00 [INF] Sending file. Request path: '/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js'. Physical path: 'N/A' -2021-06-01 16:59:44.770 +08:00 [DBG] Connection id "0HM94RECLNFIF" completed keep alive response. -2021-06-01 16:59:44.770 +08:00 [INF] Sending file. Request path: '/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js'. Physical path: 'N/A' -2021-06-01 16:59:44.770 +08:00 [DBG] Connection id "0HM94RECLNFIE" completed keep alive response. -2021-06-01 16:59:44.770 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js?_v=637581344238055428 - - - 200 5627 application/javascript 0.6670ms -2021-06-01 16:59:44.770 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js?_v=637581344238055428 - - - 200 3608 application/javascript 0.7256ms -2021-06-01 16:59:44.778 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js?_v=637581344238055428 - - -2021-06-01 16:59:44.778 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js?_v=637581344238055428 - - -2021-06-01 16:59:44.779 +08:00 [INF] Sending file. Request path: '/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js'. Physical path: 'N/A' -2021-06-01 16:59:44.779 +08:00 [INF] Sending file. Request path: '/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js'. Physical path: 'N/A' -2021-06-01 16:59:44.779 +08:00 [DBG] Connection id "0HM94RECLNFID" completed keep alive response. -2021-06-01 16:59:44.779 +08:00 [DBG] Connection id "0HM94RECLNFIG" completed keep alive response. -2021-06-01 16:59:44.779 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js?_v=637581344238055428 - - - 200 4793 application/javascript 0.5806ms -2021-06-01 16:59:44.779 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js?_v=637581344238055428 - - - 200 8385 application/javascript 0.5888ms -2021-06-01 16:59:44.779 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js?_v=637581344238055428 - - -2021-06-01 16:59:44.779 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js?_v=637581344238055428 - - -2021-06-01 16:59:44.780 +08:00 [INF] Sending file. Request path: '/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js'. Physical path: 'N/A' -2021-06-01 16:59:44.780 +08:00 [DBG] Connection id "0HM94RECLNFIE" completed keep alive response. -2021-06-01 16:59:44.780 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js?_v=637581344238055428 - - - 200 6823 application/javascript 0.4926ms -2021-06-01 16:59:44.780 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js?_v=637581344238055428 - - -2021-06-01 16:59:44.780 +08:00 [INF] Sending file. Request path: '/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js'. Physical path: 'N/A' -2021-06-01 16:59:44.780 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:44.780 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js?_v=637581344238055428 - - - 200 20212 application/javascript 0.5459ms -2021-06-01 16:59:44.780 +08:00 [INF] Sending file. Request path: '/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js'. Physical path: 'N/A' -2021-06-01 16:59:44.780 +08:00 [DBG] Connection id "0HM94RECLNFIF" completed keep alive response. -2021-06-01 16:59:44.780 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js?_v=637581344238055428 - - - 200 3005 application/javascript 0.1968ms -2021-06-01 16:59:44.784 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js?_v=637581344238055428 - - -2021-06-01 16:59:44.784 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Pages/Abp/MultiTenancy/tenant-switch.js?_v=637581344246206036 - - -2021-06-01 16:59:44.784 +08:00 [INF] Sending file. Request path: '/libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js'. Physical path: 'N/A' -2021-06-01 16:59:44.784 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/themes/basic/layout.js?_v=637581347776351428 - - -2021-06-01 16:59:44.784 +08:00 [DBG] Connection id "0HM94RECLNFID" completed keep alive response. -2021-06-01 16:59:44.785 +08:00 [INF] Sending file. Request path: '/Pages/Abp/MultiTenancy/tenant-switch.js'. Physical path: 'N/A' -2021-06-01 16:59:44.785 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js?_v=637581344238055428 - - - 200 954 application/javascript 0.5786ms -2021-06-01 16:59:44.785 +08:00 [DBG] Connection id "0HM94RECLNFIG" completed keep alive response. -2021-06-01 16:59:44.785 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Pages/Abp/MultiTenancy/tenant-switch.js?_v=637581344246206036 - - - 200 417 application/javascript 0.3011ms -2021-06-01 16:59:44.785 +08:00 [INF] Sending file. Request path: '/themes/basic/layout.js'. Physical path: 'N/A' -2021-06-01 16:59:44.785 +08:00 [DBG] Connection id "0HM94RECLNFIF" completed keep alive response. -2021-06-01 16:59:44.785 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/themes/basic/layout.js?_v=637581347776351428 - - - 200 546 application/javascript 0.4804ms -2021-06-01 16:59:44.786 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Abp/ApplicationConfigurationScript - - -2021-06-01 16:59:44.786 +08:00 [DBG] The request path /Abp/ApplicationConfigurationScript does not match a supported file type -2021-06-01 16:59:44.787 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Abp/ServiceProxyScript - - -2021-06-01 16:59:44.787 +08:00 [DBG] The request path /Abp/ServiceProxyScript does not match a supported file type -2021-06-01 16:59:44.788 +08:00 [DBG] 1 candidate(s) found for the request path '/Abp/ServiceProxyScript' -2021-06-01 16:59:44.788 +08:00 [DBG] 1 candidate(s) found for the request path '/Abp/ApplicationConfigurationScript' -2021-06-01 16:59:44.789 +08:00 [DBG] Endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' with route pattern 'Abp/ServiceProxyScript' is valid for the request path '/Abp/ServiceProxyScript' -2021-06-01 16:59:44.789 +08:00 [DBG] Endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' with route pattern 'Abp/ApplicationConfigurationScript' is valid for the request path '/Abp/ApplicationConfigurationScript' -2021-06-01 16:59:44.789 +08:00 [DBG] Request matched endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:44.789 +08:00 [DBG] Request matched endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:44.789 +08:00 [INF] Executing endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:44.789 +08:00 [INF] Executing endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:44.796 +08:00 [INF] Route matched with {area = "Abp", action = "Get", controller = "AbpApplicationConfigurationScript", page = ""}. Executing controller action with signature System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Mvc.ActionResult] Get() on controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc). -2021-06-01 16:59:44.796 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 16:59:44.796 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:44.796 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.Filters.ControllerActionFilter (Order: -2147483648)","Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 16:59:44.796 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 16:59:44.796 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter","Microsoft.AspNetCore.Mvc.ProducesAttribute (Order: 0)"] -2021-06-01 16:59:44.798 +08:00 [DBG] Executing controller factory for controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:44.806 +08:00 [INF] Route matched with {area = "Abp", action = "GetAll", controller = "AbpServiceProxyScript", page = ""}. Executing controller action with signature Microsoft.AspNetCore.Mvc.ActionResult GetAll(Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel) on controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc). -2021-06-01 16:59:44.806 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 16:59:44.806 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:44.806 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.Filters.ControllerActionFilter (Order: -2147483648)","Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 16:59:44.806 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 16:59:44.806 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter","Microsoft.AspNetCore.Mvc.ProducesAttribute (Order: 0)"] -2021-06-01 16:59:44.806 +08:00 [DBG] Executing controller factory for controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:44.828 +08:00 [DBG] Executed controller factory for controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:44.833 +08:00 [DBG] Attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' ... -2021-06-01 16:59:44.834 +08:00 [DBG] Attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' using the name '' in request data ... -2021-06-01 16:59:44.838 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String' using the name 'Type' in request data ... -2021-06-01 16:59:44.839 +08:00 [DBG] Could not find a value in the request with name 'Type' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String'. -2021-06-01 16:59:44.839 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String'. -2021-06-01 16:59:44.842 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean' using the name 'UseCache' in request data ... -2021-06-01 16:59:44.842 +08:00 [DBG] Could not find a value in the request with name 'UseCache' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean'. -2021-06-01 16:59:44.842 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean'. -2021-06-01 16:59:44.842 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String' using the name 'Modules' in request data ... -2021-06-01 16:59:44.842 +08:00 [DBG] Could not find a value in the request with name 'Modules' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String'. -2021-06-01 16:59:44.842 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String'. -2021-06-01 16:59:44.842 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String' using the name 'Controllers' in request data ... -2021-06-01 16:59:44.842 +08:00 [DBG] Could not find a value in the request with name 'Controllers' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String'. -2021-06-01 16:59:44.842 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String'. -2021-06-01 16:59:44.842 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String' using the name 'Actions' in request data ... -2021-06-01 16:59:44.842 +08:00 [DBG] Could not find a value in the request with name 'Actions' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String'. -2021-06-01 16:59:44.842 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String'. -2021-06-01 16:59:44.844 +08:00 [DBG] Done attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 16:59:44.844 +08:00 [DBG] Done attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 16:59:44.844 +08:00 [DBG] Attempting to validate the bound parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' ... -2021-06-01 16:59:44.846 +08:00 [DBG] Done attempting to validate the bound parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 16:59:44.861 +08:00 [DBG] Executed controller factory for controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:44.904 +08:00 [DBG] ActionApiDescriptionModel.Create: AbpTenant.FindTenantByNameAsyncByName -2021-06-01 16:59:44.911 +08:00 [DBG] Executing AbpApplicationConfigurationAppService.GetAsync()... -2021-06-01 16:59:44.916 +08:00 [DBG] ActionApiDescriptionModel.Create: AbpTenant.FindTenantByIdAsyncById -2021-06-01 16:59:44.917 +08:00 [DBG] ActionApiDescriptionModel.Create: AbpApplicationConfiguration.GetAsync -2021-06-01 16:59:44.917 +08:00 [DBG] ActionApiDescriptionModel.Create: AbpApiDefinition.GetByModel -2021-06-01 16:59:44.933 +08:00 [INF] Executing ContentResult with HTTP Response ContentType of application/javascript -2021-06-01 16:59:44.933 +08:00 [INF] Executed action Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc) in 127.3424ms -2021-06-01 16:59:44.934 +08:00 [INF] Executed endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:44.934 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:44.934 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Abp/ServiceProxyScript - - - 200 1936 application/javascript 146.2921ms -2021-06-01 16:59:45.231 +08:00 [DBG] Executed AbpApplicationConfigurationAppService.GetAsync(). -2021-06-01 16:59:45.275 +08:00 [DBG] A new antiforgery cookie token was created. -2021-06-01 16:59:45.276 +08:00 [WRN] The cookie 'XSRF-TOKEN' has set 'SameSite=None' and must also set 'Secure'. -2021-06-01 16:59:45.277 +08:00 [INF] Executing ContentResult with HTTP Response ContentType of application/javascript -2021-06-01 16:59:45.278 +08:00 [INF] Executed action Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc) in 482.1365ms -2021-06-01 16:59:45.278 +08:00 [INF] Executed endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:45.278 +08:00 [DBG] Connection id "0HM94RECLNFIE" completed keep alive response. -2021-06-01 16:59:45.278 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Abp/ApplicationConfigurationScript - - - 200 13072 application/javascript 492.0572ms -2021-06-01 16:59:45.319 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/favicon.ico - - -2021-06-01 16:59:45.319 +08:00 [DBG] The request path /favicon.ico does not match an existing file -2021-06-01 16:59:45.320 +08:00 [DBG] No candidates found for the request path '/favicon.ico' -2021-06-01 16:59:45.320 +08:00 [DBG] Request did not match any endpoints -2021-06-01 16:59:45.320 +08:00 [DBG] Connection id "0HM94RECLNFIE" completed keep alive response. -2021-06-01 16:59:45.320 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/favicon.ico - - - 404 0 - 1.5213ms -2021-06-01 16:59:46.609 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Components - - -2021-06-01 16:59:46.610 +08:00 [DBG] The request path /Components does not match a supported file type -2021-06-01 16:59:46.610 +08:00 [DBG] 1 candidate(s) found for the request path '/Components' -2021-06-01 16:59:46.610 +08:00 [DBG] Endpoint 'Page: /Components/Index' with route pattern 'Components' is valid for the request path '/Components' -2021-06-01 16:59:46.613 +08:00 [DBG] Request matched endpoint '/Components/Index' -2021-06-01 16:59:46.613 +08:00 [INF] Executing endpoint '/Components/Index' -2021-06-01 16:59:46.615 +08:00 [INF] Route matched with {page = "/Components/Index", area = "", action = "", controller = ""}. Executing page /Components/Index -2021-06-01 16:59:46.615 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter","Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.AutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 16:59:46.615 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:46.615 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 16:59:46.615 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 16:59:46.615 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:46.615 +08:00 [INF] Skipping the execution of current filter as its not the most effective filter implementing the policy Microsoft.AspNetCore.Mvc.ViewFeatures.IAntiforgeryPolicy -2021-06-01 16:59:46.615 +08:00 [DBG] Executing page model factory for page AspNetCore.Pages_Components_Index (Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Views) -2021-06-01 16:59:46.616 +08:00 [DBG] Executed page model factory for page AspNetCore.Pages_Components_Index (Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Views) -2021-06-01 16:59:46.617 +08:00 [INF] Executing handler method Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.IndexModel.OnGet - ModelState is "Valid" -2021-06-01 16:59:46.617 +08:00 [INF] Executed handler method OnGet, returned result . -2021-06-01 16:59:46.617 +08:00 [INF] Executing an implicit handler method - ModelState is "Valid" -2021-06-01 16:59:46.617 +08:00 [INF] Executed an implicit handler method, returned result Microsoft.AspNetCore.Mvc.RazorPages.PageResult. -2021-06-01 16:59:46.627 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Header.First","Application"]). -2021-06-01 16:59:46.627 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0081ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.628 +08:00 [DBG] Added bundle 'Basic.Global' to the page in 0.76 ms. -2021-06-01 16:59:46.628 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles.WidgetStylesViewComponent with arguments ([]). -2021-06-01 16:59:46.628 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles.WidgetStylesViewComponent in 0.0177ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.628 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Header.Last","Application"]). -2021-06-01 16:59:46.628 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0034ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.628 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Body.First","Application"]). -2021-06-01 16:59:46.628 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0034ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.628 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNavbar.MainNavbarViewComponent with arguments ([]). -2021-06-01 16:59:46.628 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNavbar.MainNavbarViewComponent in 0.0047ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.628 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand.MainNavbarBrandViewComponent with arguments ([]). -2021-06-01 16:59:46.628 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand.MainNavbarBrandViewComponent in 0.0018ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.628 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu.MainNavbarMenuViewComponent with arguments ([]). -2021-06-01 16:59:46.629 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu.MainNavbarMenuViewComponent in 0.5801ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.630 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.MainNavbarToolbarViewComponent with arguments ([]). -2021-06-01 16:59:46.630 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.MainNavbarToolbarViewComponent in 0.2012ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.631 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts.PageAlertsViewComponent with arguments ([""]). -2021-06-01 16:59:46.631 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts.PageAlertsViewComponent in 0.0154ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.631 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["PageContent.First","Application"]). -2021-06-01 16:59:46.631 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.004ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.631 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["PageContent.Last","Application"]). -2021-06-01 16:59:46.631 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0031ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.633 +08:00 [DBG] Added bundle 'Basic.Global' to the page in 1.98 ms. -2021-06-01 16:59:46.633 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts.WidgetScriptsViewComponent with arguments ([]). -2021-06-01 16:59:46.633 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts.WidgetScriptsViewComponent in 0.0094ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.633 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Body.Last","Application"]). -2021-06-01 16:59:46.633 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0036ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:46.634 +08:00 [INF] Executed page /Components/Index in 18.3018ms -2021-06-01 16:59:46.634 +08:00 [INF] Executed endpoint '/Components/Index' -2021-06-01 16:59:46.634 +08:00 [DBG] Connection id "0HM94RECLNFIE" completed keep alive response. -2021-06-01 16:59:46.634 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Components - - - 200 - text/html;+charset=utf-8 24.2282ms -2021-06-01 16:59:46.663 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/themes/basic/layout.css?_v=637581347776351428 - - -2021-06-01 16:59:46.665 +08:00 [INF] The file /themes/basic/layout.css was not modified -2021-06-01 16:59:46.665 +08:00 [DBG] Handled. Status code: 304 File: /themes/basic/layout.css -2021-06-01 16:59:46.665 +08:00 [DBG] Connection id "0HM94RECLNFIE" completed keep alive response. -2021-06-01 16:59:46.665 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/themes/basic/layout.css?_v=637581347776351428 - - - 304 - text/css 2.0592ms -2021-06-01 16:59:46.672 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Abp/ServiceProxyScript - - -2021-06-01 16:59:46.672 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Abp/ApplicationConfigurationScript - - -2021-06-01 16:59:46.672 +08:00 [DBG] The request path /Abp/ServiceProxyScript does not match a supported file type -2021-06-01 16:59:46.672 +08:00 [DBG] The request path /Abp/ApplicationConfigurationScript does not match a supported file type -2021-06-01 16:59:46.672 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/themes/basic/layout.js?_v=637581347776351428 - - -2021-06-01 16:59:46.673 +08:00 [INF] The file /themes/basic/layout.js was not modified -2021-06-01 16:59:46.673 +08:00 [DBG] Handled. Status code: 304 File: /themes/basic/layout.js -2021-06-01 16:59:46.673 +08:00 [DBG] Connection id "0HM94RECLNFIC" completed keep alive response. -2021-06-01 16:59:46.673 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/themes/basic/layout.js?_v=637581347776351428 - - - 304 - application/javascript 0.5183ms -2021-06-01 16:59:46.673 +08:00 [DBG] 1 candidate(s) found for the request path '/Abp/ApplicationConfigurationScript' -2021-06-01 16:59:46.673 +08:00 [DBG] 1 candidate(s) found for the request path '/Abp/ServiceProxyScript' -2021-06-01 16:59:46.673 +08:00 [DBG] Endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' with route pattern 'Abp/ServiceProxyScript' is valid for the request path '/Abp/ServiceProxyScript' -2021-06-01 16:59:46.673 +08:00 [DBG] Endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' with route pattern 'Abp/ApplicationConfigurationScript' is valid for the request path '/Abp/ApplicationConfigurationScript' -2021-06-01 16:59:46.673 +08:00 [DBG] Request matched endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:46.673 +08:00 [DBG] Request matched endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:46.673 +08:00 [INF] Executing endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:46.673 +08:00 [INF] Executing endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:46.674 +08:00 [INF] Route matched with {area = "Abp", action = "GetAll", controller = "AbpServiceProxyScript", page = ""}. Executing controller action with signature Microsoft.AspNetCore.Mvc.ActionResult GetAll(Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel) on controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc). -2021-06-01 16:59:46.674 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 16:59:46.674 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:46.674 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.Filters.ControllerActionFilter (Order: -2147483648)","Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 16:59:46.674 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 16:59:46.674 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter","Microsoft.AspNetCore.Mvc.ProducesAttribute (Order: 0)"] -2021-06-01 16:59:46.674 +08:00 [DBG] Executing controller factory for controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:46.674 +08:00 [DBG] Executed controller factory for controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:46.674 +08:00 [DBG] Attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' ... -2021-06-01 16:59:46.674 +08:00 [DBG] Attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' using the name '' in request data ... -2021-06-01 16:59:46.674 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String' using the name 'Type' in request data ... -2021-06-01 16:59:46.674 +08:00 [DBG] Could not find a value in the request with name 'Type' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String'. -2021-06-01 16:59:46.674 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String'. -2021-06-01 16:59:46.674 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean' using the name 'UseCache' in request data ... -2021-06-01 16:59:46.674 +08:00 [DBG] Could not find a value in the request with name 'UseCache' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean'. -2021-06-01 16:59:46.674 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean'. -2021-06-01 16:59:46.675 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String' using the name 'Modules' in request data ... -2021-06-01 16:59:46.675 +08:00 [DBG] Could not find a value in the request with name 'Modules' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String'. -2021-06-01 16:59:46.675 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String'. -2021-06-01 16:59:46.675 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String' using the name 'Controllers' in request data ... -2021-06-01 16:59:46.675 +08:00 [DBG] Could not find a value in the request with name 'Controllers' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String'. -2021-06-01 16:59:46.675 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String'. -2021-06-01 16:59:46.675 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String' using the name 'Actions' in request data ... -2021-06-01 16:59:46.675 +08:00 [DBG] Could not find a value in the request with name 'Actions' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String'. -2021-06-01 16:59:46.675 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String'. -2021-06-01 16:59:46.675 +08:00 [DBG] Done attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 16:59:46.675 +08:00 [DBG] Done attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 16:59:46.675 +08:00 [DBG] Attempting to validate the bound parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' ... -2021-06-01 16:59:46.675 +08:00 [DBG] Done attempting to validate the bound parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 16:59:46.676 +08:00 [INF] Route matched with {area = "Abp", action = "Get", controller = "AbpApplicationConfigurationScript", page = ""}. Executing controller action with signature System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Mvc.ActionResult] Get() on controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc). -2021-06-01 16:59:46.676 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 16:59:46.676 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:46.676 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.Filters.ControllerActionFilter (Order: -2147483648)","Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 16:59:46.676 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 16:59:46.676 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter","Microsoft.AspNetCore.Mvc.ProducesAttribute (Order: 0)"] -2021-06-01 16:59:46.676 +08:00 [DBG] Executing controller factory for controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:46.676 +08:00 [INF] Executing ContentResult with HTTP Response ContentType of application/javascript -2021-06-01 16:59:46.676 +08:00 [INF] Executed action Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc) in 2.5315ms -2021-06-01 16:59:46.676 +08:00 [INF] Executed endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:46.676 +08:00 [DBG] Connection id "0HM94RECLNFIG" completed keep alive response. -2021-06-01 16:59:46.676 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Abp/ServiceProxyScript - - - 200 1936 application/javascript 4.3712ms -2021-06-01 16:59:46.678 +08:00 [DBG] Executed controller factory for controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:46.679 +08:00 [DBG] Executing AbpApplicationConfigurationAppService.GetAsync()... -2021-06-01 16:59:46.681 +08:00 [DBG] Executed AbpApplicationConfigurationAppService.GetAsync(). -2021-06-01 16:59:46.692 +08:00 [DBG] An antiforgery cookie token was reused. -2021-06-01 16:59:46.692 +08:00 [WRN] The cookie 'XSRF-TOKEN' has set 'SameSite=None' and must also set 'Secure'. -2021-06-01 16:59:46.692 +08:00 [INF] Executing ContentResult with HTTP Response ContentType of application/javascript -2021-06-01 16:59:46.693 +08:00 [INF] Executed action Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc) in 16.3898ms -2021-06-01 16:59:46.693 +08:00 [INF] Executed endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:46.693 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:46.693 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Abp/ApplicationConfigurationScript - - - 200 13072 application/javascript 20.5098ms -2021-06-01 16:59:47.713 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Components/Alerts - - -2021-06-01 16:59:47.713 +08:00 [DBG] The request path /Components/Alerts does not match a supported file type -2021-06-01 16:59:47.713 +08:00 [DBG] 1 candidate(s) found for the request path '/Components/Alerts' -2021-06-01 16:59:47.713 +08:00 [DBG] Endpoint 'Page: /Components/Alerts/Index' with route pattern 'Components/Alerts' is valid for the request path '/Components/Alerts' -2021-06-01 16:59:47.715 +08:00 [DBG] Request matched endpoint '/Components/Alerts/Index' -2021-06-01 16:59:47.715 +08:00 [INF] Executing endpoint '/Components/Alerts/Index' -2021-06-01 16:59:47.716 +08:00 [INF] Route matched with {page = "/Components/Alerts/Index", area = "", action = "", controller = ""}. Executing page /Components/Alerts/Index -2021-06-01 16:59:47.716 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter","Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.AutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 16:59:47.716 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:47.716 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 16:59:47.716 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 16:59:47.716 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:47.716 +08:00 [INF] Skipping the execution of current filter as its not the most effective filter implementing the policy Microsoft.AspNetCore.Mvc.ViewFeatures.IAntiforgeryPolicy -2021-06-01 16:59:47.716 +08:00 [DBG] Executing page model factory for page AspNetCore.Pages_Components_Alerts_Index (Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Views) -2021-06-01 16:59:47.717 +08:00 [DBG] Executed page model factory for page AspNetCore.Pages_Components_Alerts_Index (Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Views) -2021-06-01 16:59:47.717 +08:00 [INF] Executing handler method Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.Components.Alerts.IndexModel.OnGet - ModelState is "Valid" -2021-06-01 16:59:47.717 +08:00 [INF] Executed handler method OnGet, returned result . -2021-06-01 16:59:47.717 +08:00 [INF] Executing an implicit handler method - ModelState is "Valid" -2021-06-01 16:59:47.717 +08:00 [INF] Executed an implicit handler method, returned result Microsoft.AspNetCore.Mvc.RazorPages.PageResult. -2021-06-01 16:59:47.721 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.AlertsDemo.AlertsDemoViewComponent with arguments ([]). -2021-06-01 16:59:47.721 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.Shared.Demos.AlertsDemo.AlertsDemoViewComponent in 0.1226ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:48.912 +08:00 [DBG] Compilation of the generated code for the Razor file at '/Views/Components/Themes/Shared/Demos/AlertsDemo/Default.cshtml' started. -2021-06-01 16:59:51.022 +08:00 [DBG] Compilation of the generated code for the Razor file at '/Views/Components/Themes/Shared/Demos/AlertsDemo/Default.cshtml' completed in 2108.9154ms. -2021-06-01 16:59:51.074 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Header.First","Application"]). -2021-06-01 16:59:51.074 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0043ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.075 +08:00 [DBG] Added bundle 'Basic.Global' to the page in 0.54 ms. -2021-06-01 16:59:51.075 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles.WidgetStylesViewComponent with arguments ([]). -2021-06-01 16:59:51.075 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles.WidgetStylesViewComponent in 0.015ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.084 +08:00 [DBG] Added bundle 'ED78B4CDC70064CB1FA5F31C4BFA513D' to the page in 1.72 ms. -2021-06-01 16:59:51.084 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Header.Last","Application"]). -2021-06-01 16:59:51.084 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0056ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.085 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Body.First","Application"]). -2021-06-01 16:59:51.085 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0028ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.085 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNavbar.MainNavbarViewComponent with arguments ([]). -2021-06-01 16:59:51.085 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNavbar.MainNavbarViewComponent in 0.0017ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.085 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand.MainNavbarBrandViewComponent with arguments ([]). -2021-06-01 16:59:51.085 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand.MainNavbarBrandViewComponent in 0.0014ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.085 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu.MainNavbarMenuViewComponent with arguments ([]). -2021-06-01 16:59:51.086 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu.MainNavbarMenuViewComponent in 0.67ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.086 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.MainNavbarToolbarViewComponent with arguments ([]). -2021-06-01 16:59:51.086 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.MainNavbarToolbarViewComponent in 0.0808ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.087 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts.PageAlertsViewComponent with arguments ([""]). -2021-06-01 16:59:51.087 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts.PageAlertsViewComponent in 0.0036ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.087 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["PageContent.First","Application"]). -2021-06-01 16:59:51.087 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0033ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.087 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["PageContent.Last","Application"]). -2021-06-01 16:59:51.087 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0024ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.088 +08:00 [DBG] Added bundle 'Basic.Global' to the page in 1.43 ms. -2021-06-01 16:59:51.089 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts.WidgetScriptsViewComponent with arguments ([]). -2021-06-01 16:59:51.089 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts.WidgetScriptsViewComponent in 0.0085ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.093 +08:00 [DBG] Added bundle '46556DCF52CF332ECC1340A1295AFE9A' to the page in 1.18 ms. -2021-06-01 16:59:51.094 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Body.Last","Application"]). -2021-06-01 16:59:51.094 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0053ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 16:59:51.097 +08:00 [INF] Executed page /Components/Alerts/Index in 3380.4634ms -2021-06-01 16:59:51.097 +08:00 [INF] Executed endpoint '/Components/Alerts/Index' -2021-06-01 16:59:51.097 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:51.097 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Components/Alerts - - - 200 - text/html;+charset=utf-8 3383.6529ms -2021-06-01 16:59:51.126 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/themes/basic/layout.css?_v=637581347776351428 - - -2021-06-01 16:59:51.126 +08:00 [INF] The file /themes/basic/layout.css was not modified -2021-06-01 16:59:51.126 +08:00 [DBG] Handled. Status code: 304 File: /themes/basic/layout.css -2021-06-01 16:59:51.126 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:51.126 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/themes/basic/layout.css?_v=637581347776351428 - - - 304 - text/css 0.4588ms -2021-06-01 16:59:51.132 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/prismjs/themes/prism-okaidia.css?_v=637543906070000000 - - -2021-06-01 16:59:51.132 +08:00 [INF] Sending file. Request path: '/libs/prismjs/themes/prism-okaidia.css'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\prismjs\themes\prism-okaidia.css' -2021-06-01 16:59:51.132 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:51.132 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/prismjs/themes/prism-okaidia.css?_v=637543906070000000 - - - 200 1935 text/css 0.4067ms -2021-06-01 16:59:51.144 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Abp/ApplicationConfigurationScript - - -2021-06-01 16:59:51.144 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/themes/basic/layout.js?_v=637581347776351428 - - -2021-06-01 16:59:51.144 +08:00 [DBG] The request path /Abp/ApplicationConfigurationScript does not match a supported file type -2021-06-01 16:59:51.144 +08:00 [DBG] 1 candidate(s) found for the request path '/Abp/ApplicationConfigurationScript' -2021-06-01 16:59:51.144 +08:00 [DBG] Endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' with route pattern 'Abp/ApplicationConfigurationScript' is valid for the request path '/Abp/ApplicationConfigurationScript' -2021-06-01 16:59:51.144 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/clipboard/clipboard.js?_v=637543906070000000 - - -2021-06-01 16:59:51.144 +08:00 [DBG] Request matched endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:51.144 +08:00 [INF] Executing endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:51.144 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Abp/ServiceProxyScript - - -2021-06-01 16:59:51.144 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/prismjs/prism.js?_v=637543906070000000 - - -2021-06-01 16:59:51.144 +08:00 [DBG] The request path /Abp/ServiceProxyScript does not match a supported file type -2021-06-01 16:59:51.144 +08:00 [DBG] 1 candidate(s) found for the request path '/Abp/ServiceProxyScript' -2021-06-01 16:59:51.145 +08:00 [DBG] Endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' with route pattern 'Abp/ServiceProxyScript' is valid for the request path '/Abp/ServiceProxyScript' -2021-06-01 16:59:51.145 +08:00 [DBG] Request matched endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:51.145 +08:00 [INF] Route matched with {area = "Abp", action = "Get", controller = "AbpApplicationConfigurationScript", page = ""}. Executing controller action with signature System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Mvc.ActionResult] Get() on controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc). -2021-06-01 16:59:51.145 +08:00 [INF] Executing endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:51.145 +08:00 [INF] The file /themes/basic/layout.js was not modified -2021-06-01 16:59:51.145 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 16:59:51.145 +08:00 [DBG] Handled. Status code: 304 File: /themes/basic/layout.js -2021-06-01 16:59:51.145 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:51.145 +08:00 [DBG] Connection id "0HM94RECLNFIG" completed keep alive response. -2021-06-01 16:59:51.145 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/themes/basic/layout.js?_v=637581347776351428 - - - 304 - application/javascript 0.5384ms -2021-06-01 16:59:51.145 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.Filters.ControllerActionFilter (Order: -2147483648)","Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 16:59:51.145 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 16:59:51.145 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter","Microsoft.AspNetCore.Mvc.ProducesAttribute (Order: 0)"] -2021-06-01 16:59:51.145 +08:00 [DBG] Executing controller factory for controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:51.145 +08:00 [INF] Sending file. Request path: '/libs/clipboard/clipboard.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\clipboard\clipboard.js' -2021-06-01 16:59:51.145 +08:00 [DBG] Connection id "0HM94RECLNFIC" completed keep alive response. -2021-06-01 16:59:51.145 +08:00 [INF] Route matched with {area = "Abp", action = "GetAll", controller = "AbpServiceProxyScript", page = ""}. Executing controller action with signature Microsoft.AspNetCore.Mvc.ActionResult GetAll(Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel) on controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc). -2021-06-01 16:59:51.145 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/clipboard/clipboard.js?_v=637543906070000000 - - - 200 30465 application/javascript 0.5769ms -2021-06-01 16:59:51.145 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 16:59:51.145 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 16:59:51.145 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.Filters.ControllerActionFilter (Order: -2147483648)","Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 16:59:51.145 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 16:59:51.145 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter","Microsoft.AspNetCore.Mvc.ProducesAttribute (Order: 0)"] -2021-06-01 16:59:51.145 +08:00 [INF] Sending file. Request path: '/libs/prismjs/prism.js'. Physical path: 'D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo\wwwroot\libs\prismjs\prism.js' -2021-06-01 16:59:51.145 +08:00 [DBG] Connection id "0HM94RECLNFIF" completed keep alive response. -2021-06-01 16:59:51.145 +08:00 [DBG] Executing controller factory for controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:51.145 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/prismjs/prism.js?_v=637543906070000000 - - - 200 51100 application/javascript 0.6572ms -2021-06-01 16:59:51.145 +08:00 [DBG] Executed controller factory for controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:51.145 +08:00 [DBG] Attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' ... -2021-06-01 16:59:51.145 +08:00 [DBG] Attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' using the name '' in request data ... -2021-06-01 16:59:51.146 +08:00 [DBG] Executed controller factory for controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 16:59:51.146 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String' using the name 'Type' in request data ... -2021-06-01 16:59:51.146 +08:00 [DBG] Could not find a value in the request with name 'Type' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String'. -2021-06-01 16:59:51.146 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String'. -2021-06-01 16:59:51.146 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean' using the name 'UseCache' in request data ... -2021-06-01 16:59:51.146 +08:00 [DBG] Could not find a value in the request with name 'UseCache' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean'. -2021-06-01 16:59:51.146 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean'. -2021-06-01 16:59:51.146 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String' using the name 'Modules' in request data ... -2021-06-01 16:59:51.146 +08:00 [DBG] Could not find a value in the request with name 'Modules' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String'. -2021-06-01 16:59:51.146 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String'. -2021-06-01 16:59:51.146 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String' using the name 'Controllers' in request data ... -2021-06-01 16:59:51.146 +08:00 [DBG] Could not find a value in the request with name 'Controllers' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String'. -2021-06-01 16:59:51.146 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String'. -2021-06-01 16:59:51.146 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String' using the name 'Actions' in request data ... -2021-06-01 16:59:51.146 +08:00 [DBG] Could not find a value in the request with name 'Actions' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String'. -2021-06-01 16:59:51.146 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String'. -2021-06-01 16:59:51.146 +08:00 [DBG] Done attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 16:59:51.146 +08:00 [DBG] Done attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 16:59:51.146 +08:00 [DBG] Attempting to validate the bound parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' ... -2021-06-01 16:59:51.146 +08:00 [DBG] Done attempting to validate the bound parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 16:59:51.146 +08:00 [DBG] Executing AbpApplicationConfigurationAppService.GetAsync()... -2021-06-01 16:59:51.147 +08:00 [DBG] Executed AbpApplicationConfigurationAppService.GetAsync(). -2021-06-01 16:59:51.148 +08:00 [INF] Executing ContentResult with HTTP Response ContentType of application/javascript -2021-06-01 16:59:51.148 +08:00 [INF] Executed action Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc) in 2.6784ms -2021-06-01 16:59:51.148 +08:00 [INF] Executed endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:51.148 +08:00 [DBG] Connection id "0HM94RECLNFIE" completed keep alive response. -2021-06-01 16:59:51.148 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Abp/ServiceProxyScript - - - 200 1936 application/javascript 3.3773ms -2021-06-01 16:59:51.160 +08:00 [DBG] An antiforgery cookie token was reused. -2021-06-01 16:59:51.161 +08:00 [WRN] The cookie 'XSRF-TOKEN' has set 'SameSite=None' and must also set 'Secure'. -2021-06-01 16:59:51.161 +08:00 [INF] Executing ContentResult with HTTP Response ContentType of application/javascript -2021-06-01 16:59:51.161 +08:00 [INF] Executed action Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc) in 16.0269ms -2021-06-01 16:59:51.161 +08:00 [INF] Executed endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 16:59:51.161 +08:00 [DBG] Connection id "0HM94RECLNFIH" completed keep alive response. -2021-06-01 16:59:51.161 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Abp/ApplicationConfigurationScript - - - 200 13072 application/javascript 16.7010ms -2021-06-01 17:01:18.739 +08:00 [INF] Starting web host. -2021-06-01 17:01:19.447 +08:00 [DBG] Hosting starting -2021-06-01 17:01:19.475 +08:00 [INF] User profile is available. Using 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys' as key repository and Windows DPAPI to encrypt keys at rest. -2021-06-01 17:01:19.491 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-00882981-b76a-49b5-97d9-cba33d1b2fac.xml'. -2021-06-01 17:01:19.497 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-16f92a94-47c6-46c3-8316-64624f1d6374.xml'. -2021-06-01 17:01:19.498 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-1c739fbe-ac37-4841-96ff-95f2e8e442b6.xml'. -2021-06-01 17:01:19.498 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-57b510d8-7687-4faf-9958-44ff9cb04f85.xml'. -2021-06-01 17:01:19.498 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-5c61addd-ecc0-4e6c-a356-8f093efb281c.xml'. -2021-06-01 17:01:19.498 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-62bbda5c-8775-40d5-9b98-5e1d890c023f.xml'. -2021-06-01 17:01:19.498 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-932dc0fd-9093-43a6-8a06-44006a08abea.xml'. -2021-06-01 17:01:19.498 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-98010c23-29bf-4f0d-8110-366f7c36adb0.xml'. -2021-06-01 17:01:19.498 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-9a3631e8-55e8-43d3-9d4b-5fd16c26d658.xml'. -2021-06-01 17:01:19.499 +08:00 [DBG] Reading data from file 'C:\Users\maliming\AppData\Local\ASP.NET\DataProtection-Keys\key-d7ba675e-ffb5-4484-b396-0913c3c07df2.xml'. -2021-06-01 17:01:19.503 +08:00 [DBG] Found key {00882981-b76a-49b5-97d9-cba33d1b2fac}. -2021-06-01 17:01:19.507 +08:00 [DBG] Found key {16f92a94-47c6-46c3-8316-64624f1d6374}. -2021-06-01 17:01:19.507 +08:00 [DBG] Found key {1c739fbe-ac37-4841-96ff-95f2e8e442b6}. -2021-06-01 17:01:19.507 +08:00 [DBG] Found key {57b510d8-7687-4faf-9958-44ff9cb04f85}. -2021-06-01 17:01:19.508 +08:00 [DBG] Found key {5c61addd-ecc0-4e6c-a356-8f093efb281c}. -2021-06-01 17:01:19.508 +08:00 [DBG] Found key {62bbda5c-8775-40d5-9b98-5e1d890c023f}. -2021-06-01 17:01:19.508 +08:00 [DBG] Found key {932dc0fd-9093-43a6-8a06-44006a08abea}. -2021-06-01 17:01:19.508 +08:00 [DBG] Found key {98010c23-29bf-4f0d-8110-366f7c36adb0}. -2021-06-01 17:01:19.508 +08:00 [DBG] Found key {9a3631e8-55e8-43d3-9d4b-5fd16c26d658}. -2021-06-01 17:01:19.508 +08:00 [DBG] Found key {d7ba675e-ffb5-4484-b396-0913c3c07df2}. -2021-06-01 17:01:19.517 +08:00 [DBG] Considering key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} with expiration date 2021-08-29 01:43:16Z as default key. -2021-06-01 17:01:19.531 +08:00 [DBG] Forwarded activator type request from Microsoft.AspNetCore.DataProtection.XmlEncryption.DpapiXmlDecryptor, Microsoft.AspNetCore.DataProtection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60 to Microsoft.AspNetCore.DataProtection.XmlEncryption.DpapiXmlDecryptor, Microsoft.AspNetCore.DataProtection, Culture=neutral, PublicKeyToken=adb9793829ddae60 -2021-06-01 17:01:19.533 +08:00 [DBG] Decrypting secret element using Windows DPAPI. -2021-06-01 17:01:19.534 +08:00 [DBG] Forwarded activator type request from Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60 to Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Culture=neutral, PublicKeyToken=adb9793829ddae60 -2021-06-01 17:01:19.536 +08:00 [DBG] Opening CNG algorithm 'AES' from provider 'null' with chaining mode CBC. -2021-06-01 17:01:19.538 +08:00 [DBG] Opening CNG algorithm 'SHA256' from provider 'null' with HMAC. -2021-06-01 17:01:19.540 +08:00 [DBG] Using key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} as the default key. -2021-06-01 17:01:19.541 +08:00 [DBG] Key ring with default key {1c739fbe-ac37-4841-96ff-95f2e8e442b6} was loaded during application startup. -2021-06-01 17:01:19.548 +08:00 [INF] Loaded ABP modules: -2021-06-01 17:01:19.548 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.AbpAspNetCoreMvcUiThemeBasicDemoModule -2021-06-01 17:01:19.548 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.AbpAspNetCoreMvcUiBasicThemeModule -2021-06-01 17:01:19.548 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.AbpAspNetCoreMvcUiThemeSharedModule -2021-06-01 17:01:19.548 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.AbpAspNetCoreMvcUiBootstrapModule -2021-06-01 17:01:19.548 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.AbpAspNetCoreMvcUiModule -2021-06-01 17:01:19.548 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule -2021-06-01 17:01:19.548 +08:00 [INF] - Volo.Abp.AspNetCore.AbpAspNetCoreModule -2021-06-01 17:01:19.548 +08:00 [INF] - Volo.Abp.Auditing.AbpAuditingModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Data.AbpDataModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.ObjectExtending.AbpObjectExtendingModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationAbstractionsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Validation.AbpValidationAbstractionsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Uow.AbpUnitOfWorkModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Json.AbpJsonModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Timing.AbpTimingModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Localization.AbpLocalizationModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Settings.AbpSettingsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Security.AbpSecurityModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.MultiTenancy.AbpMultiTenancyModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Threading.AbpThreadingModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Http.AbpHttpModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Http.AbpHttpAbstractionsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Minify.AbpMinifyModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Validation.AbpValidationModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationContractsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.UI.Navigation.AbpUiNavigationModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.UI.AbpUiModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Application.AbpDddApplicationModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Domain.AbpDddDomainModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.EventBus.AbpEventBusModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Guids.AbpGuidsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.ObjectMapping.AbpObjectMappingModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Specifications.AbpSpecificationsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Features.AbpFeaturesModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Packages.AbpAspNetCoreMvcUiPackagesModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingAbstractionsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Widgets.AbpAspNetCoreMvcUiWidgetsModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Bundling.AbpAspNetCoreMvcUiBundlingModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.AbpAspNetCoreMvcUiMultiTenancyModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.AspNetCore.MultiTenancy.AbpAspNetCoreMultiTenancyModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.AbpAspNetCoreMvcUiThemeSharedDemoModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Autofac.AbpAutofacModule -2021-06-01 17:01:19.549 +08:00 [INF] - Volo.Abp.Castle.AbpCastleCoreModule -2021-06-01 17:01:20.060 +08:00 [INF] Initialized all ABP modules. -2021-06-01 17:01:20.093 +08:00 [INF] Now listening on: http://localhost:5000 -2021-06-01 17:01:20.093 +08:00 [DBG] Loaded hosting startup assembly Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo -2021-06-01 17:01:20.093 +08:00 [INF] Application started. Press Ctrl+C to shut down. -2021-06-01 17:01:20.093 +08:00 [INF] Hosting environment: Development -2021-06-01 17:01:20.093 +08:00 [INF] Content root path: D:\Github\volo\volo5\abp\modules\basic-theme\app\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo -2021-06-01 17:01:20.093 +08:00 [DBG] Hosting started -2021-06-01 17:01:20.122 +08:00 [DBG] Connection id "0HM94RF9BC7D3" received FIN. -2021-06-01 17:01:20.131 +08:00 [DBG] Connection id "0HM94RF9BC7D3" accepted. -2021-06-01 17:01:20.131 +08:00 [DBG] Connection id "0HM94RF9BC7D3" started. -2021-06-01 17:01:20.136 +08:00 [DBG] Connection id "0HM94RF9BC7D3" sending FIN because: "The client closed the connection." -2021-06-01 17:01:20.138 +08:00 [DBG] Connection id "0HM94RF9BC7D3" disconnecting. -2021-06-01 17:01:20.140 +08:00 [DBG] Connection id "0HM94RF9BC7D3" stopped. -2021-06-01 17:01:20.189 +08:00 [DBG] Connection id "0HM94RF9BC7D4" accepted. -2021-06-01 17:01:20.189 +08:00 [DBG] Connection id "0HM94RF9BC7D4" started. -2021-06-01 17:01:20.189 +08:00 [DBG] Connection id "0HM94RF9BC7D5" accepted. -2021-06-01 17:01:20.189 +08:00 [DBG] Connection id "0HM94RF9BC7D5" started. -2021-06-01 17:01:20.218 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/ - - -2021-06-01 17:01:20.218 +08:00 [DBG] Wildcard detected, all requests with hosts will be allowed. -2021-06-01 17:01:20.220 +08:00 [DBG] The request path / does not match a supported file type -2021-06-01 17:01:20.250 +08:00 [DBG] 1 candidate(s) found for the request path '/' -2021-06-01 17:01:20.252 +08:00 [DBG] Endpoint 'Page: /Index' with route pattern '' is valid for the request path '/' -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Alerts/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Badges/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Borders/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Breadcrumbs/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/ButtonGroups/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Buttons/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Cards/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Carousel/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Collapse/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Dropdowns/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/DynamicForms/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/FormElements/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Grids/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/ListGroups/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Modals/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Navbars/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Navs/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Paginator/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Popovers/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/ProgressBars/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Tables/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Tabs/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Components/Tooltips/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Index.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/_ViewImports.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/_ViewImports.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Brand/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/MainNavbar/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Menu/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Menu/_MenuItem.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/PageAlerts/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Toolbar/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Layouts/Account.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Layouts/Application.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/Layouts/Empty.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Themes/Basic/_ViewImports.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Views/_ViewImports.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Abp/MultiTenancy/_ViewImports.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Areas/_ViewStart.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Account/_ViewStart.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpApplicationPath/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpPageSearchBox/_ViewImports.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpPageToolbar/Button/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpPageToolbar/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/Shared/Components/AbpPageToolbar/_ViewImports.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Pages/_ViewStart.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Views/Error/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Views/_ViewStart.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetScripts/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetStyles/Default.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/_ViewImports.cshtml'. -2021-06-01 17:01:20.256 +08:00 [DBG] Initializing Razor view compiler with compiled view: '/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/Default.cshtml'. -2021-06-01 17:01:20.270 +08:00 [DBG] Request matched endpoint '/Index' -2021-06-01 17:01:20.270 +08:00 [INF] Executing endpoint '/Index' -2021-06-01 17:01:20.281 +08:00 [DBG] Registered model binder providers, in the following order: ["Volo.Abp.AspNetCore.Mvc.ModelBinding.AbpDateTimeModelBinderProvider","Volo.Abp.AspNetCore.Mvc.ModelBinding.AbpExtraPropertiesDictionaryModelBinderProvider","Volo.Abp.AspNetCore.Mvc.ContentFormatters.AbpRemoteStreamContentModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.BinderTypeModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ServicesModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.BodyModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.HeaderModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FloatingPointTypeModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.EnumTypeModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.DateTimeModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.SimpleTypeModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.CancellationTokenModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ByteArrayModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FormFileModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.FormCollectionModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.KeyValuePairModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.DictionaryModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ArrayModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.CollectionModelBinderProvider","Microsoft.AspNetCore.Mvc.ModelBinding.Binders.ComplexObjectModelBinderProvider"] -2021-06-01 17:01:20.329 +08:00 [INF] Route matched with {page = "/Index", area = "", action = "", controller = ""}. Executing page /Index -2021-06-01 17:01:20.329 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter","Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.AutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 17:01:20.329 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 17:01:20.329 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 17:01:20.329 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 17:01:20.329 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 17:01:20.331 +08:00 [INF] Skipping the execution of current filter as its not the most effective filter implementing the policy Microsoft.AspNetCore.Mvc.ViewFeatures.IAntiforgeryPolicy -2021-06-01 17:01:20.332 +08:00 [DBG] Executing page model factory for page AspNetCore.Pages_Index (Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Views) -2021-06-01 17:01:20.332 +08:00 [DBG] Executed page model factory for page AspNetCore.Pages_Index (Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Views) -2021-06-01 17:01:20.370 +08:00 [INF] Executing handler method Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Pages.IndexModel.OnGet - ModelState is "Valid" -2021-06-01 17:01:20.371 +08:00 [INF] Executed handler method OnGet, returned result . -2021-06-01 17:01:20.374 +08:00 [INF] Executing an implicit handler method - ModelState is "Valid" -2021-06-01 17:01:20.374 +08:00 [INF] Executed an implicit handler method, returned result Microsoft.AspNetCore.Mvc.RazorPages.PageResult. -2021-06-01 17:01:20.508 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Header.First","Application"]). -2021-06-01 17:01:20.513 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.7273ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.565 +08:00 [DBG] Added bundle 'Basic.Global' to the page in 14.97 ms. -2021-06-01 17:01:20.566 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles.WidgetStylesViewComponent with arguments ([]). -2021-06-01 17:01:20.567 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles.WidgetStylesViewComponent in 1.1947ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.572 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Header.Last","Application"]). -2021-06-01 17:01:20.572 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0097ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.577 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Body.First","Application"]). -2021-06-01 17:01:20.577 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0071ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.578 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNavbar.MainNavbarViewComponent with arguments ([]). -2021-06-01 17:01:20.578 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNavbar.MainNavbarViewComponent in 0.2169ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.582 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand.MainNavbarBrandViewComponent with arguments ([]). -2021-06-01 17:01:20.582 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand.MainNavbarBrandViewComponent in 0.1668ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.601 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu.MainNavbarMenuViewComponent with arguments ([]). -2021-06-01 17:01:20.645 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu.MainNavbarMenuViewComponent in 43.2642ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.663 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.MainNavbarToolbarViewComponent with arguments ([]). -2021-06-01 17:01:20.670 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar.MainNavbarToolbarViewComponent in 6.9619ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.675 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts.PageAlertsViewComponent with arguments ([""]). -2021-06-01 17:01:20.676 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAlerts.PageAlertsViewComponent in 0.4039ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.681 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["PageContent.First","Application"]). -2021-06-01 17:01:20.681 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0079ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.681 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["PageContent.Last","Application"]). -2021-06-01 17:01:20.681 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0033ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.691 +08:00 [DBG] Added bundle 'Basic.Global' to the page in 7.41 ms. -2021-06-01 17:01:20.693 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts.WidgetScriptsViewComponent with arguments ([]). -2021-06-01 17:01:20.693 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts.WidgetScriptsViewComponent in 0.2635ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.696 +08:00 [DBG] Executing view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent with arguments (["Body.Last","Application"]). -2021-06-01 17:01:20.696 +08:00 [DBG] Executed view component Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook.LayoutHookViewComponent in 0.0056ms and returned Microsoft.AspNetCore.Mvc.ViewComponents.ViewViewComponentResult -2021-06-01 17:01:20.705 +08:00 [INF] Executed page /Index in 371.6076ms -2021-06-01 17:01:20.705 +08:00 [INF] Executed endpoint '/Index' -2021-06-01 17:01:20.705 +08:00 [DBG] Connection id "0HM94RF9BC7D4" completed keep alive response. -2021-06-01 17:01:20.711 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/ - - - 200 - text/html;+charset=utf-8 493.6915ms -2021-06-01 17:01:20.757 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css?_v=637581344238055428 - - -2021-06-01 17:01:20.758 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/themes/basic/layout.css?_v=637581348738017854 - - -2021-06-01 17:01:20.760 +08:00 [INF] The file /libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css was not modified -2021-06-01 17:01:20.760 +08:00 [DBG] Handled. Status code: 304 File: /libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css -2021-06-01 17:01:20.761 +08:00 [DBG] Connection id "0HM94RF9BC7D5" completed keep alive response. -2021-06-01 17:01:20.761 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-styles.css?_v=637581344238055428 - - - 304 - text/css 4.0093ms -2021-06-01 17:01:20.761 +08:00 [INF] Sending file. Request path: '/themes/basic/layout.css'. Physical path: 'N/A' -2021-06-01 17:01:20.762 +08:00 [DBG] Connection id "0HM94RF9BC7D4" completed keep alive response. -2021-06-01 17:01:20.762 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/themes/basic/layout.css?_v=637581348738017854 - - - 200 1735 text/css 3.7759ms -2021-06-01 17:01:20.765 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js?_v=637581344238055428 - - -2021-06-01 17:01:20.765 +08:00 [INF] The file /libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js was not modified -2021-06-01 17:01:20.765 +08:00 [DBG] Handled. Status code: 304 File: /libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js -2021-06-01 17:01:20.765 +08:00 [DBG] Connection id "0HM94RF9BC7D5" completed keep alive response. -2021-06-01 17:01:20.765 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js?_v=637581344238055428 - - - 304 - application/javascript 0.4319ms -2021-06-01 17:01:20.765 +08:00 [DBG] Connection id "0HM94RF9BC7D6" accepted. -2021-06-01 17:01:20.765 +08:00 [DBG] Connection id "0HM94RF9BC7D6" started. -2021-06-01 17:01:20.766 +08:00 [DBG] Connection id "0HM94RF9BC7D7" accepted. -2021-06-01 17:01:20.766 +08:00 [DBG] Connection id "0HM94RF9BC7D7" started. -2021-06-01 17:01:20.766 +08:00 [DBG] Connection id "0HM94RF9BC7D8" accepted. -2021-06-01 17:01:20.766 +08:00 [DBG] Connection id "0HM94RF9BC7D8" started. -2021-06-01 17:01:20.767 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js?_v=637581344238055428 - - -2021-06-01 17:01:20.767 +08:00 [INF] The file /libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js was not modified -2021-06-01 17:01:20.767 +08:00 [DBG] Handled. Status code: 304 File: /libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js -2021-06-01 17:01:20.767 +08:00 [DBG] Connection id "0HM94RF9BC7D6" completed keep alive response. -2021-06-01 17:01:20.767 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js?_v=637581344238055428 - - - 304 - application/javascript 0.4725ms -2021-06-01 17:01:20.767 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js?_v=637581344238055428 - - -2021-06-01 17:01:20.768 +08:00 [INF] The file /libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js was not modified -2021-06-01 17:01:20.768 +08:00 [DBG] Handled. Status code: 304 File: /libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js -2021-06-01 17:01:20.768 +08:00 [DBG] Connection id "0HM94RF9BC7D7" completed keep alive response. -2021-06-01 17:01:20.768 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js?_v=637581344238055428 - - - 304 - application/javascript 0.5060ms -2021-06-01 17:01:20.768 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js?_v=637581344238055428 - - -2021-06-01 17:01:20.768 +08:00 [INF] The file /libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js was not modified -2021-06-01 17:01:20.768 +08:00 [DBG] Handled. Status code: 304 File: /libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js -2021-06-01 17:01:20.768 +08:00 [DBG] Connection id "0HM94RF9BC7D8" completed keep alive response. -2021-06-01 17:01:20.768 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js?_v=637581344238055428 - - - 304 - application/javascript 0.4057ms -2021-06-01 17:01:20.769 +08:00 [DBG] Connection id "0HM94RF9BC7D9" accepted. -2021-06-01 17:01:20.769 +08:00 [DBG] Connection id "0HM94RF9BC7D9" started. -2021-06-01 17:01:20.769 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js?_v=637581344238055428 - - -2021-06-01 17:01:20.769 +08:00 [INF] The file /libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js was not modified -2021-06-01 17:01:20.769 +08:00 [DBG] Handled. Status code: 304 File: /libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js -2021-06-01 17:01:20.769 +08:00 [DBG] Connection id "0HM94RF9BC7D5" completed keep alive response. -2021-06-01 17:01:20.770 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js?_v=637581344238055428 - - - 304 - application/javascript 0.4231ms -2021-06-01 17:01:20.779 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js?_v=637581344238055428 - - -2021-06-01 17:01:20.779 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js?_v=637581344238055428 - - -2021-06-01 17:01:20.779 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js?_v=637581344238055428 - - -2021-06-01 17:01:20.779 +08:00 [INF] The file /libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js was not modified -2021-06-01 17:01:20.779 +08:00 [DBG] Handled. Status code: 304 File: /libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js -2021-06-01 17:01:20.779 +08:00 [DBG] Connection id "0HM94RF9BC7D6" completed keep alive response. -2021-06-01 17:01:20.779 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js?_v=637581344238055428 - - - 304 - application/javascript 0.4264ms -2021-06-01 17:01:20.779 +08:00 [INF] The file /libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js was not modified -2021-06-01 17:01:20.779 +08:00 [INF] The file /libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js was not modified -2021-06-01 17:01:20.779 +08:00 [DBG] Handled. Status code: 304 File: /libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js -2021-06-01 17:01:20.779 +08:00 [DBG] Handled. Status code: 304 File: /libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js -2021-06-01 17:01:20.779 +08:00 [DBG] Connection id "0HM94RF9BC7D9" completed keep alive response. -2021-06-01 17:01:20.779 +08:00 [DBG] Connection id "0HM94RF9BC7D7" completed keep alive response. -2021-06-01 17:01:20.779 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js?_v=637581344238055428 - - - 304 - application/javascript 0.3476ms -2021-06-01 17:01:20.779 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js?_v=637581344238055428 - - - 304 - application/javascript 0.3747ms -2021-06-01 17:01:20.780 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/themes/basic/layout.js?_v=637581348738017854 - - -2021-06-01 17:01:20.780 +08:00 [INF] Sending file. Request path: '/themes/basic/layout.js'. Physical path: 'N/A' -2021-06-01 17:01:20.780 +08:00 [DBG] Connection id "0HM94RF9BC7D4" completed keep alive response. -2021-06-01 17:01:20.780 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js?_v=637581344238055428 - - -2021-06-01 17:01:20.780 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Pages/Abp/MultiTenancy/tenant-switch.js?_v=637581344246206036 - - -2021-06-01 17:01:20.780 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/themes/basic/layout.js?_v=637581348738017854 - - - 200 546 application/javascript 0.5435ms -2021-06-01 17:01:20.781 +08:00 [INF] The file /libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js was not modified -2021-06-01 17:01:20.781 +08:00 [INF] The file /Pages/Abp/MultiTenancy/tenant-switch.js was not modified -2021-06-01 17:01:20.781 +08:00 [DBG] Handled. Status code: 304 File: /libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js -2021-06-01 17:01:20.781 +08:00 [DBG] Handled. Status code: 304 File: /Pages/Abp/MultiTenancy/tenant-switch.js -2021-06-01 17:01:20.781 +08:00 [DBG] Connection id "0HM94RF9BC7D8" completed keep alive response. -2021-06-01 17:01:20.781 +08:00 [DBG] Connection id "0HM94RF9BC7D5" completed keep alive response. -2021-06-01 17:01:20.781 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js?_v=637581344238055428 - - - 304 - application/javascript 0.3322ms -2021-06-01 17:01:20.781 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Pages/Abp/MultiTenancy/tenant-switch.js?_v=637581344246206036 - - - 304 - application/javascript 0.3554ms -2021-06-01 17:01:20.781 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Abp/ApplicationConfigurationScript - - -2021-06-01 17:01:20.781 +08:00 [INF] Request starting HTTP/1.1 GET http://localhost:5000/Abp/ServiceProxyScript - - -2021-06-01 17:01:20.782 +08:00 [DBG] The request path /Abp/ApplicationConfigurationScript does not match a supported file type -2021-06-01 17:01:20.782 +08:00 [DBG] The request path /Abp/ServiceProxyScript does not match a supported file type -2021-06-01 17:01:20.783 +08:00 [DBG] 1 candidate(s) found for the request path '/Abp/ServiceProxyScript' -2021-06-01 17:01:20.783 +08:00 [DBG] 1 candidate(s) found for the request path '/Abp/ApplicationConfigurationScript' -2021-06-01 17:01:20.783 +08:00 [DBG] Endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' with route pattern 'Abp/ServiceProxyScript' is valid for the request path '/Abp/ServiceProxyScript' -2021-06-01 17:01:20.783 +08:00 [DBG] Endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' with route pattern 'Abp/ApplicationConfigurationScript' is valid for the request path '/Abp/ApplicationConfigurationScript' -2021-06-01 17:01:20.783 +08:00 [DBG] Request matched endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 17:01:20.783 +08:00 [DBG] Request matched endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 17:01:20.783 +08:00 [INF] Executing endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 17:01:20.783 +08:00 [INF] Executing endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 17:01:20.790 +08:00 [INF] Route matched with {area = "Abp", action = "Get", controller = "AbpApplicationConfigurationScript", page = ""}. Executing controller action with signature System.Threading.Tasks.Task`1[Microsoft.AspNetCore.Mvc.ActionResult] Get() on controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc). -2021-06-01 17:01:20.790 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 17:01:20.790 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 17:01:20.790 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.Filters.ControllerActionFilter (Order: -2147483648)","Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 17:01:20.790 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 17:01:20.790 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter","Microsoft.AspNetCore.Mvc.ProducesAttribute (Order: 0)"] -2021-06-01 17:01:20.792 +08:00 [DBG] Executing controller factory for controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 17:01:20.800 +08:00 [INF] Route matched with {area = "Abp", action = "GetAll", controller = "AbpServiceProxyScript", page = ""}. Executing controller action with signature Microsoft.AspNetCore.Mvc.ActionResult GetAll(Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel) on controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc). -2021-06-01 17:01:20.800 +08:00 [DBG] Execution plan of authorization filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.AntiForgery.AbpAutoValidateAntiforgeryTokenAuthorizationFilter"] -2021-06-01 17:01:20.800 +08:00 [DBG] Execution plan of resource filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter"] -2021-06-01 17:01:20.800 +08:00 [DBG] Execution plan of action filters (in the following order): ["Microsoft.AspNetCore.Mvc.Filters.ControllerActionFilter (Order: -2147483648)","Microsoft.AspNetCore.Mvc.ModelBinding.UnsupportedContentTypeFilter (Order: -3000)","Volo.Abp.AspNetCore.Mvc.GlobalFeatures.GlobalFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Auditing.AbpAuditActionFilter","Volo.Abp.AspNetCore.Mvc.Response.AbpNoContentActionFilter","Volo.Abp.AspNetCore.Mvc.Features.AbpFeatureActionFilter","Volo.Abp.AspNetCore.Mvc.Validation.AbpValidationActionFilter","Volo.Abp.AspNetCore.Mvc.Uow.AbpUowActionFilter"] -2021-06-01 17:01:20.800 +08:00 [DBG] Execution plan of exception filters (in the following order): ["Volo.Abp.AspNetCore.Mvc.ExceptionHandling.AbpExceptionFilter"] -2021-06-01 17:01:20.800 +08:00 [DBG] Execution plan of result filters (in the following order): ["Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataFilter","Microsoft.AspNetCore.Mvc.ProducesAttribute (Order: 0)"] -2021-06-01 17:01:20.800 +08:00 [DBG] Executing controller factory for controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 17:01:20.825 +08:00 [DBG] Executed controller factory for controller Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 17:01:20.830 +08:00 [DBG] Attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' ... -2021-06-01 17:01:20.832 +08:00 [DBG] Attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' using the name '' in request data ... -2021-06-01 17:01:20.837 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String' using the name 'Type' in request data ... -2021-06-01 17:01:20.838 +08:00 [DBG] Could not find a value in the request with name 'Type' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String'. -2021-06-01 17:01:20.838 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Type' of type 'System.String'. -2021-06-01 17:01:20.841 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean' using the name 'UseCache' in request data ... -2021-06-01 17:01:20.841 +08:00 [DBG] Could not find a value in the request with name 'UseCache' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean'. -2021-06-01 17:01:20.841 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.UseCache' of type 'System.Boolean'. -2021-06-01 17:01:20.841 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String' using the name 'Modules' in request data ... -2021-06-01 17:01:20.841 +08:00 [DBG] Could not find a value in the request with name 'Modules' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String'. -2021-06-01 17:01:20.841 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Modules' of type 'System.String'. -2021-06-01 17:01:20.841 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String' using the name 'Controllers' in request data ... -2021-06-01 17:01:20.841 +08:00 [DBG] Could not find a value in the request with name 'Controllers' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String'. -2021-06-01 17:01:20.841 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Controllers' of type 'System.String'. -2021-06-01 17:01:20.841 +08:00 [DBG] Attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String' using the name 'Actions' in request data ... -2021-06-01 17:01:20.841 +08:00 [DBG] Could not find a value in the request with name 'Actions' for binding property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String'. -2021-06-01 17:01:20.841 +08:00 [DBG] Done attempting to bind property 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel.Actions' of type 'System.String'. -2021-06-01 17:01:20.843 +08:00 [DBG] Done attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 17:01:20.843 +08:00 [DBG] Done attempting to bind parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 17:01:20.843 +08:00 [DBG] Attempting to validate the bound parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel' ... -2021-06-01 17:01:20.845 +08:00 [DBG] Done attempting to validate the bound parameter 'model' of type 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.ServiceProxyGenerationModel'. -2021-06-01 17:01:20.857 +08:00 [DBG] Executed controller factory for controller Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController (Volo.Abp.AspNetCore.Mvc) -2021-06-01 17:01:20.903 +08:00 [DBG] ActionApiDescriptionModel.Create: AbpTenant.FindTenantByNameAsyncByName -2021-06-01 17:01:20.910 +08:00 [DBG] Executing AbpApplicationConfigurationAppService.GetAsync()... -2021-06-01 17:01:20.917 +08:00 [DBG] ActionApiDescriptionModel.Create: AbpTenant.FindTenantByIdAsyncById -2021-06-01 17:01:20.917 +08:00 [DBG] ActionApiDescriptionModel.Create: AbpApplicationConfiguration.GetAsync -2021-06-01 17:01:20.917 +08:00 [DBG] ActionApiDescriptionModel.Create: AbpApiDefinition.GetByModel -2021-06-01 17:01:20.935 +08:00 [INF] Executing ContentResult with HTTP Response ContentType of application/javascript -2021-06-01 17:01:20.935 +08:00 [INF] Executed action Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc) in 134.8725ms -2021-06-01 17:01:20.935 +08:00 [INF] Executed endpoint 'Volo.Abp.AspNetCore.Mvc.ProxyScripting.AbpServiceProxyScriptController.GetAll (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 17:01:20.935 +08:00 [DBG] Connection id "0HM94RF9BC7D9" completed keep alive response. -2021-06-01 17:01:20.935 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Abp/ServiceProxyScript - - - 200 1936 application/javascript 153.9787ms -2021-06-01 17:01:21.214 +08:00 [DBG] Executed AbpApplicationConfigurationAppService.GetAsync(). -2021-06-01 17:01:21.254 +08:00 [DBG] An antiforgery cookie token was reused. -2021-06-01 17:01:21.255 +08:00 [WRN] The cookie 'XSRF-TOKEN' has set 'SameSite=None' and must also set 'Secure'. -2021-06-01 17:01:21.260 +08:00 [INF] Executing ContentResult with HTTP Response ContentType of application/javascript -2021-06-01 17:01:21.260 +08:00 [INF] Executed action Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc) in 470.185ms -2021-06-01 17:01:21.260 +08:00 [INF] Executed endpoint 'Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationScriptController.Get (Volo.Abp.AspNetCore.Mvc)' -2021-06-01 17:01:21.260 +08:00 [DBG] Connection id "0HM94RF9BC7D6" completed keep alive response. -2021-06-01 17:01:21.260 +08:00 [INF] Request finished HTTP/1.1 GET http://localhost:5000/Abp/ApplicationConfigurationScript - - - 200 13072 application/javascript 478.9115ms diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json index fbb558892e..eb6278a743 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json @@ -3,8 +3,8 @@ "name": "asp.net", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2", - "@abp/prismjs": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/prismjs": "^6.0.0-rc.1" }, "devDependencies": {} } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock index bf9cff2f59..3cfae59be7 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,161 +41,161 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.2.tgz#f1c00a66b3bbe46459b8f022fd54c098a9504673" - integrity sha512-e9TvKtBziGCmWw+lysqvd5CxqaIT2+L5anAx4xujiZR6EnBApLLqprlJyH7yAsxI4LJcKdBA+oj65xBtjVOm3w== +"@abp/clipboard@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.1.tgz#3dc6808637f116a07f11c6e727f55ce9bd4b64de" + integrity sha512-u/OPfgXRmrrjkbJrzKB1YSW8rTqUWIPRVx1VAT7RdT5UMzX4DOupd7SRJFr6u7OZFP1p7umUtl6k4wY1lAv6rw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" clipboard "^2.0.8" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.2.tgz#76299d4eec3a41d518738bc0a94dc74e61552481" - integrity sha512-QwIGhUjWCWAi9lqrMIMEybjGM1WkADAFFhLB9R+Nk5Cj4dlgVe1PekypbWV0e3r300H6ZqJmgPcagKVG3G4bWg== +"@abp/prismjs@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.1.tgz#1c1afcf0533c54989d1eaf0d94a0a71f61213d70" + integrity sha512-rDkIdCEdiHw9ervlfrRyoMB0eiDGSbjM0PG+M7ePXoatDiFdDsTz/XYR3ygvdk1/8h7GM2KkNjrx8OLzWMlblQ== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/core" "~5.3.2" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/core" "~6.0.0-rc.1" prismjs "^1.26.0" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseDbProperties.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseDbProperties.cs similarity index 85% rename from modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseDbProperties.cs rename to modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseDbProperties.cs index a9689eb9fd..19985351de 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseDbProperties.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Domain/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseDbProperties.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.BlobStoring.Database; -public static class BlobStoringDatabaseDbProperties +public static class AbpBlobStoringDatabaseDbProperties { public static string DbTablePrefix { get; set; } = AbpCommonDbProperties.DbTablePrefix; diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDbContext.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDbContext.cs index b20f5190c4..f3e7661366 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDbContext.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDbContext.cs @@ -4,7 +4,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore; -[ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpBlobStoringDatabaseDbProperties.ConnectionStringName)] public class BlobStoringDbContext : AbpDbContext, IBlobStoringDbContext { public DbSet BlobContainers { get; set; } diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDbContextModelCreatingExtensions.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDbContextModelCreatingExtensions.cs index e4fad62e37..6be009f3ec 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDbContextModelCreatingExtensions.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/BlobStoringDbContextModelCreatingExtensions.cs @@ -12,7 +12,7 @@ public static class BlobStoringDbContextModelCreatingExtensions builder.Entity(b => { - b.ToTable(BlobStoringDatabaseDbProperties.DbTablePrefix + "BlobContainers", BlobStoringDatabaseDbProperties.DbSchema); + b.ToTable(AbpBlobStoringDatabaseDbProperties.DbTablePrefix + "BlobContainers", AbpBlobStoringDatabaseDbProperties.DbSchema); b.ConfigureByConvention(); @@ -27,7 +27,7 @@ public static class BlobStoringDbContextModelCreatingExtensions builder.Entity(b => { - b.ToTable(BlobStoringDatabaseDbProperties.DbTablePrefix + "Blobs", BlobStoringDatabaseDbProperties.DbSchema); + b.ToTable(AbpBlobStoringDatabaseDbProperties.DbTablePrefix + "Blobs", AbpBlobStoringDatabaseDbProperties.DbSchema); b.ConfigureByConvention(); diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/IBlobStoringDbContext.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/IBlobStoringDbContext.cs index b36c0753d3..b139d8473b 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/IBlobStoringDbContext.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.EntityFrameworkCore/Volo/Abp/BlobStoring/Database/EntityFrameworkCore/IBlobStoringDbContext.cs @@ -4,7 +4,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Volo.Abp.BlobStoring.Database.EntityFrameworkCore; -[ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpBlobStoringDatabaseDbProperties.ConnectionStringName)] public interface IBlobStoringDbContext : IEfCoreDbContext { DbSet BlobContainers { get; } diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringMongoDbContext.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringMongoDbContext.cs index d0be5f4973..108804fbb9 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringMongoDbContext.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringMongoDbContext.cs @@ -4,7 +4,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.BlobStoring.Database.MongoDB; -[ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpBlobStoringDatabaseDbProperties.ConnectionStringName)] public class BlobStoringMongoDbContext : AbpMongoDbContext, IBlobStoringMongoDbContext { public IMongoCollection BlobContainers => Collection(); diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringMongoDbContextExtensions.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringMongoDbContextExtensions.cs index 7943215534..28c3bdde7f 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringMongoDbContextExtensions.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/BlobStoringMongoDbContextExtensions.cs @@ -11,12 +11,12 @@ public static class BlobStoringMongoDbContextExtensions builder.Entity(b => { - b.CollectionName = BlobStoringDatabaseDbProperties.DbTablePrefix + "BlobContainers"; + b.CollectionName = AbpBlobStoringDatabaseDbProperties.DbTablePrefix + "BlobContainers"; }); builder.Entity(b => { - b.CollectionName = BlobStoringDatabaseDbProperties.DbTablePrefix + "Blobs"; + b.CollectionName = AbpBlobStoringDatabaseDbProperties.DbTablePrefix + "Blobs"; }); } } diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/IBlobStoringMongoDbContext.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/IBlobStoringMongoDbContext.cs index 1fcf61b146..803ed5171d 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/IBlobStoringMongoDbContext.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.MongoDB/Volo/Abp/BlobStoring/Database/MongoDB/IBlobStoringMongoDbContext.cs @@ -4,7 +4,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.BlobStoring.Database.MongoDB; -[ConnectionStringName(BlobStoringDatabaseDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpBlobStoringDatabaseDbProperties.ConnectionStringName)] public interface IBlobStoringMongoDbContext : IAbpMongoDbContext { IMongoCollection BlobContainers { get; } diff --git a/modules/blogging/app/Volo.BloggingTestApp/package.json b/modules/blogging/app/Volo.BloggingTestApp/package.json index 65b331c1fc..99070e0bd4 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/package.json +++ b/modules/blogging/app/Volo.BloggingTestApp/package.json @@ -3,7 +3,7 @@ "name": "volo.blogtestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2", - "@abp/blogging": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/blogging": "^6.0.0-rc.1" } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js b/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js +++ b/modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock index a070d65619..56a2ce435c 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/yarn.lock +++ b/modules/blogging/app/Volo.BloggingTestApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,187 +41,187 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/blogging@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-5.3.2.tgz#57564c54b27051a576376d84f6ecc42219cecac1" - integrity sha512-UIF+qAIeJa4+Y8YX7Ik86y+MNFRhqULZ1M1tkqz4AfYeUqrU4qHj7lq3ioFxAX3P9iWP7g341tLf2uy3cTCS6Q== +"@abp/blogging@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-6.0.0-rc.1.tgz#f74168adb95fc7f36ba28b93f4801c2e7d41fe6b" + integrity sha512-yjLuiVEuC1+v6bxLLze0MCn9yyciPdaikFRQ76Tgi+5oBNCOncaPuq8thO8YM8t4uqHGuQ6GFpKA2I4O9BSelg== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - "@abp/owl.carousel" "~5.3.2" - "@abp/prismjs" "~5.3.2" - "@abp/tui-editor" "~5.3.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + "@abp/owl.carousel" "~6.0.0-rc.1" + "@abp/prismjs" "~6.0.0-rc.1" + "@abp/tui-editor" "~6.0.0-rc.1" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.2.tgz#f1c00a66b3bbe46459b8f022fd54c098a9504673" - integrity sha512-e9TvKtBziGCmWw+lysqvd5CxqaIT2+L5anAx4xujiZR6EnBApLLqprlJyH7yAsxI4LJcKdBA+oj65xBtjVOm3w== +"@abp/clipboard@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.1.tgz#3dc6808637f116a07f11c6e727f55ce9bd4b64de" + integrity sha512-u/OPfgXRmrrjkbJrzKB1YSW8rTqUWIPRVx1VAT7RdT5UMzX4DOupd7SRJFr6u7OZFP1p7umUtl6k4wY1lAv6rw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" clipboard "^2.0.8" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/owl.carousel@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-5.3.2.tgz#6e458cc6844d13e493eb10588481fff5d7846d88" - integrity sha512-4vNWPQncSV9FVbwgEEIQPp6IwQ5/nWgZi5JsrFDVllYtX/Q6BaFRnMl6MKoe7Ryz5JsM+brZXnCphbpRMZz1TQ== +"@abp/owl.carousel@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-6.0.0-rc.1.tgz#b81d2f906494f7f37de15a3b35769751fbf01e5c" + integrity sha512-8zSsi8ivbqDnzIHEVnHcznihm4y2/60mcNP6nWdB99B7z8hpBdP9c+A4Wq/mwcJvtfWwV8Mx2lR8tLmm14PxCA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" owl.carousel "^2.3.4" -"@abp/prismjs@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.2.tgz#76299d4eec3a41d518738bc0a94dc74e61552481" - integrity sha512-QwIGhUjWCWAi9lqrMIMEybjGM1WkADAFFhLB9R+Nk5Cj4dlgVe1PekypbWV0e3r300H6ZqJmgPcagKVG3G4bWg== +"@abp/prismjs@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.1.tgz#1c1afcf0533c54989d1eaf0d94a0a71f61213d70" + integrity sha512-rDkIdCEdiHw9ervlfrRyoMB0eiDGSbjM0PG+M7ePXoatDiFdDsTz/XYR3ygvdk1/8h7GM2KkNjrx8OLzWMlblQ== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/core" "~5.3.2" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/core" "~6.0.0-rc.1" prismjs "^1.26.0" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/tui-editor@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.2.tgz#6e7b88e61771b958e50465d569aca0f896c396d9" - integrity sha512-iXK+6sxjxPcMQEYRTnsW9njW/jcSUMQxPRGEeot/B5GIoyVQJNqMHmdiccsZQAp1L7t2OY5G+0HVjvXD3BZ6BQ== +"@abp/tui-editor@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0-rc.1.tgz#1d3a3cd51ee9a15019813c3d854fe51dd27021f1" + integrity sha512-3dwvKJfbgJXOhaS2hXED+pm1ZEyy3tsq4KaqCkFsowRbrKvNQcaRUi3eSdrV4FCQmmtphS9+K+/c85SsIcPUIQ== dependencies: - "@abp/jquery" "~5.3.2" - "@abp/prismjs" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" + "@abp/prismjs" "~6.0.0-rc.1" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json index 9823d30f73..40c44e55c0 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json @@ -56,6 +56,8 @@ "ShareOn": "Share on", "TitleLengthWarning": "Keep your title size under 60 characters to be SEO friendly!", "ClearCache": "Clear cache", - "ClearCacheConfirmationMessage": "Are you sure you want to clear the cache?" + "ClearCacheConfirmationMessage": "Are you sure you want to clear the cache?", + "MarkdownSupported": "Markdown is supported", + "FileUploadInfo": "Drag, drop, or paste a copied image." } } \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDbProperties.cs b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/AbpBloggingDbProperties.cs similarity index 90% rename from modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDbProperties.cs rename to modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/AbpBloggingDbProperties.cs index 6f57d5f404..464ea2c348 100644 --- a/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/BloggingDbProperties.cs +++ b/modules/blogging/src/Volo.Blogging.Domain/Volo/Blogging/AbpBloggingDbProperties.cs @@ -1,6 +1,6 @@ namespace Volo.Blogging { - public static class BloggingDbProperties + public static class AbpBloggingDbProperties { /// /// Default value: "Blg". diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContext.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContext.cs index 85c34aa996..9ccbe3aa3b 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContext.cs +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContext.cs @@ -11,7 +11,7 @@ using Volo.Blogging.Users; namespace Volo.Blogging.EntityFrameworkCore { [IgnoreMultiTenancy] - [ConnectionStringName(BloggingDbProperties.ConnectionStringName)] + [ConnectionStringName(AbpBloggingDbProperties.ConnectionStringName)] public class BloggingDbContext : AbpDbContext, IBloggingDbContext { public DbSet Users { get; set; } diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs index 3386da25a5..abf96ebcef 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingDbContextModelBuilderExtensions.cs @@ -25,7 +25,7 @@ namespace Volo.Blogging.EntityFrameworkCore builder.Entity(b => { - b.ToTable(BloggingDbProperties.DbTablePrefix + "Users", BloggingDbProperties.DbSchema); + b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "Users", AbpBloggingDbProperties.DbSchema); b.ConfigureByConvention(); b.ConfigureAbpUser(); @@ -35,7 +35,7 @@ namespace Volo.Blogging.EntityFrameworkCore builder.Entity(b => { - b.ToTable(BloggingDbProperties.DbTablePrefix + "Blogs", BloggingDbProperties.DbSchema); + b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "Blogs", AbpBloggingDbProperties.DbSchema); b.ConfigureByConvention(); @@ -48,7 +48,7 @@ namespace Volo.Blogging.EntityFrameworkCore builder.Entity(b => { - b.ToTable(BloggingDbProperties.DbTablePrefix + "Posts", BloggingDbProperties.DbSchema); + b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "Posts", AbpBloggingDbProperties.DbSchema); b.ConfigureByConvention(); @@ -68,7 +68,7 @@ namespace Volo.Blogging.EntityFrameworkCore builder.Entity(b => { - b.ToTable(BloggingDbProperties.DbTablePrefix + "Comments", BloggingDbProperties.DbSchema); + b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "Comments", AbpBloggingDbProperties.DbSchema); b.ConfigureByConvention(); @@ -84,7 +84,7 @@ namespace Volo.Blogging.EntityFrameworkCore builder.Entity(b => { - b.ToTable(BloggingDbProperties.DbTablePrefix + "Tags", BloggingDbProperties.DbSchema); + b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "Tags", AbpBloggingDbProperties.DbSchema); b.ConfigureByConvention(); @@ -99,7 +99,7 @@ namespace Volo.Blogging.EntityFrameworkCore builder.Entity(b => { - b.ToTable(BloggingDbProperties.DbTablePrefix + "PostTags", BloggingDbProperties.DbSchema); + b.ToTable(AbpBloggingDbProperties.DbTablePrefix + "PostTags", AbpBloggingDbProperties.DbSchema); b.ConfigureByConvention(); diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/IBloggingDbContext.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/IBloggingDbContext.cs index 4eb8f35c03..ce63597029 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/IBloggingDbContext.cs +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/IBloggingDbContext.cs @@ -11,7 +11,7 @@ using Volo.Blogging.Users; namespace Volo.Blogging.EntityFrameworkCore { [IgnoreMultiTenancy] - [ConnectionStringName(BloggingDbProperties.ConnectionStringName)] + [ConnectionStringName(AbpBloggingDbProperties.ConnectionStringName)] public interface IBloggingDbContext : IEfCoreDbContext { DbSet Users { get; } diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContext.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContext.cs index 1f20ff1744..d782f0fb1b 100644 --- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContext.cs +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContext.cs @@ -10,7 +10,7 @@ using Volo.Blogging.Users; namespace Volo.Blogging.MongoDB { [IgnoreMultiTenancy] - [ConnectionStringName(BloggingDbProperties.ConnectionStringName)] + [ConnectionStringName(AbpBloggingDbProperties.ConnectionStringName)] public class BloggingMongoDbContext : AbpMongoDbContext, IBloggingMongoDbContext { public IMongoCollection Users => Collection(); diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs index b04f0a74fc..1083169761 100644 --- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs @@ -16,27 +16,27 @@ namespace Volo.Blogging.MongoDB builder.Entity(b => { - b.CollectionName = BloggingDbProperties.DbTablePrefix + "Users"; + b.CollectionName = AbpBloggingDbProperties.DbTablePrefix + "Users"; }); builder.Entity(b => { - b.CollectionName = BloggingDbProperties.DbTablePrefix + "Blogs"; + b.CollectionName = AbpBloggingDbProperties.DbTablePrefix + "Blogs"; }); builder.Entity(b => { - b.CollectionName = BloggingDbProperties.DbTablePrefix + "Posts"; + b.CollectionName = AbpBloggingDbProperties.DbTablePrefix + "Posts"; }); builder.Entity(b => { - b.CollectionName = BloggingDbProperties.DbTablePrefix + "Tags"; + b.CollectionName = AbpBloggingDbProperties.DbTablePrefix + "Tags"; }); builder.Entity(b => { - b.CollectionName = BloggingDbProperties.DbTablePrefix + "Comments"; + b.CollectionName = AbpBloggingDbProperties.DbTablePrefix + "Comments"; }); } } diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/IBloggingMongoDbContext.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/IBloggingMongoDbContext.cs index 1dbf5eee92..d3c898a14d 100644 --- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/IBloggingMongoDbContext.cs +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/IBloggingMongoDbContext.cs @@ -10,7 +10,7 @@ using Volo.Blogging.Users; namespace Volo.Blogging.MongoDB { [IgnoreMultiTenancy] - [ConnectionStringName(BloggingDbProperties.ConnectionStringName)] + [ConnectionStringName(AbpBloggingDbProperties.ConnectionStringName)] public interface IBloggingMongoDbContext : IAbpMongoDbContext { IMongoCollection Users { get; } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json index 09c813d7a9..99c3281cfa 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json @@ -3,6 +3,6 @@ "name": "client-simulation-web", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock index e8e53fa6bd..bc822ce865 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/angular/package.json b/modules/cms-kit/angular/package.json index 78f260d648..4496a23613 100644 --- a/modules/cms-kit/angular/package.json +++ b/modules/cms-kit/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.2", - "@abp/ng.identity": "~5.3.2", - "@abp/ng.setting-management": "~5.3.2", - "@abp/ng.tenant-management": "~5.3.2", - "@abp/ng.theme.basic": "~5.3.2", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.basic": "~6.0.0-rc.1", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/modules/cms-kit/angular/projects/cms-kit/package.json b/modules/cms-kit/angular/projects/cms-kit/package.json index b9ad9cf2df..0a10f5182b 100644 --- a/modules/cms-kit/angular/projects/cms-kit/package.json +++ b/modules/cms-kit/angular/projects/cms-kit/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": "^9.1.11", "@angular/core": "^9.1.11", - "@abp/ng.core": ">=5.3.2", - "@abp/ng.theme.shared": ">=5.3.2" + "@abp/ng.core": ">=6.0.0-rc.1", + "@abp/ng.theme.shared": ">=6.0.0-rc.1" }, "dependencies": { "tslib": "^2.0.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json index 2f6c4243aa..7c098a9017 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock index 48e4e1f8ef..85ac9f5e66 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json index 2e9daa28f6..f677733547 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js b/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock index 240068f4af..113aec5be6 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs index 5e953e82d6..801cc2dd41 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs @@ -1,11 +1,7 @@ using System.IO; -using System.Linq; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Volo.CmsKit.EntityFrameworkCore; -using Volo.CmsKit.MultiTenancy; -using Volo.CmsKit.Web; using Microsoft.OpenApi.Models; using Volo.Abp; using Volo.Abp.Account; @@ -19,8 +15,8 @@ using Volo.Abp.BlobStoring.Database.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore.SqlServer; -using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.FeatureManagement; +using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Identity; using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.Identity.Web; @@ -29,6 +25,7 @@ using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; using Volo.Abp.PermissionManagement.EntityFrameworkCore; +using Volo.Abp.PermissionManagement.HttpApi; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.Swashbuckle; @@ -38,15 +35,16 @@ using Volo.Abp.TenantManagement.Web; using Volo.Abp.Threading; using Volo.Abp.VirtualFileSystem; using Volo.CmsKit.Admin.Web; -using Volo.CmsKit.Public.Web; -using System; -using Volo.Abp.PermissionManagement.HttpApi; -using Volo.CmsKit.Tags; using Volo.CmsKit.Comments; +using Volo.CmsKit.Contents; +using Volo.CmsKit.EntityFrameworkCore; using Volo.CmsKit.MediaDescriptors; -using Volo.CmsKit.Reactions; +using Volo.CmsKit.MultiTenancy; +using Volo.CmsKit.Public.Web; using Volo.CmsKit.Ratings; -using Volo.CmsKit.Contents; +using Volo.CmsKit.Reactions; +using Volo.CmsKit.Tags; +using Volo.CmsKit.Web; namespace Volo.CmsKit; @@ -93,9 +91,8 @@ public class CmsKitWebUnifiedModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.GetConfiguration(); - ConfigureCmsKit(context); + ConfigureCmsKit(); Configure(options => { @@ -156,11 +153,11 @@ public class CmsKitWebUnifiedModule : AbpModule Configure(options => { - options.AddWidget("ExComment", "CommentDate", "DecisionCommentDate"); + options.AddWidget("Today", "CmsToday", "Format"); }); } - private void ConfigureCmsKit(ServiceConfigurationContext context) + private void ConfigureCmsKit() { Configure(options => { diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDate.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDate.cshtml deleted file mode 100644 index 7921c0ecbd..0000000000 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDate.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -@model Volo.CmsKit.ViewComponents.CommentDateViewComponent - -

Welcome Comment Date Component

-@if (Model.IsShow) -{ -

@DateTime.Today.ToLongDateString()

-} -else -{ -

Without date

-} \ No newline at end of file diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDate.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDate.cshtml deleted file mode 100644 index 0622000bb7..0000000000 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDate.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@using Volo.CmsKit.ViewComponents -@model DecisionCommentDateViewModel - -
- -
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDateViewComponent.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDateViewComponent.cs deleted file mode 100644 index c4f52d508a..0000000000 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDateViewComponent.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.AspNetCore.Mvc.UI.Widgets; -using Volo.Abp.Localization; - -namespace Volo.CmsKit.ViewComponents; - -[Widget( - AutoInitialize = true -)] - -[ViewComponent(Name = "DecisionCommentDate")] -public class DecisionCommentDateViewComponent : AbpViewComponent -{ - public DecisionCommentDateViewComponent() - { - } - - public virtual async Task InvokeAsync() - { - return View("~/ViewComponents/DecisionCommentDate.cshtml", new DecisionCommentDateViewModel()); - } -} - -public class DecisionCommentDateViewModel -{ - [DisplayName("Show date in the component")] - public bool IsShow { get; set; } = true; -} diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/Format.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/Format.cshtml new file mode 100644 index 0000000000..de58a49679 --- /dev/null +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/Format.cshtml @@ -0,0 +1,6 @@ +@using Volo.CmsKit.ViewComponents +@model FormatViewModel + +
+ +
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/FormatViewComponent.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/FormatViewComponent.cs new file mode 100644 index 0000000000..af53a3e8f1 --- /dev/null +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/FormatViewComponent.cs @@ -0,0 +1,30 @@ +using System.ComponentModel; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Widgets; + +namespace Volo.CmsKit.ViewComponents; + +[Widget( + AutoInitialize = true +)] + +[ViewComponent(Name = "Format")] +public class FormatViewComponent : AbpViewComponent +{ + public FormatViewComponent() + { + } + + public virtual async Task InvokeAsync() + { + return View("~/ViewComponents/Format.cshtml", new FormatViewModel()); + } +} + +public class FormatViewModel +{ + [DisplayName("Format your date in the component")] + public string Format { get; set; } +} diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/Today.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/Today.cshtml new file mode 100644 index 0000000000..a63170e67f --- /dev/null +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/Today.cshtml @@ -0,0 +1,5 @@ +@model Volo.CmsKit.ViewComponents.TodayViewComponent + +

Welcome Today Component

+ +

@DateTime.Now.ToString(Model.Format)

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDateViewComponent.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/TodayViewComponent.cs similarity index 50% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDateViewComponent.cs rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/TodayViewComponent.cs index 4122bb1481..f0be3ad33c 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDateViewComponent.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/TodayViewComponent.cs @@ -9,17 +9,17 @@ namespace Volo.CmsKit.ViewComponents; AutoInitialize = true )] -[ViewComponent(Name = "CommentDate")] -public class CommentDateViewComponent : AbpViewComponent +[ViewComponent(Name = "CmsToday")] +public class TodayViewComponent : AbpViewComponent { - public bool IsShow { get; set; } + public string Format { get; set; } - public CommentDateViewComponent() + public TodayViewComponent() { } - public virtual async Task InvokeAsync(string isShow) + public virtual async Task InvokeAsync(string format) { - return View("~/ViewComponents/CommentDate.cshtml", new CommentDateViewComponent() { IsShow = bool.Parse(isShow) }); + return View("~/ViewComponents/Today.cshtml", new TodayViewComponent() { Format = format }); } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json index 55de8f1d07..bd6c888e2f 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2", - "@abp/cms-kit": "5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/cms-kit": "6.0.0-rc.1" } } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock index 43603acc93..9d7cfe7b7f 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,243 +41,243 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.2.tgz#f1c00a66b3bbe46459b8f022fd54c098a9504673" - integrity sha512-e9TvKtBziGCmWw+lysqvd5CxqaIT2+L5anAx4xujiZR6EnBApLLqprlJyH7yAsxI4LJcKdBA+oj65xBtjVOm3w== +"@abp/clipboard@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.1.tgz#3dc6808637f116a07f11c6e727f55ce9bd4b64de" + integrity sha512-u/OPfgXRmrrjkbJrzKB1YSW8rTqUWIPRVx1VAT7RdT5UMzX4DOupd7SRJFr6u7OZFP1p7umUtl6k4wY1lAv6rw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" clipboard "^2.0.8" -"@abp/cms-kit.admin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-5.3.2.tgz#ca34fca45923e57328dfa728cf382d9cca1843c1" - integrity sha512-VnYM9udFFMsu2Myy6qVg3f3oLVTalguIzMe+EiPIJVbjmKBBTSpXzsgvpPYHiuCobO/V7Fd3d/fxrOOM2g1KNA== +"@abp/cms-kit.admin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.admin/-/cms-kit.admin-6.0.0-rc.1.tgz#82817dedeb57ffb52cb397f1309c3bf34a79068c" + integrity sha512-m1W/ZpXbEzJQ7KxTgyO+wDM4rTfWXOfXIyKdYsRHued+IfX6Zq+OWJaxtK6fK2NgzsFvJ5r/i7+2JKcoks1tMA== dependencies: - "@abp/codemirror" "~5.3.2" - "@abp/jstree" "~5.3.2" - "@abp/slugify" "~5.3.2" - "@abp/tui-editor" "~5.3.2" - "@abp/uppy" "~5.3.2" + "@abp/codemirror" "~6.0.0-rc.1" + "@abp/jstree" "~6.0.0-rc.1" + "@abp/slugify" "~6.0.0-rc.1" + "@abp/tui-editor" "~6.0.0-rc.1" + "@abp/uppy" "~6.0.0-rc.1" -"@abp/cms-kit.public@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-5.3.2.tgz#edad9fa5433b95c5b72483c9600ecc072ed33b52" - integrity sha512-+WOr0hv9XEZSo/6hTph7RVT6OibbhrtsWqpI2Pt9Ug3atUcPKC2GeqhPqn2UevHzBwOzPiaZgxauB9ZADgUG8A== +"@abp/cms-kit.public@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit.public/-/cms-kit.public-6.0.0-rc.1.tgz#64bc358ff618ce17266502da084c02bc166c43df" + integrity sha512-ZQ7Z1cabllEs/sCn+cc0Gq3hU/PQiZlKymulxNmxjv3ARfkAjsV7g+utFx14xxztF0Z442IT5urLasdX3N+/Jw== dependencies: - "@abp/highlight.js" "~5.3.2" - "@abp/star-rating-svg" "~5.3.2" + "@abp/highlight.js" "~6.0.0-rc.1" + "@abp/star-rating-svg" "~6.0.0-rc.1" -"@abp/cms-kit@5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-5.3.2.tgz#e51db314d4c81e465a84a3a9fa1349c792af7b5e" - integrity sha512-EIt4gbtYE2gmg95/aiVjC33/egAR3G0vmazH8mCYKqoeTaMa9Uih4Rs/DoSRhkbg8jntkDMdRoE7FOiyAAvIxA== +"@abp/cms-kit@6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/cms-kit/-/cms-kit-6.0.0-rc.1.tgz#bf5cd14a6ad83e2751d5168bd4b97b979e356a4c" + integrity sha512-9RK6TheRRtLc9FS3uR1TJNHr9iV/t8Tiy91klSrCIPwUamMQlOQYt9VZzDqZ+gkXTXoDnE3OesTUzNf0ftyOuQ== dependencies: - "@abp/cms-kit.admin" "~5.3.2" - "@abp/cms-kit.public" "~5.3.2" + "@abp/cms-kit.admin" "~6.0.0-rc.1" + "@abp/cms-kit.public" "~6.0.0-rc.1" -"@abp/codemirror@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-5.3.2.tgz#0d606585574159d9a271df2173345b21ca3502b4" - integrity sha512-0Li5nPhgE+anfg59D6C1PrCa9cURgV2RWZjrbVzh2PfPzImxWqWSBpKBemMj6o9ymYNTRqJDjmYxi/dSX42AjQ== +"@abp/codemirror@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-6.0.0-rc.1.tgz#a0c43d60c8ba25882a5e8c8f9e104e3c149b1d79" + integrity sha512-R/wYHEi+2m8SHZTla9yyThTqtPisnBhconBf57qtbv9mfjENLyYbq6dg+8tWvNguN15zrLrRgfdLKxzL/0oSyw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" codemirror "^5.65.1" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/highlight.js@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-5.3.2.tgz#c8f2b9e39da04e8e64c3882f33fd17260ff6e99b" - integrity sha512-qKg4xYwM81JdQaD0YuNTjMTNVAIxg2hRpkHfpL5lmY01bVV2Lui6Ziz0Fii1YVc6Qw8PxaJEWqNfEvEY0F5d2A== +"@abp/highlight.js@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-6.0.0-rc.1.tgz#a8383f8724e6de1d6d0557a725451f667ab08c9c" + integrity sha512-dSkVZHpHM4Bhdi26fyoSzw8DiMoGqe7e6KmxuMVGTvr+rb1bnPWhUOeUSqXNQttS1ln6JX9L/6TEw+EssJ/a/w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@highlightjs/cdn-assets" "~11.4.0" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/jstree@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-5.3.2.tgz#71e9831b0b644f7af9f7b38076fffc266e16c377" - integrity sha512-nxulvfxuEthTtbYXzASdZXxdn4/z8iMSpp0LBxY8CLCztKczF7YTBeDzUEfyR2m9hUS0A6D3SAcNd08WMgY42Q== +"@abp/jstree@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jstree/-/jstree-6.0.0-rc.1.tgz#1bbc3ac4c2a38488656611bbc04be61e7fa8af13" + integrity sha512-S0cKA4qeIaJQrKFLXavc+xmT0I88wlWInInrpF9AzrJKY2cRdtl8jOCnsnQDzBzRXOTgyCvoOE5/p1F/p6m+ng== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jstree "^3.3.12" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.2.tgz#76299d4eec3a41d518738bc0a94dc74e61552481" - integrity sha512-QwIGhUjWCWAi9lqrMIMEybjGM1WkADAFFhLB9R+Nk5Cj4dlgVe1PekypbWV0e3r300H6ZqJmgPcagKVG3G4bWg== +"@abp/prismjs@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.1.tgz#1c1afcf0533c54989d1eaf0d94a0a71f61213d70" + integrity sha512-rDkIdCEdiHw9ervlfrRyoMB0eiDGSbjM0PG+M7ePXoatDiFdDsTz/XYR3ygvdk1/8h7GM2KkNjrx8OLzWMlblQ== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/core" "~5.3.2" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/core" "~6.0.0-rc.1" prismjs "^1.26.0" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/slugify@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-5.3.2.tgz#627adf73eebf67bcd62d66da635efb17b64ae28b" - integrity sha512-EKGbLl6bg2tSlg3hlF620/bMZCXvATlKyJtteWSS+OkYy5T8DaFlQNY3AdXopPLLEfwaicJm6NJL8Eg2DSFPUg== +"@abp/slugify@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/slugify/-/slugify-6.0.0-rc.1.tgz#ddf5b8bc821e3b9c3de73f23dfda9b38f4478d84" + integrity sha512-YajzbsI8J0+ykFbLKHU5cDZs1CTMEBeiNlOolSTAySJKQf/45D+u42NfS9A6Zj+6sJwexudEwG9W6BMfxZUXjw== dependencies: slugify "^1.6.5" -"@abp/star-rating-svg@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-5.3.2.tgz#30bc8ae18b3a84e805b33f0b03cf650b9dbae1a2" - integrity sha512-vtsf6XYelYQLOqxKa4CVqsTmdrKDawwLjiVKvwUQxs/QP5Uy8jggqjnFTpPVZxZGOttUnVcAgrgn/ovLcDRntg== +"@abp/star-rating-svg@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/star-rating-svg/-/star-rating-svg-6.0.0-rc.1.tgz#39e4dc96cfae67ce2b970ef7234e741d3bb5ea6b" + integrity sha512-Smmas87Z/CGCsix6o9O29yyBzKjYydzEbV0r8aCKK291fkyBkO1d+1+zslqxDz71TvJbN4V5IPwvuw9sWBySHA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" star-rating-svg "^3.5.0" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/tui-editor@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-5.3.2.tgz#6e7b88e61771b958e50465d569aca0f896c396d9" - integrity sha512-iXK+6sxjxPcMQEYRTnsW9njW/jcSUMQxPRGEeot/B5GIoyVQJNqMHmdiccsZQAp1L7t2OY5G+0HVjvXD3BZ6BQ== +"@abp/tui-editor@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-6.0.0-rc.1.tgz#1d3a3cd51ee9a15019813c3d854fe51dd27021f1" + integrity sha512-3dwvKJfbgJXOhaS2hXED+pm1ZEyy3tsq4KaqCkFsowRbrKvNQcaRUi3eSdrV4FCQmmtphS9+K+/c85SsIcPUIQ== dependencies: - "@abp/jquery" "~5.3.2" - "@abp/prismjs" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" + "@abp/prismjs" "~6.0.0-rc.1" -"@abp/uppy@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-5.3.2.tgz#1a2ef224382ee4d628de8b91fe40dac933853bbf" - integrity sha512-VQCVkQ4KEnunLyRHfT92F8gNdRvwKy2bxYPSazzstMCXWsjm7QDH4oOaLYL+LcVNamc9SBgy7ZdtAvc2yCcS0A== +"@abp/uppy@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/uppy/-/uppy-6.0.0-rc.1.tgz#094e27d30cf1b8ac929529cc36c5c8896630d008" + integrity sha512-YmcQ1YgMRnK9rqak+6O3jO+PhXOAKh/EKCizQ2p0Zwt+QT9JaNVZ1S2pNv/+ffYVRccdAKkXjMk7MyxXkWZMag== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" uppy "^1.16.1" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js index 375b7ad41b..a101635d73 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js @@ -334,6 +334,25 @@ $(function () { editor.insertText(txt); }); + $('.tab-item').on('click', function () { + if ($(this).attr("aria-label") == 'Preview' && editor.isMarkdownMode()) { + + let content = editor.getMarkdown(); + localStorage.setItem('content', content); + + $.post("/CmsKitCommonWidgets/ContentPreview", { content: content }, function (result) { + editor.setHTML(result); + + var highllightedText = $('#ContentEditor').find('.toastui-editor-md-preview-highlight'); + highllightedText.removeClass('toastui-editor-md-preview-highlight'); + }); + } + else if ($(this).attr("aria-label") == 'Write') { + var retrievedObject = localStorage.getItem('content'); + editor.setMarkdown(retrievedObject); + } + }); + function createAddWidgetButton() { const button = document.createElement('button'); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js index 51e3eda96c..d14194ecb5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js @@ -255,6 +255,25 @@ $(function () { editor.insertText(txt); }); + $('.tab-item').on('click', function () { + if ($(this).attr("aria-label") == 'Preview' && editor.isMarkdownMode()) { + + let content = editor.getMarkdown(); + localStorage.setItem('content', content); + + $.post("/CmsKitCommonWidgets/ContentPreview", { content: content }, function (result) { + editor.setHTML(result); + + var highllightedText = $('#ContentEditor').find('.toastui-editor-md-preview-highlight'); + highllightedText.removeClass('toastui-editor-md-preview-highlight'); + }); + } + else if ($(this).attr("aria-label") == 'Write') { + var retrievedObject = localStorage.getItem('content'); + editor.setMarkdown(retrievedObject); + } + }); + function createAddWidgetButton() { const button = document.createElement('button'); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index 87831e4e1d..be33dc698e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -20,23 +20,25 @@
@if (Model.Widgets.Count() > 1) - { - - + { + - foreach (var item in Model.ViewModel.Details) + foreach (var item in Model.ViewModel.Details) + { + if (item.EditorComponentName is not null) + { + + } + } + } + else { - +

@L["PleaseConfigureWidgets"].Value

} - } - else - { -

@L["PleaseConfigureWidgets"].Value

- }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js index 49a482bf33..ee6c7b7f9f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js @@ -1,6 +1,6 @@ $(function () { var l = abp.localization.getResource("CmsKit"); - + var $createForm = $('#form-page-create'); var $title = $('#ViewModel_Title'); var $slug = $('#ViewModel_Slug'); @@ -90,7 +90,7 @@ $(function () { var fileUriPrefix = "/api/cms-kit/media/"; initEditor(); - + var editor; function initEditor() { var $editorContainer = $("#ContentEditor"); @@ -133,7 +133,7 @@ $(function () { } }); } - + function uploadFile(blob, callback, source) { var UPPY_OPTIONS = { endpoint: fileUploadUri, @@ -166,11 +166,37 @@ $(function () { }); } - $('#GeneratedWidgetText').on('change',function () { + $('#GeneratedWidgetText').on('change', function () { var txt = $('#GeneratedWidgetText').val(); editor.insertText(txt); }); - + + $('.tab-item').on('click', function () { + if ($(this).attr("aria-label") == 'Preview' && editor.isMarkdownMode()) { + + let content = editor.getMarkdown(); + localStorage.setItem('content', content); + + $.post("/CmsKitCommonWidgets/ContentPreview", { content: content }, function (result) { + + let style = styleEditor.getValue(); + + $('#editor-preview-style').remove(); + + $('head').append(''); + + editor.setHTML(result); + + var highllightedText = $('#ContentEditor').find('.toastui-editor-md-preview-highlight'); + highllightedText.removeClass('toastui-editor-md-preview-highlight'); + }); + } + else if ($(this).attr("aria-label") == 'Write'){ + var retrievedObject = localStorage.getItem('content'); + editor.setMarkdown(retrievedObject); + } + }); + function createAddWidgetButton() { const button = document.createElement('button'); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js index 565f758552..c46f1c274c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js @@ -140,7 +140,33 @@ $(function () { var txt = $('#GeneratedWidgetText').val(); editor.insertText(txt); }); - + + $('.tab-item').on('click', function () { + if ($(this).attr("aria-label") == 'Preview' && editor.isMarkdownMode()) { + + let content = editor.getMarkdown(); + localStorage.setItem('content', content); + + $.post("/CmsKitCommonWidgets/ContentPreview", { content: content }, function (result) { + + let style = styleEditor.getValue(); + + $('#editor-preview-style').remove(); + + $('head').append(''); + + editor.setHTML(result); + + var highllightedText = $('#ContentEditor').find('.toastui-editor-md-preview-highlight'); + highllightedText.removeClass('toastui-editor-md-preview-highlight'); + }); + } + else if ($(this).attr("aria-label") == 'Write') { + var retrievedObject = localStorage.getItem('content'); + editor.setMarkdown(retrievedObject); + } + }); + function createAddWidgetButton() { const button = document.createElement('button'); diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/BlogPostCommonDto.cs similarity index 80% rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs rename to modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/BlogPostCommonDto.cs index 695f50836e..c2b2373d9c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/BlogPostCommonDto.cs @@ -1,13 +1,12 @@ using System; using System.Collections.Generic; using Volo.Abp.Application.Dtos; -using Volo.CmsKit.Contents; using Volo.CmsKit.Users; -namespace Volo.CmsKit.Public.Blogs; +namespace Volo.CmsKit.Contents; [Serializable] -public class BlogPostPublicDto : AuditedEntityDto +public class BlogPostCommonDto : AuditedEntityDto, IContent { public Guid BlogId { get; set; } @@ -24,4 +23,4 @@ public class BlogPostPublicDto : AuditedEntityDto public Guid? CoverImageMediaId { get; set; } public CmsUserDto Author { get; set; } -} +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/DefaultContentDto.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/DefaultContentDto.cs new file mode 100644 index 0000000000..731e346df4 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/DefaultContentDto.cs @@ -0,0 +1,8 @@ +using System.Collections.Generic; + +namespace Volo.CmsKit.Contents; + +public class DefaultContentDto : IContent +{ + public List ContentFragments { get; set; } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/IContent.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/IContent.cs new file mode 100644 index 0000000000..2a393e0a14 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/IContent.cs @@ -0,0 +1,7 @@ +using System.Collections.Generic; + +namespace Volo.CmsKit.Contents; +public interface IContent +{ + public List ContentFragments { get; set; } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/IContentAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/IContentAppService.cs new file mode 100644 index 0000000000..ec2b9bcf42 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/IContentAppService.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Volo.Abp.Application.Services; + +namespace Volo.CmsKit.Contents; + +public interface IContentAppService : IApplicationService +{ + Task> ParseAsync(string content); +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/PageDto.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/PageDto.cs similarity index 65% rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/PageDto.cs rename to modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/PageDto.cs index a336844289..0b573be372 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/PageDto.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/Contents/PageDto.cs @@ -1,22 +1,21 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; +using System; using Volo.Abp.Application.Dtos; -using Volo.CmsKit.Contents; -namespace Volo.CmsKit.Public.Pages; +namespace Volo.CmsKit.Contents; [Serializable] -public class PageDto : EntityDto +public class PageDto : EntityDto, IContent { public string Title { get; set; } public string Slug { get; set; } public string Content { get; set; } - + public List ContentFragments { get; set; } public string Script { get; set; } public string Style { get; set; } -} +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs index b87f286b5c..34eb41d3a0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs @@ -11,9 +11,9 @@ public class CmsKitContentWidgetOptions WidgetConfigs = new(); } - public void AddWidget(string widgetKey, string widgetName, string editorWidgetName) + public void AddWidget(string widgetType, string widgetName, string parameterWidgetName = null) { - var config = new ContentWidgetConfig(widgetName, editorWidgetName); - WidgetConfigs.Add(widgetKey, config); + var config = new ContentWidgetConfig(widgetName, parameterWidgetName); + WidgetConfigs.Add(widgetType, config); } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentAppService.cs new file mode 100644 index 0000000000..a227f31e18 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentAppService.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Volo.Abp.GlobalFeatures; +using Volo.CmsKit.GlobalFeatures; + +namespace Volo.CmsKit.Contents; + +[RequiresGlobalFeature(typeof(PagesFeature))] +public class ContentAppService : CmsKitAppServiceBase, IContentAppService +{ + protected ContentParser ContentParser { get; } + + public ContentAppService(ContentParser contentParser) + { + ContentParser = contentParser; + } + + public async Task> ParseAsync(string content) + { + return await ContentParser.ParseAsync(content); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentParser.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentParser.cs index 7fe9fe5b60..9c6aafc0d0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentParser.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/ContentParser.cs @@ -28,10 +28,10 @@ public class ContentParser : ITransientDependency }); } - var parsedList = new List(); + List parsedList = new(); ParseContent(content, parsedList); - var contentFragments = new List(); + List contentFragments = new(); FillContentFragment(content, parsedList, contentFragments); return Task.FromResult(contentFragments); diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Controllers/CmsKitCommonWidgetsController.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Controllers/CmsKitCommonWidgetsController.cs new file mode 100644 index 0000000000..8e226a31f2 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Controllers/CmsKitCommonWidgetsController.cs @@ -0,0 +1,14 @@ +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; +using Volo.CmsKit.Web.Pages.CmsKit.Components.ContentPreview; + +namespace Volo.CmsKit.Web.Controllers; + +public class CmsKitCommonWidgetsController : AbpController +{ + [HttpPost] + public IActionResult ContentPreview(ContentPreviewDto dto) + { + return ViewComponent(typeof(ContentPreviewViewComponent), new { content = dto.Content }); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/ContentPreviewDto.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/ContentPreviewDto.cs new file mode 100644 index 0000000000..9c01a325bf --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/ContentPreviewDto.cs @@ -0,0 +1,9 @@ +using System; + +namespace Volo.CmsKit.Web.Pages.CmsKit.Components.ContentPreview; + +[Serializable] +public class ContentPreviewDto +{ + public string Content { get; set; } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/ContentPreviewViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/ContentPreviewViewComponent.cs new file mode 100644 index 0000000000..987c404e31 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/ContentPreviewViewComponent.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; +using Volo.CmsKit.Contents; + +namespace Volo.CmsKit.Web.Pages.CmsKit.Components.ContentPreview; + +public class ContentPreviewViewComponent : AbpViewComponent +{ + protected IContentAppService ContentAppService { get; } + + public ContentPreviewViewComponent(IContentAppService contentAppService) + { + ContentAppService = contentAppService; + } + + public virtual async Task InvokeAsync(string content) + { + var fragments = await ContentAppService.ParseAsync(content); + + return View("~/Pages/CmsKit/Components/ContentPreview/Default.cshtml", new DefaultContentDto + { + ContentFragments = fragments + }); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/Default.cshtml new file mode 100644 index 0000000000..6baf41716e --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/Default.cshtml @@ -0,0 +1,10 @@ +@using Volo.CmsKit.Contents +@using Volo.CmsKit.Web.Pages.CmsKit.Components.Contents + +@model DefaultContentDto + +
+ + @await Component.InvokeAsync(typeof(ContentFragmentViewComponent), Model) + +
\ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentFragment.cshtml b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentFragment.cshtml new file mode 100644 index 0000000000..0fa7d59064 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentFragment.cshtml @@ -0,0 +1,20 @@ +@using System.Dynamic +@using Volo.Abp.Data +@using Volo.CmsKit.Web.Renderers; +@using Volo.CmsKit.Web.Pages.CmsKit.Components.Contents; + +@model ContentFragmentViewComponent + +@inject IMarkdownToHtmlRenderer MarkdownRenderer + +@foreach (var contentFragment in Model.ContentDto.ContentFragments) +{ + if (contentFragment.Type == "Markdown") + { + @Html.Raw(await MarkdownRenderer.RenderAsync(contentFragment.GetProperty("Content"))) + } + else if (contentFragment.Type == "Widget") + { + @await Component.InvokeAsync(contentFragment.GetProperty("Type"), contentFragment.ExtraProperties.ConvertToDynamicObject()) + } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentFragmentViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentFragmentViewComponent.cs new file mode 100644 index 0000000000..d276165982 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentFragmentViewComponent.cs @@ -0,0 +1,21 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Widgets; +using Volo.CmsKit.Contents; + +namespace Volo.CmsKit.Web.Pages.CmsKit.Components.Contents; + +[ViewComponent(Name = "ContentFragment")] +[Widget( + AutoInitialize = true +)] +public class ContentFragmentViewComponent : AbpViewComponent +{ + public IContent ContentDto { get; set; } + + public virtual async Task InvokeAsync(IContent contentDto) + { + return View("~/Pages/CmsKit/Components/Contents/ContentFragment.cshtml", new ContentFragmentViewComponent() { ContentDto = contentDto }); + } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/IContentRenderer.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/IContentRenderer.cs similarity index 66% rename from modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/IContentRenderer.cs rename to modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/IContentRenderer.cs index 879b27cda7..b33c044392 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/IContentRenderer.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/IContentRenderer.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace Volo.CmsKit.Web.Contents; +namespace Volo.CmsKit.Web.Pages.CmsKit.Components.Contents; public interface IContentRenderer { diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/PlainTextContentRenderer.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/PlainTextContentRenderer.cs similarity index 80% rename from modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/PlainTextContentRenderer.cs rename to modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/PlainTextContentRenderer.cs index cf68e25e15..3fcc78f658 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/PlainTextContentRenderer.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/PlainTextContentRenderer.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Volo.Abp.DependencyInjection; -namespace Volo.CmsKit.Web.Contents; +namespace Volo.CmsKit.Web.Pages.CmsKit.Components.Contents; public class PlainTextContentRenderer : IContentRenderer, ITransientDependency { diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Renderers/IMarkdownToHtmlRenderer.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Renderers/IMarkdownToHtmlRenderer.cs new file mode 100644 index 0000000000..565437af7e --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Renderers/IMarkdownToHtmlRenderer.cs @@ -0,0 +1,8 @@ +using System.Threading.Tasks; + +namespace Volo.CmsKit.Web.Renderers; + +public interface IMarkdownToHtmlRenderer +{ + Task RenderAsync(string rawMarkdown, bool allowHtmlTags = true, bool preventXSS = true); +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Renderers/MarkdownToHtmlRenderer.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Renderers/MarkdownToHtmlRenderer.cs similarity index 97% rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Renderers/MarkdownToHtmlRenderer.cs rename to modules/cms-kit/src/Volo.CmsKit.Common.Web/Renderers/MarkdownToHtmlRenderer.cs index b6fab3c008..5e0a2e89f5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Renderers/MarkdownToHtmlRenderer.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Renderers/MarkdownToHtmlRenderer.cs @@ -7,7 +7,7 @@ using System.Web; using Volo.Abp.DependencyInjection; using Ganss.XSS; -namespace Volo.CmsKit.Public.Web.Renderers; +namespace Volo.CmsKit.Web.Renderers; public class MarkdownToHtmlRenderer : IMarkdownToHtmlRenderer, ITransientDependency { @@ -20,9 +20,9 @@ public class MarkdownToHtmlRenderer : IMarkdownToHtmlRenderer, ITransientDepende _htmlSanitizer = new HtmlSanitizer(); } - public async Task RenderAsync(string rawMarkdown, bool preventXSS = false) + public async Task RenderAsync(string rawMarkdown, bool allowHtmlTags = true, bool preventXSS = true) { - if (preventXSS) + if (!allowHtmlTags) { rawMarkdown = EncodeHtmlTags(rawMarkdown, true); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj index 1ca9a78b27..e717f49be5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj @@ -1,38 +1,40 @@ - - + + - - net6.0 - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - true - Library - Volo.CmsKit.Web - true - + + net6.0 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + true + Library + Volo.CmsKit.Web + true + - - - - - + + + + + - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/ContentsFeature.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/ContentsFeature.cs new file mode 100644 index 0000000000..ac752a68c4 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/GlobalFeatures/ContentsFeature.cs @@ -0,0 +1,28 @@ +using JetBrains.Annotations; +using Volo.Abp.GlobalFeatures; + +namespace Volo.CmsKit.GlobalFeatures; + +[GlobalFeatureName(Name)] +public class ContentsFeature : GlobalFeature +{ + public const string Name = "CmsKit.Contents"; + + internal ContentsFeature( + [NotNull] GlobalCmsKitFeatures cmsKit + ) : base(cmsKit) + { + + } + + public override void Enable() + { + var userFeature = FeatureManager.Modules.CmsKit().User; + if (!userFeature.IsEnabled) + { + userFeature.Enable(); + } + + base.Enable(); + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index b98319f51b..8da6be8bd5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -184,6 +184,9 @@ "CmsKit.BlogPost.ScrollIndex": "Quick navigation bar in blog posts", "Add": "Add", "AddWidget": "Add Widget", - "PleaseConfigureWidgets": "Please configure widgets" + "PleaseConfigureWidgets": "Please configure widgets", + "SelectAnAuthor":"Select an Author", + "InThisDocument":"In This Document", + "GoToTop":"Go To Top" } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDbProperties.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/AbpCmsKitDbProperties.cs similarity index 83% rename from modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDbProperties.cs rename to modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/AbpCmsKitDbProperties.cs index 6a29834233..1ce1fd8413 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/CmsKitDbProperties.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/AbpCmsKitDbProperties.cs @@ -1,6 +1,6 @@ namespace Volo.CmsKit; -public static class CmsKitDbProperties +public static class AbpCmsKitDbProperties { public static string DbTablePrefix { get; set; } = "Cms"; diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityTagManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityTagManager.cs index b33d337a06..2707b8854c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityTagManager.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/EntityTagManager.cs @@ -79,4 +79,12 @@ public class EntityTagManager : DomainService { return await EntityTagRepository.GetEntityIdsFilteredByTagAsync(tagId, tenantId, cancellationToken); } + public async Task> GetEntityIdsFilteredByTagNameAsync( + [NotNull] string tagName, + [NotNull] string entityType, + [CanBeNull] Guid? tenantId, + CancellationToken cancellationToken = default) + { + return await EntityTagRepository.GetEntityIdsFilteredByTagNameAsync(tagName, entityType,tenantId, cancellationToken); + } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/IEntityTagRepository.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/IEntityTagRepository.cs index a96402267d..5105635c82 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/IEntityTagRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Tags/IEntityTagRepository.cs @@ -21,4 +21,10 @@ public interface IEntityTagRepository : IBasicRepository [NotNull] Guid tagId, [CanBeNull] Guid? tenantId, CancellationToken cancellationToken = default); + + Task> GetEntityIdsFilteredByTagNameAsync( + [NotNull] string tagName, + [NotNull] string entityType, + [CanBeNull] Guid? tenantId=null, + CancellationToken cancellationToken=default); } diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs index 8f501f4c98..265495f5bf 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs @@ -14,7 +14,7 @@ using Volo.CmsKit.Users; namespace Volo.CmsKit.EntityFrameworkCore; -[ConnectionStringName(CmsKitDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpCmsKitDbProperties.ConnectionStringName)] public class CmsKitDbContext : AbpDbContext, ICmsKitDbContext { public DbSet Comments { get; set; } diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs index 9ab103fefc..9a42f6c4b0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs @@ -28,7 +28,7 @@ public static class CmsKitDbContextModelCreatingExtensions { builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "Users", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Users", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); b.ConfigureAbpUser(); @@ -48,7 +48,7 @@ public static class CmsKitDbContextModelCreatingExtensions { builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "UserReactions", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "UserReactions", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); @@ -71,7 +71,7 @@ public static class CmsKitDbContextModelCreatingExtensions { builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "Comments", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Comments", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); @@ -95,7 +95,7 @@ public static class CmsKitDbContextModelCreatingExtensions { builder.Entity(r => { - r.ToTable(CmsKitDbProperties.DbTablePrefix + "Ratings", CmsKitDbProperties.DbSchema); + r.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Ratings", AbpCmsKitDbProperties.DbSchema); r.ConfigureByConvention(); @@ -117,7 +117,7 @@ public static class CmsKitDbContextModelCreatingExtensions { builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "Tags", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Tags", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); @@ -134,7 +134,7 @@ public static class CmsKitDbContextModelCreatingExtensions builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "EntityTags", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "EntityTags", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); @@ -158,7 +158,7 @@ public static class CmsKitDbContextModelCreatingExtensions { builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "Pages", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Pages", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); @@ -180,7 +180,7 @@ public static class CmsKitDbContextModelCreatingExtensions { builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "Blogs", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "Blogs", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); @@ -193,7 +193,7 @@ public static class CmsKitDbContextModelCreatingExtensions builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "BlogPosts", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "BlogPosts", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); @@ -210,7 +210,7 @@ public static class CmsKitDbContextModelCreatingExtensions builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "BlogFeatures", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "BlogFeatures", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); @@ -230,7 +230,7 @@ public static class CmsKitDbContextModelCreatingExtensions { builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "MediaDescriptors", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "MediaDescriptors", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); @@ -251,7 +251,7 @@ public static class CmsKitDbContextModelCreatingExtensions { builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "MenuItems", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "MenuItems", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); @@ -269,7 +269,7 @@ public static class CmsKitDbContextModelCreatingExtensions { builder.Entity(b => { - b.ToTable(CmsKitDbProperties.DbTablePrefix + "GlobalResources", CmsKitDbProperties.DbSchema); + b.ToTable(AbpCmsKitDbProperties.DbTablePrefix + "GlobalResources", AbpCmsKitDbProperties.DbSchema); b.ConfigureByConvention(); diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs index fca31f2d73..8b6edc1cbe 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs @@ -14,7 +14,7 @@ using Volo.CmsKit.Users; namespace Volo.CmsKit.EntityFrameworkCore; -[ConnectionStringName(CmsKitDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpCmsKitDbProperties.ConnectionStringName)] public interface ICmsKitDbContext : IEfCoreDbContext { DbSet Comments { get; } diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs index 248c42282a..125c1a97ff 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs @@ -25,7 +25,7 @@ public class EfCorePageRepository : EfCoreRepository - x.Title.Contains(filter) + x.Title.ToLower().Contains(filter.ToLower()) || x.Slug.Contains(filter) ).CountAsync(GetCancellationToken(cancellationToken)); } @@ -39,7 +39,7 @@ public class EfCorePageRepository : EfCoreRepository - x.Title.Contains(filter)) + x.Title.ToLower().Contains(filter.ToLower()) || x.Slug.Contains(filter)) .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Tags/EfCoreEntityTagRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Tags/EfCoreEntityTagRepository.cs index fe7e622841..c9e501edc0 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Tags/EfCoreEntityTagRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Tags/EfCoreEntityTagRepository.cs @@ -52,4 +52,22 @@ public class EfCoreEntityTagRepository : EfCoreRepository q.EntityId) .ToListAsync(cancellationToken: GetCancellationToken(cancellationToken)); } + + public async Task> GetEntityIdsFilteredByTagNameAsync( + [NotNull] string tagName, + [NotNull] string entityType, + [CanBeNull] Guid? tenantId=null, + CancellationToken cancellationToken=default) + { + var dbContext = await GetDbContextAsync(); + var result = from et in dbContext.Set() + join t in dbContext.Set() on et.TagId equals t.Id + where t.Name == tagName + && t.EntityType == entityType + && et.TenantId == tenantId + && t.TenantId == tenantId + && !t.IsDeleted + select et.EntityId; + return await result.ToListAsync(cancellationToken:GetCancellationToken(cancellationToken)); + } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs index 36c9cf882c..c6a97dfbef 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs @@ -15,7 +15,7 @@ using Tag = Volo.CmsKit.Tags.Tag; namespace Volo.CmsKit.MongoDB; -[ConnectionStringName(CmsKitDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpCmsKitDbProperties.ConnectionStringName)] public class CmsKitMongoDbContext : AbpMongoDbContext, ICmsKitMongoDbContext { public IMongoCollection Comments => Collection(); diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs index 7b7edcce0d..b6127ab125 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs @@ -22,67 +22,67 @@ public static class CmsKitMongoDbContextExtensions builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Users"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Users"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "UserReactions"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "UserReactions"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Comments"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Comments"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Ratings"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Ratings"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Tags"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Tags"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "EntityTags"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "EntityTags"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Pages"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Pages"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Blogs"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "Blogs"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "BlogPosts"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "BlogPosts"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "BlogFeatures"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "BlogFeatures"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "MediaDescriptors"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "MediaDescriptors"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "MenuItems"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "MenuItems"; }); builder.Entity(x => { - x.CollectionName = CmsKitDbProperties.DbTablePrefix + "GlobalResources"; + x.CollectionName = AbpCmsKitDbProperties.DbTablePrefix + "GlobalResources"; }); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs index a2dff419e2..e220aff46e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs @@ -15,7 +15,7 @@ using Tag = Volo.CmsKit.Tags.Tag; namespace Volo.CmsKit.MongoDB; -[ConnectionStringName(CmsKitDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpCmsKitDbProperties.ConnectionStringName)] public interface ICmsKitMongoDbContext : IAbpMongoDbContext { IMongoCollection UserReactions { get; } diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs index 85b596ff1b..74c5d8cc3c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs @@ -1,13 +1,13 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Linq.Dynamic.Core; -using JetBrains.Annotations; -using MongoDB.Driver; -using Volo.Abp; -using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using JetBrains.Annotations; +using MongoDB.Driver; using MongoDB.Driver.Linq; +using Volo.Abp; using Volo.Abp.Domain.Repositories.MongoDB; using Volo.Abp.MongoDB; using Volo.CmsKit.Pages; @@ -30,7 +30,7 @@ public class MongoPageRepository : MongoDbRepository>( !filter.IsNullOrWhiteSpace(), u => - u.Title.Contains(filter) + u.Title.ToLower().Contains(filter) || u.Slug.Contains(filter) ).CountAsync(cancellation); } @@ -46,9 +46,7 @@ public class MongoPageRepository : MongoDbRepository>( !filter.IsNullOrWhiteSpace(), - u => - u.Title.Contains(filter) - ) + u => u.Title.ToLower().Contains(filter) || u.Slug.Contains(filter)) .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .As>() .PageBy>(skipCount, maxResultCount) diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Tags/MongoEntityTagRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Tags/MongoEntityTagRepository.cs index 82952c9bf5..e3835bfe42 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Tags/MongoEntityTagRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Tags/MongoEntityTagRepository.cs @@ -9,6 +9,7 @@ using Volo.Abp; using Volo.Abp.Domain.Repositories.MongoDB; using Volo.Abp.MongoDB; using Volo.CmsKit.Tags; +using Tag = Volo.CmsKit.Tags.Tag; namespace Volo.CmsKit.MongoDB.Tags; @@ -52,4 +53,30 @@ public class MongoEntityTagRepository : MongoDbRepository> GetEntityIdsFilteredByTagNameAsync( + [NotNull] string tagName, + [NotNull] string entityType, + [CanBeNull] Guid? tenantId=null, + CancellationToken cancellationToken = default) + { + var dbContext = await GetDbContextAsync(); + var entityTagQueryable = await GetMongoQueryableAsync(GetCancellationToken(cancellationToken)); + var tagQueryable = dbContext.Tags.AsQueryable(); + + var resultQueryable = entityTagQueryable + .Join( + tagQueryable, + o => o.TagId, + i => i.Id, + (entityTag, tag) => new { entityTag, tag }) + .Where(x => x.tag.EntityType == entityType + && x.entityTag.TenantId == tenantId + && x.tag.TenantId == tenantId + && x.tag.IsDeleted == false + ) + .Select(s => s.entityTag.EntityId); + + return await AsyncExecuter.ToListAsync(resultQueryable, GetCancellationToken(cancellationToken)); + } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/IBlogPostPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/IBlogPostPublicAppService.cs index 42161f884c..a6462d937c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/IBlogPostPublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/IBlogPostPublicAppService.cs @@ -1,18 +1,18 @@ -using System.Collections.Generic; -using JetBrains.Annotations; +using System; using System.Threading.Tasks; +using JetBrains.Annotations; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; +using Volo.CmsKit.Contents; using Volo.CmsKit.Users; -using System; namespace Volo.CmsKit.Public.Blogs; public interface IBlogPostPublicAppService : IApplicationService { - Task> GetListAsync([NotNull] string blogSlug, BlogPostGetListInput input); + Task> GetListAsync([NotNull] string blogSlug, BlogPostGetListInput input); - Task GetAsync([NotNull] string blogSlug, [NotNull] string blogPostSlug); + Task GetAsync([NotNull] string blogSlug, [NotNull] string blogPostSlug); Task> GetAuthorsHasBlogPostsAsync(BlogPostFilteredPagedAndSortedResultRequestDto input); diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs index 0b33a91236..230b8ded97 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/IPagePublicAppService.cs @@ -1,6 +1,7 @@ using JetBrains.Annotations; using System.Threading.Tasks; using Volo.Abp.Application.Services; +using Volo.CmsKit.Contents; namespace Volo.CmsKit.Public.Pages; diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs index ebdda3d293..80185f7bea 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Blogs/BlogPostPublicAppService.cs @@ -29,20 +29,20 @@ public class BlogPostPublicAppService : CmsKitPublicAppServiceBase, IBlogPostPub ContentParser = contentParser; } - public virtual async Task GetAsync( + public virtual async Task GetAsync( [NotNull] string blogSlug, [NotNull] string blogPostSlug) { var blog = await BlogRepository.GetBySlugAsync(blogSlug); var blogPost = await BlogPostRepository.GetBySlugAsync(blog.Id, blogPostSlug); - var blogPostDto = ObjectMapper.Map(blogPost); + var blogPostDto = ObjectMapper.Map(blogPost); blogPostDto.ContentFragments = await ContentParser.ParseAsync(blogPost.Content); return blogPostDto; } - public virtual async Task> GetListAsync([NotNull] string blogSlug, BlogPostGetListInput input) + public virtual async Task> GetListAsync([NotNull] string blogSlug, BlogPostGetListInput input) { var blog = await BlogRepository.GetBySlugAsync(blogSlug); @@ -50,10 +50,10 @@ public class BlogPostPublicAppService : CmsKitPublicAppServiceBase, IBlogPostPub BlogPostStatus.Published, input.MaxResultCount, input.SkipCount, input.Sorting); - return new PagedResultDto( + return new PagedResultDto( await BlogPostRepository.GetCountAsync(blogId: blog.Id, tagId: input.TagId, statusFilter: BlogPostStatus.Published, authorId: input.AuthorId), - ObjectMapper.Map, List>(blogPosts)); + ObjectMapper.Map, List>(blogPosts)); } public virtual async Task> GetAuthorsHasBlogPostsAsync(BlogPostFilteredPagedAndSortedResultRequestDto input) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs index 704a03778c..bd0c6d5e6c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs @@ -2,13 +2,13 @@ using Volo.Abp.AutoMapper; using Volo.CmsKit.Blogs; using Volo.CmsKit.Comments; +using Volo.CmsKit.Contents; using Volo.CmsKit.GlobalResources; using Volo.CmsKit.Menus; using Volo.CmsKit.Pages; using Volo.CmsKit.Public.Blogs; using Volo.CmsKit.Public.Comments; using Volo.CmsKit.Public.GlobalResources; -using Volo.CmsKit.Public.Pages; using Volo.CmsKit.Public.Ratings; using Volo.CmsKit.Ratings; using Volo.CmsKit.Users; @@ -33,7 +33,7 @@ public class PublicApplicationAutoMapperProfile : Profile CreateMap() .Ignore(x => x.ContentFragments); - CreateMap() + CreateMap() .Ignore(x => x.ContentFragments); CreateMap(); diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/BlogPostPublicClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/BlogPostPublicClientProxy.Generated.cs index b1bbf6be07..f26816e88d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/BlogPostPublicClientProxy.Generated.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/BlogPostPublicClientProxy.Generated.cs @@ -2,11 +2,9 @@ using System; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; -using Volo.Abp.Http.Client; -using Volo.Abp.Http.Modeling; using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Client.ClientProxying; -using Volo.CmsKit.Public.Blogs; +using Volo.CmsKit.Contents; using Volo.CmsKit.Users; // ReSharper disable once CheckNamespace @@ -16,18 +14,18 @@ namespace Volo.CmsKit.Public.Blogs.ClientProxies; [ExposeServices(typeof(IBlogPostPublicAppService), typeof(BlogPostPublicClientProxy))] public partial class BlogPostPublicClientProxy : ClientProxyBase, IBlogPostPublicAppService { - public virtual async Task GetAsync(string blogSlug, string blogPostSlug) + public virtual async Task GetAsync(string blogSlug, string blogPostSlug) { - return await RequestAsync(nameof(GetAsync), new ClientProxyRequestTypeValue + return await RequestAsync(nameof(GetAsync), new ClientProxyRequestTypeValue { { typeof(string), blogSlug }, { typeof(string), blogPostSlug } }); } - public virtual async Task> GetListAsync(string blogSlug, BlogPostGetListInput input) + public virtual async Task> GetListAsync(string blogSlug, BlogPostGetListInput input) { - return await RequestAsync>(nameof(GetListAsync), new ClientProxyRequestTypeValue + return await RequestAsync>(nameof(GetListAsync), new ClientProxyRequestTypeValue { { typeof(string), blogSlug }, { typeof(BlogPostGetListInput), input } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/PagesPublicClientProxy.Generated.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/PagesPublicClientProxy.Generated.cs index 9ecf6cb387..f992bb3dbf 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/PagesPublicClientProxy.Generated.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/PagesPublicClientProxy.Generated.cs @@ -1,12 +1,8 @@ // This file is automatically generated by ABP framework to use MVC Controllers from CSharp -using System; using System.Threading.Tasks; -using Volo.Abp.Application.Dtos; -using Volo.Abp.Http.Client; -using Volo.Abp.Http.Modeling; using Volo.Abp.DependencyInjection; using Volo.Abp.Http.Client.ClientProxying; -using Volo.CmsKit.Public.Pages; +using Volo.CmsKit.Contents; // ReSharper disable once CheckNamespace namespace Volo.CmsKit.Public.Pages.ClientProxies; diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json index 626dce7ff2..e3b3802ee9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/cms-kit-generate-proxy.json @@ -505,57 +505,6 @@ } } }, - "Volo.CmsKit.Public.Polls.PollViewComponentController": { - "controllerName": "PollViewComponent", - "controllerGroupName": "PollViewComponent", - "isRemoteService": true, - "apiVersion": null, - "type": "Volo.CmsKit.Public.Polls.PollViewComponentController", - "interfaces": [ - { - "type": "Volo.CmsKit.Public.Polls.IPollViewComponentAppService" - } - ], - "actions": { - "ParseAsyncByContent": { - "uniqueName": "ParseAsyncByContent", - "name": "ParseAsync", - "httpMethod": "GET", - "url": "api/cms-kit-public/polls/{content}", - "supportedVersions": [], - "parametersOnMethod": [ - { - "name": "content", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - } - ], - "parameters": [ - { - "nameOnMethod": "content", - "name": "content", - "jsonName": null, - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", - "descriptorName": "" - } - ], - "returnValue": { - "type": "System.Collections.Generic.List", - "typeSimple": "[Volo.CmsKit.Polls.ContentFragment]" - }, - "allowAnonymous": null, - "implementFrom": "Volo.CmsKit.Public.Polls.IPollViewComponentAppService" - } - } - }, "Volo.CmsKit.Public.Pages.PagesPublicController": { "controllerName": "PagesPublic", "controllerGroupName": "PagesPublic", @@ -599,8 +548,8 @@ } ], "returnValue": { - "type": "Volo.CmsKit.Public.Pages.PageDto", - "typeSimple": "Volo.CmsKit.Public.Pages.PageDto" + "type": "Volo.CmsKit.Contents.PageDto", + "typeSimple": "Volo.CmsKit.Contents.PageDto" }, "allowAnonymous": null, "implementFrom": "Volo.CmsKit.Public.Pages.IPagePublicAppService" @@ -985,8 +934,8 @@ } ], "returnValue": { - "type": "Volo.CmsKit.Public.Blogs.BlogPostPublicDto", - "typeSimple": "Volo.CmsKit.Public.Blogs.BlogPostPublicDto" + "type": "Volo.CmsKit.Contents.BlogPostCommonDto", + "typeSimple": "Volo.CmsKit.Contents.BlogPostCommonDto" }, "allowAnonymous": null, "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" @@ -1090,8 +1039,8 @@ } ], "returnValue": { - "type": "Volo.Abp.Application.Dtos.PagedResultDto", - "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" + "type": "Volo.Abp.Application.Dtos.PagedResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" }, "allowAnonymous": null, "implementFrom": "Volo.CmsKit.Public.Blogs.IBlogPostPublicAppService" diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Blogs/BlogPostPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Blogs/BlogPostPublicController.cs index 9f43d65766..be28afa6a4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Blogs/BlogPostPublicController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Blogs/BlogPostPublicController.cs @@ -1,11 +1,10 @@ -using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; +using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; using Volo.Abp; using Volo.Abp.Application.Dtos; -using Volo.Abp.Content; using Volo.Abp.GlobalFeatures; +using Volo.CmsKit.Contents; using Volo.CmsKit.GlobalFeatures; using Volo.CmsKit.Users; @@ -26,14 +25,14 @@ public class BlogPostPublicController : CmsKitPublicControllerBase, IBlogPostPub [HttpGet] [Route("{blogSlug}/{blogPostSlug}")] - public virtual Task GetAsync(string blogSlug, string blogPostSlug) + public virtual Task GetAsync(string blogSlug, string blogPostSlug) { return BlogPostPublicAppService.GetAsync(blogSlug, blogPostSlug); } [HttpGet] [Route("{blogSlug}")] - public virtual Task> GetListAsync(string blogSlug, BlogPostGetListInput input) + public virtual Task> GetListAsync(string blogSlug, BlogPostGetListInput input) { return BlogPostPublicAppService.GetListAsync(blogSlug, input); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs index 763fe7522d..cd65f84c26 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Volo.Abp; using Volo.Abp.GlobalFeatures; +using Volo.CmsKit.Contents; using Volo.CmsKit.GlobalFeatures; namespace Volo.CmsKit.Public.Pages; diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingViewComponent.cs index 0a608740e9..81fd94406d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingViewComponent.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingViewComponent.cs @@ -8,7 +8,7 @@ using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; using Volo.CmsKit.Public.Comments; -using Volo.CmsKit.Public.Web.Renderers; +using Volo.CmsKit.Web.Renderers; namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting; @@ -65,12 +65,12 @@ public class CommentingViewComponent : AbpViewComponent foreach (var comment in viewModel.Comments) { viewModel.RawCommentTexts.Add(comment.Id, comment.Text); - comment.Text = await MarkdownToHtmlRenderer.RenderAsync(comment.Text, true); + comment.Text = await MarkdownToHtmlRenderer.RenderAsync(comment.Text, allowHtmlTags: false, preventXSS: true); foreach (var reply in comment.Replies) { viewModel.RawCommentTexts.Add(reply.Id, reply.Text); - reply.Text = await MarkdownToHtmlRenderer.RenderAsync(reply.Text, true); + reply.Text = await MarkdownToHtmlRenderer.RenderAsync(reply.Text, allowHtmlTags: false, preventXSS: true); } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml index 6f1f7a542d..9b7f6e24f7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml @@ -12,13 +12,13 @@ { @if (Model.CurrentRating != null) { - + @L["Undo"] } if (Model.Ratings != null) { - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml index 2cff5c9072..fe9227f194 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml @@ -9,9 +9,9 @@ @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Tags -@using Volo.CmsKit.Public.Web.Renderers @using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs @using Volo.CmsKit.Contents +@using Volo.CmsKit.Web.Renderers @inherits CmsKitPublicPageBase @@ -32,13 +32,14 @@ } + } - @section scripts{ +@section scripts{ @if (isScrollIndexEnabled) { @@ -54,49 +55,39 @@ } -
-
- - - - -
-

@Model.BlogPost.Title

-

- - @@@Model.BlogPost.Author?.UserName - - @Model.BlogPost.CreationTime -

- @foreach (var contentFragment in Model.BlogPost.ContentFragments) +
+
+ + + + +
+

@Model.BlogPost.Title

+

+ + @@@Model.BlogPost.Author?.UserName + + @Model.BlogPost.CreationTime +

+ @await Component.InvokeAsync("ContentFragment", new { contentDto = Model.BlogPost }) +

+ @if (Model.BlogPost.LastModificationTime != null) { - if (contentFragment.Type == ContentConsts.Markdown) - { - @Html.Raw(await MarkdownRenderer.RenderAsync(contentFragment.GetProperty("Content"))) - } - else if (contentFragment.Type == ContentConsts.Widget) - { - @await Component.InvokeAsync(contentFragment.GetProperty("Type"), contentFragment.ExtraProperties.ConvertToDynamicObject()) - } + @L["LastModification"].Value : @Model.BlogPost.LastModificationTime } -

- @if (Model.BlogPost.LastModificationTime != null) - { - @L["LastModification"].Value : @Model.BlogPost.LastModificationTime - } -

-
+

+
- @if (GlobalFeatureManager.Instance.IsEnabled()) + @if (GlobalFeatureManager.Instance.IsEnabled()) + { + if (Model.TagsFeature?.IsEnabled == true) { - if (Model.TagsFeature?.IsEnabled == true) + @await Component.InvokeAsync(typeof(TagViewComponent), new { - @await Component.InvokeAsync(typeof(TagViewComponent), new - { - entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType, - entityId = Model.BlogPost.Id.ToString(), - urlFormat = $"/blogs/{Model.BlogSlug}?tagId={{TagId}}" - }) + entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType, + entityId = Model.BlogPost.Id.ToString(), + urlFormat = $"/blogs/{Model.BlogSlug}?tagId={{TagId}}" + }) } }
@@ -109,10 +100,10 @@ if (Model.ReactionsFeature?.IsEnabled == true) { @await Component.InvokeAsync(typeof(ReactionSelectionViewComponent), new - { - entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType, - entityId = Model.BlogPost.Id.ToString() - }) + { + entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType, + entityId = Model.BlogPost.Id.ToString() + }) } } @@ -122,10 +113,10 @@ if (Model.RatingsFeature?.IsEnabled == true) { @await Component.InvokeAsync(typeof(RatingViewComponent), new - { - entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType, - entityId = Model.BlogPost.Id.ToString() - }) + { + entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType, + entityId = Model.BlogPost.Id.ToString() + }) } } @@ -133,6 +124,7 @@
+ @if (isScrollIndexEnabled) {
@@ -140,7 +132,7 @@
@L["InThisDocument"]
- +
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs index 6227190ab8..e1d9a3b0f7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Volo.Abp.GlobalFeatures; using Volo.CmsKit.Blogs; +using Volo.CmsKit.Contents; using Volo.CmsKit.GlobalFeatures; using Volo.CmsKit.Public.Blogs; @@ -15,7 +16,7 @@ public class BlogPostModel : CmsKitPublicPageModelBase [BindProperty(SupportsGet = true)] public string BlogPostSlug { get; set; } - public BlogPostPublicDto BlogPost { get; private set; } + public BlogPostCommonDto BlogPost { get; private set; } public BlogFeatureDto CommentsFeature { get; private set; } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml.cs index f5f2cc2f7a..736fba5e9e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml.cs @@ -1,11 +1,9 @@ -using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; using Volo.Abp.Application.Dtos; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination; +using Volo.CmsKit.Contents; using Volo.CmsKit.Public.Blogs; using Volo.CmsKit.Users; @@ -27,7 +25,7 @@ public class IndexModel : CmsKitPublicPageModelBase [BindProperty(SupportsGet = true)] public Guid? TagId { get; set; } - public PagedResultDto Blogs { get; private set; } + public PagedResultDto Blogs { get; private set; } public PagerModel PagerModel => new PagerModel(Blogs.TotalCount, Blogs.Items.Count, CurrentPage, PageSize, Request.Path.ToString()); diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml index 2aa3c0ce8b..250303177b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml @@ -2,17 +2,12 @@ @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap @using Volo.CmsKit.Contents @using System.Dynamic -@using Volo.CmsKit.Public.Web.Renderers @using Volo.Abp.Data @using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs; @using Volo.Abp.AspNetCore.Mvc.UI.Widgets; -@inject IMarkdownToHtmlRenderer MarkdownRenderer - - @model Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Pages.IndexModel - @section styles{ @@ -30,18 +25,7 @@ - @foreach (ContentFragment contentFragment in Model.PageDto.ContentFragments) - { - if (contentFragment.Type == ContentConsts.Markdown) - { - @Html.Raw(await MarkdownRenderer.RenderAsync(contentFragment.GetProperty("Content"))) - } - else if (contentFragment.Type == ContentConsts.Widget) - { - @await Component.InvokeAsync(contentFragment.GetProperty("Type"), contentFragment.ExtraProperties.ConvertToDynamicObject()) - } - - } + @await Component.InvokeAsync("ContentFragment", new { contentDto = Model.PageDto }) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs index 1434eccb4b..7ae92d7016 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using Volo.CmsKit.Contents; using Volo.CmsKit.Public.Pages; using Volo.CmsKit.Web.Pages; @@ -12,9 +13,9 @@ public class IndexModel : CommonPageModel protected IPagePublicAppService PagePublicAppService { get; } - public PageDto PageDto{ get; private set; } + public PageDto PageDto { get; private set; } -public IndexModel(IPagePublicAppService pagePublicAppService) + public IndexModel(IPagePublicAppService pagePublicAppService) { PagePublicAppService = pagePublicAppService; } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Renderers/IMarkdownToHtmlRenderer.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Renderers/IMarkdownToHtmlRenderer.cs deleted file mode 100644 index d11e76f6dd..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Renderers/IMarkdownToHtmlRenderer.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.CmsKit.Public.Web.Renderers; - -public interface IMarkdownToHtmlRenderer -{ - Task RenderAsync(string rawMarkdown, bool preventXSS = true); -} diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/Tags/EntityTagRepository_Test.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/Tags/EntityTagRepository_Test.cs index 9da9dd7710..c200fd01f3 100644 --- a/modules/cms-kit/test/Volo.CmsKit.TestBase/Tags/EntityTagRepository_Test.cs +++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/Tags/EntityTagRepository_Test.cs @@ -1,9 +1,6 @@ -using Shouldly; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Linq; using System.Threading.Tasks; +using Shouldly; using Volo.Abp.Modularity; using Xunit; @@ -34,4 +31,15 @@ public abstract class EntityTagRepository_Test : CmsKitTestBase< relatedTags.ShouldBeEmpty(); } + + [Fact] + public async Task GetEntityIdsFilteredByTagNameAsync_ShouldWorkProperly() + { + var entityIds = await _entityTagRepository.GetEntityIdsFilteredByTagNameAsync(_cmsKitTestData.TagName_1, _cmsKitTestData.EntityType1); + + entityIds.ShouldNotBeNull(); + entityIds.ShouldNotBeEmpty(); + + entityIds.Count.ShouldBe(1); + } } diff --git a/modules/docs/app/VoloDocs.Web/package.json b/modules/docs/app/VoloDocs.Web/package.json index 11df194026..dfdc303de2 100644 --- a/modules/docs/app/VoloDocs.Web/package.json +++ b/modules/docs/app/VoloDocs.Web/package.json @@ -3,7 +3,7 @@ "name": "volo.docstestapp", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2", - "@abp/docs": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/docs": "^6.0.0-rc.1" } } diff --git a/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js b/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js +++ b/modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/docs/app/VoloDocs.Web/yarn.lock b/modules/docs/app/VoloDocs.Web/yarn.lock index f3ece2f088..b25f56a1c0 100644 --- a/modules/docs/app/VoloDocs.Web/yarn.lock +++ b/modules/docs/app/VoloDocs.Web/yarn.lock @@ -2,45 +2,45 @@ # yarn lockfile v1 -"@abp/anchor-js@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-5.3.2.tgz#414048995a2d7942b1e1f7e551493216269a23d9" - integrity sha512-ZIJgI2fKMYsNHtTHkEzM15EoaXpiJ42xoen76v6rr2aj8qODWGeWseJDkX4Shid45/G+hx/hriMJfUOuQVjr/w== +"@abp/anchor-js@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-6.0.0-rc.1.tgz#242fa38fc22c7aca7233841b2b7a6e12a2503c67" + integrity sha512-ZXN5h4vf/OpV7x9hJt4sjnBD48OEKDcmhyVH2ydlE2E2AGiMMrrqyVdeyvY22YF+nmRYBODdcZCqmWx2SLakbA== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" anchor-js "^4.3.1" -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -49,180 +49,180 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.2.tgz#f1c00a66b3bbe46459b8f022fd54c098a9504673" - integrity sha512-e9TvKtBziGCmWw+lysqvd5CxqaIT2+L5anAx4xujiZR6EnBApLLqprlJyH7yAsxI4LJcKdBA+oj65xBtjVOm3w== +"@abp/clipboard@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.1.tgz#3dc6808637f116a07f11c6e727f55ce9bd4b64de" + integrity sha512-u/OPfgXRmrrjkbJrzKB1YSW8rTqUWIPRVx1VAT7RdT5UMzX4DOupd7SRJFr6u7OZFP1p7umUtl6k4wY1lAv6rw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" clipboard "^2.0.8" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/docs@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-5.3.2.tgz#5d7d7fcd4e5fe0d20118f5153135e8c5555c8b5b" - integrity sha512-CCHyvIE/drntklqj/nsKGjCtJHjL6Wh1E/ztiH6K99HHje0mDSfOFLWWAssDTihNFRmVhHJyECR8EK0b5SwlIQ== +"@abp/docs@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-6.0.0-rc.1.tgz#efebc35dc9b414b443518136991974a2630e8b9d" + integrity sha512-YRDKf1BmgJ2VvHsUJxDc/hxQHBiJnZkSGMYXE/7ytiH2V8/tiTQ9WwcmmIa69JV3jyYkiaDHc+lbR3VZRTLKpw== dependencies: - "@abp/anchor-js" "~5.3.2" - "@abp/clipboard" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/popper.js" "~5.3.2" - "@abp/prismjs" "~5.3.2" + "@abp/anchor-js" "~6.0.0-rc.1" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/popper.js" "~6.0.0-rc.1" + "@abp/prismjs" "~6.0.0-rc.1" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/popper.js@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-5.3.2.tgz#ab92ca12c10211464856281ba665f9d948dbc084" - integrity sha512-wgQczdnorfENIhfflZJ1t77DgTuKEwV5vYoB4n4QShcvbBXDj+Y7M5vQAz19U6AlCyiivNGMPnbXqu0sJnoADQ== +"@abp/popper.js@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-6.0.0-rc.1.tgz#b77d6f09856c97873e7caba5e3ba5b31df1c59a2" + integrity sha512-QgXi+VxdV8gsRi9V7i5erU5yRyYjr4XDlKx0eLRdBpCtb2TI1FLwSOSg6WNJsLeIfHvZE+95pAE400z3ZjqzoQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@popperjs/core" "^2.11.2" -"@abp/prismjs@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.2.tgz#76299d4eec3a41d518738bc0a94dc74e61552481" - integrity sha512-QwIGhUjWCWAi9lqrMIMEybjGM1WkADAFFhLB9R+Nk5Cj4dlgVe1PekypbWV0e3r300H6ZqJmgPcagKVG3G4bWg== +"@abp/prismjs@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.1.tgz#1c1afcf0533c54989d1eaf0d94a0a71f61213d70" + integrity sha512-rDkIdCEdiHw9ervlfrRyoMB0eiDGSbjM0PG+M7ePXoatDiFdDsTz/XYR3ygvdk1/8h7GM2KkNjrx8OLzWMlblQ== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/core" "~5.3.2" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/core" "~6.0.0-rc.1" prismjs "^1.26.0" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml index 696f61d6db..5f6df3938e 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml +++ b/modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml @@ -29,10 +29,7 @@ - -

@L["Projects"]

-
- + @if (await Authorization.IsGrantedAsync(DocsAdminPermissions.Projects.Create)) { diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDbProperties.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/AbpDocsDbProperties.cs similarity index 83% rename from modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDbProperties.cs rename to modules/docs/src/Volo.Docs.Domain/Volo/Docs/AbpDocsDbProperties.cs index 7f534d4305..093bf477a6 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDbProperties.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/AbpDocsDbProperties.cs @@ -1,6 +1,6 @@ namespace Volo.Docs { - public static class DocsDbProperties + public static class AbpDocsDbProperties { public static string DbTablePrefix { get; set; } = "Docs"; diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en-GB.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en-GB.json index 02026775d7..a8cf1c6627 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en-GB.json +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en-GB.json @@ -19,7 +19,7 @@ "SuccessfullyReIndexAllProject": "Successfully reindexed all projects", "InThisDocument": "In this document", "GoToTop": "Go to top", - "Projects": "Project(s)", + "Projects": "Projects", "NoProjectWarning": "There are no Projects yet!", "DocumentNotFound": "Oops, the requested document was not found!", "ProjectNotFound": "Oops, the requested project was not found!", @@ -36,4 +36,4 @@ "Volo.Docs.Domain:010002": "ShortName {ShortName} already exists.", "Preview": "preview" } -} \ No newline at end of file +} diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json index bc5c7cf826..236589ee3c 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json @@ -19,7 +19,7 @@ "SuccessfullyReIndexAllProject": "Successfully reindexed all projects", "InThisDocument": "In this document", "GoToTop": "Go to top", - "Projects": "Project(s)", + "Projects": "Projects", "NoProjectWarning": "There are no projects yet!", "DocumentNotFound": "Oops, the requested document was not found!", "ProjectNotFound": "Oops, the requested project was not found!", @@ -38,4 +38,4 @@ "Search": "Search", "SearchResults": "Search Results" } -} \ No newline at end of file +} diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json index ca6128638f..384fe5fcd3 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/tr.json @@ -19,7 +19,7 @@ "SuccessfullyReIndexAllProject": "Tüm projeler başarıyla yeniden indekslendi", "InThisDocument": "Bu dökümanda", "GoToTop": "En üste çık", - "Projects": "Proje(ler)", + "Projects": "Projeler", "NoProjectWarning": "Hiç proje yok!", "DocumentNotFound": "Aradığınız döküman bulunamadı!", "ProjectNotFound": "Talep edilen proje bulunamadı!", @@ -38,4 +38,4 @@ "Search": "Arama", "SearchResults": "Arama Sonuçları" } -} \ No newline at end of file +} diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContext.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContext.cs index 911db81a15..9ce0c59dc3 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContext.cs +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContext.cs @@ -8,7 +8,7 @@ using Volo.Docs.Projects; namespace Volo.Docs.EntityFrameworkCore { [IgnoreMultiTenancy] - [ConnectionStringName(DocsDbProperties.ConnectionStringName)] + [ConnectionStringName(AbpDocsDbProperties.ConnectionStringName)] public class DocsDbContext: AbpDbContext, IDocsDbContext { public DbSet Projects { get; set; } diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContextModelBuilderExtensions.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContextModelBuilderExtensions.cs index f3a5997048..745b822f17 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContextModelBuilderExtensions.cs +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsDbContextModelBuilderExtensions.cs @@ -21,7 +21,7 @@ namespace Volo.Docs.EntityFrameworkCore builder.Entity(b => { - b.ToTable(DocsDbProperties.DbTablePrefix + "Projects", DocsDbProperties.DbSchema); + b.ToTable(AbpDocsDbProperties.DbTablePrefix + "Projects", AbpDocsDbProperties.DbSchema); b.ConfigureByConvention(); @@ -37,7 +37,7 @@ namespace Volo.Docs.EntityFrameworkCore builder.Entity(b => { - b.ToTable(DocsDbProperties.DbTablePrefix + "Documents", DocsDbProperties.DbSchema); + b.ToTable(AbpDocsDbProperties.DbTablePrefix + "Documents", AbpDocsDbProperties.DbSchema); b.ConfigureByConvention(); @@ -61,7 +61,7 @@ namespace Volo.Docs.EntityFrameworkCore builder.Entity(b => { - b.ToTable(DocsDbProperties.DbTablePrefix + "DocumentContributors", DocsDbProperties.DbSchema); + b.ToTable(AbpDocsDbProperties.DbTablePrefix + "DocumentContributors", AbpDocsDbProperties.DbSchema); b.ConfigureByConvention(); diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/IDocsDbContext.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/IDocsDbContext.cs index 4d79609718..e85f9b4aa5 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/IDocsDbContext.cs +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/IDocsDbContext.cs @@ -8,7 +8,7 @@ using Volo.Docs.Projects; namespace Volo.Docs.EntityFrameworkCore { [IgnoreMultiTenancy] - [ConnectionStringName(DocsDbProperties.ConnectionStringName)] + [ConnectionStringName(AbpDocsDbProperties.ConnectionStringName)] public interface IDocsDbContext : IEfCoreDbContext { DbSet Projects { get; } diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContext.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContext.cs index 3bfb5df491..b566801631 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContext.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContext.cs @@ -8,7 +8,7 @@ using Volo.Docs.Documents; namespace Volo.Docs.MongoDB { [IgnoreMultiTenancy] - [ConnectionStringName(DocsDbProperties.ConnectionStringName)] + [ConnectionStringName(AbpDocsDbProperties.ConnectionStringName)] public class DocsMongoDbContext : AbpMongoDbContext, IDocsMongoDbContext { public IMongoCollection Projects => Collection(); diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs index 56d367c651..436fb1b527 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs @@ -14,12 +14,12 @@ namespace Volo.Docs.MongoDB builder.Entity(b => { - b.CollectionName = DocsDbProperties.DbTablePrefix + "Projects"; + b.CollectionName = AbpDocsDbProperties.DbTablePrefix + "Projects"; }); builder.Entity(b => { - b.CollectionName = DocsDbProperties.DbTablePrefix + "DocumentS"; + b.CollectionName = AbpDocsDbProperties.DbTablePrefix + "DocumentS"; }); } } diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/IDocsMongoDbContext.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/IDocsMongoDbContext.cs index f6b748611c..ecc8267fd8 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/IDocsMongoDbContext.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/IDocsMongoDbContext.cs @@ -8,7 +8,7 @@ using Volo.Docs.Projects; namespace Volo.Docs.MongoDB { [IgnoreMultiTenancy] - [ConnectionStringName(DocsDbProperties.ConnectionStringName)] + [ConnectionStringName(AbpDocsDbProperties.ConnectionStringName)] public interface IDocsMongoDbContext : IAbpMongoDbContext { IMongoCollection Projects { get; } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs index 8bfee863b1..87882015fc 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs @@ -1,15 +1,24 @@ using Volo.Abp.AspNetCore.Components.Web.Theming; +using Volo.Abp.FeatureManagement.Blazor.Settings; using Volo.Abp.Features; using Volo.Abp.Modularity; +using Volo.Abp.SettingManagement.Blazor; namespace Volo.Abp.FeatureManagement.Blazor; [DependsOn( typeof(AbpAspNetCoreComponentsWebThemingModule), typeof(AbpFeatureManagementApplicationContractsModule), - typeof(AbpFeaturesModule) + typeof(AbpFeaturesModule), + typeof(AbpSettingManagementBlazorModule) )] public class AbpFeatureManagementBlazorModule : AbpModule { - + public override void ConfigureServices(ServiceConfigurationContext context) + { + Configure(options => + { + options.Contributors.Add(new FeatureSettingManagementComponentContributor()); + }); + } } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor new file mode 100644 index 0000000000..341d405e4e --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor @@ -0,0 +1,12 @@ +@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase + +@if (Settings != null && Settings.HasManageHostFeaturesPermission) +{ +
+ +
+ + +} \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs new file mode 100644 index 0000000000..09b31b9609 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs @@ -0,0 +1,40 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Localization; +using Volo.Abp.AspNetCore.Components; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.FeatureManagement.Localization; +using Volo.Abp.Features; + +namespace Volo.Abp.FeatureManagement.Blazor.Components.FeatureSettingGroup; + +public partial class FeatureSettingManagementComponent : AbpComponentBase +{ + [Inject] + protected IStringLocalizer L { get; set; } + + [Inject] + protected PermissionChecker PermissionChecker { get; set; } + + protected FeatureManagementModal FeatureManagementModal; + + protected FeatureSettingViewModel Settings; + + protected async override Task OnInitializedAsync() + { + Settings = new FeatureSettingViewModel + { + HasManageHostFeaturesPermission = await PermissionChecker.IsGrantedAsync(FeatureManagementPermissions.ManageHostFeatures) + }; + } + + protected virtual async Task OnManageHostFeaturesClicked() + { + await FeatureManagementModal.OpenAsync(TenantFeatureValueProvider.ProviderName); + } +} + +public class FeatureSettingViewModel +{ + public bool HasManageHostFeaturesPermission { get; set; } +} \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Settings/FeatureSettingManagementComponentContributor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Settings/FeatureSettingManagementComponentContributor.cs new file mode 100644 index 0000000000..caeb17de26 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Settings/FeatureSettingManagementComponentContributor.cs @@ -0,0 +1,41 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; +using Volo.Abp.FeatureManagement.Blazor.Components.FeatureSettingGroup; +using Volo.Abp.FeatureManagement.Localization; +using Volo.Abp.SettingManagement.Blazor; + +namespace Volo.Abp.FeatureManagement.Blazor.Settings; + +public class FeatureSettingManagementComponentContributor: ISettingComponentContributor +{ + public virtual async Task ConfigureAsync(SettingComponentCreationContext context) + { + if (!await CheckPermissionsInternalAsync(context)) + { + return; + } + + var l = context.ServiceProvider.GetRequiredService>(); + context.Groups.Add( + new SettingComponentGroup( + "Volo.Abp.Feature", + l["Permission:FeatureManagement"], + typeof(FeatureSettingManagementComponent) + ) + ); + } + + public virtual async Task CheckPermissionsAsync(SettingComponentCreationContext context) + { + return await CheckPermissionsInternalAsync(context); + } + + protected virtual async Task CheckPermissionsInternalAsync(SettingComponentCreationContext context) + { + var authorizationService = context.ServiceProvider.GetRequiredService(); + + return await authorizationService.IsGrantedAsync(FeatureManagementPermissions.ManageHostFeatures); + } +} diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj index 22dab36cff..49d7ffd6c6 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj @@ -14,6 +14,7 @@ + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json index 5fff0f6d8a..c482493f88 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ar.json @@ -3,6 +3,7 @@ "texts": { "Features": "المميزات", "NoFeatureFoundMessage": "لا توجد أي ميزة متاحة.", + "ManageHostFeatures": "إدارة ميزات المضيف", "Permission:FeatureManagement": "إدارة الميزات", "Permission:FeatureManagement.ManageHostFeatures": "إدارة ميزات المضيف", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} قيمة الميزة غير صالحة!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/cs.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/cs.json index 36bc77b789..2e8b78a947 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/cs.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/cs.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funkce", "NoFeatureFoundMessage": "Nejsou zde dostupné žádné funkce.", + "ManageHostFeatures": "Správa funkcí hostitele", "Permission:FeatureManagement": "Správa funkcí", "Permission:FeatureManagement.ManageHostFeatures": "Správa funkcí hostitele", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Hodnota funkce {0} není platná!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de-DE.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de-DE.json index af3a7601af..0c7d1a40eb 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de-DE.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/de-DE.json @@ -3,6 +3,7 @@ "texts": { "Features": "Features", "NoFeatureFoundMessage": "Es ist kein Feature verfügbar.", + "ManageHostFeatures": "Host-Features verwalten", "Permission:FeatureManagement": "Feature-Verwaltung", "Permission:FeatureManagement.ManageHostFeatures": "Host-Features verwalten", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} Feature-Wert ist ungültig!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/el.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/el.json index 6e5529f2cd..744b94a2c5 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/el.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/el.json @@ -3,6 +3,7 @@ "texts": { "Features": "Χαρακτηριστικά", "NoFeatureFoundMessage": "Δεν διατίθεται καποιο χαρακτηριστικο.", + "ManageHostFeatures": "Διαχείριση δυνατοτήτων του Οικοδεσπότη", "Permission:FeatureManagement": "Διαχείριση χαρακτηριστικών", "Permission:FeatureManagement.ManageHostFeatures": "Διαχείριση Χαρακτηριστικών Εξυπηρετήτη", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "Η τιμή χαρακτηριστικού {0} δεν ειναι έγκυρη!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json index 09b4b306b7..0c61bfbbb5 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en-GB.json @@ -3,6 +3,7 @@ "texts": { "Features": "Features", "NoFeatureFoundMessage": "There isn't any available feature.", + "ManageHostFeatures": "Manage Host features", "Permission:FeatureManagement": "Feature management", "Permission:FeatureManagement.ManageHostFeatures": "Manage Host features", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} feature value is not valid!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json index c5194de6c7..8033d2c6a0 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json @@ -3,6 +3,7 @@ "texts": { "Features": "Features", "NoFeatureFoundMessage": "There isn't any available feature.", + "ManageHostFeatures": "Manage Host features", "Permission:FeatureManagement": "Feature management", "Permission:FeatureManagement.ManageHostFeatures": "Manage Host features", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0} feature value is not valid!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/es.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/es.json index 74e51eb9d4..7f4ae2055c 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/es.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/es.json @@ -3,6 +3,7 @@ "texts": { "Features": "Características", "NoFeatureFoundMessage": "No hay ninguna característica disponible.", + "ManageHostFeatures": "Administrar funciones de host", "Permission:FeatureManagement": "Gestión de características", "Permission:FeatureManagement.ManageHostFeatures": "Gestionar características del Host", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} valor de característica no es valido!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fa.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fa.json index af7a5ff5a0..fd1af964fa 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fa.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fa.json @@ -3,6 +3,7 @@ "texts": { "Features": "ویژگی ها", "NoFeatureFoundMessage": "هیچ ویژگی ای در دسترس نمی باشد.", + "ManageHostFeatures": "مدیریت ویژگی های میزبان", "Permission:FeatureManagement": "مدیریت ویژگی ها", "Permission:FeatureManagement.ManageHostFeatures": "مدیریت ویژگی های میزبان", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} مقدار ویژگی صحیح نمی باشد!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fi.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fi.json index 73c352c5b2..43c3ede121 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fi.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fi.json @@ -3,6 +3,7 @@ "texts": { "Features": "ominaisuudet", "NoFeatureFoundMessage": "Ei ole mitään käytettävissä olevaa ominaisuutta.", + "ManageHostFeatures": "Hallinnoi isäntäominaisuuksia", "Permission:FeatureManagement": "Ominaisuuden hallinta", "Permission:FeatureManagement.ManageHostFeatures": "Hallinnoi isäntäominaisuuksia", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Ominaisuuden {0} arvo ei kelpaa!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fr.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fr.json index 5983edf8a3..44a6a59a14 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fr.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/fr.json @@ -3,6 +3,7 @@ "texts": { "Features": "Fonctionnalités", "NoFeatureFoundMessage": "Il n'y a aucune fonctionnalité disponible.", + "ManageHostFeatures": "Gérer les fonctionnalités de l’hôte", "Permission:FeatureManagement": "Gestion des fonctionnalités", "Permission:FeatureManagement.ManageHostFeatures": "Gérer les fonctionnalités de l'hôte", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "La valeur de la fonctionnalité {0} n'est pas valide!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hi.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hi.json index 51fe35a788..303b2ff84d 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hi.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hi.json @@ -3,6 +3,7 @@ "texts": { "Features": "विशेषताएं", "NoFeatureFoundMessage": "कोई भी उपलब्ध सुविधा नहीं है।", + "ManageHostFeatures": "होस्ट सुविधाएँ प्रबंधित करें", "Permission:FeatureManagement": "सुविधा प्रबंधन", "Permission:FeatureManagement.ManageHostFeatures": "होस्ट सुविधाएँ प्रबंधित करें", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} सुविधा मान मान्य नहीं है!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hu.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hu.json index a7e1b8378e..db82d25610 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hu.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/hu.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funkciók", "NoFeatureFoundMessage": "Nincs elérhető funkció.", + "ManageHostFeatures": "Host funkciók kezelése", "Permission:FeatureManagement": "Funkciókezelés", "Permission:FeatureManagement.ManageHostFeatures": "Host funkciók kezelése", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "A (z) {0} szolgáltatás értéke érvénytelen!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/is.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/is.json index e245bf5a54..1aac3eb952 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/is.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/is.json @@ -3,6 +3,7 @@ "texts": { "Features": "Eiginleikar", "NoFeatureFoundMessage": "Enginn eiginleiki í boði.", + "ManageHostFeatures": "Stjórna Gestgjafa Eiginleikum", "Permission:FeatureManagement": "Eiginleika stjórnun", "Permission:FeatureManagement.ManageHostFeatures": "Stjórna Gestgjafa Eiginleikum", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "eiginleikagildið {0} er ekki gilt" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/it.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/it.json index ba77671388..ee08666365 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/it.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/it.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funzionalità", "NoFeatureFoundMessage": "Non ci sono funzioni disponibili.", + "ManageHostFeatures": "Gestisci le funzionalità dell'host", "Permission:FeatureManagement": "Gestione funzionalità", "Permission:FeatureManagement.ManageHostFeatures": "Gestisci le funzionalità dell'host", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Il valore dell'elemento {0} non è valido!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/nl.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/nl.json index c34ae5cc93..f34188e0a6 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/nl.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/nl.json @@ -3,6 +3,7 @@ "texts": { "Features": "Functies", "NoFeatureFoundMessage": "Er is geen functie beschikbaar.", + "ManageHostFeatures": "Beheer host functies", "Permission:FeatureManagement": "Functiebeheer", "Permission:FeatureManagement.ManageHostFeatures": "Beheer host functies", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} functie-waarde is niet geldig!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pl-PL.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pl-PL.json index 6eff64c1b0..5be57e6198 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pl-PL.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pl-PL.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funkcje", "NoFeatureFoundMessage": "Brak dostępnej funkcji.", + "ManageHostFeatures": "Zarządzaj funkcjami hosta", "Permission:FeatureManagement": "Zarządzanie funkcjami", "Permission:FeatureManagement.ManageHostFeatures": "Zarządzaj funkcjami hosta", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "{0} wartość funkcji jest nieprawidłowa!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json index a50ec6d471..570b9a40d5 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funcionalidades", "NoFeatureFoundMessage": "Não há nenhuma funcionalidade disponivel.", + "ManageHostFeatures": "Gerenciar recursos do Host", "Permission:FeatureManagement": "Gerenciamento de recursos", "Permission:FeatureManagement.ManageHostFeatures": "Gerenciar recursos do Host", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "O valor do recurso {0} não é válido!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ro-RO.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ro-RO.json index 824d789291..8e42f19123 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ro-RO.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ro-RO.json @@ -3,6 +3,7 @@ "texts": { "Features": "Caracteristici", "NoFeatureFoundMessage": "Nu există nicio caracteristică disponibilă.", + "ManageHostFeatures": "Administraţi caracteristicile de host", "Permission:FeatureManagement": "Administrare caracteristici", "Permission:FeatureManagement.ManageHostFeatures": "Gestionare caracteristici gazdă", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "Valoarea {0} a caracteristicii nu este validă!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json index bdcb53005d..e72a87388a 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/ru.json @@ -3,6 +3,7 @@ "texts": { "Features": "Функциональные возможности", "NoFeatureFoundMessage": "Нет доступных функциональных возможностей.", + "ManageHostFeatures": "Управление функциями хоста", "Permission:FeatureManagement": "Управление функциями", "Permission:FeatureManagement.ManageHostFeatures": "Управление функциями хоста", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Недопустимое значение функции {0}!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sk.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sk.json index 817d1ba801..fe7772a5b1 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sk.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sk.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funkcie", "NoFeatureFoundMessage": "Nie je k dispozícii žiadna funkcia.", + "ManageHostFeatures": "Spravovať funkcie poskytovateľa", "Permission:FeatureManagement": "Správa funkcií", "Permission:FeatureManagement.ManageHostFeatures": "Správa funkcií poskytovateľa", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Hodnota funkcie {0} nie je platná!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sl.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sl.json index 2cec7a09c0..29987fa094 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sl.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/sl.json @@ -3,6 +3,7 @@ "texts": { "Features": "Funkcionalnosti", "NoFeatureFoundMessage": "Na voljo ni nobene funkcionalnosti.", + "ManageHostFeatures": "Upravljajte funkcije gostitelja", "Permission:FeatureManagement": "Upravljanje funkcij", "Permission:FeatureManagement.ManageHostFeatures": "Upravljajte funkcije gostitelja", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Vrednost funkcije {0} ni veljavna!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json index 421b66824d..7f7ca999e6 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/tr.json @@ -3,6 +3,7 @@ "texts": { "Features": "Özellikler", "NoFeatureFoundMessage": "Hiç özellik yok.", + "ManageHostFeatures": "Host özelliklerini yönetin", "Permission:FeatureManagement": "Özellik yönetimi", "Permission:FeatureManagement.ManageHostFeatures": "Host özelliklerini düzenle", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0} özellik değeri geçerli değil!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/vi.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/vi.json index a87f6f719d..36195a8ce4 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/vi.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/vi.json @@ -3,6 +3,7 @@ "texts": { "Features": "Tính năng", "NoFeatureFoundMessage": "Không có bất kỳ tính năng khả dụng nào.", + "ManageHostFeatures": "Quản lý các tính năng của Máy chủ lưu trữ", "Permission:FeatureManagement": "Quản lý tính năng", "Permission:FeatureManagement.ManageHostFeatures": "Quản lý các tính năng của Máy chủ lưu trữ", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "Giá trị tính năng {0} không hợp lệ!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json index 473f581b34..41ac0eb5b5 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json @@ -3,6 +3,7 @@ "texts": { "Features": "功能", "NoFeatureFoundMessage": "没有可用的功能.", + "ManageHostFeatures": "管理Host特性", "Permission:FeatureManagement": "特性管理", "Permission:FeatureManagement.ManageHostFeatures": "管理Host特性", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0}功能的值无效!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json index dc84e7c104..41f625352f 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hant.json @@ -3,6 +3,7 @@ "texts": { "Features": "功能", "NoFeatureFoundMessage": "沒有可用的功能.", + "ManageHostFeatures": "管理Host功能", "Permission:FeatureManagement": "功能管理", "Permission:FeatureManagement.ManageHostFeatures": "管理Host功能", "Volo.Abp.FeatureManagement:InvalidFeatureValue" : "{0}功能的值無效!" diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementDbProperties.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDbProperties.cs similarity index 85% rename from modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementDbProperties.cs rename to modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDbProperties.cs index 6b7418351a..ee34d0523f 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementDbProperties.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDbProperties.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.FeatureManagement; -public static class FeatureManagementDbProperties +public static class AbpFeatureManagementDbProperties { public static string DbTablePrefix { get; set; } = AbpCommonDbProperties.DbTablePrefix; diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs index 06c293219b..36800a9a33 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManager.cs @@ -29,7 +29,7 @@ public class FeatureManager : IFeatureManager, ISingletonDependency StringLocalizerFactory = stringLocalizerFactory; Options = options.Value; - //TODO: Instead, use IHybridServiceScopeFactory and create a scope..? + //TODO: Instead, use IServiceScopeFactory and create a scope..? _lazyProviders = new Lazy>( () => Options diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContext.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContext.cs index 28c2ebe49f..1999a11984 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContext.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContext.cs @@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.FeatureManagement.EntityFrameworkCore; [IgnoreMultiTenancy] -[ConnectionStringName(FeatureManagementDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpFeatureManagementDbProperties.ConnectionStringName)] public class FeatureManagementDbContext : AbpDbContext, IFeatureManagementDbContext { public DbSet FeatureValues { get; set; } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContextModelCreatingExtensions.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContextModelCreatingExtensions.cs index 1994d670aa..97a9ba83d7 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContextModelCreatingExtensions.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementDbContextModelCreatingExtensions.cs @@ -17,7 +17,7 @@ public static class FeatureManagementDbContextModelCreatingExtensions builder.Entity(b => { - b.ToTable(FeatureManagementDbProperties.DbTablePrefix + "FeatureValues", FeatureManagementDbProperties.DbSchema); + b.ToTable(AbpFeatureManagementDbProperties.DbTablePrefix + "FeatureValues", AbpFeatureManagementDbProperties.DbSchema); b.ConfigureByConvention(); diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/IFeatureManagementDbContext.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/IFeatureManagementDbContext.cs index 47c600330c..7848f56cab 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/IFeatureManagementDbContext.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/IFeatureManagementDbContext.cs @@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.FeatureManagement.EntityFrameworkCore; [IgnoreMultiTenancy] -[ConnectionStringName(FeatureManagementDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpFeatureManagementDbProperties.ConnectionStringName)] public interface IFeatureManagementDbContext : IEfCoreDbContext { DbSet FeatureValues { get; } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContext.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContext.cs index 466c412cfc..37273a3dcc 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContext.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContext.cs @@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.FeatureManagement.MongoDB; [IgnoreMultiTenancy] -[ConnectionStringName(FeatureManagementDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpFeatureManagementDbProperties.ConnectionStringName)] public class FeatureManagementMongoDbContext : AbpMongoDbContext, IFeatureManagementMongoDbContext { public IMongoCollection FeatureValues => Collection(); diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContextExtensions.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContextExtensions.cs index 9922aa220b..8d263bb71e 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContextExtensions.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContextExtensions.cs @@ -11,7 +11,7 @@ public static class FeatureManagementMongoDbContextExtensions builder.Entity(b => { - b.CollectionName = FeatureManagementDbProperties.DbTablePrefix + "FeatureValues"; + b.CollectionName = AbpFeatureManagementDbProperties.DbTablePrefix + "FeatureValues"; }); } } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/IFeatureManagementMongoDbContext.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/IFeatureManagementMongoDbContext.cs index fc1e848c08..1fefaf67cf 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/IFeatureManagementMongoDbContext.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/IFeatureManagementMongoDbContext.cs @@ -6,7 +6,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.FeatureManagement.MongoDB; [IgnoreMultiTenancy] -[ConnectionStringName(FeatureManagementDbProperties.ConnectionStringName)] +[ConnectionStringName(AbpFeatureManagementDbProperties.ConnectionStringName)] public interface IFeatureManagementMongoDbContext : IAbpMongoDbContext { IMongoCollection FeatureValues { get; } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs index 752e966ef2..78959e7d22 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs @@ -3,15 +3,19 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.FeatureManagement.Localization; +using Volo.Abp.FeatureManagement.Settings; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; using Volo.Abp.Modularity; +using Volo.Abp.SettingManagement.Web; +using Volo.Abp.SettingManagement.Web.Pages.SettingManagement; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.FeatureManagement; [DependsOn( typeof(AbpFeatureManagementApplicationContractsModule), - typeof(AbpAspNetCoreMvcUiThemeSharedModule) + typeof(AbpAspNetCoreMvcUiThemeSharedModule), + typeof(AbpSettingManagementWebModule) )] public class AbpFeatureManagementWebModule : AbpModule { @@ -44,5 +48,10 @@ public class AbpFeatureManagementWebModule : AbpModule { options.DisableModule(FeatureManagementRemoteServiceConsts.ModuleName); }); + + Configure(options => + { + options.Contributors.Add(new FeatureSettingManagementPageContributor()); + }); } } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml new file mode 100644 index 0000000000..0af011ee8b --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml @@ -0,0 +1,13 @@ +@inject IHtmlLocalizer L +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.FeatureManagement.Localization +@model Volo.Abp.FeatureManagement.Pages.FeatureManagement.Components.FeatureSettingGroup.FeatureSettingGroupViewComponent.FeatureSettingViewModel + + + +
+ @if (Model.HasManageHostFeaturesPermission) + { + + } + \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.js b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.js new file mode 100644 index 0000000000..3e6842928e --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.js @@ -0,0 +1,16 @@ +(function($){ + + $(function(){ + var _featuresModal = new abp.ModalManager( + abp.appPath + 'FeatureManagement/FeatureManagementModal' + ); + + $("#ManageHostFeatures").click(function (e) { + e.preventDefault(); + _featuresModal.open({ + providerName: 'T' + }); + }); + }) + +})(jQuery); \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/FeatureSettingGroupViewComponent.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/FeatureSettingGroupViewComponent.cs new file mode 100644 index 0000000000..fc6aee9c55 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/FeatureSettingGroupViewComponent.cs @@ -0,0 +1,31 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Features; + +namespace Volo.Abp.FeatureManagement.Pages.FeatureManagement.Components.FeatureSettingGroup; + +public class FeatureSettingGroupViewComponent: AbpViewComponent +{ + protected IPermissionChecker PermissionChecker { get; } + + public FeatureSettingGroupViewComponent(IPermissionChecker permissionChecker) + { + PermissionChecker = permissionChecker; + } + + public virtual async Task InvokeAsync() + { + var model = new FeatureSettingViewModel + { + HasManageHostFeaturesPermission = await PermissionChecker.IsGrantedAsync(FeatureManagementPermissions.ManageHostFeatures) + }; + return View("~/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml", model); + } + + public class FeatureSettingViewModel + { + public bool HasManageHostFeaturesPermission { get; set; } + } +} \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Settings/FeatureSettingManagementPageContributor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Settings/FeatureSettingManagementPageContributor.cs new file mode 100644 index 0000000000..259c440166 --- /dev/null +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Settings/FeatureSettingManagementPageContributor.cs @@ -0,0 +1,29 @@ +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; +using Volo.Abp.FeatureManagement.Localization; +using Volo.Abp.FeatureManagement.Pages.FeatureManagement.Components.FeatureSettingGroup; +using Volo.Abp.SettingManagement.Web.Pages.SettingManagement; + +namespace Volo.Abp.FeatureManagement.Settings; + +public class FeatureSettingManagementPageContributor : SettingPageContributorBase +{ + public FeatureSettingManagementPageContributor() + { + RequiredPermissions(FeatureManagementPermissions.ManageHostFeatures); + } + + public override Task ConfigureAsync(SettingPageCreationContext context) + { + var l = context.ServiceProvider.GetRequiredService>(); + context.Groups.Add( + new SettingPageGroup( + "Volo.Abp.FeatureManagement", + l["Permission:FeatureManagement"], + typeof(FeatureSettingGroupViewComponent) + ) + ); + return Task.CompletedTask; + } +} \ No newline at end of file diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj index e5c8b3ba52..f9e1bdb16e 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Volo.Abp.FeatureManagement.Web.csproj @@ -33,6 +33,7 @@ + diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json index d08702a356..f9c49a7d42 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json @@ -21,7 +21,7 @@ "DisplayName:RoleName": "Nume rol", "DisplayName:UserName": "Nume de utilizator", "DisplayName:Name": "Nume", - "DisplayName:Surname": "Nume", + "DisplayName:Surname": "Nume de familie", "DisplayName:Password": "Parola", "DisplayName:Email": "Adresa de email", "DisplayName:PhoneNumber": "Număr de telefon", @@ -110,4 +110,4 @@ "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "Dacă numele de utilizator poate fi actualizat de către utilizator.", "Description:Abp.Identity.User.IsEmailUpdateEnabled": "Dacă emailul poate fi actualizat de către utilizator." } -} \ No newline at end of file +} diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs index 9a989a1ad6..0b8efc4af5 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityUserRepository.cs @@ -161,7 +161,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository x.UserName == userName) .WhereIf(!string.IsNullOrWhiteSpace(phoneNumber), x => x.PhoneNumber == phoneNumber) .WhereIf(!string.IsNullOrWhiteSpace(emailAddress), x => x.Email == emailAddress) - .WhereIf(isLockedOut == true, x => x.LockoutEnabled && x.LockoutEnd > DateTimeOffset.UtcNow) + .WhereIf(isLockedOut == true, x => x.LockoutEnabled && x.LockoutEnd.Value.CompareTo(DateTime.UtcNow) > 0) .WhereIf(notActive == true, x => !x.IsActive) .OrderBy(sorting.IsNullOrWhiteSpace() ? nameof(IdentityUser.UserName) : sorting) .PageBy(skipCount, maxResultCount) @@ -225,7 +225,7 @@ public class EfCoreIdentityUserRepository : EfCoreRepository x.UserName == userName) .WhereIf(!string.IsNullOrWhiteSpace(phoneNumber), x => x.PhoneNumber == phoneNumber) .WhereIf(!string.IsNullOrWhiteSpace(emailAddress), x => x.Email == emailAddress) - .WhereIf(isLockedOut == true, x => x.LockoutEnabled && x.LockoutEnd > DateTimeOffset.UtcNow) + .WhereIf(isLockedOut == true, x => x.LockoutEnabled && x.LockoutEnd.Value.CompareTo(DateTime.UtcNow) > 0) .WhereIf(notActive == true, x => !x.IsActive) .LongCountAsync(GetCancellationToken(cancellationToken)); } diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs index 2381748d68..788f974b5e 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs @@ -117,6 +117,8 @@ public class AbpIdentityTestDataBuilder : ITransientDependency await _userRepository.InsertAsync(adminUser); var john = new IdentityUser(_testData.UserJohnId, "john.nash", "john.nash@abp.io"); + john.LockoutEnabled = true; + john.LockoutEnd = DateTime.UtcNow.AddDays(1); john.AddRole(_moderatorRole.Id); john.AddRole(_supporterRole.Id); john.AddOrganizationUnit(_ou111.Id); @@ -132,6 +134,8 @@ public class AbpIdentityTestDataBuilder : ITransientDependency await _userRepository.InsertAsync(david); var neo = new IdentityUser(_testData.UserNeoId, "neo", "neo@abp.io"); + neo.LockoutEnabled = true; + neo.LockoutEnd = DateTime.UtcNow.AddDays(1); neo.AddRole(_supporterRole.Id); neo.AddClaim(_guidGenerator, new Claim("TestClaimType", "43")); neo.AddOrganizationUnit(_ou111.Id); diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs index de7f23cb4b..3931ecbafe 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/IdentityUserRepository_Tests.cs @@ -92,7 +92,7 @@ public abstract class IdentityUserRepository_Tests : AbpIdentity [Fact] public async Task GetListAsync() { - var users = await UserRepository.GetListAsync("UserName DESC", 5, 0, "n"); + var users = await UserRepository.GetListAsync("UserName DESC", 5, 0, "n", isLockedOut: true); users.Count.ShouldBeGreaterThan(1); users.Count.ShouldBeLessThanOrEqualTo(5); diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs index ac6c9d9edf..bc711254f1 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs @@ -17,13 +17,13 @@ namespace Volo.Abp.IdentityServer; public class AbpCorsPolicyService : ICorsPolicyService { public ILogger Logger { get; set; } - protected IHybridServiceScopeFactory HybridServiceScopeFactory { get; } + protected IServiceScopeFactory HybridServiceScopeFactory { get; } protected IDistributedCache Cache { get; } protected IdentityServerOptions Options { get; } public AbpCorsPolicyService( IDistributedCache cache, - IHybridServiceScopeFactory hybridServiceScopeFactory, + IServiceScopeFactory hybridServiceScopeFactory, IOptions options) { Cache = cache; diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService.cs index 82658ceccd..32d2d1eb73 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpWildcardSubdomainCorsPolicyService.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using IdentityServer4.Configuration; using Microsoft.Extensions.Options; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Caching; using Volo.Abp.DependencyInjection; using Volo.Abp.Text.Formatting; @@ -13,7 +14,7 @@ public class AbpWildcardSubdomainCorsPolicyService : AbpCorsPolicyService { public AbpWildcardSubdomainCorsPolicyService( IDistributedCache cache, - IHybridServiceScopeFactory hybridServiceScopeFactory, + IServiceScopeFactory hybridServiceScopeFactory, IOptions options) : base(cache, hybridServiceScopeFactory, options) { diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs index 77181a8b8b..cf69fda91a 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs @@ -32,7 +32,7 @@ public class AbpResourceOwnerPasswordValidator : IResourceOwnerPasswordValidator protected IdentitySecurityLogManager IdentitySecurityLogManager { get; } protected ILogger> Logger { get; } protected IStringLocalizer Localizer { get; } - protected IHybridServiceScopeFactory ServiceScopeFactory { get; } + protected IServiceScopeFactory ServiceScopeFactory { get; } protected AbpIdentityOptions AbpIdentityOptions { get; } protected IOptions IdentityOptions { get; } @@ -43,7 +43,7 @@ public class AbpResourceOwnerPasswordValidator : IResourceOwnerPasswordValidator ILogger> logger, IStringLocalizer localizer, IOptions abpIdentityOptions, - IHybridServiceScopeFactory serviceScopeFactory, + IServiceScopeFactory serviceScopeFactory, IOptions identityOptions) { UserManager = userManager; diff --git a/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.csproj b/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.csproj index ea620272cb..fc8ba192d3 100644 --- a/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.API/OpenIddict.Demo.API.csproj @@ -8,7 +8,7 @@ - +
diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.csproj b/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.csproj index b24c51c57a..8291ec7157 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.Client.BlazorWASM/OpenIddict.Demo.Client.BlazorWASM.csproj @@ -8,9 +8,9 @@ - - - + + +
diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.csproj b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.csproj index 6cd8c919ff..f1fc938e17 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/OpenIddict.Demo.Client.Mvc.csproj @@ -8,7 +8,7 @@ - +
diff --git a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/Program.cs b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/Program.cs index 6e18cde936..d08b46893c 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/Program.cs +++ b/modules/openiddict/app/OpenIddict.Demo.Client.Mvc/Program.cs @@ -19,19 +19,15 @@ builder.Services.AddAuthentication(options => .AddOpenIdConnect("oidc", options => { options.Authority = "https://localhost:44301/"; + options.RequireHttpsMetadata = true; + options.ResponseType = OidcConstants.ResponseTypes.Code; options.ClientId = "AbpApp"; options.ClientSecret = "1q2w3e*"; - options.RequireHttpsMetadata = true; - options.GetClaimsFromUserInfoEndpoint = true; - options.SaveTokens = true; - options.UsePkce = true; - - options.ResponseType = OidcConstants.ResponseTypes.Code; - - options.SignOutScheme = "Cookies"; + options.SaveTokens = true; + options.GetClaimsFromUserInfoEndpoint = true; options.Scope.Add("email"); options.Scope.Add("roles"); diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj index 227a4bfd7b..3bf02ee182 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj +++ b/modules/openiddict/app/OpenIddict.Demo.Server/OpenIddict.Demo.Server.csproj @@ -40,10 +40,10 @@ - - - - + + + + @@ -65,8 +65,8 @@ - - + + runtime; build; native; contentfiles; analyzers compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native diff --git a/modules/openiddict/app/OpenIddict.Demo.Server/package.json b/modules/openiddict/app/OpenIddict.Demo.Server/package.json index 55344897d5..e0cb825774 100644 --- a/modules/openiddict/app/OpenIddict.Demo.Server/package.json +++ b/modules/openiddict/app/OpenIddict.Demo.Server/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~5.2.0-rc.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~6.0.0-rc.1" } } diff --git a/modules/openiddict/app/angular/package.json b/modules/openiddict/app/angular/package.json index 1fa0dfc73c..4a342ee840 100644 --- a/modules/openiddict/app/angular/package.json +++ b/modules/openiddict/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.2.0-rc.2", - "@abp/ng.components": "~5.2.0-rc.2", - "@abp/ng.core": "~5.2.0-rc.2", - "@abp/ng.identity": "~5.2.0-rc.2", - "@abp/ng.setting-management": "~5.2.0-rc.2", - "@abp/ng.tenant-management": "~5.2.0-rc.2", - "@abp/ng.theme.basic": "~5.2.0-rc.2", - "@abp/ng.theme.shared": "~5.2.0-rc.2", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.components": "~6.0.0-rc.1", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.basic": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", @@ -34,7 +34,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.2.0-rc.2", + "@abp/ng.schematics": "~6.0.0-rc.1", "@angular-devkit/build-angular": "~13.1.2", "@angular-eslint/builder": "~13.0.1", "@angular-eslint/eslint-plugin": "~13.0.1", diff --git a/modules/openiddict/app/angular/src/environments/environment.prod.ts b/modules/openiddict/app/angular/src/environments/environment.prod.ts index ae8f02f96b..c0fcaf39a2 100644 --- a/modules/openiddict/app/angular/src/environments/environment.prod.ts +++ b/modules/openiddict/app/angular/src/environments/environment.prod.ts @@ -10,16 +10,17 @@ export const environment = { logoUrl: '', }, oAuthConfig: { - issuer: 'https://localhost:44333', + issuer: 'https://localhost:44301/', redirectUri: baseUrl, - clientId: 'Angular_App', + clientId: 'AbpApp', + dummyClientSecret: '1q2w3e*', responseType: 'code', - scope: 'offline_access Angular', + scope: 'offline_access AbpAPI', requireHttps: true }, apis: { default: { - url: 'https://localhost:44333', + url: 'https://localhost:44301', rootNamespace: 'OpenIddict.Demo.Client.Angular', }, }, diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs index 49d415c927..1484ea4b52 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.OpenIddict.Controllers; public partial class TokenController { - protected IHybridServiceScopeFactory ServiceScopeFactory => LazyServiceProvider.LazyGetRequiredService(); + protected IServiceScopeFactory ServiceScopeFactory => LazyServiceProvider.LazyGetRequiredService(); protected ITenantConfigurationProvider TenantConfigurationProvider=> LazyServiceProvider.LazyGetRequiredService(); protected IOptions AbpIdentityOptions => LazyServiceProvider.LazyGetRequiredService>(); protected IOptions IdentityOptions => LazyServiceProvider.LazyGetRequiredService>(); diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.csproj b/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.csproj index ba5c9024bf..bc0107236b 100644 --- a/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.csproj +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.Domain.Tests/Volo.Abp.OpenIddict.Domain.Tests.csproj @@ -8,7 +8,10 @@ - + + + + diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.csproj b/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.csproj index acfe196697..959bdcbfef 100644 --- a/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.csproj +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests/Volo.Abp.OpenIddict.EntityFrameworkCore.Tests.csproj @@ -8,15 +8,14 @@ - + + + + - - - -
diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.csproj b/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.csproj index 97e8e7121d..12cb1cfddd 100644 --- a/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.csproj +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.MongoDB.Tests/Volo.Abp.OpenIddict.MongoDB.Tests.csproj @@ -8,15 +8,14 @@ - - - - - + + - + + +
diff --git a/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.csproj b/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.csproj index f1ad7a1757..08d40ade84 100644 --- a/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.csproj +++ b/modules/openiddict/test/Volo.Abp.OpenIddict.TestBase/Volo.Abp.OpenIddict.TestBase.csproj @@ -8,13 +8,16 @@ - - - - - - + + + + + + + + + diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json index 516f836ada..5e66e3d5c5 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json @@ -3,6 +3,6 @@ "name": "demo-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/wwwroot/libs/abp/core/abp.js b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/wwwroot/libs/abp/core/abp.js +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock index 0dc603bcbd..24112c54a3 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs index 14629b988e..570c99925b 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManager.cs @@ -27,7 +27,7 @@ public class SettingManager : ISettingManager, ISingletonDependency SettingEncryptionService = settingEncryptionService; Options = options.Value; - //TODO: Instead, use IHybridServiceScopeFactory and create a scope..? + //TODO: Instead, use IServiceScopeFactory and create a scope..? _lazyProviders = new Lazy>( () => Options diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs index e1f597b85a..9b08236cae 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageContributorManager.cs @@ -66,7 +66,9 @@ public class SettingPageContributorManager : IScopedDependency if (available) { var requiredTenantSideFeatures = contributor.GetRequiredFeatures(MultiTenancySides.Tenant); - if (requiredTenantSideFeatures.Any() && !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray())) + if (requiredTenantSideFeatures.Any() && + ServiceProvider.GetRequiredService().IsAvailable && + !await featureChecker.IsEnabledAsync(true, requiredTenantSideFeatures.ToArray())) { available = false; } diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs index 0f0e689f2f..6fe3005a98 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs @@ -54,11 +54,6 @@ public partial class TenantManagement protected override ValueTask SetToolbarItemsAsync() { - Toolbar.AddButton(L["ManageHostFeatures"], - async () => await FeatureManagementModal.OpenAsync(FeatureProviderName), - "fa fa-cog", - requiredPolicyName: FeatureManagementPermissions.ManageHostFeatures); - Toolbar.AddButton(L["NewTenant"], OpenCreateModalAsync, IconName.Add, diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json index 134da8c601..267165038c 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ar.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Default Connection String", "DisplayName:UseSharedDatabase": "استخدام قاعدة البيانات المشتركة", - "ManageHostFeatures": "إدارة ميزات المضيف", "Permission:TenantManagement": "إدارة المستأجر", "Permission:Create": "إنشاء", "Permission:Edit": "تحرير", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/cs.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/cs.json index 754b66d081..001d5d71fb 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/cs.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/cs.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection stringy", "DisplayName:DefaultConnectionString": "Výchozí connection string", "DisplayName:UseSharedDatabase": "Použít sdílenou databázi", - "ManageHostFeatures": "Správa funkcí hostitele", "Permission:TenantManagement": "Správa tenantů", "Permission:Create": "Vytvořit", "Permission:Edit": "Upravit", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json index 16644b17aa..c744619234 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/de-DE.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Standard-Connection String", "DisplayName:UseSharedDatabase": "Verwenden Sie die freigegebene Datenbank", - "ManageHostFeatures": "Host-Features verwalten", "Permission:TenantManagement": "Mandantenverwaltung", "Permission:Create": "Erstellen", "Permission:Edit": "Bearbeiten", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/el.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/el.json index 026bcb0b76..bc75c34e03 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/el.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/el.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Συμβολοσειρές σύνδεσης", "DisplayName:DefaultConnectionString": "Προεπιλεγμένη συμβολοσειρά σύνδεσης", "DisplayName:UseSharedDatabase": "Χρησιμοποιήστε την Κοινόχρηστη βάση δεδομένων", - "ManageHostFeatures": "Διαχείριση δυνατοτήτων του Οικοδεσπότη", "Permission:TenantManagement": "Διαχείριση ενοικιαστών", "Permission:Create": "Δημιουργία", "Permission:Edit": "Επεξεργασία", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en-GB.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en-GB.json index 4d6075ff74..8b4e4c185b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en-GB.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en-GB.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Default Connection String", "DisplayName:UseSharedDatabase": "Use the Shared Database", - "ManageHostFeatures": "Manage Host features", "Permission:TenantManagement": "Tenant management", "Permission:Create": "Create", "Permission:Edit": "Edit", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json index ba4109c392..da222e994d 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Default Connection String", "DisplayName:UseSharedDatabase": "Use the Shared Database", - "ManageHostFeatures": "Manage Host features", "Permission:TenantManagement": "Tenant management", "Permission:Create": "Create", "Permission:Edit": "Edit", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json index cd18e3c33b..a570c4a84e 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/es.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Connection String predeterminado", "DisplayName:UseSharedDatabase": "Usar la base de datos compartida", - "ManageHostFeatures": "Administrar funciones de host", "Permission:TenantManagement": "Gestión de tenants", "Permission:Create": "Crear", "Permission:Edit": "Editar", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fa.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fa.json index f0a804c073..c67a9c070b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fa.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fa.json @@ -10,7 +10,6 @@ "ConnectionStrings": "کانکشن استرینگها", "DisplayName:DefaultConnectionString": "کانکشن استرینگ پیش فرض", "DisplayName:UseSharedDatabase": "استفاده از پایگاه داده مشترک", - "ManageHostFeatures": "مدیریت ویژگی های میزبان", "Permission:TenantManagement": "مدیریت تننت", "Permission:Create": "ایجاد", "Permission:Edit": "ویرایش", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json index cae6bf6cac..3bd039ffcf 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fi.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Yhteysjonot", "DisplayName:DefaultConnectionString": "Oletusyhteysmerkkijono", "DisplayName:UseSharedDatabase": "Käytä jaettua tietokantaa", - "ManageHostFeatures": "Hallinnoi isäntäominaisuuksia", "Permission:TenantManagement": "Vuokralaisten hallinta", "Permission:Create": "Luoda", "Permission:Edit": "Muokata", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json index 4aac3eebab..771a1e1fd5 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/fr.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Chaînes de connexion", "DisplayName:DefaultConnectionString": "Chaîne de connexion par défaut", "DisplayName:UseSharedDatabase": "Utiliser la base de données partagée", - "ManageHostFeatures": "Gérer les fonctionnalités de l’hôte", "Permission:TenantManagement": "Gestion des locataires", "Permission:Create": "Créer", "Permission:Edit": "Modifier", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json index 1094744a16..45e5de55c0 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hi.json @@ -10,7 +10,6 @@ "ConnectionStrings": "कनेक्शन स्ट्रिंग्स", "DisplayName:DefaultConnectionString": "डिफ़ॉल्ट कनेक्शन स्ट्रिंग", "DisplayName:UseSharedDatabase": "साझा डेटाबेस का उपयोग करें", - "ManageHostFeatures": "होस्ट सुविधाएँ प्रबंधित करें", "Permission:TenantManagement": "किरायेदार प्रबंधन", "Permission:Create": "सृजन करना", "Permission:Edit": "संपादित करें", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hu.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hu.json index 60c61c15cf..f4ccb64b0a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hu.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/hu.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Kapcsolat beállítás", "DisplayName:DefaultConnectionString": "Alapértelmezettt kapcsolati beállítás", "DisplayName:UseSharedDatabase": "Használjon megosztott adatbázist", - "ManageHostFeatures": "Host funkciók kezelése", "Permission:TenantManagement": "Bérlő menedzsment", "Permission:Create": "Létrehozás", "Permission:Edit": "Szerkesztés", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/is.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/is.json index 25c6a86ca3..ca2a8cb7a9 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/is.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/is.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Tengi strengir", "DisplayName:DefaultConnectionString": "Sjálfgefin tengistrengur", "DisplayName:UseSharedDatabase": "Notaðu samnýttan gagnagrunn", - "ManageHostFeatures": "Stjórna Gestgjafa Eiginleikum", "Permission:TenantManagement": "Tenant umsjá", "Permission:Create": "Búa til", "Permission:Edit": "Breyta", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json index c80b7974ab..efc7cb2f6b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/it.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Stringhe di connessione", "DisplayName:DefaultConnectionString": "Stringa di connessione predefinita", "DisplayName:UseSharedDatabase": "Usa il database condiviso", - "ManageHostFeatures": "Gestisci le funzionalità dell'host", "Permission:TenantManagement": "Gestione Tenant", "Permission:Create": "Crea", "Permission:Edit": "Modifica", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/nl.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/nl.json index d4c45b8aad..1aeb208560 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/nl.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/nl.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Standaard Connection String", "DisplayName:UseSharedDatabase": "Gebruik de gedeelde database", - "ManageHostFeatures": "Beheer host functies", "Permission:TenantManagement": "Klanten beheer", "Permission:Create": "Maak aan", "Permission:Edit": "Bewerk", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pl-PL.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pl-PL.json index c62c67123e..6ec40c7310 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pl-PL.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pl-PL.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Domyślny Connection String", "DisplayName:UseSharedDatabase": "Użyj współdzielonej bazy danych", - "ManageHostFeatures": "Zarządzaj funkcjami hosta", "Permission:TenantManagement": "Zarządzanie tenantami", "Permission:Create": "Utwórz", "Permission:Edit": "Edytuj", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json index 6f43740161..9d0771ed9e 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Cadeia de Conexão", "DisplayName:DefaultConnectionString": "Cadeia de Conexão Padrão", "DisplayName:UseSharedDatabase": "Use o banco de dados compartilhado", - "ManageHostFeatures": "Gerenciar recursos do Host", "Permission:TenantManagement": "Inquilinos", "Permission:Create": "Criar", "Permission:Edit": "Editar", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ro-RO.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ro-RO.json index 70147d9921..18bf9fb74e 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ro-RO.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ro-RO.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Connection String implicit", "DisplayName:UseSharedDatabase": "Folosiţi baza de date partajată", - "ManageHostFeatures": "Administraţi caracteristicile de host", "Permission:TenantManagement": "Administrarea clienţilor", "Permission:Create": "Creează", "Permission:Edit": "Editează", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json index 9e5732bbd7..b737b7ee24 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/ru.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Строки подключения", "DisplayName:DefaultConnectionString": "Строка подключения по умолчанию", "DisplayName:UseSharedDatabase": "Использование общей базы данных", - "ManageHostFeatures": "Управление функциями хоста", "Permission:TenantManagement": "Управление арендаторами", "Permission:Create": "Создать", "Permission:Edit": "Редактировать", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json index df3cd3dd13..0689dee0e2 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sk.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection stringy", "DisplayName:DefaultConnectionString": "Predvolený connection string", "DisplayName:UseSharedDatabase": "Použiť zdieľanú databázu", - "ManageHostFeatures": "Spravovať funkcie poskytovateľa", "Permission:TenantManagement": "Správa tenantov", "Permission:Create": "Vytvoriť", "Permission:Edit": "Upraviť", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json index b9df388d7c..bc2d857331 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/sl.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Connection Strings", "DisplayName:DefaultConnectionString": "Privzeti Connection String", "DisplayName:UseSharedDatabase": "Uporabi skupno bazo", - "ManageHostFeatures": "Upravljajte funkcije gostitelja", "Permission:TenantManagement": "Upravljanje najemnikov", "Permission:Create": "Ustvarjanje", "Permission:Edit": "Urejanje", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json index 25ca3f2407..933f4a4650 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Bağlantı cümlesi", "DisplayName:DefaultConnectionString": "Varsayılan bağlantı cümlesi", "DisplayName:UseSharedDatabase": "Paylaşılan veritabanını kullan", - "ManageHostFeatures": "Host özelliklerini yönetin", "Permission:TenantManagement": "Müşteri yönetimi", "Permission:Create": "Oluşturma", "Permission:Edit": "Düzenleme", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/vi.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/vi.json index 025ec04eb6..4fafa9cc72 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/vi.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/vi.json @@ -10,7 +10,6 @@ "ConnectionStrings": "Chuỗi kết nối", "DisplayName:DefaultConnectionString": "Chuỗi kết nối mặc định", "DisplayName:UseSharedDatabase": "Sử dụng cơ sở dữ liệu dùng chung", - "ManageHostFeatures": "Quản lý các tính năng của Máy chủ lưu trữ", "Permission:TenantManagement": "Quản lý khách thuê", "Permission:Create": "Tạo", "Permission:Edit": "Sửa", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json index 034d4bac81..1e8e98412a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hans.json @@ -10,7 +10,6 @@ "ConnectionStrings": "连接字符串", "DisplayName:DefaultConnectionString": "默认连接字符串", "DisplayName:UseSharedDatabase": "使用共享数据库", - "ManageHostFeatures": "管理Host特性", "Permission:TenantManagement": "租户管理", "Permission:Create": "创建", "Permission:Edit": "编辑", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json index 6950a1ca00..200dde595f 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json @@ -10,7 +10,6 @@ "ConnectionStrings": "資料庫連線字串", "DisplayName:DefaultConnectionString": "預設資料庫連線字串", "DisplayName:UseSharedDatabase": "使用共用資料庫", - "ManageHostFeatures": "管理Host功能", "Permission:TenantManagement": "租戶管理", "Permission:Create": "新增", "Permission:Edit": "編輯", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs index 1ac62db5e2..b3a63fb8ae 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs @@ -69,13 +69,6 @@ public class AbpTenantManagementWebModule : AbpModule options.Configure( toolbar => { - toolbar.AddButton( - LocalizableString.Create("ManageHostFeatures"), - icon: "cog", - name: "ManageHostFeatures", - requiredPolicyName: FeatureManagementPermissions.ManageHostFeatures - ); - toolbar.AddButton( LocalizableString.Create("NewTenant"), icon: "plus", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js index e990b8fc37..a9cf094c6c 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.js @@ -113,12 +113,5 @@ e.preventDefault(); _createModal.open(); }); - - _$wrapper.find('button[name=ManageHostFeatures]').click(function (e) { - e.preventDefault(); - _featuresModal.open({ - providerName: 'T' - }); - }); }); })(); diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json index 4c1c7c74b7..262598948c 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2", - "@abp/virtual-file-explorer": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/virtual-file-explorer": "^6.0.0-rc.1" } } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/wwwroot/libs/abp/core/abp.js b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/wwwroot/libs/abp/core/abp.js index 9445e4e7f4..d8b7531660 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/wwwroot/libs/abp/core/abp.js +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/wwwroot/libs/abp/core/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock index 2a1c70efdc..b744c88831 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.3.2.tgz#d0798086ffcad7d0e58c1127cb212012c97f5c9f" - integrity sha512-FJeTr7ePMvBrMN018qWDjhT7xcmNgIBjes6XkE1V7h8Tc6Wyn5aBvXrrqEr1v4FbKm214t1VQy7NudIjMF/UFw== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.3.2" - -"@abp/aspnetcore.mvc.ui.theme.shared@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.3.2.tgz#7ffe5199d7df25b043919592edfbd15c5033acd6" - integrity sha512-8C6QTUqKfi2wCGo+uSZi4tEtPog/E/+F+jBDfT8tFj3eZ8UFZXwYFGUKKt/m1KsVCJ0ItHj1FxKSlpvgadcmtg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~5.3.2" - "@abp/bootstrap" "~5.3.2" - "@abp/bootstrap-datepicker" "~5.3.2" - "@abp/datatables.net-bs5" "~5.3.2" - "@abp/font-awesome" "~5.3.2" - "@abp/jquery-form" "~5.3.2" - "@abp/jquery-validation-unobtrusive" "~5.3.2" - "@abp/lodash" "~5.3.2" - "@abp/luxon" "~5.3.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.3.2" - "@abp/select2" "~5.3.2" - "@abp/sweetalert2" "~5.3.2" - "@abp/timeago" "~5.3.2" - "@abp/toastr" "~5.3.2" - -"@abp/aspnetcore.mvc.ui@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.3.2.tgz#59c8ba140898260c0e1f0612f135af17bd5ae146" - integrity sha512-o12lXWhckLsvYn7xmlOgsUot0WVc/Mljfrf/HIpyzntW1jL0aqGgnG4bNVDlF77fXiPlwK/7WpwHKugqXMPOPQ== +"@abp/aspnetcore.mvc.ui.theme.basic@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0-rc.1.tgz#561522e75e850bfa33243c91b9c37e4791039455" + integrity sha512-oov7mcynMOjeBxD3oBXzSuarwLYxB902O/TMbQsdiU50oJmfgidsaHC7W3lAvfXbuZiok9+zkUW9uaGXS+OuXA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0-rc.1.tgz#5b0afe34c485f8e11ef21b0bce86e231602d8c1b" + integrity sha512-lY8ToScqRSlIHKMMiut+yiXzJG/+B8/ZXS+O9+nNOZ97G6oJZr3TYFuLcR8Rr5tFSZ65dUYivshHAM7HcRYyNA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-rc.1" + "@abp/bootstrap" "~6.0.0-rc.1" + "@abp/bootstrap-datepicker" "~6.0.0-rc.1" + "@abp/datatables.net-bs5" "~6.0.0-rc.1" + "@abp/font-awesome" "~6.0.0-rc.1" + "@abp/jquery-form" "~6.0.0-rc.1" + "@abp/jquery-validation-unobtrusive" "~6.0.0-rc.1" + "@abp/lodash" "~6.0.0-rc.1" + "@abp/luxon" "~6.0.0-rc.1" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-rc.1" + "@abp/select2" "~6.0.0-rc.1" + "@abp/sweetalert2" "~6.0.0-rc.1" + "@abp/timeago" "~6.0.0-rc.1" + "@abp/toastr" "~6.0.0-rc.1" + +"@abp/aspnetcore.mvc.ui@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0-rc.1.tgz#cec27a35b336ef8319308ac24995def0f26e00be" + integrity sha512-wH4ar4DHJiMPfe+z6IO1nCCz5L+/1W//Kh+wdtuU2QGmJX4mavAgO+ZXKGeA1QYsUY8NBXWj0Xwoyp9PgbqsyQ== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,171 +41,171 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.3.2.tgz#065b6d5b4dc484ed4c34c01209d319027e8967ea" - integrity sha512-uA2g1sThLIvGwirbLWLxExw46jnC63jjjs8aO5qSOrGrGfT6XB1OLgnnOPdFacZqPjYneGZ7ULXvOzGh2SsBYQ== +"@abp/bootstrap-datepicker@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0-rc.1.tgz#33bd5d9e1d6b351eb1e7a278ccd9a79db119e461" + integrity sha512-/y4v/JZ5YXJ2ew0v7//C//ShK3cf7IPd23d2kVb/7vypdR7yquxyoM7nxpnsfJBs5dQLsH8D5tAhFyTJBZUovA== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.3.2.tgz#7b2663b1d5b0ba8cd079dfb020e26b01fced3118" - integrity sha512-tdbzywiDnbsjNdOY0QBGYD/AtgchGSY7JQZoYczN9Rk4IZr7Axy1Dkw3sP/UBOQrxIOdUGlTEg2bi0MzAmTTig== +"@abp/bootstrap@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0-rc.1.tgz#c6f64f1f34870b75da623ed9cee7b3b1159611fc" + integrity sha512-/cAVvgmp/jYTxsuz1RmfNZ7r0X01SKvAB7yjJPvBuEdLj/5ms9HyEa3K4ifnALoShFOKP9yQN1aJtmHN7hepiQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" bootstrap "^5.1.3" -"@abp/clipboard@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-5.3.2.tgz#f1c00a66b3bbe46459b8f022fd54c098a9504673" - integrity sha512-e9TvKtBziGCmWw+lysqvd5CxqaIT2+L5anAx4xujiZR6EnBApLLqprlJyH7yAsxI4LJcKdBA+oj65xBtjVOm3w== +"@abp/clipboard@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-6.0.0-rc.1.tgz#3dc6808637f116a07f11c6e727f55ce9bd4b64de" + integrity sha512-u/OPfgXRmrrjkbJrzKB1YSW8rTqUWIPRVx1VAT7RdT5UMzX4DOupd7SRJFr6u7OZFP1p7umUtl6k4wY1lAv6rw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" clipboard "^2.0.8" -"@abp/core@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.3.2.tgz#f16026cdfd993c78904a5afe6642b5da8fbc6707" - integrity sha512-kCS8XtL2UyqYavWYGN8SY2A9PKdY5fJxKBEB6GMin4v6LzJB8f7auomLY+gFJs0PjG2rYcyT7sgVijNlOs4ypg== +"@abp/core@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0-rc.1.tgz#ec88b3339d854c91e93c342206984daf01b745df" + integrity sha512-V3X4fFm4A13LX47JNpjyxLs9IQ+StISHYMld6srEgCatHx1+dUfLcA4v5uj4IHIrPaRxhX/wv4iDND6FYcGJ2Q== dependencies: - "@abp/utils" "~5.3.2" + "@abp/utils" "~6.0.0-rc.1" -"@abp/datatables.net-bs5@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.3.2.tgz#bcccfe383ea271f845d25134307c2b407a513c33" - integrity sha512-MTaJW8LKvxOqzWFqmSZP3RcI3ygzB9sC8gH6J3ayILIXuMR+MjWe2OEMYAAQaT/582pME1wHtbp/dthkz6cmRQ== +"@abp/datatables.net-bs5@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0-rc.1.tgz#111c8c04e7d31f1b417602c7dde87d5a49104890" + integrity sha512-r4pxy1FYc06Ju4tYBVXe9HcE9LFDPCQJYP+01fPAAXcIDM7f02nCqdBjUJdv/z0VSejs9Ttn9ZIVSc85Y9JNoA== dependencies: - "@abp/datatables.net" "~5.3.2" + "@abp/datatables.net" "~6.0.0-rc.1" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.3.2.tgz#870959555907cad03dbcb8b3866f2be4aea7a16e" - integrity sha512-7F3dCqBmBzm8h6cM1tl8JG1eras7GaSbDKqJY3CqVCnDgJsk1O966p0VrZjWBxWKJrCoQCDX7+vid9UJlo/1aw== +"@abp/datatables.net@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0-rc.1.tgz#278762acd0df9c7fd50ef0caef9a9e6c32665e6f" + integrity sha512-NQSKDdpUvsY6JgGHTrTSNAp2ZcMb3L4PwSv9vJVoDSYYF7+f/KFO/bZWlamig+gucX917auRvxzD5bFSL9ub8Q== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" datatables.net "^1.11.4" -"@abp/font-awesome@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.3.2.tgz#2ae82288e1c4d664b673d2d7ec264f05fac98d7a" - integrity sha512-ZXNbI+U++Kz73FAEtWCc6KMZYQehqOQCSPEC4AfpYptK6fQ4weTARWzdfWcXluNSPeBtdl3Of+IR4TRjjUEyPA== +"@abp/font-awesome@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0-rc.1.tgz#87b89f8923b262a8531cf4702cf318d9fab155b6" + integrity sha512-lxY1ONRR0sW/uLbgY/6KJpaeZ1ueQfARjcTfHdCmnat72Qd2jID/jKGKUW2fmK0SHmAZiBnKWHLFvF+JcB3JPQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.3.2.tgz#0dc63c9b546a4aef4967fad90e6cd010aae976fa" - integrity sha512-S6lWlz32RgZj+ETrg214kOm5++HNiW4ftNRP4DMbwkq3dHvRvHqywdmVLfwaRciAsYpGqu0fl6T4P2WHiPRw2w== +"@abp/jquery-form@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0-rc.1.tgz#5bb68fbb2ce0c3b9a59a52ab20c4ea971258c3b1" + integrity sha512-RZ6v6ZbF+05gSBLltsjIMWd8a3bE8bKEPGfHgIPBJr2+xl7TGwuBB0GmDYa+2X6ctBN1BvGsNvMtOB41ahSaGA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.3.2.tgz#91a393a24ab60fce366c65ba23bddf36411da7cb" - integrity sha512-8V99Oaff6P7dQ46klCcl/CmC1OY6MJ43SyUnOltRCVeIodga8wK8rgvJFM5tYZQVmIdNtdxrUziNMw611N+3Uw== +"@abp/jquery-validation-unobtrusive@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0-rc.1.tgz#d082de2aa6c2d8bc2a0808b4159d0f5d281afdd2" + integrity sha512-Wv7/W8CXvO5+GFfYVSRXR7MnI5Vv+grDal8onwPTZ8OZS1dsTUnXe5enQMfuyzSBkq/YKTve6vFOOx8sNi0Tfg== dependencies: - "@abp/jquery-validation" "~5.3.2" + "@abp/jquery-validation" "~6.0.0-rc.1" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.3.2.tgz#18a0f7ca797adebe9393732a62251760f34f66f0" - integrity sha512-uokx6CKtHlu8WCe3YogPi+24KG15hOi7vvtiwvwZ2dV9rJpbAnDYnq7NLwjh1JFlRGsPp8vpLi9m9zilKf1CDg== +"@abp/jquery-validation@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0-rc.1.tgz#e30227075f6d7eabe6224faf2e033622ce0fe3b1" + integrity sha512-xdEVHDsPUmZRyQS5qJYs+FurK6rjGH4ARzlDjtZCwiP85pFQ3+dglF+2/KZxzsNWfHwHl3DdoKWufzzT1qYbrg== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" jquery-validation "^1.19.3" -"@abp/jquery@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.3.2.tgz#add343f7a69a2bad7f7195a616ea4fd75abcb223" - integrity sha512-s8yfkAY1xRRc/WHkrC0mDJAW3j28b/w0EMIKv+IKi6xOExqZ9/PxWDC7HIdHt3lTvHf3I9jHumypZwNyC4PP1A== +"@abp/jquery@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0-rc.1.tgz#6f486cfc16dd915ccd4fe4a3029fa6359fea49c0" + integrity sha512-WLcF9BHjRPjtz/QVWfrkltA0eYXVfUPrKmodeJ0q3wmndPqmmMyTMFSrsnoos2bSxd1Z/WGqqB3vVEYGUc1E4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" jquery "~3.6.0" -"@abp/lodash@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.3.2.tgz#b3bfc70be099aae436badb4840a1f9715af5db36" - integrity sha512-IkeNEy8uiONy3VoHS7FVIL/bQVzTD1prmRMJ78dYNP8Qn317pG5/NEOgJXbka0zqR/mb2gXDg13kwlffsJWWlw== +"@abp/lodash@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0-rc.1.tgz#5e143be48e1d266356bd726764a89f520c55e8a5" + integrity sha512-lPui/un/eZcUaeJ2r/I9DgtfIVVoASy/e+gj3opCIGv9cgBQwoV9vlAZGCsUwRFy1RO7EUUsJR4jgxWSmj1JFw== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" lodash "^4.17.21" -"@abp/luxon@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.3.2.tgz#4d6039505d13edb30ef8b2f00bca69639cd2afd2" - integrity sha512-uxym895NuCsi5KE7JwiL2d+MnJMXZIu8xCutb0NtT89BvfjeZnAv8FOr4NjaYg+pmxTyj1i9RmBzfYsz0yvmkQ== +"@abp/luxon@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0-rc.1.tgz#a4242d862576b4151912d48fbf81d89862b6a91e" + integrity sha512-O0nbZk1PA7RryFG+J3gKRtuT4+FV4eSkth8GZvhCOKoN8SpDu/92G2cIEzR0l9O1TYlrKAEbUpmsA+d6abSG+w== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.3.2.tgz#99188d4b6497384720cf7168c909d32a39eff8a4" - integrity sha512-d2UcBQt4w7VqZdJjdb+JJpp9mFli7WbK7SrRTUeIINdKo3x4nrABbuKUgMBNxkroDVi1ErI0I4gwsVAGrMUPFw== +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0-rc.1.tgz#738efa17783450971c6f47608cfafc0ef87d8ec6" + integrity sha512-6Q9slGs6A1d1v+lpTfzI8W+QrpTtY0LTKQkRbYYpm31Lf5zQ55QFoinDpV9wnxDPrfh2u5aX/dSYMrHjdzj6Qg== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/prismjs@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-5.3.2.tgz#76299d4eec3a41d518738bc0a94dc74e61552481" - integrity sha512-QwIGhUjWCWAi9lqrMIMEybjGM1WkADAFFhLB9R+Nk5Cj4dlgVe1PekypbWV0e3r300H6ZqJmgPcagKVG3G4bWg== +"@abp/prismjs@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-6.0.0-rc.1.tgz#1c1afcf0533c54989d1eaf0d94a0a71f61213d70" + integrity sha512-rDkIdCEdiHw9ervlfrRyoMB0eiDGSbjM0PG+M7ePXoatDiFdDsTz/XYR3ygvdk1/8h7GM2KkNjrx8OLzWMlblQ== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/core" "~5.3.2" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/core" "~6.0.0-rc.1" prismjs "^1.26.0" -"@abp/select2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.3.2.tgz#b39ddab8f0be539a880bdff7bc3307d9596a545d" - integrity sha512-JAf8LceHL5SUDBYRZ2BTpfIBRc4xyhE+9uo4ZqXXstLpJUUoaW2WlTSCNlBakSlR9k4Fprk9RjqVcrpNuWN+ew== +"@abp/select2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0-rc.1.tgz#d4ba6e71536c56ef2c98c1b3342f15fc286d3c1b" + integrity sha512-j1mebFXYiLOaOqK9FW5FqafTvT6oydEbcKj2Dk4JdgbcwdY+Mf5DPrb4cu61IPR7SzMCfeZX6j6d2LCdnW7o4g== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" select2 "^4.0.13" -"@abp/sweetalert2@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.3.2.tgz#1ddb2caf2e82b6f0faa3420beda8a491c51fb1df" - integrity sha512-JSV33EVAK7y1VaYQf9HBLFjVkfUHvb3aeIta/xu0Wbw17JyJHrjlk/H0Z4ihkjPcCU2CDqVJCUUzhjdFFjHNag== +"@abp/sweetalert2@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0-rc.1.tgz#2633ed54227a703dbd81e2db0923d6f402561232" + integrity sha512-JxrLUnsntCoimJTpY+9uQ+CK6VW1sRTv0qhOX7EJTEefvA+YZjSSk0MwyG4KNzF46JSMW1OctXqWihl/UHZzTQ== dependencies: - "@abp/core" "~5.3.2" + "@abp/core" "~6.0.0-rc.1" sweetalert2 "^11.3.6" -"@abp/timeago@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.3.2.tgz#cb85f15a06cb85f82cdfa0c1454b20258014f613" - integrity sha512-jjUI+R4vRe/k9I2In5tp9PNKsf1quldVZA16vKRfxkF8TrN05RBF9ks5H+zlbe//okVCVl1Gz5MVt3XP7arEig== +"@abp/timeago@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0-rc.1.tgz#78903b3d523da6985a83a306d6a31d223b244d8b" + integrity sha512-f5AaVRCKXS4+U4axVE6B1gQIo28gmJ5iOsn+tGhH9YANsfybS7in7dN8Nu89oqx10tVyHZ6r5/ESd21aV34VDA== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" timeago "^1.6.7" -"@abp/toastr@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.3.2.tgz#f714ff89267d5e375fa2c0c8bef40f3eeacedfe8" - integrity sha512-9ZTSo+4X4cuLdfOwGBWACMS4/379BulFsMW5kcDxFWW/EYhQ2ieE/CclYMeiOqeIL92rmurdVMHeum0MSH6hbg== +"@abp/toastr@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0-rc.1.tgz#2cb0898d48bad1cb8cb5e994b55e51d60e5a6b90" + integrity sha512-RPp6J5IWtYW1q27+fFc5UxramldBIbCyEU9aniH9rfkEs4F5SF4RJphqjSKeYMclvT0PheUnR1x26PJbi179MQ== dependencies: - "@abp/jquery" "~5.3.2" + "@abp/jquery" "~6.0.0-rc.1" toastr "^2.1.4" -"@abp/utils@~5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.3.2.tgz#03111ac799363db8948cc4b905b7eea437b01fb3" - integrity sha512-ZPrhzl+NiCXxudIv+XozMzwiIWM70AQo8VXl9el8pYiQH0oiEOcT4ny+VmWdMU/94ouW0F3h1cjpYGeJSUWO/w== +"@abp/utils@~6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0-rc.1.tgz#f25b383d6d7ba28c1220399397247cdef9704daf" + integrity sha512-Fi8dBDDAjdPE6tsWCP7iNlBb7WpoF8V3wOnoGmeg/ZklEcHDNZymjSa2RG8+6Qc4fSuUfti/Qyyj4CoDHhsOBw== dependencies: just-compare "^1.3.0" -"@abp/virtual-file-explorer@^5.3.2": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-5.3.2.tgz#9c88886e2cfa612636013916ca93a44a171e16ec" - integrity sha512-8itIyplAXSnLuyRBwFAg63d3fJg8XMbPjlD944BlCHd+aqbUcygXMTxZBb3HGd10mT6k8OTNrkJ96vzaxML0Qg== +"@abp/virtual-file-explorer@^6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/virtual-file-explorer/-/virtual-file-explorer-6.0.0-rc.1.tgz#82185af45c12fd25453d0926f8f89a43d01fdfbc" + integrity sha512-P6CHOlUwvdCAdKUJiJX3SZeIaz8sat+VuBZfR2ITKFc7hJ+/XuZ5LyCWnulPOqjmpqSibyq2tili3OBgC9hlEQ== dependencies: - "@abp/clipboard" "~5.3.2" - "@abp/prismjs" "~5.3.2" + "@abp/clipboard" "~6.0.0-rc.1" + "@abp/prismjs" "~6.0.0-rc.1" "@fortawesome/fontawesome-free@^5.15.4": version "5.15.4" diff --git a/npm/lerna.json b/npm/lerna.json index c8e1500717..64c792f8e5 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "packages": [ "packs/*" ], diff --git a/npm/ng-packs/apps/dev-app/src/environments/environment.ts b/npm/ng-packs/apps/dev-app/src/environments/environment.ts index 58008f922b..1e014dcaa7 100644 --- a/npm/ng-packs/apps/dev-app/src/environments/environment.ts +++ b/npm/ng-packs/apps/dev-app/src/environments/environment.ts @@ -37,7 +37,7 @@ export const environment = { AbpIdentity: { rootNamespace: 'Volo.Abp', }, - AbpSettingManagement: { + SettingManagement: { rootNamespace: 'Volo.Abp.SettingManagement', }, }, diff --git a/npm/ng-packs/lerna.version.json b/npm/ng-packs/lerna.version.json index c96e86635a..c189ec5f73 100644 --- a/npm/ng-packs/lerna.version.json +++ b/npm/ng-packs/lerna.version.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "packages": [ "packages/*" ], diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 70423ebc3a..2491ff401c 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -38,7 +38,7 @@ }, "private": true, "devDependencies": { - "@abp/utils": "~5.3.2", + "@abp/utils": "~6.0.0-rc.1", "@angular-devkit/build-angular": "13.3.5", "@angular-devkit/build-ng-packagr": "^0.1002.0", "@angular-devkit/schematics-cli": "~12.2.0", @@ -57,17 +57,17 @@ "@angular/platform-browser": "13.3.6", "@angular/platform-browser-dynamic": "13.3.6", "@angular/router": "13.3.6", - "@abp/ng.account": "~5.3.2", - "@abp/ng.account.core": "~5.3.2", - "@abp/ng.core": "~5.3.2", - "@abp/ng.feature-management": "~5.3.2", - "@abp/ng.identity": "~5.3.2", - "@abp/ng.permission-management": "~5.3.2", - "@abp/ng.schematics": "~5.3.2", - "@abp/ng.setting-management": "~5.3.2", - "@abp/ng.tenant-management": "~5.3.2", - "@abp/ng.theme.basic": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.account.core": "~6.0.0-rc.1", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.feature-management": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.permission-management": "~6.0.0-rc.1", + "@abp/ng.schematics": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.basic": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4", "@ngneat/spectator": "^10.0.0", @@ -80,7 +80,7 @@ "@nrwl/linter": "13.10.3", "@nrwl/workspace": "13.10.3", "@schematics/angular": "~12.2.0", - "@swimlane/ngx-datatable": "^19.0.0", + "@swimlane/ngx-datatable": "^20.0.0", "@types/jest": "27.0.2", "@types/node": "14.14.33", "@typescript-eslint/eslint-plugin": "5.18.0", diff --git a/npm/ng-packs/packages/account-core/package.json b/npm/ng-packs/packages/account-core/package.json index 62772b2ee2..fe918c327d 100644 --- a/npm/ng-packs/packages/account-core/package.json +++ b/npm/ng-packs/packages/account-core/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account.core", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "@angular/common": ">=12.0.0", "@angular/core": ">=12.0.0" }, diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index 21431ce4b4..a5408c4a25 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.account", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.account.core": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/components/package.json b/npm/ng-packs/packages/components/package.json index 397e70a888..cde60867d8 100644 --- a/npm/ng-packs/packages/components/package.json +++ b/npm/ng-packs/packages/components/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.components", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "peerDependencies": { - "@abp/ng.core": ">=5.3.2", - "@abp/ng.theme.shared": ">=5.3.2", + "@abp/ng.core": ">=6.0.0-rc.1", + "@abp/ng.theme.shared": ">=6.0.0-rc.1", "@ng-bootstrap/ng-bootstrap": ">=10.0.0" }, "dependencies": { diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index 7d08fcfeeb..980c3de2c3 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.core", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/utils": "~5.3.2", + "@abp/utils": "~6.0.0-rc.1", "angular-oauth2-oidc": "^13.0.1", "just-clone": "^3.2.1", "just-compare": "^1.4.0", diff --git a/npm/ng-packs/packages/core/src/lib/services/rest.service.ts b/npm/ng-packs/packages/core/src/lib/services/rest.service.ts index 846d7a44ce..82e2c12707 100644 --- a/npm/ng-packs/packages/core/src/lib/services/rest.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/rest.service.ts @@ -38,9 +38,9 @@ export class RestService { api = api || this.getApiFromStore(config.apiName); const { method, params, ...options } = request; const { observe = Rest.Observe.Body, skipHandleError } = config; - + const url = this.removeDuplicateSlashes(api + request.url); return this.http - .request(method, api + request.url, { + .request(method, url, { observe, ...(params && { params: this.getParams(params, config.httpParamEncoder), @@ -62,4 +62,8 @@ export class RestService { ? new HttpParams({ encoder, fromObject: filteredParams }) : new HttpParams({ fromObject: filteredParams }); } + + private removeDuplicateSlashes(url: string): string { + return url.replace(/([^:]\/)\/+/g, '$1'); + } } diff --git a/npm/ng-packs/packages/core/src/lib/tests/rest.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/rest.service.spec.ts index 1a3672df3d..49d561ada0 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/rest.service.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/rest.service.spec.ts @@ -120,4 +120,17 @@ describe('HttpClient testing', () => { const req = spectator.expectOne(api + '/test', HttpMethod.GET); spectator.flushAll([req], [throwError('Testing error')]); }); + + test('should remove the duplicate slashes', () => { + spectator.service + .request({ method: HttpMethod.GET, url: '//test', params: { id: 1 } }) + .subscribe(); + spectator.expectOne(api + '/test?id=1', HttpMethod.GET); + }); + test('should remove the duplicate slashes multiple', () => { + spectator.service + .request({ method: HttpMethod.GET, url: '//test//my//endpoint', params: { id: 1 } }) + .subscribe(); + spectator.expectOne(api + '/test/my/endpoint?id=1', HttpMethod.GET); + }); }); diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index 67fbbfbce1..bdfd8deab0 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.feature-management", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index d6d32b3c77..a742f6ff71 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.identity", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.permission-management": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.permission-management": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index 763e685359..2a3196dae9 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -1,13 +1,13 @@ { "name": "@abp/ng.permission-management", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 0167508daf..5fb9c679f5 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.schematics", - "version": "5.3.2", + "version": "6.0.0-rc.1", "description": "Schematics that works with ABP Backend", "keywords": [ "schematics" diff --git a/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template b/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template index 78fb27c33d..1e1cc4564a 100644 --- a/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template +++ b/npm/ng-packs/packages/schematics/src/commands/api/files-service/proxy/__namespace@dir__/__name@kebab__.service.ts.template @@ -7,12 +7,18 @@ export class <%= name %>Service { apiName = '<%= apiName %>';<% for (let {body, signature} of methods) { %> + <% + const isBlob = body.isBlobMethod() ; + const responseType = isBlob ? "Blob":body.responseType; + %> <%= camel(signature.name) %> = (<%= serializeParameters(signature.parameters) %>) => - this.restService.request<<%= body.requestType %>, <%= body.responseType %>>({ - method: '<%= body.method %>',<% + this.restService.request<<%= body.requestType %>, <%= responseType %>>({ + method: '<%= body.method %>',<% if (body.responseType === 'string') { %> - responseType: 'text',<% } %> + responseType: 'text',<% } %><% + if (isBlob) { %> + responseType: 'blob',<% } %> url: <%= body.url %>,<% if (body.params.length) { %> params: { <%= body.params.join(', ') %> },<% } diff --git a/npm/ng-packs/packages/schematics/src/constants/volo.ts b/npm/ng-packs/packages/schematics/src/constants/volo.ts index 00fde72c79..d45a4b9e72 100644 --- a/npm/ng-packs/packages/schematics/src/constants/volo.ts +++ b/npm/ng-packs/packages/schematics/src/constants/volo.ts @@ -1 +1,2 @@ export const VOLO_REGEX = /^Volo\.Abp\.(Application\.Dtos|ObjectExtending)/; +export const VOLO_REMOTE_STREAM_CONTENT = 'Volo.Abp.Content.IRemoteStreamContent' diff --git a/npm/ng-packs/packages/schematics/src/models/method.ts b/npm/ng-packs/packages/schematics/src/models/method.ts index d8f56e383e..d54d4303b9 100644 --- a/npm/ng-packs/packages/schematics/src/models/method.ts +++ b/npm/ng-packs/packages/schematics/src/models/method.ts @@ -4,6 +4,7 @@ import { getParamName } from '../utils/methods'; import { ParameterInBody } from './api-definition'; import { Property } from './model'; import { Omissible } from './util'; +import {VOLO_REMOTE_STREAM_CONTENT} from "../constants"; // eslint-disable-next-line @typescript-eslint/no-var-requires const shouldQuote = require('should-quote'); @@ -39,6 +40,7 @@ export class Body { body?: string; method: string; params: string[] = []; + responseTypeWithNamespace: string; requestType = 'any'; responseType: string; url: string; @@ -77,6 +79,10 @@ export class Body { this.setUrlQuotes(); } + isBlobMethod(){ + return this.responseTypeWithNamespace === VOLO_REMOTE_STREAM_CONTENT + } + private setUrlQuotes() { this.url = /{/.test(this.url) ? `\`/${this.url}\`` : `'/${this.url}'`; } @@ -84,5 +90,5 @@ export class Body { export type BodyOptions = Omissible< Omit, - 'params' | 'requestType' + 'params' | 'requestType' | 'isBlobMethod' >; diff --git a/npm/ng-packs/packages/schematics/src/utils/service.ts b/npm/ng-packs/packages/schematics/src/utils/service.ts index 4e2fdc7c02..28ce82e3f7 100644 --- a/npm/ng-packs/packages/schematics/src/utils/service.ts +++ b/npm/ng-packs/packages/schematics/src/utils/service.ts @@ -22,6 +22,7 @@ import { } from './type'; import { eBindingSourceId } from '../enums'; import { camelizeHyphen } from './text'; +import {VOLO_REMOTE_STREAM_CONTENT} from "../constants"; export function serializeParameters(parameters: Property[]) { return parameters.map(p => p.name + p.optional + ': ' + p.type + p.default, '').join(', '); @@ -38,7 +39,8 @@ export function createControllerToServiceMapper({ const name = controller.controllerName; const namespace = parseNamespace(solution, controller.type); const actions = Object.values(controller.actions); - const imports = actions.reduce(createActionToImportsReducer(solution, types, namespace), []); + const typeWithoutIRemoteStreamContent = getTypesWithoutIRemoteStreamContent(types) + const imports = actions.reduce(createActionToImportsReducer(solution, typeWithoutIRemoteStreamContent, namespace), []); imports.push(new Import({ path: '@abp/ng.core', specifiers: ['RestService'] })); imports.push(new Import({ path: '@angular/core', specifiers: ['Injectable'] })); sortImports(imports); @@ -48,6 +50,11 @@ export function createControllerToServiceMapper({ }; } +function getTypesWithoutIRemoteStreamContent(types: Record) { + const newType = {...types} + delete newType[VOLO_REMOTE_STREAM_CONTENT] + return newType +} function sortMethods(methods: Method[]) { methods.sort((a, b) => (a.signature.name > b.signature.name ? 1 : -1)); } @@ -68,7 +75,8 @@ export function createActionToBodyMapper() { return ({ httpMethod, parameters, returnValue, url }: Action) => { const responseType = adaptType(returnValue.typeSimple); - const body = new Body({ method: httpMethod, responseType, url }); + const responseTypeWithNamespace = returnValue.typeSimple; + const body = new Body({ method: httpMethod, responseType, url ,responseTypeWithNamespace}); parameters.forEach(body.registerActionParameter); diff --git a/npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.html b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html similarity index 52% rename from npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.html rename to npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html index 8d23d2779d..21d3ee1dee 100644 --- a/npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.html +++ b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html @@ -6,13 +6,13 @@
+ }}
+ }}
@@ -25,34 +25,23 @@
- + + }}
- + + }}
-
+ }">
@@ -74,4 +63,51 @@ + + + + +

{{"SendTestEmail" | abpLocalization}}

+
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ + +
+ + +
+ + +
+
+
+ + + + + {{ 'AbpTenantManagement::Send' | abpLocalization }} + + + + +
\ No newline at end of file diff --git a/npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.ts b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts similarity index 65% rename from npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts index a695d71ca8..e8bdea2ea7 100644 --- a/npm/ng-packs/packages/setting-management/config/src/components/email-setting-group/email-setting-group.component.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts @@ -1,7 +1,9 @@ +import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap'; import { collapse, ToasterService } from '@abp/ng.theme.shared'; import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { finalize } from 'rxjs/operators'; +import { SettingManagementPolicyNames } from '../../enums/policy-names'; import { EmailSettingsService } from '../../proxy/email-settings.service'; import { EmailSettingsDto } from '../../proxy/models'; @@ -12,8 +14,11 @@ import { EmailSettingsDto } from '../../proxy/models'; }) export class EmailSettingGroupComponent implements OnInit { form!: FormGroup; - + emailTestForm: FormGroup; saving = false; + emailingPolicy = SettingManagementPolicyNames.Emailing; + isEmailTestModalOpen = false; + modalSize:NgbModalOptions= { size:"lg"} constructor( private emailSettingsService: EmailSettingsService, @@ -57,4 +62,30 @@ export class EmailSettingGroupComponent implements OnInit { this.getData(); }); } + openSendEmailModal() { + this.buildEmailTestForm(); + this.isEmailTestModalOpen = true; + } + + buildEmailTestForm() { + this.emailTestForm = this.fb.group({ + senderEmailAddress: ['', [Validators.required, Validators.email]], + targetEmailAddress: ['', [Validators.required, Validators.email]], + subject: ['', [Validators.required]], + body: [''], + }); + } + + emailTestFormSubmit() { + + if(this.emailTestForm.invalid){ + return; + } + this.emailSettingsService.sendTestEmail(this.emailTestForm.value).subscribe(res => { + this.toasterService.success('AbpSettingManagement::SuccessfullySent'); + this.isEmailTestModalOpen = false; + }) + + } + } diff --git a/npm/ng-packs/packages/setting-management/config/src/enums/index.ts b/npm/ng-packs/packages/setting-management/config/src/lib/enums/index.ts similarity index 68% rename from npm/ng-packs/packages/setting-management/config/src/enums/index.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/enums/index.ts index 34fd5f8eb8..6015b15b03 100644 --- a/npm/ng-packs/packages/setting-management/config/src/enums/index.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/enums/index.ts @@ -1,2 +1,3 @@ export * from './route-names'; export * from './setting-tab-names'; +export * from './policy-names'; diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/enums/policy-names.ts b/npm/ng-packs/packages/setting-management/config/src/lib/enums/policy-names.ts new file mode 100644 index 0000000000..d6df2d0e10 --- /dev/null +++ b/npm/ng-packs/packages/setting-management/config/src/lib/enums/policy-names.ts @@ -0,0 +1,4 @@ +export const enum SettingManagementPolicyNames { + Emailing = 'SettingManagement.Emailing', + } + diff --git a/npm/ng-packs/packages/setting-management/config/src/enums/route-names.ts b/npm/ng-packs/packages/setting-management/config/src/lib/enums/route-names.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/enums/route-names.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/enums/route-names.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/enums/setting-tab-names.ts b/npm/ng-packs/packages/setting-management/config/src/lib/enums/setting-tab-names.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/enums/setting-tab-names.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/enums/setting-tab-names.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/features.token.ts b/npm/ng-packs/packages/setting-management/config/src/lib/providers/features.token.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/providers/features.token.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/providers/features.token.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/index.ts b/npm/ng-packs/packages/setting-management/config/src/lib/providers/index.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/providers/index.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/providers/index.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts b/npm/ng-packs/packages/setting-management/config/src/lib/providers/route.provider.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/providers/route.provider.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/setting-tab.provider.ts b/npm/ng-packs/packages/setting-management/config/src/lib/providers/setting-tab.provider.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/providers/setting-tab.provider.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/providers/setting-tab.provider.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/visible.provider.ts b/npm/ng-packs/packages/setting-management/config/src/lib/providers/visible.provider.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/providers/visible.provider.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/providers/visible.provider.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/proxy/README.md b/npm/ng-packs/packages/setting-management/config/src/lib/proxy/README.md similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/proxy/README.md rename to npm/ng-packs/packages/setting-management/config/src/lib/proxy/README.md diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/proxy/email-settings.service.ts b/npm/ng-packs/packages/setting-management/config/src/lib/proxy/email-settings.service.ts new file mode 100644 index 0000000000..f9091a97d0 --- /dev/null +++ b/npm/ng-packs/packages/setting-management/config/src/lib/proxy/email-settings.service.ts @@ -0,0 +1,35 @@ +import type { EmailSettingsDto, SendTestEmailInput, UpdateEmailSettingsDto } from './models'; +import { RestService } from '@abp/ng.core'; +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root', +}) +export class EmailSettingsService { + apiName = 'SettingManagement'; + + get = () => + this.restService.request({ + method: 'GET', + url: '/api/setting-management/emailing', + }, + { apiName: this.apiName }); + + sendTestEmail = (input: SendTestEmailInput) => + this.restService.request({ + method: 'POST', + url: '/api/setting-management/emailing/send-test-email', + body: input, + }, + { apiName: this.apiName }); + + update = (input: UpdateEmailSettingsDto) => + this.restService.request({ + method: 'POST', + url: '/api/setting-management/emailing', + body: input, + }, + { apiName: this.apiName }); + + constructor(private restService: RestService) {} +} diff --git a/npm/ng-packs/packages/setting-management/config/src/proxy/generate-proxy.json b/npm/ng-packs/packages/setting-management/config/src/lib/proxy/generate-proxy.json similarity index 63% rename from npm/ng-packs/packages/setting-management/config/src/proxy/generate-proxy.json rename to npm/ng-packs/packages/setting-management/config/src/lib/proxy/generate-proxy.json index f5a18bee75..229e4e4bbe 100644 --- a/npm/ng-packs/packages/setting-management/config/src/proxy/generate-proxy.json +++ b/npm/ng-packs/packages/setting-management/config/src/lib/proxy/generate-proxy.json @@ -3,16 +3,19 @@ "settingManagement" ], "modules": { - "featureManagement": { - "rootPath": "featureManagement", - "remoteServiceName": "AbpFeatureManagement", + "permissionManagement": { + "rootPath": "permissionManagement", + "remoteServiceName": "AbpPermissionManagement", "controllers": { - "Volo.Abp.FeatureManagement.FeaturesController": { - "controllerName": "Features", - "type": "Volo.Abp.FeatureManagement.FeaturesController", + "Volo.Abp.PermissionManagement.PermissionsController": { + "controllerName": "Permissions", + "controllerGroupName": "Permissions", + "isRemoteService": true, + "apiVersion": null, + "type": "Volo.Abp.PermissionManagement.PermissionsController", "interfaces": [ { - "type": "Volo.Abp.FeatureManagement.IFeatureAppService" + "type": "Volo.Abp.PermissionManagement.IPermissionAppService" } ], "actions": { @@ -20,7 +23,7 @@ "uniqueName": "GetAsyncByProviderNameAndProviderKey", "name": "GetAsync", "httpMethod": "GET", - "url": "api/feature-management/features", + "url": "api/permission-management/permissions", "supportedVersions": [], "parametersOnMethod": [ { @@ -44,6 +47,7 @@ { "nameOnMethod": "providerName", "name": "providerName", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -55,6 +59,7 @@ { "nameOnMethod": "providerKey", "name": "providerKey", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -65,15 +70,17 @@ } ], "returnValue": { - "type": "Volo.Abp.FeatureManagement.GetFeatureListResultDto", - "typeSimple": "Volo.Abp.FeatureManagement.GetFeatureListResultDto" - } + "type": "Volo.Abp.PermissionManagement.GetPermissionListResultDto", + "typeSimple": "Volo.Abp.PermissionManagement.GetPermissionListResultDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.PermissionManagement.IPermissionAppService" }, "UpdateAsyncByProviderNameAndProviderKeyAndInput": { "uniqueName": "UpdateAsyncByProviderNameAndProviderKeyAndInput", "name": "UpdateAsync", "httpMethod": "PUT", - "url": "api/feature-management/features", + "url": "api/permission-management/permissions", "supportedVersions": [], "parametersOnMethod": [ { @@ -94,9 +101,9 @@ }, { "name": "input", - "typeAsString": "Volo.Abp.FeatureManagement.UpdateFeaturesDto, Volo.Abp.FeatureManagement.Application.Contracts", - "type": "Volo.Abp.FeatureManagement.UpdateFeaturesDto", - "typeSimple": "Volo.Abp.FeatureManagement.UpdateFeaturesDto", + "typeAsString": "Volo.Abp.PermissionManagement.UpdatePermissionsDto, Volo.Abp.PermissionManagement.Application.Contracts", + "type": "Volo.Abp.PermissionManagement.UpdatePermissionsDto", + "typeSimple": "Volo.Abp.PermissionManagement.UpdatePermissionsDto", "isOptional": false, "defaultValue": null } @@ -105,6 +112,7 @@ { "nameOnMethod": "providerName", "name": "providerName", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -116,6 +124,7 @@ { "nameOnMethod": "providerKey", "name": "providerKey", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -127,8 +136,9 @@ { "nameOnMethod": "input", "name": "input", - "type": "Volo.Abp.FeatureManagement.UpdateFeaturesDto", - "typeSimple": "Volo.Abp.FeatureManagement.UpdateFeaturesDto", + "jsonName": null, + "type": "Volo.Abp.PermissionManagement.UpdatePermissionsDto", + "typeSimple": "Volo.Abp.PermissionManagement.UpdatePermissionsDto", "isOptional": false, "defaultValue": null, "constraintTypes": null, @@ -139,7 +149,179 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.PermissionManagement.IPermissionAppService" + } + } + } + } + }, + "abp": { + "rootPath": "abp", + "remoteServiceName": "abp", + "controllers": { + "Pages.Abp.MultiTenancy.AbpTenantController": { + "controllerName": "AbpTenant", + "controllerGroupName": "AbpTenant", + "isRemoteService": true, + "apiVersion": null, + "type": "Pages.Abp.MultiTenancy.AbpTenantController", + "interfaces": [ + { + "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.IAbpTenantAppService" + } + ], + "actions": { + "FindTenantByNameAsyncByName": { + "uniqueName": "FindTenantByNameAsyncByName", + "name": "FindTenantByNameAsync", + "httpMethod": "GET", + "url": "api/abp/multi-tenancy/tenants/by-name/{name}", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "name", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "name", + "name": "name", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" + } + ], + "returnValue": { + "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto", + "typeSimple": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.IAbpTenantAppService" + }, + "FindTenantByIdAsyncById": { + "uniqueName": "FindTenantByIdAsyncById", + "name": "FindTenantByIdAsync", + "httpMethod": "GET", + "url": "api/abp/multi-tenancy/tenants/by-id/{id}", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "id", + "name": "id", + "jsonName": null, + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" + } + ], + "returnValue": { + "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto", + "typeSimple": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.IAbpTenantAppService" + } + } + }, + "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationController": { + "controllerName": "AbpApplicationConfiguration", + "controllerGroupName": "AbpApplicationConfiguration", + "isRemoteService": true, + "apiVersion": null, + "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationController", + "interfaces": [ + { + "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.IAbpApplicationConfigurationAppService" + } + ], + "actions": { + "GetAsync": { + "uniqueName": "GetAsync", + "name": "GetAsync", + "httpMethod": "GET", + "url": "api/abp/application-configuration", + "supportedVersions": [], + "parametersOnMethod": [], + "parameters": [], + "returnValue": { + "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationConfigurationDto", + "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationConfigurationDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.IAbpApplicationConfigurationAppService" + } + } + }, + "Volo.Abp.AspNetCore.Mvc.ApiExploring.AbpApiDefinitionController": { + "controllerName": "AbpApiDefinition", + "controllerGroupName": "AbpApiDefinition", + "isRemoteService": true, + "apiVersion": null, + "type": "Volo.Abp.AspNetCore.Mvc.ApiExploring.AbpApiDefinitionController", + "interfaces": [], + "actions": { + "GetByModel": { + "uniqueName": "GetByModel", + "name": "Get", + "httpMethod": "GET", + "url": "api/abp/api-definition", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "model", + "typeAsString": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto, Volo.Abp.Http", + "type": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto", + "typeSimple": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "model", + "name": "IncludeTypes", + "jsonName": null, + "type": "System.Boolean", + "typeSimple": "boolean", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "model" + } + ], + "returnValue": { + "type": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModel", + "typeSimple": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModel" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.AspNetCore.Mvc.ApiExploring.AbpApiDefinitionController" } } } @@ -151,6 +333,9 @@ "controllers": { "Volo.Abp.TenantManagement.TenantController": { "controllerName": "Tenant", + "controllerGroupName": "Tenant", + "isRemoteService": true, + "apiVersion": null, "type": "Volo.Abp.TenantManagement.TenantController", "interfaces": [ { @@ -178,6 +363,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -190,7 +376,9 @@ "returnValue": { "type": "Volo.Abp.TenantManagement.TenantDto", "typeSimple": "Volo.Abp.TenantManagement.TenantDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IReadOnlyAppService" }, "GetListAsyncByInput": { "uniqueName": "GetListAsyncByInput", @@ -212,6 +400,7 @@ { "nameOnMethod": "input", "name": "Filter", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -223,6 +412,7 @@ { "nameOnMethod": "input", "name": "Sorting", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -234,6 +424,7 @@ { "nameOnMethod": "input", "name": "SkipCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", "isOptional": false, @@ -245,6 +436,7 @@ { "nameOnMethod": "input", "name": "MaxResultCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", "isOptional": false, @@ -257,7 +449,9 @@ "returnValue": { "type": "Volo.Abp.Application.Dtos.PagedResultDto", "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IReadOnlyAppService" }, "CreateAsyncByInput": { "uniqueName": "CreateAsyncByInput", @@ -279,6 +473,7 @@ { "nameOnMethod": "input", "name": "input", + "jsonName": null, "type": "Volo.Abp.TenantManagement.TenantCreateDto", "typeSimple": "Volo.Abp.TenantManagement.TenantCreateDto", "isOptional": false, @@ -291,7 +486,9 @@ "returnValue": { "type": "Volo.Abp.TenantManagement.TenantDto", "typeSimple": "Volo.Abp.TenantManagement.TenantDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.ICreateAppService" }, "UpdateAsyncByIdAndInput": { "uniqueName": "UpdateAsyncByIdAndInput", @@ -321,6 +518,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -332,6 +530,7 @@ { "nameOnMethod": "input", "name": "input", + "jsonName": null, "type": "Volo.Abp.TenantManagement.TenantUpdateDto", "typeSimple": "Volo.Abp.TenantManagement.TenantUpdateDto", "isOptional": false, @@ -344,7 +543,9 @@ "returnValue": { "type": "Volo.Abp.TenantManagement.TenantDto", "typeSimple": "Volo.Abp.TenantManagement.TenantDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IUpdateAppService" }, "DeleteAsyncById": { "uniqueName": "DeleteAsyncById", @@ -366,6 +567,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -378,7 +580,9 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IDeleteAppService" }, "GetDefaultConnectionStringAsyncById": { "uniqueName": "GetDefaultConnectionStringAsyncById", @@ -400,6 +604,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -412,7 +617,9 @@ "returnValue": { "type": "System.String", "typeSimple": "string" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.TenantManagement.ITenantAppService" }, "UpdateDefaultConnectionStringAsyncByIdAndDefaultConnectionString": { "uniqueName": "UpdateDefaultConnectionStringAsyncByIdAndDefaultConnectionString", @@ -442,6 +649,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -453,6 +661,7 @@ { "nameOnMethod": "defaultConnectionString", "name": "defaultConnectionString", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -465,7 +674,9 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.TenantManagement.ITenantAppService" }, "DeleteDefaultConnectionStringAsyncById": { "uniqueName": "DeleteDefaultConnectionStringAsyncById", @@ -487,6 +698,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -499,50 +711,79 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.TenantManagement.ITenantAppService" } } } } }, - "settingManagement": { - "rootPath": "settingManagement", - "remoteServiceName": "SettingManagement", + "account": { + "rootPath": "account", + "remoteServiceName": "AbpAccount", "controllers": { - "Volo.Abp.SettingManagement.EmailSettingsController": { - "controllerName": "EmailSettings", - "type": "Volo.Abp.SettingManagement.EmailSettingsController", + "Volo.Abp.Account.AccountController": { + "controllerName": "Account", + "controllerGroupName": "Account", + "isRemoteService": true, + "apiVersion": null, + "type": "Volo.Abp.Account.AccountController", "interfaces": [ { - "type": "Volo.Abp.SettingManagement.IEmailSettingsAppService" + "type": "Volo.Abp.Account.IAccountAppService" } ], "actions": { - "GetAsync": { - "uniqueName": "GetAsync", - "name": "GetAsync", - "httpMethod": "GET", - "url": "api/setting-management/emailing", + "RegisterAsyncByInput": { + "uniqueName": "RegisterAsyncByInput", + "name": "RegisterAsync", + "httpMethod": "POST", + "url": "api/account/register", "supportedVersions": [], - "parametersOnMethod": [], - "parameters": [], + "parametersOnMethod": [ + { + "name": "input", + "typeAsString": "Volo.Abp.Account.RegisterDto, Volo.Abp.Account.Application.Contracts", + "type": "Volo.Abp.Account.RegisterDto", + "typeSimple": "Volo.Abp.Account.RegisterDto", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.Abp.Account.RegisterDto", + "typeSimple": "Volo.Abp.Account.RegisterDto", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" + } + ], "returnValue": { - "type": "Volo.Abp.SettingManagement.EmailSettingsDto", - "typeSimple": "Volo.Abp.SettingManagement.EmailSettingsDto" - } + "type": "Volo.Abp.Identity.IdentityUserDto", + "typeSimple": "Volo.Abp.Identity.IdentityUserDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Account.IAccountAppService" }, - "UpdateAsyncByInput": { - "uniqueName": "UpdateAsyncByInput", - "name": "UpdateAsync", + "SendPasswordResetCodeAsyncByInput": { + "uniqueName": "SendPasswordResetCodeAsyncByInput", + "name": "SendPasswordResetCodeAsync", "httpMethod": "POST", - "url": "api/setting-management/emailing", + "url": "api/account/send-password-reset-code", "supportedVersions": [], "parametersOnMethod": [ { "name": "input", - "typeAsString": "Volo.Abp.SettingManagement.UpdateEmailSettingsDto, Volo.Abp.SettingManagement.Application.Contracts", - "type": "Volo.Abp.SettingManagement.UpdateEmailSettingsDto", - "typeSimple": "Volo.Abp.SettingManagement.UpdateEmailSettingsDto", + "typeAsString": "Volo.Abp.Account.SendPasswordResetCodeDto, Volo.Abp.Account.Application.Contracts", + "type": "Volo.Abp.Account.SendPasswordResetCodeDto", + "typeSimple": "Volo.Abp.Account.SendPasswordResetCodeDto", "isOptional": false, "defaultValue": null } @@ -551,8 +792,9 @@ { "nameOnMethod": "input", "name": "input", - "type": "Volo.Abp.SettingManagement.UpdateEmailSettingsDto", - "typeSimple": "Volo.Abp.SettingManagement.UpdateEmailSettingsDto", + "jsonName": null, + "type": "Volo.Abp.Account.SendPasswordResetCodeDto", + "typeSimple": "Volo.Abp.Account.SendPasswordResetCodeDto", "isOptional": false, "defaultValue": null, "constraintTypes": null, @@ -563,138 +805,33 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } - } - } - } - } - }, - "permissionManagement": { - "rootPath": "permissionManagement", - "remoteServiceName": "AbpPermissionManagement", - "controllers": { - "Volo.Abp.PermissionManagement.PermissionsController": { - "controllerName": "Permissions", - "type": "Volo.Abp.PermissionManagement.PermissionsController", - "interfaces": [ - { - "type": "Volo.Abp.PermissionManagement.IPermissionAppService" - } - ], - "actions": { - "GetAsyncByProviderNameAndProviderKey": { - "uniqueName": "GetAsyncByProviderNameAndProviderKey", - "name": "GetAsync", - "httpMethod": "GET", - "url": "api/permission-management/permissions", - "supportedVersions": [], - "parametersOnMethod": [ - { - "name": "providerName", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "providerKey", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - } - ], - "parameters": [ - { - "nameOnMethod": "providerName", - "name": "providerName", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "" - }, - { - "nameOnMethod": "providerKey", - "name": "providerKey", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "" - } - ], - "returnValue": { - "type": "Volo.Abp.PermissionManagement.GetPermissionListResultDto", - "typeSimple": "Volo.Abp.PermissionManagement.GetPermissionListResultDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Account.IAccountAppService" }, - "UpdateAsyncByProviderNameAndProviderKeyAndInput": { - "uniqueName": "UpdateAsyncByProviderNameAndProviderKeyAndInput", - "name": "UpdateAsync", - "httpMethod": "PUT", - "url": "api/permission-management/permissions", + "ResetPasswordAsyncByInput": { + "uniqueName": "ResetPasswordAsyncByInput", + "name": "ResetPasswordAsync", + "httpMethod": "POST", + "url": "api/account/reset-password", "supportedVersions": [], "parametersOnMethod": [ - { - "name": "providerName", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, - { - "name": "providerKey", - "typeAsString": "System.String, System.Private.CoreLib", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null - }, { "name": "input", - "typeAsString": "Volo.Abp.PermissionManagement.UpdatePermissionsDto, Volo.Abp.PermissionManagement.Application.Contracts", - "type": "Volo.Abp.PermissionManagement.UpdatePermissionsDto", - "typeSimple": "Volo.Abp.PermissionManagement.UpdatePermissionsDto", + "typeAsString": "Volo.Abp.Account.ResetPasswordDto, Volo.Abp.Account.Application.Contracts", + "type": "Volo.Abp.Account.ResetPasswordDto", + "typeSimple": "Volo.Abp.Account.ResetPasswordDto", "isOptional": false, "defaultValue": null } ], "parameters": [ - { - "nameOnMethod": "providerName", - "name": "providerName", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "" - }, - { - "nameOnMethod": "providerKey", - "name": "providerKey", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "" - }, { "nameOnMethod": "input", "name": "input", - "type": "Volo.Abp.PermissionManagement.UpdatePermissionsDto", - "typeSimple": "Volo.Abp.PermissionManagement.UpdatePermissionsDto", + "jsonName": null, + "type": "Volo.Abp.Account.ResetPasswordDto", + "typeSimple": "Volo.Abp.Account.ResetPasswordDto", "isOptional": false, "defaultValue": null, "constraintTypes": null, @@ -705,18 +842,17 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Account.IAccountAppService" } } - } - } - }, - "account": { - "rootPath": "account", - "remoteServiceName": "AbpAccount", - "controllers": { + }, "Volo.Abp.Account.Web.Areas.Account.Controllers.AccountController": { "controllerName": "Account", + "controllerGroupName": "Login", + "isRemoteService": true, + "apiVersion": null, "type": "Volo.Abp.Account.Web.Areas.Account.Controllers.AccountController", "interfaces": [], "actions": { @@ -740,6 +876,7 @@ { "nameOnMethod": "login", "name": "login", + "jsonName": null, "type": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.UserLoginInfo", "typeSimple": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.UserLoginInfo", "isOptional": false, @@ -752,7 +889,9 @@ "returnValue": { "type": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.AbpLoginResult", "typeSimple": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.AbpLoginResult" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Account.Web.Areas.Account.Controllers.AccountController" }, "Logout": { "uniqueName": "Logout", @@ -765,7 +904,9 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Account.Web.Areas.Account.Controllers.AccountController" }, "CheckPasswordByLogin": { "uniqueName": "CheckPasswordByLogin", @@ -787,6 +928,7 @@ { "nameOnMethod": "login", "name": "login", + "jsonName": null, "type": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.UserLoginInfo", "typeSimple": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.UserLoginInfo", "isOptional": false, @@ -799,65 +941,51 @@ "returnValue": { "type": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.AbpLoginResult", "typeSimple": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.AbpLoginResult" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Account.Web.Areas.Account.Controllers.AccountController" } } }, - "Volo.Abp.Account.AccountController": { - "controllerName": "Account", - "type": "Volo.Abp.Account.AccountController", + "Volo.Abp.Account.ProfileController": { + "controllerName": "Profile", + "controllerGroupName": "Profile", + "isRemoteService": true, + "apiVersion": null, + "type": "Volo.Abp.Account.ProfileController", "interfaces": [ { - "type": "Volo.Abp.Account.IAccountAppService" + "type": "Volo.Abp.Account.IProfileAppService" } ], "actions": { - "RegisterAsyncByInput": { - "uniqueName": "RegisterAsyncByInput", - "name": "RegisterAsync", - "httpMethod": "POST", - "url": "api/account/register", + "GetAsync": { + "uniqueName": "GetAsync", + "name": "GetAsync", + "httpMethod": "GET", + "url": "api/account/my-profile", "supportedVersions": [], - "parametersOnMethod": [ - { - "name": "input", - "typeAsString": "Volo.Abp.Account.RegisterDto, Volo.Abp.Account.Application.Contracts", - "type": "Volo.Abp.Account.RegisterDto", - "typeSimple": "Volo.Abp.Account.RegisterDto", - "isOptional": false, - "defaultValue": null - } - ], - "parameters": [ - { - "nameOnMethod": "input", - "name": "input", - "type": "Volo.Abp.Account.RegisterDto", - "typeSimple": "Volo.Abp.Account.RegisterDto", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "Body", - "descriptorName": "" - } - ], + "parametersOnMethod": [], + "parameters": [], "returnValue": { - "type": "Volo.Abp.Identity.IdentityUserDto", - "typeSimple": "Volo.Abp.Identity.IdentityUserDto" - } + "type": "Volo.Abp.Account.ProfileDto", + "typeSimple": "Volo.Abp.Account.ProfileDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Account.IProfileAppService" }, - "SendPasswordResetCodeAsyncByInput": { - "uniqueName": "SendPasswordResetCodeAsyncByInput", - "name": "SendPasswordResetCodeAsync", - "httpMethod": "POST", - "url": "api/account/send-password-reset-code", + "UpdateAsyncByInput": { + "uniqueName": "UpdateAsyncByInput", + "name": "UpdateAsync", + "httpMethod": "PUT", + "url": "api/account/my-profile", "supportedVersions": [], "parametersOnMethod": [ { "name": "input", - "typeAsString": "Volo.Abp.Account.SendPasswordResetCodeDto, Volo.Abp.Account.Application.Contracts", - "type": "Volo.Abp.Account.SendPasswordResetCodeDto", - "typeSimple": "Volo.Abp.Account.SendPasswordResetCodeDto", + "typeAsString": "Volo.Abp.Account.UpdateProfileDto, Volo.Abp.Account.Application.Contracts", + "type": "Volo.Abp.Account.UpdateProfileDto", + "typeSimple": "Volo.Abp.Account.UpdateProfileDto", "isOptional": false, "defaultValue": null } @@ -866,8 +994,9 @@ { "nameOnMethod": "input", "name": "input", - "type": "Volo.Abp.Account.SendPasswordResetCodeDto", - "typeSimple": "Volo.Abp.Account.SendPasswordResetCodeDto", + "jsonName": null, + "type": "Volo.Abp.Account.UpdateProfileDto", + "typeSimple": "Volo.Abp.Account.UpdateProfileDto", "isOptional": false, "defaultValue": null, "constraintTypes": null, @@ -876,22 +1005,24 @@ } ], "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" - } + "type": "Volo.Abp.Account.ProfileDto", + "typeSimple": "Volo.Abp.Account.ProfileDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Account.IProfileAppService" }, - "ResetPasswordAsyncByInput": { - "uniqueName": "ResetPasswordAsyncByInput", - "name": "ResetPasswordAsync", + "ChangePasswordAsyncByInput": { + "uniqueName": "ChangePasswordAsyncByInput", + "name": "ChangePasswordAsync", "httpMethod": "POST", - "url": "api/account/reset-password", + "url": "api/account/my-profile/change-password", "supportedVersions": [], "parametersOnMethod": [ { "name": "input", - "typeAsString": "Volo.Abp.Account.ResetPasswordDto, Volo.Abp.Account.Application.Contracts", - "type": "Volo.Abp.Account.ResetPasswordDto", - "typeSimple": "Volo.Abp.Account.ResetPasswordDto", + "typeAsString": "Volo.Abp.Account.ChangePasswordInput, Volo.Abp.Account.Application.Contracts", + "type": "Volo.Abp.Account.ChangePasswordInput", + "typeSimple": "Volo.Abp.Account.ChangePasswordInput", "isOptional": false, "defaultValue": null } @@ -900,8 +1031,9 @@ { "nameOnMethod": "input", "name": "input", - "type": "Volo.Abp.Account.ResetPasswordDto", - "typeSimple": "Volo.Abp.Account.ResetPasswordDto", + "jsonName": null, + "type": "Volo.Abp.Account.ChangePasswordInput", + "typeSimple": "Volo.Abp.Account.ChangePasswordInput", "isOptional": false, "defaultValue": null, "constraintTypes": null, @@ -912,34 +1044,47 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Account.IProfileAppService" } } } } }, - "abp": { - "rootPath": "abp", - "remoteServiceName": "abp", + "featureManagement": { + "rootPath": "featureManagement", + "remoteServiceName": "AbpFeatureManagement", "controllers": { - "Pages.Abp.MultiTenancy.AbpTenantController": { - "controllerName": "AbpTenant", - "type": "Pages.Abp.MultiTenancy.AbpTenantController", + "Volo.Abp.FeatureManagement.FeaturesController": { + "controllerName": "Features", + "controllerGroupName": "Features", + "isRemoteService": true, + "apiVersion": null, + "type": "Volo.Abp.FeatureManagement.FeaturesController", "interfaces": [ { - "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.IAbpTenantAppService" + "type": "Volo.Abp.FeatureManagement.IFeatureAppService" } ], "actions": { - "FindTenantByNameAsyncByName": { - "uniqueName": "FindTenantByNameAsyncByName", - "name": "FindTenantByNameAsync", + "GetAsyncByProviderNameAndProviderKey": { + "uniqueName": "GetAsyncByProviderNameAndProviderKey", + "name": "GetAsync", "httpMethod": "GET", - "url": "api/abp/multi-tenancy/tenants/by-name/{name}", + "url": "api/feature-management/features", "supportedVersions": [], "parametersOnMethod": [ { - "name": "name", + "name": "providerName", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "providerKey", "typeAsString": "System.String, System.Private.CoreLib", "type": "System.String", "typeSimple": "string", @@ -949,64 +1094,131 @@ ], "parameters": [ { - "nameOnMethod": "name", - "name": "name", + "nameOnMethod": "providerName", + "name": "providerName", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "" + }, + { + "nameOnMethod": "providerKey", + "name": "providerKey", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", "descriptorName": "" } ], "returnValue": { - "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto", - "typeSimple": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto" - } + "type": "Volo.Abp.FeatureManagement.GetFeatureListResultDto", + "typeSimple": "Volo.Abp.FeatureManagement.GetFeatureListResultDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.FeatureManagement.IFeatureAppService" }, - "FindTenantByIdAsyncById": { - "uniqueName": "FindTenantByIdAsyncById", - "name": "FindTenantByIdAsync", - "httpMethod": "GET", - "url": "api/abp/multi-tenancy/tenants/by-id/{id}", + "UpdateAsyncByProviderNameAndProviderKeyAndInput": { + "uniqueName": "UpdateAsyncByProviderNameAndProviderKeyAndInput", + "name": "UpdateAsync", + "httpMethod": "PUT", + "url": "api/feature-management/features", "supportedVersions": [], "parametersOnMethod": [ { - "name": "id", - "typeAsString": "System.Guid, System.Private.CoreLib", - "type": "System.Guid", + "name": "providerName", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null + }, + { + "name": "providerKey", + "typeAsString": "System.String, System.Private.CoreLib", + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + }, + { + "name": "input", + "typeAsString": "Volo.Abp.FeatureManagement.UpdateFeaturesDto, Volo.Abp.FeatureManagement.Application.Contracts", + "type": "Volo.Abp.FeatureManagement.UpdateFeaturesDto", + "typeSimple": "Volo.Abp.FeatureManagement.UpdateFeaturesDto", + "isOptional": false, + "defaultValue": null } ], "parameters": [ { - "nameOnMethod": "id", - "name": "id", - "type": "System.Guid", + "nameOnMethod": "providerName", + "name": "providerName", + "jsonName": null, + "type": "System.String", "typeSimple": "string", "isOptional": false, "defaultValue": null, - "constraintTypes": [], - "bindingSourceId": "Path", + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "" + }, + { + "nameOnMethod": "providerKey", + "name": "providerKey", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "" + }, + { + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.Abp.FeatureManagement.UpdateFeaturesDto", + "typeSimple": "Volo.Abp.FeatureManagement.UpdateFeaturesDto", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", "descriptorName": "" } ], "returnValue": { - "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto", - "typeSimple": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.FindTenantResultDto" - } + "type": "System.Void", + "typeSimple": "System.Void" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.FeatureManagement.IFeatureAppService" } } - }, - "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationController": { - "controllerName": "AbpApplicationConfiguration", - "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.AbpApplicationConfigurationController", + } + } + }, + "settingManagement": { + "rootPath": "settingManagement", + "remoteServiceName": "SettingManagement", + "controllers": { + "Volo.Abp.SettingManagement.EmailSettingsController": { + "controllerName": "EmailSettings", + "controllerGroupName": "EmailSettings", + "isRemoteService": true, + "apiVersion": null, + "type": "Volo.Abp.SettingManagement.EmailSettingsController", "interfaces": [ { - "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.IAbpApplicationConfigurationAppService" + "type": "Volo.Abp.SettingManagement.IEmailSettingsAppService" } ], "actions": { @@ -1014,55 +1226,90 @@ "uniqueName": "GetAsync", "name": "GetAsync", "httpMethod": "GET", - "url": "api/abp/application-configuration", + "url": "api/setting-management/emailing", "supportedVersions": [], "parametersOnMethod": [], "parameters": [], "returnValue": { - "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationConfigurationDto", - "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationConfigurationDto" - } - } - } - }, - "Volo.Abp.AspNetCore.Mvc.ApiExploring.AbpApiDefinitionController": { - "controllerName": "AbpApiDefinition", - "type": "Volo.Abp.AspNetCore.Mvc.ApiExploring.AbpApiDefinitionController", - "interfaces": [], - "actions": { - "GetByModel": { - "uniqueName": "GetByModel", - "name": "Get", - "httpMethod": "GET", - "url": "api/abp/api-definition", + "type": "Volo.Abp.SettingManagement.EmailSettingsDto", + "typeSimple": "Volo.Abp.SettingManagement.EmailSettingsDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.SettingManagement.IEmailSettingsAppService" + }, + "UpdateAsyncByInput": { + "uniqueName": "UpdateAsyncByInput", + "name": "UpdateAsync", + "httpMethod": "POST", + "url": "api/setting-management/emailing", "supportedVersions": [], "parametersOnMethod": [ { - "name": "model", - "typeAsString": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto, Volo.Abp.Http", - "type": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto", - "typeSimple": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModelRequestDto", + "name": "input", + "typeAsString": "Volo.Abp.SettingManagement.UpdateEmailSettingsDto, Volo.Abp.SettingManagement.Application.Contracts", + "type": "Volo.Abp.SettingManagement.UpdateEmailSettingsDto", + "typeSimple": "Volo.Abp.SettingManagement.UpdateEmailSettingsDto", "isOptional": false, "defaultValue": null } ], "parameters": [ { - "nameOnMethod": "model", - "name": "IncludeTypes", - "type": "System.Boolean", - "typeSimple": "boolean", + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.Abp.SettingManagement.UpdateEmailSettingsDto", + "typeSimple": "Volo.Abp.SettingManagement.UpdateEmailSettingsDto", "isOptional": false, "defaultValue": null, "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "model" + "bindingSourceId": "Body", + "descriptorName": "" } ], "returnValue": { - "type": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModel", - "typeSimple": "Volo.Abp.Http.Modeling.ApplicationApiDescriptionModel" - } + "type": "System.Void", + "typeSimple": "System.Void" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.SettingManagement.IEmailSettingsAppService" + }, + "SendTestEmailAsyncByInput": { + "uniqueName": "SendTestEmailAsyncByInput", + "name": "SendTestEmailAsync", + "httpMethod": "POST", + "url": "api/setting-management/emailing/send-test-email", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "input", + "typeAsString": "Volo.Abp.SettingManagement.SendTestEmailInput, Volo.Abp.SettingManagement.Application.Contracts", + "type": "Volo.Abp.SettingManagement.SendTestEmailInput", + "typeSimple": "Volo.Abp.SettingManagement.SendTestEmailInput", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "input", + "name": "input", + "jsonName": null, + "type": "Volo.Abp.SettingManagement.SendTestEmailInput", + "typeSimple": "Volo.Abp.SettingManagement.SendTestEmailInput", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "Body", + "descriptorName": "" + } + ], + "returnValue": { + "type": "System.Void", + "typeSimple": "System.Void" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.SettingManagement.IEmailSettingsAppService" } } } @@ -1074,6 +1321,9 @@ "controllers": { "Volo.Abp.Identity.IdentityRoleController": { "controllerName": "IdentityRole", + "controllerGroupName": "Role", + "isRemoteService": true, + "apiVersion": null, "type": "Volo.Abp.Identity.IdentityRoleController", "interfaces": [ { @@ -1092,7 +1342,9 @@ "returnValue": { "type": "Volo.Abp.Application.Dtos.ListResultDto", "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Identity.IIdentityRoleAppService" }, "GetListAsyncByInput": { "uniqueName": "GetListAsyncByInput", @@ -1114,6 +1366,7 @@ { "nameOnMethod": "input", "name": "Filter", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -1125,6 +1378,7 @@ { "nameOnMethod": "input", "name": "Sorting", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -1136,6 +1390,7 @@ { "nameOnMethod": "input", "name": "SkipCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", "isOptional": false, @@ -1147,6 +1402,7 @@ { "nameOnMethod": "input", "name": "MaxResultCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", "isOptional": false, @@ -1159,7 +1415,9 @@ "returnValue": { "type": "Volo.Abp.Application.Dtos.PagedResultDto", "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IReadOnlyAppService" }, "GetAsyncById": { "uniqueName": "GetAsyncById", @@ -1181,6 +1439,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -1193,7 +1452,9 @@ "returnValue": { "type": "Volo.Abp.Identity.IdentityRoleDto", "typeSimple": "Volo.Abp.Identity.IdentityRoleDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IReadOnlyAppService" }, "CreateAsyncByInput": { "uniqueName": "CreateAsyncByInput", @@ -1215,6 +1476,7 @@ { "nameOnMethod": "input", "name": "input", + "jsonName": null, "type": "Volo.Abp.Identity.IdentityRoleCreateDto", "typeSimple": "Volo.Abp.Identity.IdentityRoleCreateDto", "isOptional": false, @@ -1227,7 +1489,9 @@ "returnValue": { "type": "Volo.Abp.Identity.IdentityRoleDto", "typeSimple": "Volo.Abp.Identity.IdentityRoleDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.ICreateAppService" }, "UpdateAsyncByIdAndInput": { "uniqueName": "UpdateAsyncByIdAndInput", @@ -1257,6 +1521,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -1268,6 +1533,7 @@ { "nameOnMethod": "input", "name": "input", + "jsonName": null, "type": "Volo.Abp.Identity.IdentityRoleUpdateDto", "typeSimple": "Volo.Abp.Identity.IdentityRoleUpdateDto", "isOptional": false, @@ -1280,7 +1546,9 @@ "returnValue": { "type": "Volo.Abp.Identity.IdentityRoleDto", "typeSimple": "Volo.Abp.Identity.IdentityRoleDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IUpdateAppService" }, "DeleteAsyncById": { "uniqueName": "DeleteAsyncById", @@ -1302,6 +1570,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -1314,12 +1583,17 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IDeleteAppService" } } }, "Volo.Abp.Identity.IdentityUserController": { "controllerName": "IdentityUser", + "controllerGroupName": "User", + "isRemoteService": true, + "apiVersion": null, "type": "Volo.Abp.Identity.IdentityUserController", "interfaces": [ { @@ -1347,6 +1621,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -1359,7 +1634,9 @@ "returnValue": { "type": "Volo.Abp.Identity.IdentityUserDto", "typeSimple": "Volo.Abp.Identity.IdentityUserDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IReadOnlyAppService" }, "GetListAsyncByInput": { "uniqueName": "GetListAsyncByInput", @@ -1381,6 +1658,7 @@ { "nameOnMethod": "input", "name": "Filter", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -1392,6 +1670,7 @@ { "nameOnMethod": "input", "name": "Sorting", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -1403,6 +1682,7 @@ { "nameOnMethod": "input", "name": "SkipCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", "isOptional": false, @@ -1414,6 +1694,7 @@ { "nameOnMethod": "input", "name": "MaxResultCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", "isOptional": false, @@ -1426,7 +1707,9 @@ "returnValue": { "type": "Volo.Abp.Application.Dtos.PagedResultDto", "typeSimple": "Volo.Abp.Application.Dtos.PagedResultDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IReadOnlyAppService" }, "CreateAsyncByInput": { "uniqueName": "CreateAsyncByInput", @@ -1448,6 +1731,7 @@ { "nameOnMethod": "input", "name": "input", + "jsonName": null, "type": "Volo.Abp.Identity.IdentityUserCreateDto", "typeSimple": "Volo.Abp.Identity.IdentityUserCreateDto", "isOptional": false, @@ -1460,7 +1744,9 @@ "returnValue": { "type": "Volo.Abp.Identity.IdentityUserDto", "typeSimple": "Volo.Abp.Identity.IdentityUserDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.ICreateAppService" }, "UpdateAsyncByIdAndInput": { "uniqueName": "UpdateAsyncByIdAndInput", @@ -1490,6 +1776,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -1501,6 +1788,7 @@ { "nameOnMethod": "input", "name": "input", + "jsonName": null, "type": "Volo.Abp.Identity.IdentityUserUpdateDto", "typeSimple": "Volo.Abp.Identity.IdentityUserUpdateDto", "isOptional": false, @@ -1513,7 +1801,9 @@ "returnValue": { "type": "Volo.Abp.Identity.IdentityUserDto", "typeSimple": "Volo.Abp.Identity.IdentityUserDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IUpdateAppService" }, "DeleteAsyncById": { "uniqueName": "DeleteAsyncById", @@ -1535,6 +1825,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -1547,7 +1838,9 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Application.Services.IDeleteAppService" }, "GetRolesAsyncById": { "uniqueName": "GetRolesAsyncById", @@ -1569,6 +1862,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -1581,7 +1875,9 @@ "returnValue": { "type": "Volo.Abp.Application.Dtos.ListResultDto", "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Identity.IIdentityUserAppService" }, "GetAssignableRolesAsync": { "uniqueName": "GetAssignableRolesAsync", @@ -1594,7 +1890,9 @@ "returnValue": { "type": "Volo.Abp.Application.Dtos.ListResultDto", "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Identity.IIdentityUserAppService" }, "UpdateRolesAsyncByIdAndInput": { "uniqueName": "UpdateRolesAsyncByIdAndInput", @@ -1624,6 +1922,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -1635,6 +1934,7 @@ { "nameOnMethod": "input", "name": "input", + "jsonName": null, "type": "Volo.Abp.Identity.IdentityUserUpdateRolesDto", "typeSimple": "Volo.Abp.Identity.IdentityUserUpdateRolesDto", "isOptional": false, @@ -1647,7 +1947,9 @@ "returnValue": { "type": "System.Void", "typeSimple": "System.Void" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Identity.IIdentityUserAppService" }, "FindByUsernameAsyncByUserName": { "uniqueName": "FindByUsernameAsyncByUserName", @@ -1669,6 +1971,7 @@ { "nameOnMethod": "userName", "name": "userName", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -1681,7 +1984,9 @@ "returnValue": { "type": "Volo.Abp.Identity.IdentityUserDto", "typeSimple": "Volo.Abp.Identity.IdentityUserDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Identity.IIdentityUserAppService" }, "FindByEmailAsyncByEmail": { "uniqueName": "FindByEmailAsyncByEmail", @@ -1703,6 +2008,7 @@ { "nameOnMethod": "email", "name": "email", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -1715,12 +2021,17 @@ "returnValue": { "type": "Volo.Abp.Identity.IdentityUserDto", "typeSimple": "Volo.Abp.Identity.IdentityUserDto" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Identity.IIdentityUserAppService" } } }, "Volo.Abp.Identity.IdentityUserLookupController": { "controllerName": "IdentityUserLookup", + "controllerGroupName": "UserLookup", + "isRemoteService": true, + "apiVersion": null, "type": "Volo.Abp.Identity.IdentityUserLookupController", "interfaces": [ { @@ -1748,6 +2059,7 @@ { "nameOnMethod": "id", "name": "id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", "isOptional": false, @@ -1760,7 +2072,9 @@ "returnValue": { "type": "Volo.Abp.Users.UserData", "typeSimple": "Volo.Abp.Users.UserData" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Identity.IIdentityUserLookupAppService" }, "FindByUserNameAsyncByUserName": { "uniqueName": "FindByUserNameAsyncByUserName", @@ -1782,6 +2096,7 @@ { "nameOnMethod": "userName", "name": "userName", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -1794,7 +2109,9 @@ "returnValue": { "type": "Volo.Abp.Users.UserData", "typeSimple": "Volo.Abp.Users.UserData" - } + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Identity.IIdentityUserLookupAppService" }, "SearchAsyncByInput": { "uniqueName": "SearchAsyncByInput", @@ -1816,6 +2133,7 @@ { "nameOnMethod": "input", "name": "Filter", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -1827,6 +2145,7 @@ { "nameOnMethod": "input", "name": "Sorting", + "jsonName": null, "type": "System.String", "typeSimple": "string", "isOptional": false, @@ -1838,6 +2157,7 @@ { "nameOnMethod": "input", "name": "SkipCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", "isOptional": false, @@ -1848,125 +2168,36 @@ }, { "nameOnMethod": "input", - "name": "MaxResultCount", - "type": "System.Int32", - "typeSimple": "number", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" - } - ], - "returnValue": { - "type": "Volo.Abp.Application.Dtos.ListResultDto", - "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" - } - }, - "GetCountAsyncByInput": { - "uniqueName": "GetCountAsyncByInput", - "name": "GetCountAsync", - "httpMethod": "GET", - "url": "api/identity/users/lookup/count", - "supportedVersions": [], - "parametersOnMethod": [ - { - "name": "input", - "typeAsString": "Volo.Abp.Identity.UserLookupCountInputDto, Volo.Abp.Identity.Application.Contracts", - "type": "Volo.Abp.Identity.UserLookupCountInputDto", - "typeSimple": "Volo.Abp.Identity.UserLookupCountInputDto", - "isOptional": false, - "defaultValue": null - } - ], - "parameters": [ - { - "nameOnMethod": "input", - "name": "Filter", - "type": "System.String", - "typeSimple": "string", - "isOptional": false, - "defaultValue": null, - "constraintTypes": null, - "bindingSourceId": "ModelBinding", - "descriptorName": "input" - } - ], - "returnValue": { - "type": "System.Int64", - "typeSimple": "number" - } - } - } - }, - "Volo.Abp.Identity.ProfileController": { - "controllerName": "Profile", - "type": "Volo.Abp.Identity.ProfileController", - "interfaces": [ - { - "type": "Volo.Abp.Identity.IProfileAppService" - } - ], - "actions": { - "GetAsync": { - "uniqueName": "GetAsync", - "name": "GetAsync", - "httpMethod": "GET", - "url": "api/identity/my-profile", - "supportedVersions": [], - "parametersOnMethod": [], - "parameters": [], - "returnValue": { - "type": "Volo.Abp.Identity.ProfileDto", - "typeSimple": "Volo.Abp.Identity.ProfileDto" - } - }, - "UpdateAsyncByInput": { - "uniqueName": "UpdateAsyncByInput", - "name": "UpdateAsync", - "httpMethod": "PUT", - "url": "api/identity/my-profile", - "supportedVersions": [], - "parametersOnMethod": [ - { - "name": "input", - "typeAsString": "Volo.Abp.Identity.UpdateProfileDto, Volo.Abp.Identity.Application.Contracts", - "type": "Volo.Abp.Identity.UpdateProfileDto", - "typeSimple": "Volo.Abp.Identity.UpdateProfileDto", - "isOptional": false, - "defaultValue": null - } - ], - "parameters": [ - { - "nameOnMethod": "input", - "name": "input", - "type": "Volo.Abp.Identity.UpdateProfileDto", - "typeSimple": "Volo.Abp.Identity.UpdateProfileDto", + "name": "MaxResultCount", + "jsonName": null, + "type": "System.Int32", + "typeSimple": "number", "isOptional": false, "defaultValue": null, "constraintTypes": null, - "bindingSourceId": "Body", - "descriptorName": "" + "bindingSourceId": "ModelBinding", + "descriptorName": "input" } ], "returnValue": { - "type": "Volo.Abp.Identity.ProfileDto", - "typeSimple": "Volo.Abp.Identity.ProfileDto" - } + "type": "Volo.Abp.Application.Dtos.ListResultDto", + "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Identity.IIdentityUserLookupAppService" }, - "ChangePasswordAsyncByInput": { - "uniqueName": "ChangePasswordAsyncByInput", - "name": "ChangePasswordAsync", - "httpMethod": "POST", - "url": "api/identity/my-profile/change-password", + "GetCountAsyncByInput": { + "uniqueName": "GetCountAsyncByInput", + "name": "GetCountAsync", + "httpMethod": "GET", + "url": "api/identity/users/lookup/count", "supportedVersions": [], "parametersOnMethod": [ { "name": "input", - "typeAsString": "Volo.Abp.Identity.ChangePasswordInput, Volo.Abp.Identity.Application.Contracts", - "type": "Volo.Abp.Identity.ChangePasswordInput", - "typeSimple": "Volo.Abp.Identity.ChangePasswordInput", + "typeAsString": "Volo.Abp.Identity.UserLookupCountInputDto, Volo.Abp.Identity.Application.Contracts", + "type": "Volo.Abp.Identity.UserLookupCountInputDto", + "typeSimple": "Volo.Abp.Identity.UserLookupCountInputDto", "isOptional": false, "defaultValue": null } @@ -1974,20 +2205,23 @@ "parameters": [ { "nameOnMethod": "input", - "name": "input", - "type": "Volo.Abp.Identity.ChangePasswordInput", - "typeSimple": "Volo.Abp.Identity.ChangePasswordInput", + "name": "Filter", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", "isOptional": false, "defaultValue": null, "constraintTypes": null, - "bindingSourceId": "Body", - "descriptorName": "" + "bindingSourceId": "ModelBinding", + "descriptorName": "input" } ], "returnValue": { - "type": "System.Void", - "typeSimple": "System.Void" - } + "type": "System.Int64", + "typeSimple": "number" + }, + "allowAnonymous": null, + "implementFrom": "Volo.Abp.Identity.IIdentityUserLookupAppService" } } } @@ -1995,74 +2229,6 @@ } }, "types": { - "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.UserLoginInfo": { - "baseType": null, - "isEnum": false, - "enumNames": null, - "enumValues": null, - "genericArguments": null, - "properties": [ - { - "name": "UserNameOrEmailAddress", - "type": "System.String", - "typeSimple": "string", - "isRequired": true - }, - { - "name": "Password", - "type": "System.String", - "typeSimple": "string", - "isRequired": true - }, - { - "name": "RememberMe", - "type": "System.Boolean", - "typeSimple": "boolean", - "isRequired": false - } - ] - }, - "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.AbpLoginResult": { - "baseType": null, - "isEnum": false, - "enumNames": null, - "enumValues": null, - "genericArguments": null, - "properties": [ - { - "name": "Result", - "type": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.LoginResultType", - "typeSimple": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.LoginResultType", - "isRequired": false - }, - { - "name": "Description", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - } - ] - }, - "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.LoginResultType": { - "baseType": "System.Enum", - "isEnum": true, - "enumNames": [ - "Success", - "InvalidUserNameOrPassword", - "NotAllowed", - "LockedOut", - "RequiresTwoFactor" - ], - "enumValues": [ - 1, - 2, - 3, - 4, - 5 - ], - "genericArguments": null, - "properties": null - }, "Volo.Abp.Account.RegisterDto": { "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject", "isEnum": false, @@ -2072,27 +2238,51 @@ "properties": [ { "name": "UserName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": 0, + "maxLength": 256, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "EmailAddress", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": 0, + "maxLength": 256, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Password", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": 0, + "maxLength": 128, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "AppName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2105,9 +2295,15 @@ "properties": [ { "name": "ExtraProperties", + "jsonName": null, "type": "{System.String:System.Object}", "typeSimple": "{string:object}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2120,69 +2316,147 @@ "properties": [ { "name": "TenantId", + "jsonName": null, "type": "System.Guid?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "UserName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Surname", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Email", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "EmailConfirmed", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "PhoneNumber", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "PhoneNumberConfirmed", + "jsonName": null, + "type": "System.Boolean", + "typeSimple": "boolean", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "IsActive", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "LockoutEnabled", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "LockoutEnd", + "jsonName": null, "type": "System.DateTimeOffset?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ConcurrencyStamp", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2197,21 +2471,39 @@ "properties": [ { "name": "IsDeleted", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DeleterId", + "jsonName": null, "type": "System.Guid?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DeletionTime", + "jsonName": null, "type": "System.DateTime?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2226,15 +2518,27 @@ "properties": [ { "name": "LastModificationTime", + "jsonName": null, "type": "System.DateTime?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "LastModifierId", + "jsonName": null, "type": "System.Guid?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2249,15 +2553,27 @@ "properties": [ { "name": "CreationTime", + "jsonName": null, "type": "System.DateTime", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "CreatorId", + "jsonName": null, "type": "System.Guid?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2271,47 +2587,406 @@ ], "properties": [ { - "name": "Id", - "type": "TKey", - "typeSimple": "TKey", - "isRequired": false + "name": "Id", + "jsonName": null, + "type": "TKey", + "typeSimple": "TKey", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + } + ] + }, + "Volo.Abp.Account.SendPasswordResetCodeDto": { + "baseType": null, + "isEnum": false, + "enumNames": null, + "enumValues": null, + "genericArguments": null, + "properties": [ + { + "name": "Email", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": true, + "minLength": 0, + "maxLength": 256, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "AppName", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": true, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ReturnUrl", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ReturnUrlHash", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + } + ] + }, + "Volo.Abp.Account.ResetPasswordDto": { + "baseType": null, + "isEnum": false, + "enumNames": null, + "enumValues": null, + "genericArguments": null, + "properties": [ + { + "name": "UserId", + "jsonName": null, + "type": "System.Guid", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ResetToken", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": true, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Password", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": true, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + } + ] + }, + "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.UserLoginInfo": { + "baseType": null, + "isEnum": false, + "enumNames": null, + "enumValues": null, + "genericArguments": null, + "properties": [ + { + "name": "UserNameOrEmailAddress", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": true, + "minLength": 0, + "maxLength": 255, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Password", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": true, + "minLength": 0, + "maxLength": 32, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "RememberMe", + "jsonName": null, + "type": "System.Boolean", + "typeSimple": "boolean", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + } + ] + }, + "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.AbpLoginResult": { + "baseType": null, + "isEnum": false, + "enumNames": null, + "enumValues": null, + "genericArguments": null, + "properties": [ + { + "name": "Result", + "jsonName": null, + "type": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.LoginResultType", + "typeSimple": "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.LoginResultType", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Description", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + } + ] + }, + "Volo.Abp.Account.Web.Areas.Account.Controllers.Models.LoginResultType": { + "baseType": "System.Enum", + "isEnum": true, + "enumNames": [ + "Success", + "InvalidUserNameOrPassword", + "NotAllowed", + "LockedOut", + "RequiresTwoFactor" + ], + "enumValues": [ + 1, + 2, + 3, + 4, + 5 + ], + "genericArguments": null, + "properties": null + }, + "Volo.Abp.Account.ProfileDto": { + "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject", + "isEnum": false, + "enumNames": null, + "enumValues": null, + "genericArguments": null, + "properties": [ + { + "name": "UserName", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Email", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Name", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Surname", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "PhoneNumber", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "IsExternal", + "jsonName": null, + "type": "System.Boolean", + "typeSimple": "boolean", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "HasPassword", + "jsonName": null, + "type": "System.Boolean", + "typeSimple": "boolean", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ConcurrencyStamp", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, - "Volo.Abp.Account.SendPasswordResetCodeDto": { - "baseType": null, + "Volo.Abp.Account.UpdateProfileDto": { + "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject", "isEnum": false, "enumNames": null, "enumValues": null, "genericArguments": null, "properties": [ + { + "name": "UserName", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": 0, + "maxLength": 256, + "minimum": null, + "maximum": null, + "regex": null + }, { "name": "Email", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": false, + "minLength": 0, + "maxLength": 256, + "minimum": null, + "maximum": null, + "regex": null }, { - "name": "AppName", + "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": false, + "minLength": 0, + "maxLength": 64, + "minimum": null, + "maximum": null, + "regex": null }, { - "name": "ReturnUrl", + "name": "Surname", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": 0, + "maxLength": 64, + "minimum": null, + "maximum": null, + "regex": null }, { - "name": "ReturnUrlHash", + "name": "PhoneNumber", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": 0, + "maxLength": 16, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ConcurrencyStamp", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, - "Volo.Abp.Account.ResetPasswordDto": { + "Volo.Abp.Account.ChangePasswordInput": { "baseType": null, "isEnum": false, "enumNames": null, @@ -2319,22 +2994,28 @@ "genericArguments": null, "properties": [ { - "name": "UserId", - "type": "System.Guid", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "ResetToken", + "name": "CurrentPassword", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": false, + "minLength": 0, + "maxLength": 128, + "minimum": null, + "maximum": null, + "regex": null }, { - "name": "Password", + "name": "NewPassword", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": 0, + "maxLength": 128, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2347,21 +3028,51 @@ "properties": [ { "name": "Success", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "TenantId", + "jsonName": null, "type": "System.Guid?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "IsActive", + "jsonName": null, + "type": "System.Boolean", + "typeSimple": "boolean", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2376,9 +3087,15 @@ "properties": [ { "name": "Items", + "jsonName": null, "type": "[T]", "typeSimple": "[T]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2391,33 +3108,63 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsDefault", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsStatic", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsPublic", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ConcurrencyStamp", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2430,9 +3177,15 @@ "properties": [ { "name": "Filter", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2445,9 +3198,15 @@ "properties": [ { "name": "Sorting", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2460,9 +3219,15 @@ "properties": [ { "name": "SkipCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": "0", + "maximum": "2147483647", + "regex": null } ] }, @@ -2475,21 +3240,39 @@ "properties": [ { "name": "DefaultMaxResultCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "MaxMaxResultCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "MaxResultCount", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": "1", + "maximum": "2147483647", + "regex": null } ] }, @@ -2504,9 +3287,15 @@ "properties": [ { "name": "TotalCount", + "jsonName": null, "type": "System.Int64", "typeSimple": "number", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2527,21 +3316,39 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": 0, + "maxLength": 256, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsDefault", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsPublic", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2554,9 +3361,15 @@ "properties": [ { "name": "ConcurrencyStamp", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2569,9 +3382,15 @@ "properties": [ { "name": "Filter", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2584,9 +3403,15 @@ "properties": [ { "name": "Password", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": 0, + "maxLength": 128, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2599,45 +3424,99 @@ "properties": [ { "name": "UserName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": 0, + "maxLength": 256, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": 0, + "maxLength": 64, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Surname", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": 0, + "maxLength": 64, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Email", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": 0, + "maxLength": 256, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "PhoneNumber", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": 0, + "maxLength": 16, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "IsActive", + "jsonName": null, + "type": "System.Boolean", + "typeSimple": "boolean", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "LockoutEnabled", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "RoleNames", + "jsonName": null, "type": "[System.String]", "typeSimple": "[string]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2650,15 +3529,27 @@ "properties": [ { "name": "Password", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": 0, + "maxLength": 128, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ConcurrencyStamp", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2671,9 +3562,15 @@ "properties": [ { "name": "RoleNames", + "jsonName": null, "type": "[System.String]", "typeSimple": "[string]", - "isRequired": true + "isRequired": true, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2686,57 +3583,123 @@ "properties": [ { "name": "Id", + "jsonName": null, "type": "System.Guid", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "TenantId", + "jsonName": null, "type": "System.Guid?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "UserName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Surname", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "IsActive", + "jsonName": null, + "type": "System.Boolean", + "typeSimple": "boolean", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Email", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "EmailConfirmed", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "PhoneNumber", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "PhoneNumberConfirmed", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2749,9 +3712,15 @@ "properties": [ { "name": "Filter", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2764,120 +3733,15 @@ "properties": [ { "name": "Filter", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false - } - ] - }, - "Volo.Abp.Identity.ProfileDto": { - "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject", - "isEnum": false, - "enumNames": null, - "enumValues": null, - "genericArguments": null, - "properties": [ - { - "name": "UserName", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "Email", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "Name", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "Surname", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "PhoneNumber", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "IsExternal", - "type": "System.Boolean", - "typeSimple": "boolean", - "isRequired": false - }, - { - "name": "HasPassword", - "type": "System.Boolean", - "typeSimple": "boolean", - "isRequired": false - } - ] - }, - "Volo.Abp.Identity.UpdateProfileDto": { - "baseType": "Volo.Abp.ObjectExtending.ExtensibleObject", - "isEnum": false, - "enumNames": null, - "enumValues": null, - "genericArguments": null, - "properties": [ - { - "name": "UserName", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "Email", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "Name", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "Surname", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "PhoneNumber", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - } - ] - }, - "Volo.Abp.Identity.ChangePasswordInput": { - "baseType": null, - "isEnum": false, - "enumNames": null, - "enumValues": null, - "genericArguments": null, - "properties": [ - { - "name": "CurrentPassword", - "type": "System.String", - "typeSimple": "string", - "isRequired": false - }, - { - "name": "NewPassword", - "type": "System.String", - "typeSimple": "string", - "isRequired": true + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2890,15 +3754,27 @@ "properties": [ { "name": "EntityDisplayName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Groups", + "jsonName": null, "type": "[Volo.Abp.PermissionManagement.PermissionGroupDto]", "typeSimple": "[Volo.Abp.PermissionManagement.PermissionGroupDto]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2911,21 +3787,39 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DisplayName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Permissions", + "jsonName": null, "type": "[Volo.Abp.PermissionManagement.PermissionGrantInfoDto]", "typeSimple": "[Volo.Abp.PermissionManagement.PermissionGrantInfoDto]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2938,39 +3832,75 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DisplayName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ParentName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsGranted", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "AllowedProviders", + "jsonName": null, "type": "[System.String]", "typeSimple": "[string]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "GrantedProviders", + "jsonName": null, "type": "[Volo.Abp.PermissionManagement.ProviderInfoDto]", "typeSimple": "[Volo.Abp.PermissionManagement.ProviderInfoDto]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -2983,15 +3913,27 @@ "properties": [ { "name": "ProviderName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ProviderKey", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3004,9 +3946,15 @@ "properties": [ { "name": "Permissions", + "jsonName": null, "type": "[Volo.Abp.PermissionManagement.UpdatePermissionDto]", "typeSimple": "[Volo.Abp.PermissionManagement.UpdatePermissionDto]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3019,15 +3967,27 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsGranted", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3040,57 +4000,111 @@ "properties": [ { "name": "SmtpHost", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpPort", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpUserName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpPassword", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpDomain", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpEnableSsl", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpUseDefaultCredentials", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DefaultFromAddress", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DefaultFromDisplayName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3103,57 +4117,168 @@ "properties": [ { "name": "SmtpHost", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": 256, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpPort", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": "1", + "maximum": "65535", + "regex": null }, { "name": "SmtpUserName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": 1024, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpPassword", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": 1024, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpDomain", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": 1024, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpEnableSsl", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SmtpUseDefaultCredentials", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DefaultFromAddress", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": null, + "maxLength": 1024, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DefaultFromDisplayName", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": true, + "minLength": null, + "maxLength": 1024, + "minimum": null, + "maximum": null, + "regex": null + } + ] + }, + "Volo.Abp.SettingManagement.SendTestEmailInput": { + "baseType": null, + "isEnum": false, + "enumNames": null, + "enumValues": null, + "genericArguments": null, + "properties": [ + { + "name": "SenderEmailAddress", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": true, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "TargetEmailAddress", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": true, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Subject", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": true, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Body", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3166,9 +4291,27 @@ "properties": [ { "name": "Name", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ConcurrencyStamp", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3181,9 +4324,15 @@ "properties": [ { "name": "Filter", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3196,15 +4345,27 @@ "properties": [ { "name": "AdminEmailAddress", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": null, + "maxLength": 256, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "AdminPassword", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": null, + "maxLength": 128, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3217,9 +4378,15 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": true + "isRequired": true, + "minLength": 0, + "maxLength": 64, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3229,7 +4396,20 @@ "enumNames": null, "enumValues": null, "genericArguments": null, - "properties": [] + "properties": [ + { + "name": "ConcurrencyStamp", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + } + ] }, "Volo.Abp.FeatureManagement.GetFeatureListResultDto": { "baseType": null, @@ -3240,9 +4420,15 @@ "properties": [ { "name": "Groups", + "jsonName": null, "type": "[Volo.Abp.FeatureManagement.FeatureGroupDto]", "typeSimple": "[Volo.Abp.FeatureManagement.FeatureGroupDto]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3255,21 +4441,39 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DisplayName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Features", + "jsonName": null, "type": "[Volo.Abp.FeatureManagement.FeatureDto]", "typeSimple": "[Volo.Abp.FeatureManagement.FeatureDto]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3282,51 +4486,99 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DisplayName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Value", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Provider", + "jsonName": null, "type": "Volo.Abp.FeatureManagement.FeatureProviderDto", "typeSimple": "Volo.Abp.FeatureManagement.FeatureProviderDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Description", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ValueType", + "jsonName": null, "type": "Volo.Abp.Validation.StringValues.IStringValueType", "typeSimple": "Volo.Abp.Validation.StringValues.IStringValueType", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Depth", + "jsonName": null, "type": "System.Int32", "typeSimple": "number", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ParentName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3339,15 +4591,27 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Key", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3360,27 +4624,51 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Item", + "jsonName": null, "type": "System.Object", "typeSimple": "object", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Properties", + "jsonName": null, "type": "{System.String:System.Object}", "typeSimple": "{string:object}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Validator", + "jsonName": null, "type": "Volo.Abp.Validation.StringValues.IValueValidator", "typeSimple": "Volo.Abp.Validation.StringValues.IValueValidator", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3393,21 +4681,39 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Item", + "jsonName": null, "type": "System.Object", "typeSimple": "object", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Properties", + "jsonName": null, "type": "{System.String:System.Object}", "typeSimple": "{string:object}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3420,9 +4726,15 @@ "properties": [ { "name": "Features", + "jsonName": null, "type": "[Volo.Abp.FeatureManagement.UpdateFeatureDto]", "typeSimple": "[Volo.Abp.FeatureManagement.UpdateFeatureDto]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3435,15 +4747,27 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Value", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3456,63 +4780,147 @@ "properties": [ { "name": "Localization", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationLocalizationConfigurationDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationLocalizationConfigurationDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Auth", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationAuthConfigurationDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationAuthConfigurationDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Setting", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationSettingConfigurationDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationSettingConfigurationDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "CurrentUser", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.CurrentUserDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.CurrentUserDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Features", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationFeatureConfigurationDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationFeatureConfigurationDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "GlobalFeatures", + "jsonName": null, + "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationGlobalFeatureConfigurationDto", + "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationGlobalFeatureConfigurationDto", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "MultiTenancy", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.MultiTenancyInfoDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.MultiTenancyInfoDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "CurrentTenant", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.CurrentTenantDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.MultiTenancy.CurrentTenantDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Timing", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.TimingDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.TimingDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Clock", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ClockDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ClockDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ObjectExtensions", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ObjectExtensionsDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ObjectExtensionsDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ExtraProperties", + "jsonName": null, + "type": "{System.String:System.Object}", + "typeSimple": "{string:object}", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3525,39 +4933,75 @@ "properties": [ { "name": "Values", + "jsonName": null, "type": "{System.String:System.Collections.Generic.Dictionary}", "typeSimple": "{string:System.Collections.Generic.Dictionary}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Languages", + "jsonName": null, "type": "[Volo.Abp.Localization.LanguageInfo]", "typeSimple": "[Volo.Abp.Localization.LanguageInfo]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "CurrentCulture", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.CurrentCultureDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.CurrentCultureDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DefaultResourceName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "LanguagesMap", + "jsonName": null, "type": "{System.String:[Volo.Abp.NameValue]}", "typeSimple": "{string:[Volo.Abp.NameValue]}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "LanguageFilesMap", + "jsonName": null, "type": "{System.String:[Volo.Abp.NameValue]}", "typeSimple": "{string:[Volo.Abp.NameValue]}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3570,27 +5014,51 @@ "properties": [ { "name": "CultureName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "UiCultureName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DisplayName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "FlagIcon", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3603,57 +5071,111 @@ "properties": [ { "name": "DisplayName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "EnglishName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ThreeLetterIsoLanguageName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "TwoLetterIsoLanguageName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsRightToLeft", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "CultureName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "NativeName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DateTimeFormat", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.DateTimeFormatDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.DateTimeFormatDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3666,45 +5188,87 @@ "properties": [ { "name": "CalendarAlgorithmType", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DateTimeFormatLong", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ShortDatePattern", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "FullDateTimePattern", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DateSeparator", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ShortTimePattern", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "LongTimePattern", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3727,15 +5291,27 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Value", + "jsonName": null, "type": "T", "typeSimple": "T", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3748,15 +5324,27 @@ "properties": [ { "name": "Policies", + "jsonName": null, "type": "{System.String:System.Boolean}", "typeSimple": "{string:boolean}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "GrantedPolicies", + "jsonName": null, "type": "{System.String:System.Boolean}", "typeSimple": "{string:boolean}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3769,9 +5357,15 @@ "properties": [ { "name": "Values", + "jsonName": null, "type": "{System.String:System.String}", "typeSimple": "{string:string}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3784,69 +5378,183 @@ "properties": [ { "name": "IsAuthenticated", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Id", + "jsonName": null, "type": "System.Guid?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "TenantId", + "jsonName": null, "type": "System.Guid?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ImpersonatorUserId", + "jsonName": null, + "type": "System.Guid?", + "typeSimple": "string?", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ImpersonatorTenantId", + "jsonName": null, + "type": "System.Guid?", + "typeSimple": "string?", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ImpersonatorUserName", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ImpersonatorTenantName", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "UserName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SurName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Email", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "EmailVerified", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "PhoneNumber", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "PhoneNumberVerified", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Roles", + "jsonName": null, "type": "[System.String]", "typeSimple": "[string]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3859,9 +5567,36 @@ "properties": [ { "name": "Values", + "jsonName": null, "type": "{System.String:System.String}", "typeSimple": "{string:string}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + } + ] + }, + "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ApplicationGlobalFeatureConfigurationDto": { + "baseType": null, + "isEnum": false, + "enumNames": null, + "enumValues": null, + "genericArguments": null, + "properties": [ + { + "name": "EnabledFeatures", + "jsonName": null, + "type": "[System.String]", + "typeSimple": "[string]", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3874,9 +5609,15 @@ "properties": [ { "name": "IsEnabled", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3889,21 +5630,39 @@ "properties": [ { "name": "Id", + "jsonName": null, "type": "System.Guid?", "typeSimple": "string?", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsAvailable", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3916,9 +5675,15 @@ "properties": [ { "name": "TimeZone", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.TimeZone", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.TimeZone", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3931,15 +5696,27 @@ "properties": [ { "name": "Iana", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.IanaTimeZone", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.IanaTimeZone", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Windows", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.WindowsTimeZone", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.WindowsTimeZone", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3952,9 +5729,15 @@ "properties": [ { "name": "TimeZoneName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3967,9 +5750,15 @@ "properties": [ { "name": "TimeZoneId", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3982,9 +5771,15 @@ "properties": [ { "name": "Kind", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -3997,15 +5792,27 @@ "properties": [ { "name": "Modules", + "jsonName": null, "type": "{System.String:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ModuleExtensionDto}", "typeSimple": "{string:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ModuleExtensionDto}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Enums", + "jsonName": null, "type": "{System.String:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionEnumDto}", "typeSimple": "{string:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionEnumDto}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4018,15 +5825,27 @@ "properties": [ { "name": "Entities", + "jsonName": null, "type": "{System.String:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.EntityExtensionDto}", "typeSimple": "{string:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.EntityExtensionDto}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Configuration", + "jsonName": null, "type": "{System.String:System.Object}", "typeSimple": "{string:object}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4039,15 +5858,27 @@ "properties": [ { "name": "Properties", + "jsonName": null, "type": "{System.String:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyDto}", "typeSimple": "{string:Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyDto}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Configuration", + "jsonName": null, "type": "{System.String:System.Object}", "typeSimple": "{string:object}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4060,51 +5891,99 @@ "properties": [ { "name": "Type", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "TypeSimple", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DisplayName", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.LocalizableStringDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.LocalizableStringDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Api", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Ui", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Attributes", + "jsonName": null, "type": "[Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyAttributeDto]", "typeSimple": "[Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyAttributeDto]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Configuration", + "jsonName": null, "type": "{System.String:System.Object}", "typeSimple": "{string:object}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DefaultValue", + "jsonName": null, "type": "System.Object", "typeSimple": "object", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4117,15 +5996,27 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Resource", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4138,21 +6029,39 @@ "properties": [ { "name": "OnGet", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiGetDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiGetDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "OnCreate", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiCreateDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiCreateDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "OnUpdate", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiUpdateDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyApiUpdateDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4165,9 +6074,15 @@ "properties": [ { "name": "IsAvailable", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4180,9 +6095,15 @@ "properties": [ { "name": "IsAvailable", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4195,9 +6116,15 @@ "properties": [ { "name": "IsAvailable", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4210,27 +6137,51 @@ "properties": [ { "name": "OnTable", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiTableDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiTableDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "OnCreateForm", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiFormDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiFormDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "OnEditForm", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiFormDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiFormDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Lookup", + "jsonName": null, "type": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiLookupDto", "typeSimple": "Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionPropertyUiLookupDto", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4243,9 +6194,15 @@ "properties": [ { "name": "IsVisible", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4258,9 +6215,15 @@ "properties": [ { "name": "IsVisible", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4273,33 +6236,63 @@ "properties": [ { "name": "Url", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ResultListPropertyName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DisplayPropertyName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ValuePropertyName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "FilterParamName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4312,15 +6305,27 @@ "properties": [ { "name": "TypeSimple", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Config", + "jsonName": null, "type": "{System.String:System.Object}", "typeSimple": "{string:object}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4333,15 +6338,27 @@ "properties": [ { "name": "Fields", + "jsonName": null, "type": "[Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionEnumFieldDto]", "typeSimple": "[Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending.ExtensionEnumFieldDto]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "LocalizationResource", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4354,15 +6371,27 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Value", + "jsonName": null, "type": "System.Object", "typeSimple": "object", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4375,9 +6404,15 @@ "properties": [ { "name": "IncludeTypes", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4390,15 +6425,27 @@ "properties": [ { "name": "Modules", + "jsonName": null, "type": "{System.String:Volo.Abp.Http.Modeling.ModuleApiDescriptionModel}", "typeSimple": "{string:Volo.Abp.Http.Modeling.ModuleApiDescriptionModel}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Types", + "jsonName": null, "type": "{System.String:Volo.Abp.Http.Modeling.TypeApiDescriptionModel}", "typeSimple": "{string:Volo.Abp.Http.Modeling.TypeApiDescriptionModel}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4411,21 +6458,39 @@ "properties": [ { "name": "RootPath", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "RemoteServiceName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Controllers", + "jsonName": null, "type": "{System.String:Volo.Abp.Http.Modeling.ControllerApiDescriptionModel}", "typeSimple": "{string:Volo.Abp.Http.Modeling.ControllerApiDescriptionModel}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4438,27 +6503,87 @@ "properties": [ { "name": "ControllerName", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ControllerGroupName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "IsRemoteService", + "jsonName": null, + "type": "System.Boolean", + "typeSimple": "boolean", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ApiVersion", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Type", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Interfaces", + "jsonName": null, "type": "[Volo.Abp.Http.Modeling.ControllerInterfaceApiDescriptionModel]", "typeSimple": "[Volo.Abp.Http.Modeling.ControllerInterfaceApiDescriptionModel]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Actions", + "jsonName": null, "type": "{System.String:Volo.Abp.Http.Modeling.ActionApiDescriptionModel}", "typeSimple": "{string:Volo.Abp.Http.Modeling.ActionApiDescriptionModel}", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4471,9 +6596,15 @@ "properties": [ { "name": "Type", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4486,51 +6617,123 @@ "properties": [ { "name": "UniqueName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "HttpMethod", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Url", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "SupportedVersions", + "jsonName": null, "type": "[System.String]", "typeSimple": "[string]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ParametersOnMethod", + "jsonName": null, "type": "[Volo.Abp.Http.Modeling.MethodParameterApiDescriptionModel]", "typeSimple": "[Volo.Abp.Http.Modeling.MethodParameterApiDescriptionModel]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Parameters", + "jsonName": null, "type": "[Volo.Abp.Http.Modeling.ParameterApiDescriptionModel]", "typeSimple": "[Volo.Abp.Http.Modeling.ParameterApiDescriptionModel]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ReturnValue", + "jsonName": null, "type": "Volo.Abp.Http.Modeling.ReturnValueApiDescriptionModel", "typeSimple": "Volo.Abp.Http.Modeling.ReturnValueApiDescriptionModel", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "AllowAnonymous", + "jsonName": null, + "type": "System.Boolean?", + "typeSimple": "boolean?", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "ImplementFrom", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4543,39 +6746,75 @@ "properties": [ { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "TypeAsString", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Type", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "TypeSimple", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsOptional", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DefaultValue", + "jsonName": null, "type": "System.Object", "typeSimple": "object", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4588,57 +6827,123 @@ "properties": [ { "name": "NameOnMethod", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Name", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "JsonName", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Type", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "TypeSimple", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsOptional", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DefaultValue", + "jsonName": null, "type": "System.Object", "typeSimple": "object", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "ConstraintTypes", + "jsonName": null, "type": "[System.String]", "typeSimple": "[string]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "BindingSourceId", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "DescriptorName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4651,15 +6956,27 @@ "properties": [ { "name": "Type", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "TypeSimple", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4672,39 +6989,75 @@ "properties": [ { "name": "BaseType", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsEnum", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "EnumNames", + "jsonName": null, "type": "[System.String]", "typeSimple": "[string]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "EnumValues", + "jsonName": null, "type": "[System.Object]", "typeSimple": "[object]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "GenericArguments", + "jsonName": null, "type": "[System.String]", "typeSimple": "[string]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Properties", + "jsonName": null, "type": "[Volo.Abp.Http.Modeling.PropertyApiDescriptionModel]", "typeSimple": "[Volo.Abp.Http.Modeling.PropertyApiDescriptionModel]", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] }, @@ -4717,27 +7070,123 @@ "properties": [ { "name": "Name", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "JsonName", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "Type", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "TypeSimple", + "jsonName": null, "type": "System.String", "typeSimple": "string", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null }, { "name": "IsRequired", + "jsonName": null, "type": "System.Boolean", "typeSimple": "boolean", - "isRequired": false + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "MinLength", + "jsonName": null, + "type": "System.Int32?", + "typeSimple": "number?", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "MaxLength", + "jsonName": null, + "type": "System.Int32?", + "typeSimple": "number?", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Minimum", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Maximum", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null + }, + { + "name": "Regex", + "jsonName": null, + "type": "System.String", + "typeSimple": "string", + "isRequired": false, + "minLength": null, + "maxLength": null, + "minimum": null, + "maximum": null, + "regex": null } ] } diff --git a/npm/ng-packs/packages/setting-management/config/src/proxy/index.ts b/npm/ng-packs/packages/setting-management/config/src/lib/proxy/index.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/proxy/index.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/proxy/index.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/proxy/models.ts b/npm/ng-packs/packages/setting-management/config/src/lib/proxy/models.ts similarity index 80% rename from npm/ng-packs/packages/setting-management/config/src/proxy/models.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/proxy/models.ts index 9a87f0d345..5ab6d00799 100644 --- a/npm/ng-packs/packages/setting-management/config/src/proxy/models.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/proxy/models.ts @@ -1,3 +1,4 @@ + export interface EmailSettingsDto { smtpHost?: string; smtpPort: number; @@ -10,6 +11,13 @@ export interface EmailSettingsDto { defaultFromDisplayName?: string; } +export interface SendTestEmailInput { + senderEmailAddress: string; + targetEmailAddress: string; + subject: string; + body?: string; +} + export interface UpdateEmailSettingsDto { smtpHost?: string; smtpPort: number; diff --git a/npm/ng-packs/packages/setting-management/config/src/services/index.ts b/npm/ng-packs/packages/setting-management/config/src/lib/services/index.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/services/index.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/services/index.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/services/settings-tabs.service.ts b/npm/ng-packs/packages/setting-management/config/src/lib/services/settings-tabs.service.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/services/settings-tabs.service.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/services/settings-tabs.service.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/setting-management-config.module.ts b/npm/ng-packs/packages/setting-management/config/src/lib/setting-management-config.module.ts similarity index 90% rename from npm/ng-packs/packages/setting-management/config/src/setting-management-config.module.ts rename to npm/ng-packs/packages/setting-management/config/src/lib/setting-management-config.module.ts index 4821dad145..60f567c31a 100644 --- a/npm/ng-packs/packages/setting-management/config/src/setting-management-config.module.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/setting-management-config.module.ts @@ -1,3 +1,4 @@ +import { ThemeSharedModule } from '@abp/ng.theme.shared'; import { ModuleWithProviders, NgModule } from '@angular/core'; import { CoreModule } from '@abp/ng.core'; import { NgxValidateCoreModule } from '@ngx-validate/core'; @@ -8,7 +9,7 @@ import { SETTING_MANAGEMENT_SETTING_TAB_PROVIDERS } from './providers/setting-ta import { EmailSettingGroupComponent } from './components/email-setting-group/email-setting-group.component'; @NgModule({ - imports: [CoreModule, NgxValidateCoreModule], + imports: [CoreModule,ThemeSharedModule,NgxValidateCoreModule], declarations: [EmailSettingGroupComponent], exports: [EmailSettingGroupComponent], }) diff --git a/npm/ng-packs/packages/setting-management/config/src/proxy/email-settings.service.ts b/npm/ng-packs/packages/setting-management/config/src/proxy/email-settings.service.ts deleted file mode 100644 index a681a32c8d..0000000000 --- a/npm/ng-packs/packages/setting-management/config/src/proxy/email-settings.service.ts +++ /dev/null @@ -1,31 +0,0 @@ -import type { EmailSettingsDto, UpdateEmailSettingsDto } from './models'; -import { RestService } from '@abp/ng.core'; -import { Injectable } from '@angular/core'; - -@Injectable({ - providedIn: 'root', -}) -export class EmailSettingsService { - apiName = 'SettingManagement'; - - get = () => - this.restService.request( - { - method: 'GET', - url: '/api/setting-management/emailing', - }, - { apiName: this.apiName }, - ); - - update = (input: UpdateEmailSettingsDto) => - this.restService.request( - { - method: 'POST', - url: '/api/setting-management/emailing', - body: input, - }, - { apiName: this.apiName }, - ); - - constructor(private restService: RestService) {} -} diff --git a/npm/ng-packs/packages/setting-management/config/src/public-api.ts b/npm/ng-packs/packages/setting-management/config/src/public-api.ts index 83eb57e505..cd96bad911 100644 --- a/npm/ng-packs/packages/setting-management/config/src/public-api.ts +++ b/npm/ng-packs/packages/setting-management/config/src/public-api.ts @@ -1,6 +1,6 @@ -export * from './components/email-setting-group/email-setting-group.component'; -export * from './enums'; -export * from './providers'; -export * from './proxy'; -export * from './services'; -export * from './setting-management-config.module'; +export * from './lib/components/email-setting-group/email-setting-group.component'; +export * from './lib/enums'; +export * from './lib/providers'; +export * from './lib/proxy'; +export * from './lib/services'; +export * from './lib/setting-management-config.module'; diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index 97fce0cf04..bfca6b3d88 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.setting-management", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.components": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.components": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index 78e9d6906a..e79ee42c84 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.tenant-management", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.feature-management": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.feature-management": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index e8b8ffa7b5..7e3ae18d7b 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,14 +1,14 @@ { "name": "@abp/ng.theme.basic", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.account.core": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.account.core": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "tslib": "^2.0.0" }, "publishConfig": { diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 9759d43d7e..124caec215 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -1,18 +1,18 @@ { "name": "@abp/ng.theme.shared", - "version": "5.3.2", + "version": "6.0.0-rc.1", "homepage": "https://abp.io", "repository": { "type": "git", "url": "https://github.com/abpframework/abp.git" }, "dependencies": { - "@abp/ng.core": "~5.3.2", + "@abp/ng.core": "~6.0.0-rc.1", "@fortawesome/fontawesome-free": "^5.15.4", "@ng-bootstrap/ng-bootstrap": "~12.0.0-beta.4", "@ngx-validate/core": "^0.1.2", "@popperjs/core": "~2.11.2", - "@swimlane/ngx-datatable": "^19.0.0", + "@swimlane/ngx-datatable": "^20.0.0", "bootstrap": "^5.1.1", "tslib": "^2.0.0" }, diff --git a/npm/ng-packs/scripts/copy-packages-to-templates.ts b/npm/ng-packs/scripts/copy-packages-to-templates.ts new file mode 100644 index 0000000000..42aa7e5eff --- /dev/null +++ b/npm/ng-packs/scripts/copy-packages-to-templates.ts @@ -0,0 +1,88 @@ +import execa from 'execa'; +import fse from 'fs-extra'; +import fs from 'fs'; +import program from 'commander'; + +const defaultTemplates = ['app', 'app-nolayers', 'module']; +const defaultTemplatePath = '../../../templates'; +const packageMap = { + account: 'ng.account', + 'account-core': 'ng.account.core', + components: 'ng.components', + core: 'ng.core', + 'feature-management': 'ng.feature-management', + identity: 'ng.identity', + 'permission-management': 'ng.permission-management', + 'setting-management': 'ng.setting-management', + 'tenant-management': 'ng.tenant-management', + 'theme-basic': 'ng.theme.basic', + 'theme-shared': 'ng.theme.shared', +}; +program.option('-t, --templates ', 'template dirs', false); +program.option('-p, --template-path ', 'root template path', false); +program.parse(process.argv); +const templates = program.templates ? program.templates.split(',') : defaultTemplates; +const templateRootPath = program.templatePath ? program.templatePath : defaultTemplatePath; +(async () => { + await execa('yarn', ['build'], { + stdout: 'inherit', + }); + + await installPackages(); + + await removeAbpPackages(); + + await copyBuildedPackagesFromDistFolder(); +})(); + +async function runEachTemplate( + handler: (template: string, templatePath?: string) => void | Promise, +) { + for (var template of templates) { + const templatePath = `${templateRootPath}/${template}/angular`; + const result = handler(template, templatePath); + result instanceof Promise ? await result : result; + } +} + +async function installPackages() { + await runEachTemplate(async (template, templatePath) => { + if (fse.existsSync(`${templatePath}/yarn.lock`)) { + fse.removeSync(`${templatePath}/yarn.lock`); + } + await execa('yarn', ['install', '--ignore-scripts'], { + stdout: 'inherit', + cwd: templatePath, + }); + }); +} + +async function removeAbpPackages() { + await runEachTemplate(async (template, templatePath) => { + Object.values(packageMap).forEach(value => { + const path = `${templatePath}/node_modules/@abp/${value}`; + if (fs.existsSync(path)) { + fse.removeSync(path); + } + }); + if (fs.existsSync(`${templatePath}/.angular`)) { + fse.removeSync(`${templatePath}/.angular`); + } + }); +} +function createFolderIfNotExists(destination: string) { + destination.split('/').reduce((acc, dir) => { + if (!fs.existsSync(acc)) { + fs.mkdirSync(acc); + } + return `${acc}/${dir}`; + }); +} +async function copyBuildedPackagesFromDistFolder() { + await runEachTemplate(async (template, templatePath) => { + Object.entries(packageMap).forEach(([key, value]) => { + createFolderIfNotExists(`${templatePath}/node_modules/@abp/${value}`); + fse.copySync(`../dist/packages/${key}/`, `${templatePath}/node_modules/@abp/${value}`); + }); + }); +} diff --git a/npm/ng-packs/scripts/package.json b/npm/ng-packs/scripts/package.json index b0961239bb..8f82f88cc9 100644 --- a/npm/ng-packs/scripts/package.json +++ b/npm/ng-packs/scripts/package.json @@ -8,7 +8,8 @@ "build:prod": "ts-node -r tsconfig-paths/register prod-build.ts", "build:schematics": "ts-node -r tsconfig-paths/register build-schematics.ts", "publish-packages": "ts-node -r tsconfig-paths/register publish.ts", - "replace-with-tilde": "ts-node -r tsconfig-paths/register replace-with-tilde.ts" + "replace-with-tilde": "ts-node -r tsconfig-paths/register replace-with-tilde.ts", + "copy-to-templates": "ts-node -r tsconfig-paths/register copy-packages-to-templates.ts" }, "author": "", "dependencies": { diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 56280258af..bfd1d9ab7f 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "anchor-js": "^4.3.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/aspnetcore.components.server.basictheme/package.json b/npm/packs/aspnetcore.components.server.basictheme/package.json index 9f7bc7ee34..664b832a54 100644 --- a/npm/packs/aspnetcore.components.server.basictheme/package.json +++ b/npm/packs/aspnetcore.components.server.basictheme/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/aspnetcore.components.server.basictheme", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.components.server.theming": "~5.3.2" + "@abp/aspnetcore.components.server.theming": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.components.server.theming/package.json b/npm/packs/aspnetcore.components.server.theming/package.json index 2b8e940a13..fc365dc136 100644 --- a/npm/packs/aspnetcore.components.server.theming/package.json +++ b/npm/packs/aspnetcore.components.server.theming/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/aspnetcore.components.server.theming", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/bootstrap": "~5.3.2", - "@abp/font-awesome": "~5.3.2" + "@abp/bootstrap": "~6.0.0-rc.1", + "@abp/font-awesome": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index 774b1c3556..2415dc7c70 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.2" + "@abp/aspnetcore.mvc.ui.theme.shared": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index c0f1299088..f3873de4fc 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "repository": { "type": "git", @@ -10,20 +10,20 @@ "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "~5.3.2", - "@abp/bootstrap": "~5.3.2", - "@abp/bootstrap-datepicker": "~5.3.2", - "@abp/datatables.net-bs5": "~5.3.2", - "@abp/font-awesome": "~5.3.2", - "@abp/jquery-form": "~5.3.2", - "@abp/jquery-validation-unobtrusive": "~5.3.2", - "@abp/lodash": "~5.3.2", - "@abp/luxon": "~5.3.2", - "@abp/malihu-custom-scrollbar-plugin": "~5.3.2", - "@abp/select2": "~5.3.2", - "@abp/sweetalert2": "~5.3.2", - "@abp/timeago": "~5.3.2", - "@abp/toastr": "~5.3.2" + "@abp/aspnetcore.mvc.ui": "~6.0.0-rc.1", + "@abp/bootstrap": "~6.0.0-rc.1", + "@abp/bootstrap-datepicker": "~6.0.0-rc.1", + "@abp/datatables.net-bs5": "~6.0.0-rc.1", + "@abp/font-awesome": "~6.0.0-rc.1", + "@abp/jquery-form": "~6.0.0-rc.1", + "@abp/jquery-validation-unobtrusive": "~6.0.0-rc.1", + "@abp/lodash": "~6.0.0-rc.1", + "@abp/luxon": "~6.0.0-rc.1", + "@abp/malihu-custom-scrollbar-plugin": "~6.0.0-rc.1", + "@abp/select2": "~6.0.0-rc.1", + "@abp/sweetalert2": "~6.0.0-rc.1", + "@abp/timeago": "~6.0.0-rc.1", + "@abp/toastr": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/aspnetcore.mvc.ui/package-lock.json b/npm/packs/aspnetcore.mvc.ui/package-lock.json index f61f3d0d00..02635b023a 100644 --- a/npm/packs/aspnetcore.mvc.ui/package-lock.json +++ b/npm/packs/aspnetcore.mvc.ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@abp/aspnetcore.mvc.ui", - "version": "5.3.2", + "version": "6.0.0-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index ccb8ca9169..ea6bd0718a 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/aspnetcore.mvc.ui", "repository": { "type": "git", diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 6cbfc3e8df..9c008cceae 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,14 +1,14 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~5.3.2", - "@abp/owl.carousel": "~5.3.2", - "@abp/prismjs": "~5.3.2", - "@abp/tui-editor": "~5.3.2" + "@abp/aspnetcore.mvc.ui.theme.shared": "~6.0.0-rc.1", + "@abp/owl.carousel": "~6.0.0-rc.1", + "@abp/prismjs": "~6.0.0-rc.1", + "@abp/tui-editor": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index 7699c656c5..2e09bb4a47 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/bootstrap-datepicker", "repository": { "type": "git", diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index cd6b2d558a..cb6d67c717 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/bootstrap", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "bootstrap": "^5.1.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index c7412fc877..18fa110ff9 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index dfcd74f1ce..a0518da63d 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "clipboard": "^2.0.8" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/cms-kit.admin/package.json b/npm/packs/cms-kit.admin/package.json index f529128439..eddacf0cb5 100644 --- a/npm/packs/cms-kit.admin/package.json +++ b/npm/packs/cms-kit.admin/package.json @@ -1,15 +1,15 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/cms-kit.admin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "~5.3.2", - "@abp/jstree": "~5.3.2", - "@abp/slugify": "~5.3.2", - "@abp/tui-editor": "~5.3.2", - "@abp/uppy": "~5.3.2" + "@abp/codemirror": "~6.0.0-rc.1", + "@abp/jstree": "~6.0.0-rc.1", + "@abp/slugify": "~6.0.0-rc.1", + "@abp/tui-editor": "~6.0.0-rc.1", + "@abp/uppy": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit.public/package.json b/npm/packs/cms-kit.public/package.json index 7899f52de9..1146659067 100644 --- a/npm/packs/cms-kit.public/package.json +++ b/npm/packs/cms-kit.public/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/cms-kit.public", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/highlight.js": "~5.3.2", - "@abp/star-rating-svg": "~5.3.2" + "@abp/highlight.js": "~6.0.0-rc.1", + "@abp/star-rating-svg": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/cms-kit/package.json b/npm/packs/cms-kit/package.json index 5b706a1323..9ffe1dbe02 100644 --- a/npm/packs/cms-kit/package.json +++ b/npm/packs/cms-kit/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/cms-kit", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/cms-kit.admin": "~5.3.2", - "@abp/cms-kit.public": "~5.3.2" + "@abp/cms-kit.admin": "~6.0.0-rc.1", + "@abp/cms-kit.public": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index 10c15ed4b9..710cc7d44e 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "codemirror": "^5.65.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index c75a08f123..1dd7919564 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/core", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/utils": "~5.3.2" + "@abp/utils": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/core/src/abp.js b/npm/packs/core/src/abp.js index b028c013d6..0348069bec 100644 --- a/npm/packs/core/src/abp.js +++ b/npm/packs/core/src/abp.js @@ -372,7 +372,9 @@ var abp = abp || {}; setTimeout(function () { if (element) { element.classList.remove('abp-block-area-disappearing'); - element.parentElement.removeChild(element); + if (element.parentElement) { + element.parentElement.removeChild(element); + } } }, 250); } diff --git a/npm/packs/cropperjs/package.json b/npm/packs/cropperjs/package.json index fbbceeb9e4..c8a7c1eedf 100644 --- a/npm/packs/cropperjs/package.json +++ b/npm/packs/cropperjs/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/cropperjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "cropperjs": "^1.5.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index e1b4469da4..4b8a84013c 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/datatables.net-bs4", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/datatables.net": "~5.3.2", + "@abp/datatables.net": "~6.0.0-rc.1", "datatables.net-bs4": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index 1970b5c21d..2564261f9a 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/datatables.net-bs5", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "~5.3.2", + "@abp/datatables.net": "~6.0.0-rc.1", "datatables.net-bs5": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index 44d335170a..adebb54f3d 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/datatables.net", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~6.0.0-rc.1", "datatables.net": "^1.11.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index a01dff4329..d510006f50 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "~5.3.2", - "@abp/clipboard": "~5.3.2", - "@abp/malihu-custom-scrollbar-plugin": "~5.3.2", - "@abp/popper.js": "~5.3.2", - "@abp/prismjs": "~5.3.2" + "@abp/anchor-js": "~6.0.0-rc.1", + "@abp/clipboard": "~6.0.0-rc.1", + "@abp/malihu-custom-scrollbar-plugin": "~6.0.0-rc.1", + "@abp/popper.js": "~6.0.0-rc.1", + "@abp/prismjs": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index 6d0a9dc950..2f61082155 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index 58e889b236..a7d397b700 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/font-awesome", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "@fortawesome/fontawesome-free": "^5.15.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index 326b13b5fe..d9a2d65ca8 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "@highlightjs/cdn-assets": "~11.4.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 8e641d523e..cae9ae53d0 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/jquery-form", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~6.0.0-rc.1", "jquery-form": "^4.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index c3a0d438d1..973b792bfa 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/jquery-validation-unobtrusive", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery-validation": "~5.3.2", + "@abp/jquery-validation": "~6.0.0-rc.1", "jquery-validation-unobtrusive": "^3.2.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index d0ca2237c3..bafac9ffeb 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/jquery-validation", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~6.0.0-rc.1", "jquery-validation": "^1.19.3" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index c074764e84..0f482011d4 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/jquery", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "jquery": "~3.6.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/jstree/package.json b/npm/packs/jstree/package.json index 99eba24040..9cf5309147 100644 --- a/npm/packs/jstree/package.json +++ b/npm/packs/jstree/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/jstree", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~6.0.0-rc.1", "jstree": "^3.3.12" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index 2685ea1fc7..cf96b1a3d7 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/lodash", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "lodash": "^4.17.21" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index 73cbcab589..e953d76243 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/luxon", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "luxon": "^2.3.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index 15f58c7fb4..8b4010f34e 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/malihu-custom-scrollbar-plugin", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index 212f7ddfc2..9cff8f9754 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "markdown-it": "^12.3.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index 0d56ef1afd..96e5c9bd9b 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "owl.carousel": "^2.3.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index 350cfa1845..028b4d58ed 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "@popperjs/core": "^2.11.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index 534b5653ac..5b8540e2f8 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~5.3.2", - "@abp/core": "~5.3.2", + "@abp/clipboard": "~6.0.0-rc.1", + "@abp/core": "~6.0.0-rc.1", "prismjs": "^1.26.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index 81e80b5948..8ca2d465db 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/select2", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "select2": "^4.0.13" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/signalr/package.json b/npm/packs/signalr/package.json index 0bee3d64ea..deec8c4b77 100644 --- a/npm/packs/signalr/package.json +++ b/npm/packs/signalr/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/signalr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "@microsoft/signalr": "~6.0.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/slugify/package.json b/npm/packs/slugify/package.json index 6222775de1..2788188c52 100644 --- a/npm/packs/slugify/package.json +++ b/npm/packs/slugify/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/slugify", "publishConfig": { "access": "public" diff --git a/npm/packs/star-rating-svg/package.json b/npm/packs/star-rating-svg/package.json index 0e22d5277c..dcaa8c4a15 100644 --- a/npm/packs/star-rating-svg/package.json +++ b/npm/packs/star-rating-svg/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/star-rating-svg", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~6.0.0-rc.1", "star-rating-svg": "^3.5.0" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/sweetalert2/package.json b/npm/packs/sweetalert2/package.json index 0266c4cbfa..b20243291f 100644 --- a/npm/packs/sweetalert2/package.json +++ b/npm/packs/sweetalert2/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/sweetalert2", "publishConfig": { "access": "public" @@ -10,7 +10,7 @@ "directory": "npm/packs/sweetalert2" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "sweetalert2": "^11.3.6" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index ed69589969..1ebe533058 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/timeago", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~6.0.0-rc.1", "timeago": "^1.6.7" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index fa29a4a52c..c8793bdbd7 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/toastr", "repository": { "type": "git", @@ -10,7 +10,7 @@ "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", + "@abp/jquery": "~6.0.0-rc.1", "toastr": "^2.1.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index a55fdf9517..c6f007ec32 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "~5.3.2", - "@abp/prismjs": "~5.3.2" + "@abp/jquery": "~6.0.0-rc.1", + "@abp/prismjs": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/uppy/package.json b/npm/packs/uppy/package.json index 4a3f23eeee..6a9df41f95 100644 --- a/npm/packs/uppy/package.json +++ b/npm/packs/uppy/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/uppy", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "~5.3.2", + "@abp/core": "~6.0.0-rc.1", "uppy": "^1.16.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/utils/package.json b/npm/packs/utils/package.json index 858e26d203..68ab12fa89 100644 --- a/npm/packs/utils/package.json +++ b/npm/packs/utils/package.json @@ -1,6 +1,6 @@ { "name": "@abp/utils", - "version": "5.3.2", + "version": "6.0.0-rc.1", "scripts": { "prepublishOnly": "yarn install --ignore-scripts && node prepublish.js", "ng": "ng", diff --git a/npm/packs/vee-validate/package.json b/npm/packs/vee-validate/package.json index 985de8d8b0..47d9ebdfb9 100644 --- a/npm/packs/vee-validate/package.json +++ b/npm/packs/vee-validate/package.json @@ -1,11 +1,11 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/vee-validate", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/vue": "~5.3.2", + "@abp/vue": "~6.0.0-rc.1", "vee-validate": "~3.4.4" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" diff --git a/npm/packs/virtual-file-explorer/package.json b/npm/packs/virtual-file-explorer/package.json index 29d7cf9cdb..fa2923cd7c 100644 --- a/npm/packs/virtual-file-explorer/package.json +++ b/npm/packs/virtual-file-explorer/package.json @@ -1,12 +1,12 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/virtual-file-explorer", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/clipboard": "~5.3.2", - "@abp/prismjs": "~5.3.2" + "@abp/clipboard": "~6.0.0-rc.1", + "@abp/prismjs": "~6.0.0-rc.1" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" } diff --git a/npm/packs/vue/package.json b/npm/packs/vue/package.json index e681e9c921..1aaec722a4 100644 --- a/npm/packs/vue/package.json +++ b/npm/packs/vue/package.json @@ -1,5 +1,5 @@ { - "version": "5.3.2", + "version": "6.0.0-rc.1", "name": "@abp/vue", "publishConfig": { "access": "public" diff --git a/npm/scripts/yarn.lock b/npm/scripts/yarn.lock index bae2201646..2feefc9b8a 100644 --- a/npm/scripts/yarn.lock +++ b/npm/scripts/yarn.lock @@ -1144,9 +1144,9 @@ locate-path@^6.0.0: p-locate "^5.0.0" lodash@^4.17.20: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" diff --git a/nupkg/0 b/nupkg/0 new file mode 100644 index 0000000000..cf175e3b0b Binary files /dev/null and b/nupkg/0 differ diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index cd2b0d6012..965aa26499 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.2", - "@abp/ng.components": "~5.3.2", - "@abp/ng.core": "~5.3.2", - "@abp/ng.identity": "~5.3.2", - "@abp/ng.setting-management": "~5.3.2", - "@abp/ng.tenant-management": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", - "@abp/ng.theme.lepton-x": "~1.0.0-beta.5", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.components": "~6.0.0-rc.1", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", + "@abp/ng.theme.lepton-x": "~1.0.0-rc.1", "@angular/animations": "~13.1.1", "@angular/common": "~13.1.1", "@angular/compiler": "~13.1.1", @@ -35,7 +35,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.2", + "@abp/ng.schematics": "~6.0.0-rc.1", "@angular-devkit/build-angular": "~13.1.2", "@angular-eslint/builder": "~13.0.1", "@angular-eslint/eslint-plugin": "~13.0.1", diff --git a/templates/app-nolayers/angular/src/styles.scss b/templates/app-nolayers/angular/src/styles.scss index dbc4332587..efe57bd8c3 100644 --- a/templates/app-nolayers/angular/src/styles.scss +++ b/templates/app-nolayers/angular/src/styles.scss @@ -24,9 +24,3 @@ transform: translate(-50%, -50%); } } - -:root { - --lpx-logo: url('/assets/images/logo.png'); - --lpx-logo-icon: url('/assets/images/logo-icon.png'); - --lpx-brand: #edae53; -} \ No newline at end of file diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Localization/MyProjectName/ar.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Localization/MyProjectName/ar.json index 1ee94530fb..153f571276 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Localization/MyProjectName/ar.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Localization/MyProjectName/ar.json @@ -3,6 +3,6 @@ "texts": { "Welcome_Title": "مرحبا", "Welcome_Text": "هذا هو قالب بدء تشغيل تطبيق ذو طبقة واحدة مبسط لإطار عمل ABP.", - "Menu:Home": "الرئيسية" + "Menu:Home": "الصفحة الرئيسية" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj index 52fa59a985..af31d6b3b0 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj @@ -15,14 +15,14 @@ - - - - - + + + + + - - + + @@ -63,10 +63,10 @@ - - - - + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json index 46f6e5ab6f..101e95a5a6 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.5" + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Localization/MyProjectName/ar.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Localization/MyProjectName/ar.json index 1ee94530fb..153f571276 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Localization/MyProjectName/ar.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Localization/MyProjectName/ar.json @@ -3,6 +3,6 @@ "texts": { "Welcome_Title": "مرحبا", "Welcome_Text": "هذا هو قالب بدء تشغيل تطبيق ذو طبقة واحدة مبسط لإطار عمل ABP.", - "Menu:Home": "الرئيسية" + "Menu:Home": "الصفحة الرئيسية" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 420a031c00..9525771603 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -15,14 +15,14 @@ - - - - - + + + + + - - + + @@ -64,10 +64,10 @@ - - - - + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json index cfe1d94661..30b73b111f 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Localization/MyProjectName/ar.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Localization/MyProjectName/ar.json index 1ee94530fb..153f571276 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Localization/MyProjectName/ar.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Localization/MyProjectName/ar.json @@ -3,6 +3,6 @@ "texts": { "Welcome_Title": "مرحبا", "Welcome_Text": "هذا هو قالب بدء تشغيل تطبيق ذو طبقة واحدة مبسط لإطار عمل ABP.", - "Menu:Home": "الرئيسية" + "Menu:Home": "الصفحة الرئيسية" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj index 7c499d8ab2..afd7cf01cf 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj @@ -48,9 +48,9 @@ - - - + + + @@ -65,11 +65,11 @@ - - - + + + - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json index 5a69896673..de039528aa 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Localization/MyProjectName/ar.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Localization/MyProjectName/ar.json index 1ee94530fb..153f571276 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Localization/MyProjectName/ar.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Localization/MyProjectName/ar.json @@ -3,6 +3,6 @@ "texts": { "Welcome_Title": "مرحبا", "Welcome_Text": "هذا هو قالب بدء تشغيل تطبيق ذو طبقة واحدة مبسط لإطار عمل ABP.", - "Menu:Home": "الرئيسية" + "Menu:Home": "الصفحة الرئيسية" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj index cef852ee83..9b9817c9a6 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj @@ -49,9 +49,9 @@ - - - + + + @@ -66,11 +66,11 @@ - - - + + + - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json index 5a69896673..de039528aa 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/Localization/MyProjectName/ar.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/Localization/MyProjectName/ar.json index 1ee94530fb..153f571276 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/Localization/MyProjectName/ar.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/Localization/MyProjectName/ar.json @@ -3,6 +3,6 @@ "texts": { "Welcome_Title": "مرحبا", "Welcome_Text": "هذا هو قالب بدء تشغيل تطبيق ذو طبقة واحدة مبسط لإطار عمل ABP.", - "Menu:Home": "الرئيسية" + "Menu:Home": "الصفحة الرئيسية" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj index 33d51906ef..10e8b24a06 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj @@ -13,11 +13,11 @@ - - - + + + - + @@ -58,10 +58,10 @@ - - - - + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json index 5a69896673..de039528aa 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Localization/MyProjectName/ar.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Localization/MyProjectName/ar.json index 1ee94530fb..153f571276 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Localization/MyProjectName/ar.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Localization/MyProjectName/ar.json @@ -3,6 +3,6 @@ "texts": { "Welcome_Title": "مرحبا", "Welcome_Text": "هذا هو قالب بدء تشغيل تطبيق ذو طبقة واحدة مبسط لإطار عمل ABP.", - "Menu:Home": "الرئيسية" + "Menu:Home": "الصفحة الرئيسية" } } diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj index 5fb4be341b..4c48cc7a23 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj @@ -13,11 +13,11 @@ - - - + + + - + @@ -59,10 +59,10 @@ - - - - + + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json index 5a69896673..de039528aa 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0-rc.1" } } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index a04b563740..5bc08b1acb 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -12,14 +12,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.2", - "@abp/ng.components": "~5.3.2", - "@abp/ng.core": "~5.3.2", - "@abp/ng.identity": "~5.3.2", - "@abp/ng.setting-management": "~5.3.2", - "@abp/ng.tenant-management": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", - "@abp/ng.theme.lepton-x": "~1.0.0-beta.5", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.components": "~6.0.0-rc.1", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", + "@abp/ng.theme.lepton-x": "~1.0.0-rc.1", "@angular/animations": "~13.3.3", "@angular/common": "~13.3.3", "@angular/compiler": "~13.3.3", @@ -35,7 +35,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.2", + "@abp/ng.schematics": "~6.0.0-rc.1", "@angular-devkit/build-angular": "~13.3.3", "@angular-eslint/builder": "~13.2.1", "@angular-eslint/eslint-plugin": "~13.2.1", diff --git a/templates/app/angular/src/styles.scss b/templates/app/angular/src/styles.scss index 14d29fc69b..efe57bd8c3 100644 --- a/templates/app/angular/src/styles.scss +++ b/templates/app/angular/src/styles.scss @@ -24,9 +24,3 @@ transform: translate(-50%, -50%); } } - -:root { - --lpx-logo: url('/assets/images/logo.png'); - --lpx-logo-icon: url('/assets/images/logo-icon.png'); - --lpx-brand: #edae53; -} \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj index bc91b87df0..2fa421b562 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj @@ -42,7 +42,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs index 9a6e49e32a..57d4d22992 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs @@ -196,7 +196,8 @@ public class MyProjectNameAuthServerModule : AbpModule app.UseRouting(); app.UseCors(); app.UseAuthentication(); - + app.UseAbpOpenIddictValidation(); + if (MultiTenancyConsts.IsEnabled) { app.UseMultiTenancy(); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml.cs index 8e31fb91f1..f5fef94c78 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Globalization; -using System.Threading; using System.Threading.Tasks; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; using Volo.Abp.Localization; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json index 4c70d3533f..a86e6094e2 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock index ebc69b232b..2b23fd7903 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj index 17cbcb97b1..a5260019d1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs index f3a2e1da9f..b8c91610b9 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs @@ -1,6 +1,5 @@ using System; using System.IO; -using System.Net.Http; using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Builder; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json index cfe1d94661..30b73b111f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock index 026cc3e383..cb49aabf61 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/yarn.lock @@ -2,52 +2,52 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-beta.5.tgz#15156400aac99138fecc179ff9f97ca591856237" - integrity sha1-FRVkAKrJkTj+zBef+fl8pZGFYjc= - dependencies: - "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220630" - -"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220706.tgz#7bbd388922143c5957d96acad1322b7c63520316" - integrity sha1-e704iSIUPFlX2WrK0TIrfGNSAxY= - dependencies: - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-rc.1.tgz#a40d6191a275e5fbb20918e5fabfd6b97b3f815b" + integrity sha1-pA1hkaJ15fuyCRjl+r/WuXs/gVs= + dependencies: + "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220719" + +"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220720.tgz#dc5cb8994b7de42f889414982cbc1f5b9fff482c" + integrity sha1-3Fy4mUt95C+IlBSYLLwfW5//SCw= + dependencies: + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -56,144 +56,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 58e1b13398..7f7a66ce6c 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json index cfe1d94661..30b73b111f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5", - "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1", + "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock index 026cc3e383..cb49aabf61 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/yarn.lock @@ -2,52 +2,52 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-beta.5.tgz#15156400aac99138fecc179ff9f97ca591856237" - integrity sha1-FRVkAKrJkTj+zBef+fl8pZGFYjc= - dependencies: - "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220630" - -"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220706.tgz#7bbd388922143c5957d96acad1322b7c63520316" - integrity sha1-e704iSIUPFlX2WrK0TIrfGNSAxY= - dependencies: - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.components.server.leptonxlitetheme@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.leptonxlitetheme/-/@abp/aspnetcore.components.server.leptonxlitetheme-1.0.0-rc.1.tgz#a40d6191a275e5fbb20918e5fabfd6b97b3f815b" + integrity sha1-pA1hkaJ15fuyCRjl+r/WuXs/gVs= + dependencies: + "@abp/aspnetcore.components.server.theming" "~6.0.0-preview20220719" + +"@abp/aspnetcore.components.server.theming@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.components.server.theming/-/@abp/aspnetcore.components.server.theming-6.0.0-preview20220720.tgz#dc5cb8994b7de42f889414982cbc1f5b9fff482c" + integrity sha1-3Fy4mUt95C+IlBSYLLwfW5//SCw= + dependencies: + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -56,144 +56,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index 202661a2d2..cb7138393f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -23,7 +23,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs index 338ae879b8..84abc220c8 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs @@ -2,7 +2,6 @@ using System.Net.Http; using Blazorise.Bootstrap5; using Blazorise.Icons.FontAwesome; -using IdentityModel; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -16,7 +15,6 @@ using Volo.Abp.AutoMapper; using Volo.Abp.Modularity; using Volo.Abp.UI.Navigation; using Volo.Abp.Identity.Blazor.WebAssembly; -using Volo.Abp.Security.Claims; using Volo.Abp.SettingManagement.Blazor.WebAssembly; using Volo.Abp.TenantManagement.Blazor.WebAssembly; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css index b3a56f8a00..25321f5ffd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/global.css @@ -5516,7 +5516,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-brand { color: #686b6e; - background: rgba(247, 37, 133, 0.2); + background: rgba(247, 37, 133, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-brand a, .alert-brand .icon, @@ -5527,7 +5529,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-primary { color: #686b6e; - background: rgba(53, 93, 255, 0.2); + background: rgba(53, 93, 255, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-primary a, .alert-primary .icon, @@ -5538,7 +5542,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-secondary { color: #686b6e; - background: rgba(108, 93, 211, 0.2); + background: rgba(108, 93, 211, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-secondary a, .alert-secondary .icon, @@ -5549,7 +5555,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-success { color: #686b6e; - background: rgba(79, 191, 103, 0.2); + background: rgba(79, 191, 103, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-success a, .alert-success .icon, @@ -5560,7 +5568,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-info { color: #686b6e; - background: rgba(67, 138, 167, 0.2); + background: rgba(67, 138, 167, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-info a, .alert-info .icon, @@ -5571,7 +5581,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-warning { color: #686b6e; - background: rgba(255, 159, 56, 0.2); + background: rgba(255, 159, 56, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-warning a, .alert-warning .icon, @@ -5582,7 +5594,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-danger { color: #686b6e; - background: rgba(192, 13, 73, 0.2); + background: rgba(192, 13, 73, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-danger a, .alert-danger .icon, @@ -5593,7 +5607,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-light { color: #686b6e; - background: rgba(245, 245, 247, 0.2); + background: rgba(245, 245, 247, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-light a, .alert-light .icon, @@ -5604,7 +5620,9 @@ select.form-select option:checked[selected], select.form-select option:focus[sel .alert-dark { color: #686b6e; - background: rgba(22, 22, 22, 0.2); + background: rgba(22, 22, 22, 0.35); + -webkit-backdrop-filter: saturate(180%) blur(20px); + backdrop-filter: saturate(180%) blur(20px); } .alert-dark a, .alert-dark .icon, @@ -12075,6 +12093,19 @@ body { padding-top: 72px; } +.lpx-topbar-content { + display: flex; + align-items: center; + margin-right: 0.4rem; + gap: 0.7rem; + font-size: 0.875em; +} +.lpx-topbar-content .lpx-avatar .lpx-avatar-img, +.lpx-topbar-content .lpx-avatar .lpx-avatar-icon { + height: 24px; + width: 24px; +} + @media only screen and (min-width: 1200px) { .lpx-footbar-container { left: 280px; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html index f76edbb631..97aa0ac121 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html @@ -8,7 +8,7 @@ - + @@ -29,7 +29,7 @@
- + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ar.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ar.json index 3e5227a915..96bbf80b40 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ar.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ar.json @@ -2,7 +2,7 @@ "culture": "ar", "texts": { "Menu:Home": "الرئيسية", - "Welcome": "مرحبا", + "Menu:Home": "الصفحة الرئيسية", "LongWelcomeMessage": "مرحبا بكم في التطبيق. هذا مشروع بدء تشغيل يعتمد على إطار عمل ABP. لمزيد من المعلومات ، يرجى زيارة abp.io." } -} \ No newline at end of file +} diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 4edcc7a73f..dc32d493b1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Cors; @@ -11,7 +10,6 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.IdentityModel.Tokens; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; @@ -19,7 +17,6 @@ using Microsoft.OpenApi.Models; using Volo.Abp; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; -using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; using Volo.Abp.Caching; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj index 1cd0ec3cde..4ee3eb11f7 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj @@ -25,7 +25,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json index 6370b24cac..b0b2ecbefe 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock index e5bce29887..c3e2752356 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 957714626f..c4d92656ad 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -26,7 +26,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 2e3d4d30e4..2b13b8e49b 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -153,7 +153,6 @@ public class MyProjectNameWebModule : AbpModule options.UsePkce = true; options.SaveTokens = true; options.GetClaimsFromUserInfoEndpoint = true; - options.SignOutScheme = "Cookies"; options.Scope.Add("roles"); options.Scope.Add("email"); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json index 6370b24cac..b0b2ecbefe 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock index ebc69b232b..2b23fd7903 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index d839f8df53..1ca867ba78 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -41,7 +41,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index fb5079b2e9..7ee120f135 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -1,4 +1,3 @@ -using System; using System.IO; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Extensions.DependencyInjection; @@ -11,6 +10,7 @@ using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using MyCompanyName.MyProjectName.Web.Menus; using Microsoft.OpenApi.Models; +using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Mvc; @@ -47,7 +47,7 @@ namespace MyCompanyName.MyProjectName.Web; typeof(AbpAutofacModule), typeof(AbpIdentityWebModule), typeof(AbpSettingManagementWebModule), - typeof(AbpAccountWebModule), + typeof(AbpAccountWebOpenIddictModule), typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), typeof(AbpTenantManagementWebModule), typeof(AbpAspNetCoreSerilogModule), @@ -68,6 +68,16 @@ public class MyProjectNameWebModule : AbpModule typeof(MyProjectNameWebModule).Assembly ); }); + + PreConfigure(builder => + { + builder.AddValidation(options => + { + options.AddAudiences("MyProjectName"); + options.UseLocalServer(); + options.UseAspNetCore(); + }); + }); } public override void ConfigureServices(ServiceConfigurationContext context) @@ -75,6 +85,7 @@ public class MyProjectNameWebModule : AbpModule var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); + ConfigureAuthentication(context); ConfigureUrls(configuration); ConfigureBundles(); ConfigureAutoMapper(); @@ -84,6 +95,11 @@ public class MyProjectNameWebModule : AbpModule ConfigureAutoApiControllers(); ConfigureSwaggerServices(context.Services); } + + private void ConfigureAuthentication(ServiceConfigurationContext context) + { + context.Services.ForwardIdentityAuthenticationForBearer(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme); + } private void ConfigureUrls(IConfiguration configuration) { @@ -106,7 +122,7 @@ public class MyProjectNameWebModule : AbpModule ); }); } - + private void ConfigureAutoMapper() { Configure(options => @@ -130,7 +146,7 @@ public class MyProjectNameWebModule : AbpModule options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web", Path.DirectorySeparatorChar))); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web.OpenIddict", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}tenant-management{0}src{0}Volo.Abp.TenantManagement.Web", Path.DirectorySeparatorChar))); // options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared")); @@ -218,6 +234,7 @@ public class MyProjectNameWebModule : AbpModule app.UseStaticFiles(); app.UseRouting(); app.UseAuthentication(); + app.UseAbpOpenIddictValidation(); if (MultiTenancyConsts.IsEnabled) { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json index 6370b24cac..b0b2ecbefe 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-beta.5" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0-rc.1" } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock index e379c868cc..78a3147810 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-beta.5": - version "1.0.0-beta.5" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-beta.5.tgz#bc5baa2e6bfd5048f097525629da87a4436b8e4e" - integrity sha1-vFuqLmv9UEjwl1JWKdqHpENrjk4= - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220630" - -"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220630": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220706.tgz#11d5307c38e3b541a591d2d055689f8738d2c2da" - integrity sha1-EdUwfDjjtUGlkdLQVWifhzjSwto= - dependencies: - "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220706" - "@abp/bootstrap" "~6.0.0-preview20220706" - "@abp/bootstrap-datepicker" "~6.0.0-preview20220706" - "@abp/datatables.net-bs5" "~6.0.0-preview20220706" - "@abp/font-awesome" "~6.0.0-preview20220706" - "@abp/jquery-form" "~6.0.0-preview20220706" - "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220706" - "@abp/lodash" "~6.0.0-preview20220706" - "@abp/luxon" "~6.0.0-preview20220706" - "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220706" - "@abp/select2" "~6.0.0-preview20220706" - "@abp/sweetalert2" "~6.0.0-preview20220706" - "@abp/timeago" "~6.0.0-preview20220706" - "@abp/toastr" "~6.0.0-preview20220706" - -"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220706.tgz#98c9070508f2eab900ef3ec3f07fa9fbe7abc1cf" - integrity sha1-mMkHBQjy6rkA7z7D8H+p++erwc8= +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@^1.0.0-rc.1": + version "1.0.0-rc.1" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/@abp/aspnetcore.mvc.ui.theme.leptonxlite-1.0.0-rc.1.tgz#a10e11bd3516748d54999a7a9f0f5260920cf92f" + integrity sha1-oQ4RvTUWdI1UmZp6nw9SYJIM+S8= + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0-preview20220719" + +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0-preview20220719": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui.theme.shared/-/@abp/aspnetcore.mvc.ui.theme.shared-6.0.0-preview20220720.tgz#8eadc3b3689ab81badf8bf4f69876dd21b4472c2" + integrity sha1-jq3Ds2iauBut+L9PaYdt0htEcsI= + dependencies: + "@abp/aspnetcore.mvc.ui" "~6.0.0-preview20220720" + "@abp/bootstrap" "~6.0.0-preview20220720" + "@abp/bootstrap-datepicker" "~6.0.0-preview20220720" + "@abp/datatables.net-bs5" "~6.0.0-preview20220720" + "@abp/font-awesome" "~6.0.0-preview20220720" + "@abp/jquery-form" "~6.0.0-preview20220720" + "@abp/jquery-validation-unobtrusive" "~6.0.0-preview20220720" + "@abp/lodash" "~6.0.0-preview20220720" + "@abp/luxon" "~6.0.0-preview20220720" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0-preview20220720" + "@abp/select2" "~6.0.0-preview20220720" + "@abp/sweetalert2" "~6.0.0-preview20220720" + "@abp/timeago" "~6.0.0-preview20220720" + "@abp/toastr" "~6.0.0-preview20220720" + +"@abp/aspnetcore.mvc.ui@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/aspnetcore.mvc.ui/-/@abp/aspnetcore.mvc.ui-6.0.0-preview20220720.tgz#86d45510348f194533c7bbcfe669256f60f0ec71" + integrity sha1-htRVEDSPGUUzx7vP5mklb2Dw7HE= dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,144 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220706.tgz#c0e067f669a5e9a793c064cd36bfc44ed6eca57b" - integrity sha1-wOBn9mml6aeTwGTNNr/ETtbspXs= +"@abp/bootstrap-datepicker@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap-datepicker/-/@abp/bootstrap-datepicker-6.0.0-preview20220720.tgz#e0c305a1260555a5adcf2d8b50852339a96845fd" + integrity sha1-4MMFoSYFVaWtzy2LUIUjOaloRf0= dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220706.tgz#cac892165484c07248a384857eccacea69f301da" - integrity sha1-ysiSFlSEwHJIo4SFfsys6mnzAdo= +"@abp/bootstrap@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/bootstrap/-/@abp/bootstrap-6.0.0-preview20220720.tgz#0eab26a14dc434bc3f79da32f8c68b98b774c142" + integrity sha1-DqsmoU3ENLw/edoy+MaLmLd0wUI= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" bootstrap "^5.1.3" -"@abp/core@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220706.tgz#d53152cc92f4d969de21ea7bfa9e7a2fa7d5b8c3" - integrity sha1-1TFSzJL02WneIep7+p56L6fVuMM= +"@abp/core@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/core/-/@abp/core-6.0.0-preview20220720.tgz#a8197318482a74c847e4c359d77e106f625731fc" + integrity sha1-qBlzGEgqdMhH5MNZ134Qb2JXMfw= dependencies: - "@abp/utils" "~6.0.0-preview20220706" + "@abp/utils" "~6.0.0-preview20220720" -"@abp/datatables.net-bs5@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220706.tgz#73000a07a63c54910750c41f101d667c3d694407" - integrity sha1-cwAKB6Y8VJEHUMQfEB1mfD1pRAc= +"@abp/datatables.net-bs5@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net-bs5/-/@abp/datatables.net-bs5-6.0.0-preview20220720.tgz#940315f5409721dc5c09d08d291bdd5c81b9777d" + integrity sha1-lAMV9UCXIdxcCdCNKRvdXIG5d30= dependencies: - "@abp/datatables.net" "~6.0.0-preview20220706" + "@abp/datatables.net" "~6.0.0-preview20220720" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220706.tgz#803785b6c56c03f50d99e102f3afab8b105ec1ef" - integrity sha1-gDeFtsVsA/UNmeEC86+rixBewe8= +"@abp/datatables.net@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/datatables.net/-/@abp/datatables.net-6.0.0-preview20220720.tgz#34aa416ac0fdd97961be8f946ba6536bd264f6bd" + integrity sha1-NKpBasD92Xlhvo+Ua6ZTa9Jk9r0= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" datatables.net "^1.11.4" -"@abp/font-awesome@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220706.tgz#df58f0167513aba5b71c467ba14d1601400da6c2" - integrity sha1-31jwFnUTq6W3HEZ7oU0WAUANpsI= +"@abp/font-awesome@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/font-awesome/-/@abp/font-awesome-6.0.0-preview20220720.tgz#cbba37b3b3a0c659bada8133f6911c90b86fa6e7" + integrity sha1-y7o3s7Ogxlm62oEz9pEckLhvpuc= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220706.tgz#bc47253029b5120bd35a0e885acdc7ac2a64ef37" - integrity sha1-vEclMCm1EgvTWg6IWs3HrCpk7zc= +"@abp/jquery-form@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-form/-/@abp/jquery-form-6.0.0-preview20220720.tgz#f6dd53204faa99225ea92f1996431bb90cfeb17e" + integrity sha1-9t1TIE+qmSJeqS8ZlkMbuQz+sX4= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220706.tgz#089ac5c4614268cd67c1f3e97702dfed3de2d99d" - integrity sha1-CJrFxGFCaM1nwfPpdwLf7T3i2Z0= +"@abp/jquery-validation-unobtrusive@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation-unobtrusive/-/@abp/jquery-validation-unobtrusive-6.0.0-preview20220720.tgz#aa7f16ea28aa8c7445d71856a51f592541744982" + integrity sha1-qn8W6iiqjHRF1xhWpR9ZJUF0SYI= dependencies: - "@abp/jquery-validation" "~6.0.0-preview20220706" + "@abp/jquery-validation" "~6.0.0-preview20220720" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220706.tgz#f9ca93f8c3c05f429b5cba17f373ccefbe742685" - integrity sha1-+cqT+MPAX0KbXLoX83PM7750JoU= +"@abp/jquery-validation@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery-validation/-/@abp/jquery-validation-6.0.0-preview20220720.tgz#4af78971bbe6ef17e110916656c64cf438a8ec3f" + integrity sha1-SveJcbvm7xfhEJFmVsZM9Dio7D8= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" jquery-validation "^1.19.3" -"@abp/jquery@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220706.tgz#ca0b243122ea73e52302e554fba738e7f4e6478b" - integrity sha1-ygskMSLqc+UjAuVU+6c45/TmR4s= +"@abp/jquery@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/jquery/-/@abp/jquery-6.0.0-preview20220720.tgz#b24a4dd4cd167c82d694e9849beb72afcd1ffb79" + integrity sha1-skpN1M0WfILWlOmEm+tyr80f+3k= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" jquery "~3.6.0" -"@abp/lodash@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220706.tgz#9fda3d6b0a3cb7af9704e9a2c4b73ca87b04f9e8" - integrity sha1-n9o9awo8t6+XBOmixLc8qHsE+eg= +"@abp/lodash@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/lodash/-/@abp/lodash-6.0.0-preview20220720.tgz#c67ebe78dcb862f84e4202baa4203245acf75791" + integrity sha1-xn6+eNy4YvhOQgK6pCAyRaz3V5E= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" lodash "^4.17.21" -"@abp/luxon@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220706.tgz#298edf10a7cc9c7753f0b2d84e077262b4fc1367" - integrity sha1-KY7fEKfMnHdT8LLYTgdyYrT8E2c= +"@abp/luxon@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/luxon/-/@abp/luxon-6.0.0-preview20220720.tgz#99eb8fc9e7c9e1c71850b562b6ec131b89e14dfb" + integrity sha1-meuPyefJ4ccYULVituwTG4nhTfs= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220706.tgz#d9cd9488f563a9118819cab997d0a31601c28578" - integrity sha1-2c2UiPVjqRGIGcq5l9CjFgHChXg= +"@abp/malihu-custom-scrollbar-plugin@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/malihu-custom-scrollbar-plugin/-/@abp/malihu-custom-scrollbar-plugin-6.0.0-preview20220720.tgz#9a9dc785a4c2ff6962c326f9aaa86d6621a3f66d" + integrity sha1-mp3HhaTC/2liwyb5qqhtZiGj9m0= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220706.tgz#283d7b82f7871d80120ddf7f152e7846fe239846" - integrity sha1-KD17gveHHYASDd9/FS54Rv4jmEY= +"@abp/select2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/select2/-/@abp/select2-6.0.0-preview20220720.tgz#32fed6ccedc18a98ba3d0d8f155bcd604d37864a" + integrity sha1-Mv7WzO3Bipi6PQ2PFVvNYE03hko= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" select2 "^4.0.13" -"@abp/sweetalert2@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220706.tgz#cc617eb7cdb2c1127155ff79ab80e7213d069bb0" - integrity sha1-zGF+t82ywRJxVf95q4DnIT0Gm7A= +"@abp/sweetalert2@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/sweetalert2/-/@abp/sweetalert2-6.0.0-preview20220720.tgz#cdfe984653ed008173c669f3448a4a4b4e32a0e3" + integrity sha1-zf6YRlPtAIFzxmnzRIpKS04yoOM= dependencies: - "@abp/core" "~6.0.0-preview20220706" + "@abp/core" "~6.0.0-preview20220720" sweetalert2 "^11.3.6" -"@abp/timeago@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220706.tgz#2b676e41341b34f14fa8854f539c1a77b5427ce0" - integrity sha1-K2duQTQbNPFPqIVPU5wad7VCfOA= +"@abp/timeago@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/timeago/-/@abp/timeago-6.0.0-preview20220720.tgz#eff687139b888423b866fe6cefd8e305352be818" + integrity sha1-7/aHE5uIhCO4Zv5s79jjBTUr6Bg= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" timeago "^1.6.7" -"@abp/toastr@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220706.tgz#33708e757b8c258dce9eae2dbbbfa59f3ca557eb" - integrity sha1-M3COdXuMJY3Onq4tu7+lnzylV+s= +"@abp/toastr@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/toastr/-/@abp/toastr-6.0.0-preview20220720.tgz#bcaad9d365a46b44a290b61f921530f1c6327a93" + integrity sha1-vKrZ02Wka0SikLYfkhUw8cYyepM= dependencies: - "@abp/jquery" "~6.0.0-preview20220706" + "@abp/jquery" "~6.0.0-preview20220720" toastr "^2.1.4" -"@abp/utils@~6.0.0-preview20220706": - version "6.0.0-preview20220706" - resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220706.tgz#35bfe9533ff0cb45ed64bbc99f52d50183a59173" - integrity sha1-Nb/pUz/wy0XtZLvJn1LVAYOlkXM= +"@abp/utils@~6.0.0-preview20220720": + version "6.0.0-preview20220720" + resolved "https://www.myget.org/F/abp-nightly/npm/@abp/utils/-/@abp/utils-6.0.0-preview20220720.tgz#82172d690ddbfb3bafa86fbf719cd9b4cc76ba2d" + integrity sha1-ghctaQ3b+zuvqG+/cZzZtMx2ui0= dependencies: just-compare "^1.3.0" diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index f41af0d268..e606d547b0 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -15,14 +15,14 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~5.3.2", - "@abp/ng.components": "~5.3.2", - "@abp/ng.core": "~5.3.2", - "@abp/ng.identity": "~5.3.2", - "@abp/ng.setting-management": "~5.3.2", - "@abp/ng.tenant-management": "~5.3.2", - "@abp/ng.theme.basic": "~5.3.2", - "@abp/ng.theme.shared": "~5.3.2", + "@abp/ng.account": "~6.0.0-rc.1", + "@abp/ng.components": "~6.0.0-rc.1", + "@abp/ng.core": "~6.0.0-rc.1", + "@abp/ng.identity": "~6.0.0-rc.1", + "@abp/ng.setting-management": "~6.0.0-rc.1", + "@abp/ng.tenant-management": "~6.0.0-rc.1", + "@abp/ng.theme.basic": "~6.0.0-rc.1", + "@abp/ng.theme.shared": "~6.0.0-rc.1", "@angular/animations": "~13.3.3", "@angular/common": "~13.3.3", "@angular/compiler": "~13.3.3", @@ -37,7 +37,7 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@abp/ng.schematics": "~5.3.2", + "@abp/ng.schematics": "~6.0.0-rc.1", "@angular-devkit/build-angular": "~13.3.3", "@angular-eslint/builder": "~13.2.1", "@angular-eslint/eslint-plugin": "~13.2.1", diff --git a/templates/module/angular/projects/my-project-name/package.json b/templates/module/angular/projects/my-project-name/package.json index dfe37d2f92..7eedfe88ad 100644 --- a/templates/module/angular/projects/my-project-name/package.json +++ b/templates/module/angular/projects/my-project-name/package.json @@ -4,8 +4,8 @@ "peerDependencies": { "@angular/common": ">=9", "@angular/core": ">=9", - "@abp/ng.core": ">=5.3.2", - "@abp/ng.theme.shared": ">=5.3.2" + "@abp/ng.core": ">=6.0.0-rc.1", + "@abp/ng.theme.shared": ">=6.0.0-rc.1" }, "dependencies": { "tslib": "^2.1.0" diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json index 2703bfccc5..ea318fd183 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json index d9a5ecfc6e..37dd94844f 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2", - "@abp/aspnetcore.components.server.basictheme": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1", + "@abp/aspnetcore.components.server.basictheme": "^6.0.0-rc.1" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json index 2e9daa28f6..f677733547 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json index 2e9daa28f6..f677733547 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "^6.0.0-rc.1" } }