diff --git a/angular/package.json b/angular/package.json index 7ece63f..90a0f72 100644 --- a/angular/package.json +++ b/angular/package.json @@ -15,11 +15,11 @@ }, "private": true, "dependencies": { - "@abp/ng.account": "~3.0.5", - "@abp/ng.identity": "~3.0.5", - "@abp/ng.setting-management": "~3.0.5", - "@abp/ng.tenant-management": "~3.0.5", - "@abp/ng.theme.basic": "~3.0.5", + "@abp/ng.account": "~3.3.1", + "@abp/ng.identity": "~3.3.1", + "@abp/ng.setting-management": "~3.3.1", + "@abp/ng.tenant-management": "~3.3.1", + "@abp/ng.theme.basic": "~3.3.1", "@angular/animations": "~10.0.0", "@angular/common": "~10.0.0", "@angular/compiler": "~10.0.0", diff --git a/host/EasyAbp.IdentityServerAdmin.Host.Shared/EasyAbp.IdentityServerAdmin.Host.Shared.csproj b/host/EasyAbp.IdentityServerAdmin.Host.Shared/EasyAbp.IdentityServerAdmin.Host.Shared.csproj index 45bcbaa..32c3bad 100644 --- a/host/EasyAbp.IdentityServerAdmin.Host.Shared/EasyAbp.IdentityServerAdmin.Host.Shared.csproj +++ b/host/EasyAbp.IdentityServerAdmin.Host.Shared/EasyAbp.IdentityServerAdmin.Host.Shared.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + net5.0 EasyAbp.IdentityServerAdmin diff --git a/host/EasyAbp.IdentityServerAdmin.HttpApi.Host/EasyAbp.IdentityServerAdmin.HttpApi.Host.csproj b/host/EasyAbp.IdentityServerAdmin.HttpApi.Host/EasyAbp.IdentityServerAdmin.HttpApi.Host.csproj index da470e6..3cd035b 100644 --- a/host/EasyAbp.IdentityServerAdmin.HttpApi.Host/EasyAbp.IdentityServerAdmin.HttpApi.Host.csproj +++ b/host/EasyAbp.IdentityServerAdmin.HttpApi.Host/EasyAbp.IdentityServerAdmin.HttpApi.Host.csproj @@ -3,27 +3,30 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin true EasyAbp.IdentityServerAdmin-c2d31439-b723-48e2-b061-5ebd7aeb6010 - - - + + + - - - - - - - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/EasyAbp.IdentityServerAdmin.IdentityServer.csproj b/host/EasyAbp.IdentityServerAdmin.IdentityServer/EasyAbp.IdentityServerAdmin.IdentityServer.csproj index ed91b4c..fa1b4c8 100644 --- a/host/EasyAbp.IdentityServerAdmin.IdentityServer/EasyAbp.IdentityServerAdmin.IdentityServer.csproj +++ b/host/EasyAbp.IdentityServerAdmin.IdentityServer/EasyAbp.IdentityServerAdmin.IdentityServer.csproj @@ -1,50 +1,53 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin true EasyAbp.IdentityServerAdmin-c2d31439-b723-48e2-b061-5ebd7aeb6010 - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs b/host/EasyAbp.IdentityServerAdmin.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs index 1f328ed..7fdbcee 100644 --- a/host/EasyAbp.IdentityServerAdmin.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/host/EasyAbp.IdentityServerAdmin.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs @@ -142,7 +142,7 @@ private async Task CreateClientAsync( string postLogoutRedirectUri = null, IEnumerable permissions = null) { - var client = await _clientRepository.FindByCliendIdAsync(name); + var client = await _clientRepository.FindByClientIdAsync(name); if (client == null) { client = await _clientRepository.InsertAsync( diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/package.json b/host/EasyAbp.IdentityServerAdmin.IdentityServer/package.json index 605cf5b..093d701 100644 --- a/host/EasyAbp.IdentityServerAdmin.IdentityServer/package.json +++ b/host/EasyAbp.IdentityServerAdmin.IdentityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "~3.3.1" } -} +} \ No newline at end of file diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/core/abp.js b/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/core/abp.js index 41837d2..72af4bd 100644 --- a/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/core/abp.js +++ b/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/core/abp.js @@ -689,7 +689,7 @@ var abp = abp || {}; abp.security.antiForgery = abp.security.antiForgery || {}; abp.security.antiForgery.tokenCookieName = 'XSRF-TOKEN'; - abp.security.antiForgery.tokenHeaderName = 'X-XSRF-TOKEN'; + abp.security.antiForgery.tokenHeaderName = 'RequestVerificationToken'; abp.security.antiForgery.getToken = function () { return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName); @@ -706,18 +706,18 @@ var abp = abp || {}; var toLocal = function (date) { return new Date( - date.getUTCFullYear(), - date.getUTCMonth(), - date.getUTCDate(), - date.getUTCHours(), - date.getUTCMinutes(), - date.getUTCSeconds(), - date.getUTCMilliseconds() + date.getFullYear(), + date.getMonth(), + date.getDate(), + date.getHours(), + date.getMinutes(), + date.getSeconds(), + date.getMilliseconds() ); }; var toUtc = function (date) { - Date.UTC( + return Date.UTC( date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js b/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js index e6aff04..3087635 100644 --- a/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js +++ b/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js @@ -79,13 +79,15 @@ var abp = abp || {}; } }; - new MutationObserver(mutationObserverCallback).observe( - $('body')[0], - { - subtree: true, - childList: true - } - ); + $(function(){ + new MutationObserver(mutationObserverCallback).observe( + $('body')[0], + { + subtree: true, + childList: true + } + ); + }); // AJAX /////////////////////////////////////////////////////////////////// diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/luxon/abp.luxon.js b/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/luxon/abp.luxon.js new file mode 100644 index 0000000..b04de7c --- /dev/null +++ b/host/EasyAbp.IdentityServerAdmin.IdentityServer/wwwroot/libs/abp/luxon/abp.luxon.js @@ -0,0 +1,46 @@ +var abp = abp || {}; +(function () { + + if (!luxon) { + throw "abp/luxon library requires the luxon library included to the page!"; + } + + /* TIMING *************************************************/ + + abp.timing = abp.timing || {}; + + var setObjectValue = function (obj, property, value) { + if (typeof property === "string") { + property = property.split('.'); + } + + if (property.length > 1) { + var p = property.shift(); + setObjectValue(obj[p], property, value); + } else { + obj[property[0]] = value; + } + } + + var getObjectValue = function (obj, property) { + return property.split('.').reduce((a, v) => a[v], obj) + } + + abp.timing.convertFieldsToIsoDate = function (form, fields) { + for (var field of fields) { + var dateTime = luxon.DateTime + .fromFormat( + getObjectValue(form, field), + abp.localization.currentCulture.dateTimeFormat.shortDatePattern, + {locale: abp.localization.currentCulture.cultureName} + ); + + if (!dateTime.invalid) { + setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss")) + } + } + + return form; + } + +})(jQuery); diff --git a/host/EasyAbp.IdentityServerAdmin.IdentityServer/yarn.lock b/host/EasyAbp.IdentityServerAdmin.IdentityServer/yarn.lock index a583172..cf129fa 100644 --- a/host/EasyAbp.IdentityServerAdmin.IdentityServer/yarn.lock +++ b/host/EasyAbp.IdentityServerAdmin.IdentityServer/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.0.5.tgz#c146f20226522f0305cc0fa31cfcf9d39be78901" - integrity sha512-ptNhD4xV2wSLW7vQ5KUgaRiH5Ov1OscZW2ZEoivnt3kqgtIC3DGw+SiE9vjFCvyY83fjRkIlW2PIfQxSySbteQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76" - integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~3.0.5" - "@abp/bootstrap" "~3.0.5" - "@abp/bootstrap-datepicker" "~3.0.5" - "@abp/datatables.net-bs4" "~3.0.5" - "@abp/font-awesome" "~3.0.5" - "@abp/jquery-form" "~3.0.5" - "@abp/jquery-validation-unobtrusive" "~3.0.5" - "@abp/lodash" "~3.0.5" - "@abp/luxon" "~3.0.5" - "@abp/malihu-custom-scrollbar-plugin" "~3.0.5" - "@abp/select2" "~3.0.5" - "@abp/sweetalert" "~3.0.5" - "@abp/timeago" "~3.0.5" - "@abp/toastr" "~3.0.5" - -"@abp/aspnetcore.mvc.ui@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0" - integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg== +"@abp/aspnetcore.mvc.ui.theme.basic@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.1.tgz#58ae88355b821ca72eccf1950bde544b8f0edcca" + integrity sha512-AUIJQIBb+5of0Na1cxmyacni6ToYBpmtU+NJH9/cTC3UUAPylj8TiAX9yobAPn8dbrcXTm+dh9T8i49rXTtxoA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740" + integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~3.3.1" + "@abp/bootstrap" "~3.3.1" + "@abp/bootstrap-datepicker" "~3.3.1" + "@abp/datatables.net-bs4" "~3.3.1" + "@abp/font-awesome" "~3.3.1" + "@abp/jquery-form" "~3.3.1" + "@abp/jquery-validation-unobtrusive" "~3.3.1" + "@abp/lodash" "~3.3.1" + "@abp/luxon" "~3.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~3.3.1" + "@abp/select2" "~3.3.1" + "@abp/sweetalert" "~3.3.1" + "@abp/timeago" "~3.3.1" + "@abp/toastr" "~3.3.1" + +"@abp/aspnetcore.mvc.ui@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5" + integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,145 @@ path "^0.12.7" rimraf "^3.0.2" -"@abp/bootstrap-datepicker@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540" - integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA== +"@abp/bootstrap-datepicker@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3" + integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880" - integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg== +"@abp/bootstrap@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0" + integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" bootstrap "^4.5.0" bootstrap-v4-rtl "4.4.1-2" -"@abp/core@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8" - integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA== +"@abp/core@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de" + integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g== dependencies: - "@abp/utils" "^3.0.5" + "@abp/utils" "^3.3.1" -"@abp/datatables.net-bs4@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a" - integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ== +"@abp/datatables.net-bs4@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4" + integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg== dependencies: - "@abp/datatables.net" "~3.0.5" + "@abp/datatables.net" "~3.3.1" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491" - integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew== +"@abp/datatables.net@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278" + integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" datatables.net "^1.10.21" -"@abp/font-awesome@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412" - integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ== +"@abp/font-awesome@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6" + integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78" - integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg== +"@abp/jquery-form@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf" + integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f" - integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw== +"@abp/jquery-validation-unobtrusive@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1" + integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw== dependencies: - "@abp/jquery-validation" "~3.0.5" + "@abp/jquery-validation" "~3.3.1" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279" - integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng== +"@abp/jquery-validation@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394" + integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" jquery-validation "^1.19.2" -"@abp/jquery@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754" - integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ== +"@abp/jquery@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0" + integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" jquery "~3.5.1" -"@abp/lodash@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4" - integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA== +"@abp/lodash@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87" + integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" lodash "^4.17.15" -"@abp/luxon@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688" - integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw== +"@abp/luxon@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e" + integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg== dependencies: + "@abp/core" "~3.3.1" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39" - integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q== +"@abp/malihu-custom-scrollbar-plugin@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8" + integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350" - integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw== +"@abp/select2@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4" + integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" select2 "^4.0.13" -"@abp/sweetalert@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab" - integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg== +"@abp/sweetalert@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534" + integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" sweetalert "^2.1.2" -"@abp/timeago@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31" - integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw== +"@abp/timeago@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720" + integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" timeago "^1.6.7" -"@abp/toastr@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc" - integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw== +"@abp/toastr@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d" + integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" toastr "^2.1.4" -"@abp/utils@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49" - integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg== +"@abp/utils@^3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd" + integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA== dependencies: just-compare "^1.3.0" diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Host/EasyAbp.IdentityServerAdmin.Web.Host.csproj b/host/EasyAbp.IdentityServerAdmin.Web.Host/EasyAbp.IdentityServerAdmin.Web.Host.csproj index eed294f..af2369e 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Host/EasyAbp.IdentityServerAdmin.Web.Host.csproj +++ b/host/EasyAbp.IdentityServerAdmin.Web.Host/EasyAbp.IdentityServerAdmin.Web.Host.csproj @@ -3,31 +3,31 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin true EasyAbp.IdentityServerAdmin-c2d31439-b723-48e2-b061-5ebd7aeb6010 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Host/IdentityServerAdminBrandingProvider.cs b/host/EasyAbp.IdentityServerAdmin.Web.Host/IdentityServerAdminBrandingProvider.cs index 68d5155..e334784 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Host/IdentityServerAdminBrandingProvider.cs +++ b/host/EasyAbp.IdentityServerAdmin.Web.Host/IdentityServerAdminBrandingProvider.cs @@ -1,4 +1,4 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components; +using Volo.Abp.Ui.Branding; using Volo.Abp.DependencyInjection; namespace EasyAbp.IdentityServerAdmin diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Host/package.json b/host/EasyAbp.IdentityServerAdmin.Web.Host/package.json index 27fe846..1fe996f 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Host/package.json +++ b/host/EasyAbp.IdentityServerAdmin.Web.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "~3.3.1" } -} +} \ No newline at end of file diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/core/abp.js b/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/core/abp.js index 41837d2..72af4bd 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/core/abp.js +++ b/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/core/abp.js @@ -689,7 +689,7 @@ var abp = abp || {}; abp.security.antiForgery = abp.security.antiForgery || {}; abp.security.antiForgery.tokenCookieName = 'XSRF-TOKEN'; - abp.security.antiForgery.tokenHeaderName = 'X-XSRF-TOKEN'; + abp.security.antiForgery.tokenHeaderName = 'RequestVerificationToken'; abp.security.antiForgery.getToken = function () { return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName); @@ -706,18 +706,18 @@ var abp = abp || {}; var toLocal = function (date) { return new Date( - date.getUTCFullYear(), - date.getUTCMonth(), - date.getUTCDate(), - date.getUTCHours(), - date.getUTCMinutes(), - date.getUTCSeconds(), - date.getUTCMilliseconds() + date.getFullYear(), + date.getMonth(), + date.getDate(), + date.getHours(), + date.getMinutes(), + date.getSeconds(), + date.getMilliseconds() ); }; var toUtc = function (date) { - Date.UTC( + return Date.UTC( date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/jquery/abp.jquery.js b/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/jquery/abp.jquery.js index e6aff04..3087635 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/jquery/abp.jquery.js +++ b/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/jquery/abp.jquery.js @@ -79,13 +79,15 @@ var abp = abp || {}; } }; - new MutationObserver(mutationObserverCallback).observe( - $('body')[0], - { - subtree: true, - childList: true - } - ); + $(function(){ + new MutationObserver(mutationObserverCallback).observe( + $('body')[0], + { + subtree: true, + childList: true + } + ); + }); // AJAX /////////////////////////////////////////////////////////////////// diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/luxon/abp.luxon.js b/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/luxon/abp.luxon.js new file mode 100644 index 0000000..b04de7c --- /dev/null +++ b/host/EasyAbp.IdentityServerAdmin.Web.Host/wwwroot/libs/abp/luxon/abp.luxon.js @@ -0,0 +1,46 @@ +var abp = abp || {}; +(function () { + + if (!luxon) { + throw "abp/luxon library requires the luxon library included to the page!"; + } + + /* TIMING *************************************************/ + + abp.timing = abp.timing || {}; + + var setObjectValue = function (obj, property, value) { + if (typeof property === "string") { + property = property.split('.'); + } + + if (property.length > 1) { + var p = property.shift(); + setObjectValue(obj[p], property, value); + } else { + obj[property[0]] = value; + } + } + + var getObjectValue = function (obj, property) { + return property.split('.').reduce((a, v) => a[v], obj) + } + + abp.timing.convertFieldsToIsoDate = function (form, fields) { + for (var field of fields) { + var dateTime = luxon.DateTime + .fromFormat( + getObjectValue(form, field), + abp.localization.currentCulture.dateTimeFormat.shortDatePattern, + {locale: abp.localization.currentCulture.cultureName} + ); + + if (!dateTime.invalid) { + setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss")) + } + } + + return form; + } + +})(jQuery); diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Host/yarn.lock b/host/EasyAbp.IdentityServerAdmin.Web.Host/yarn.lock index a583172..cf129fa 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Host/yarn.lock +++ b/host/EasyAbp.IdentityServerAdmin.Web.Host/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.0.5.tgz#c146f20226522f0305cc0fa31cfcf9d39be78901" - integrity sha512-ptNhD4xV2wSLW7vQ5KUgaRiH5Ov1OscZW2ZEoivnt3kqgtIC3DGw+SiE9vjFCvyY83fjRkIlW2PIfQxSySbteQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76" - integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~3.0.5" - "@abp/bootstrap" "~3.0.5" - "@abp/bootstrap-datepicker" "~3.0.5" - "@abp/datatables.net-bs4" "~3.0.5" - "@abp/font-awesome" "~3.0.5" - "@abp/jquery-form" "~3.0.5" - "@abp/jquery-validation-unobtrusive" "~3.0.5" - "@abp/lodash" "~3.0.5" - "@abp/luxon" "~3.0.5" - "@abp/malihu-custom-scrollbar-plugin" "~3.0.5" - "@abp/select2" "~3.0.5" - "@abp/sweetalert" "~3.0.5" - "@abp/timeago" "~3.0.5" - "@abp/toastr" "~3.0.5" - -"@abp/aspnetcore.mvc.ui@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0" - integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg== +"@abp/aspnetcore.mvc.ui.theme.basic@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.1.tgz#58ae88355b821ca72eccf1950bde544b8f0edcca" + integrity sha512-AUIJQIBb+5of0Na1cxmyacni6ToYBpmtU+NJH9/cTC3UUAPylj8TiAX9yobAPn8dbrcXTm+dh9T8i49rXTtxoA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740" + integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~3.3.1" + "@abp/bootstrap" "~3.3.1" + "@abp/bootstrap-datepicker" "~3.3.1" + "@abp/datatables.net-bs4" "~3.3.1" + "@abp/font-awesome" "~3.3.1" + "@abp/jquery-form" "~3.3.1" + "@abp/jquery-validation-unobtrusive" "~3.3.1" + "@abp/lodash" "~3.3.1" + "@abp/luxon" "~3.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~3.3.1" + "@abp/select2" "~3.3.1" + "@abp/sweetalert" "~3.3.1" + "@abp/timeago" "~3.3.1" + "@abp/toastr" "~3.3.1" + +"@abp/aspnetcore.mvc.ui@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5" + integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,145 @@ path "^0.12.7" rimraf "^3.0.2" -"@abp/bootstrap-datepicker@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540" - integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA== +"@abp/bootstrap-datepicker@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3" + integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880" - integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg== +"@abp/bootstrap@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0" + integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" bootstrap "^4.5.0" bootstrap-v4-rtl "4.4.1-2" -"@abp/core@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8" - integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA== +"@abp/core@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de" + integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g== dependencies: - "@abp/utils" "^3.0.5" + "@abp/utils" "^3.3.1" -"@abp/datatables.net-bs4@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a" - integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ== +"@abp/datatables.net-bs4@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4" + integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg== dependencies: - "@abp/datatables.net" "~3.0.5" + "@abp/datatables.net" "~3.3.1" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491" - integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew== +"@abp/datatables.net@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278" + integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" datatables.net "^1.10.21" -"@abp/font-awesome@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412" - integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ== +"@abp/font-awesome@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6" + integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78" - integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg== +"@abp/jquery-form@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf" + integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f" - integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw== +"@abp/jquery-validation-unobtrusive@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1" + integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw== dependencies: - "@abp/jquery-validation" "~3.0.5" + "@abp/jquery-validation" "~3.3.1" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279" - integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng== +"@abp/jquery-validation@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394" + integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" jquery-validation "^1.19.2" -"@abp/jquery@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754" - integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ== +"@abp/jquery@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0" + integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" jquery "~3.5.1" -"@abp/lodash@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4" - integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA== +"@abp/lodash@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87" + integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" lodash "^4.17.15" -"@abp/luxon@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688" - integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw== +"@abp/luxon@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e" + integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg== dependencies: + "@abp/core" "~3.3.1" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39" - integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q== +"@abp/malihu-custom-scrollbar-plugin@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8" + integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350" - integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw== +"@abp/select2@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4" + integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" select2 "^4.0.13" -"@abp/sweetalert@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab" - integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg== +"@abp/sweetalert@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534" + integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" sweetalert "^2.1.2" -"@abp/timeago@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31" - integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw== +"@abp/timeago@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720" + integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" timeago "^1.6.7" -"@abp/toastr@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc" - integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw== +"@abp/toastr@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d" + integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" toastr "^2.1.4" -"@abp/utils@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49" - integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg== +"@abp/utils@^3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd" + integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA== dependencies: just-compare "^1.3.0" diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Unified/EasyAbp.IdentityServerAdmin.Web.Unified.csproj b/host/EasyAbp.IdentityServerAdmin.Web.Unified/EasyAbp.IdentityServerAdmin.Web.Unified.csproj index d2b9f94..46e485e 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Unified/EasyAbp.IdentityServerAdmin.Web.Unified.csproj +++ b/host/EasyAbp.IdentityServerAdmin.Web.Unified/EasyAbp.IdentityServerAdmin.Web.Unified.csproj @@ -3,41 +3,44 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin true EasyAbp.IdentityServerAdmin-c2d31439-b723-48e2-b061-5ebd7aeb6010 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Unified/package.json b/host/EasyAbp.IdentityServerAdmin.Web.Unified/package.json index 27fe846..1fe996f 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Unified/package.json +++ b/host/EasyAbp.IdentityServerAdmin.Web.Unified/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "^3.0.5" + "@abp/aspnetcore.mvc.ui.theme.basic": "~3.3.1" } -} +} \ No newline at end of file diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/core/abp.js b/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/core/abp.js index 41837d2..72af4bd 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/core/abp.js +++ b/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/core/abp.js @@ -689,7 +689,7 @@ var abp = abp || {}; abp.security.antiForgery = abp.security.antiForgery || {}; abp.security.antiForgery.tokenCookieName = 'XSRF-TOKEN'; - abp.security.antiForgery.tokenHeaderName = 'X-XSRF-TOKEN'; + abp.security.antiForgery.tokenHeaderName = 'RequestVerificationToken'; abp.security.antiForgery.getToken = function () { return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName); @@ -706,18 +706,18 @@ var abp = abp || {}; var toLocal = function (date) { return new Date( - date.getUTCFullYear(), - date.getUTCMonth(), - date.getUTCDate(), - date.getUTCHours(), - date.getUTCMinutes(), - date.getUTCSeconds(), - date.getUTCMilliseconds() + date.getFullYear(), + date.getMonth(), + date.getDate(), + date.getHours(), + date.getMinutes(), + date.getSeconds(), + date.getMilliseconds() ); }; var toUtc = function (date) { - Date.UTC( + return Date.UTC( date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/jquery/abp.jquery.js b/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/jquery/abp.jquery.js index e6aff04..3087635 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/jquery/abp.jquery.js +++ b/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/jquery/abp.jquery.js @@ -79,13 +79,15 @@ var abp = abp || {}; } }; - new MutationObserver(mutationObserverCallback).observe( - $('body')[0], - { - subtree: true, - childList: true - } - ); + $(function(){ + new MutationObserver(mutationObserverCallback).observe( + $('body')[0], + { + subtree: true, + childList: true + } + ); + }); // AJAX /////////////////////////////////////////////////////////////////// diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/luxon/abp.luxon.js b/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/luxon/abp.luxon.js new file mode 100644 index 0000000..b04de7c --- /dev/null +++ b/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/abp/luxon/abp.luxon.js @@ -0,0 +1,46 @@ +var abp = abp || {}; +(function () { + + if (!luxon) { + throw "abp/luxon library requires the luxon library included to the page!"; + } + + /* TIMING *************************************************/ + + abp.timing = abp.timing || {}; + + var setObjectValue = function (obj, property, value) { + if (typeof property === "string") { + property = property.split('.'); + } + + if (property.length > 1) { + var p = property.shift(); + setObjectValue(obj[p], property, value); + } else { + obj[property[0]] = value; + } + } + + var getObjectValue = function (obj, property) { + return property.split('.').reduce((a, v) => a[v], obj) + } + + abp.timing.convertFieldsToIsoDate = function (form, fields) { + for (var field of fields) { + var dateTime = luxon.DateTime + .fromFormat( + getObjectValue(form, field), + abp.localization.currentCulture.dateTimeFormat.shortDatePattern, + {locale: abp.localization.currentCulture.cultureName} + ); + + if (!dateTime.invalid) { + setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss")) + } + } + + return form; + } + +})(jQuery); diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/jquery/jquery.js b/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/jquery/jquery.js index 9b5206b..9a421b0 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/jquery/jquery.js +++ b/host/EasyAbp.IdentityServerAdmin.Web.Unified/wwwroot/libs/jquery/jquery.js @@ -129,7 +129,7 @@ function toType( obj ) { var - version = "3.3.1", + version = "4.0.0-rc.3", // Define a local copy of jQuery jQuery = function( selector, context ) { diff --git a/host/EasyAbp.IdentityServerAdmin.Web.Unified/yarn.lock b/host/EasyAbp.IdentityServerAdmin.Web.Unified/yarn.lock index 3261b07..8abda85 100644 --- a/host/EasyAbp.IdentityServerAdmin.Web.Unified/yarn.lock +++ b/host/EasyAbp.IdentityServerAdmin.Web.Unified/yarn.lock @@ -2,37 +2,37 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.0.5.tgz#c146f20226522f0305cc0fa31cfcf9d39be78901" - integrity sha512-ptNhD4xV2wSLW7vQ5KUgaRiH5Ov1OscZW2ZEoivnt3kqgtIC3DGw+SiE9vjFCvyY83fjRkIlW2PIfQxSySbteQ== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~3.0.5" - -"@abp/aspnetcore.mvc.ui.theme.shared@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.0.5.tgz#5b370902cf229963f9aa10dd64482d57299dde76" - integrity sha512-iobAH39xrCdnqdaABaiYZg4lqNSOwPkMCLnyc+ytxOMbu/YnNKahXPmRhgd8dR/l+iQY1+6T4SWfLdGswi3gAg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~3.0.5" - "@abp/bootstrap" "~3.0.5" - "@abp/bootstrap-datepicker" "~3.0.5" - "@abp/datatables.net-bs4" "~3.0.5" - "@abp/font-awesome" "~3.0.5" - "@abp/jquery-form" "~3.0.5" - "@abp/jquery-validation-unobtrusive" "~3.0.5" - "@abp/lodash" "~3.0.5" - "@abp/luxon" "~3.0.5" - "@abp/malihu-custom-scrollbar-plugin" "~3.0.5" - "@abp/select2" "~3.0.5" - "@abp/sweetalert" "~3.0.5" - "@abp/timeago" "~3.0.5" - "@abp/toastr" "~3.0.5" - -"@abp/aspnetcore.mvc.ui@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.0.5.tgz#a050eaee328c56a3730f5abbf25035adf612d6f0" - integrity sha512-/EOgjXTzR+I1OK9KA7L3yzQ2RGSDW97+n3cQrSdLAUF+tnRvMJS0nytDlSJSRK2hb8/clFMaofZHCC81aUkYUg== +"@abp/aspnetcore.mvc.ui.theme.basic@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.1.tgz#58ae88355b821ca72eccf1950bde544b8f0edcca" + integrity sha512-AUIJQIBb+5of0Na1cxmyacni6ToYBpmtU+NJH9/cTC3UUAPylj8TiAX9yobAPn8dbrcXTm+dh9T8i49rXTtxoA== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1" + +"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740" + integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~3.3.1" + "@abp/bootstrap" "~3.3.1" + "@abp/bootstrap-datepicker" "~3.3.1" + "@abp/datatables.net-bs4" "~3.3.1" + "@abp/font-awesome" "~3.3.1" + "@abp/jquery-form" "~3.3.1" + "@abp/jquery-validation-unobtrusive" "~3.3.1" + "@abp/lodash" "~3.3.1" + "@abp/luxon" "~3.3.1" + "@abp/malihu-custom-scrollbar-plugin" "~3.3.1" + "@abp/select2" "~3.3.1" + "@abp/sweetalert" "~3.3.1" + "@abp/timeago" "~3.3.1" + "@abp/toastr" "~3.3.1" + +"@abp/aspnetcore.mvc.ui@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5" + integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -41,144 +41,145 @@ path "^0.12.7" rimraf "^3.0.2" -"@abp/bootstrap-datepicker@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.0.5.tgz#3a7fd86dbcadc31c11be5b2b31c8cf8ac3035540" - integrity sha512-vIY1wT4RHoJAPhVK11Q5MS71iZbwsmM/0VTBvvs04mjRSSi6xhdyRYkA+l+P49fnOwhZNaaK19XwQdVVScDuhA== +"@abp/bootstrap-datepicker@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3" + integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.0.5.tgz#91f2c8fe6a57fc5789ae8fe9c206b2c159e55880" - integrity sha512-LdydeJIbw5k1k7FkWaI1lTectZeTXmEIoccJtj9Qx4N9yGt40wGsjz9SOvUdJ0IKAgntIWNQP8ohWiBPgzT7Xg== +"@abp/bootstrap@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0" + integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" bootstrap "^4.5.0" bootstrap-v4-rtl "4.4.1-2" -"@abp/core@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.0.5.tgz#9a7bd990d02edc8128a5be3233b6fbb5669b15b8" - integrity sha512-LdkSkZQfN4hugcGNxBkje0+eQomivwNFbnAkMFQbvCwYLwKB2yvk7GCemEetW1piqvyrUGz4jqhtunjoXps5JA== +"@abp/core@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de" + integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g== dependencies: - "@abp/utils" "^3.0.5" + "@abp/utils" "^3.3.1" -"@abp/datatables.net-bs4@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.0.5.tgz#9b79935970d2d4074994240b5deb01dff5987c0a" - integrity sha512-jIWRBEG/NlhaE43i6Xzr18XJ5aTWA+WWslf7WgNOArG5slGBbH4lLLja4HswLP3NGdSmzIyHJR1p9XQ82nBkbQ== +"@abp/datatables.net-bs4@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4" + integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg== dependencies: - "@abp/datatables.net" "~3.0.5" + "@abp/datatables.net" "~3.3.1" datatables.net-bs4 "^1.10.21" -"@abp/datatables.net@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.0.5.tgz#0a0a39e8fa54522bf8a09ce76ff3927207a79491" - integrity sha512-HClQ2tcZuWBAChf9oOJOtMP1zHv8jqloPEcw3iqbhS/tWZBw5VQ4TO+BVfZsqHDXZNnWSmR6/2xiKsK32nliew== +"@abp/datatables.net@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278" + integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" datatables.net "^1.10.21" -"@abp/font-awesome@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.0.5.tgz#62d58c34f0abf268e30bdf788dfbd3f45b19b412" - integrity sha512-/+31Vtw1S9vvuNy/rN/Q6awkgUaYNNYXESgfvqI0pqIkvlPgigvS8E68mHqGzsxyRqdZisI6JGd94AF+vJD7sQ== +"@abp/font-awesome@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6" + integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" "@fortawesome/fontawesome-free" "^5.13.0" -"@abp/jquery-form@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.0.5.tgz#9d2ea9b2509448ee163a163298a7a09480865f78" - integrity sha512-RKgvQciaMml33NvzA28aYyfNI+WQHRfKLFWvOvqc8qO4C3BvyrnwepuzZcnI/9UsELKLSLoFrfk3rJHhxnTJhg== +"@abp/jquery-form@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf" + integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.0.5.tgz#b8912e1c4cfdd4fdff6ad4aa7ee8693b55a3be1f" - integrity sha512-kPifDA+1ErbeQBwn+BzwtWuTHXzBke/EMCmITuj59plM/60gZ1ZfVm8EzzTmKS7iLaVVeOqTKf0vEQTobNYffw== +"@abp/jquery-validation-unobtrusive@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1" + integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw== dependencies: - "@abp/jquery-validation" "~3.0.5" + "@abp/jquery-validation" "~3.3.1" jquery-validation-unobtrusive "^3.2.11" -"@abp/jquery-validation@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.0.5.tgz#55e36b3c832a35447fac69af312dedf1dee22279" - integrity sha512-fdqxc5CJ6TpUAF8+NEsKCmXvvZiOPR5bzczcfvfovxLOjvHvdEO74XPGjsjlBNTdaKMhmNGZRK4JRLUz7fvTng== +"@abp/jquery-validation@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394" + integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" jquery-validation "^1.19.2" -"@abp/jquery@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.0.5.tgz#2e43ac19a8df6e1e0220d6d4991d33a93d890754" - integrity sha512-2d2l+smWKAVP4/b6GSO+8rmJ7pFXiUewpBDwkHm5qgkK6n6UGqIcK9lIgiS2YQ6rmL6qdtuNhhqtC9GF2TF2kQ== +"@abp/jquery@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0" + integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" jquery "~3.5.1" -"@abp/lodash@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.0.5.tgz#d5d9f14095d76239bc0e6f9804c24d1f92ffcab4" - integrity sha512-+B2vxfPwxoIIb8Ac8eHi6OgAn0qbjmPZuun7/es0/ouYYTbEhvhTAD20X3PGZlHrIYeDyS2ansuXm8gJI+/BzA== +"@abp/lodash@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87" + integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" lodash "^4.17.15" -"@abp/luxon@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.0.5.tgz#083042c939ea58bf719e35114a6c8efb07b68688" - integrity sha512-0UVHO2CO89t34O35OA3JzWGWLBpg+e1NQXSfVtK90nmg/QmzGkHVM9m7Su0jjLNBt3N5EA5OPOhriot3bCKItw== +"@abp/luxon@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e" + integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg== dependencies: + "@abp/core" "~3.3.1" luxon "^1.24.1" -"@abp/malihu-custom-scrollbar-plugin@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.0.5.tgz#f908289927a63fd76fb8f60b00a37747d9edbe39" - integrity sha512-3GoXA8VtGyZWKiqaPCipPXYLLM7h2Y5Oecq5c5YlMQyW2akv7uHiQQF2GZW/nVsFu3HBbGTOWpKRRmVk3PEO9Q== +"@abp/malihu-custom-scrollbar-plugin@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8" + integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.0.5.tgz#79d7754713c64a6549da520dc6867ef3e3dd0350" - integrity sha512-VbeSHdAdDy8exrjplHMMhLVV4oG7Gq9zBb5M52f0sIkA4DkXFhksXHcHNoOCfhaKAXpenGA03Z9GJewZ3MTpMw== +"@abp/select2@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4" + integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" select2 "^4.0.13" -"@abp/sweetalert@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.0.5.tgz#e3b92d23cf3633983980b6255bf63c43d422ceab" - integrity sha512-OUt4ANgj14GESfRG7+UqdONS8daOu+8x2OZDWv98hriuX0uCVBjwB2J0jRI/n653C68Mi0yHixGONDv9OLy/lg== +"@abp/sweetalert@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534" + integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA== dependencies: - "@abp/core" "~3.0.5" + "@abp/core" "~3.3.1" sweetalert "^2.1.2" -"@abp/timeago@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.0.5.tgz#b191a7c43f3dc77645fe27273f2f6619f7d4eb31" - integrity sha512-QhvAOU4C+Qxh/gFuCSGZtLU4KwVhdv/jtK8ovWyqbGvQMCCIimqa8BFKIz0H5XWIJhHwwWblkpjICWgjWh6uXw== +"@abp/timeago@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720" + integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" timeago "^1.6.7" -"@abp/toastr@~3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.0.5.tgz#fc83b678f5be3a22040d0421ad9db5b2eac9d4fc" - integrity sha512-qgi2DEu6FYpN/DYcOZrmXsAr1HqcIKMhBWeXgjfoYUIl/K5+OuUgbQ69D/jdc0jz8HU9a4Cw7Q8hhe4CkgssEw== +"@abp/toastr@~3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d" + integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g== dependencies: - "@abp/jquery" "~3.0.5" + "@abp/jquery" "~3.3.1" toastr "^2.1.4" -"@abp/utils@^3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.0.5.tgz#66b3da953500e73ff1f23d1b41168cde8216ce49" - integrity sha512-X9V1xLIEazItaf93nFSA4p94WT6QK3yA4eIyvU7GyyEkkOQdaakNwPbRwy930sd+I+/oXnIqM1vDsJu9QDhgvg== +"@abp/utils@^3.3.1": + version "4.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd" + integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA== dependencies: just-compare "^1.3.0" @@ -1360,7 +1361,7 @@ jquery-validation@^1.19.2: integrity sha512-yHaAqOGaAB7+p2u5lpzhhQVt3CBMUw3fHcuCJ7nXmXz0LWLHPN7yOhwnocp5nrn2SmnXR1jpV+whx2j1kLz1tQ== jquery@>=1.12.0, jquery@>=1.7, jquery@>=1.7.2, jquery@>=1.8, "jquery@^1.7 || ^2.0 || ^3.1": - version "3.3.1" + version "4.0.0-rc.3" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" "jquery@>=1.5.0 <4.0", "jquery@>=1.7.1 <4.0.0": diff --git a/src/EasyAbp.IdentityServerAdmin.Application.Contracts/ApiResources/Dtos/ApiScopeDto.cs b/src/EasyAbp.IdentityServerAdmin.Application.Contracts/ApiResources/Dtos/ApiScopeDto.cs index c915914..89a72fe 100644 --- a/src/EasyAbp.IdentityServerAdmin.Application.Contracts/ApiResources/Dtos/ApiScopeDto.cs +++ b/src/EasyAbp.IdentityServerAdmin.Application.Contracts/ApiResources/Dtos/ApiScopeDto.cs @@ -6,12 +6,6 @@ namespace EasyAbp.IdentityServerAdmin.ApiResources.Dtos { public class ApiScopeDto { - public string Name { get; set; } - public string DisplayName { get; set; } - public string Description { get; set; } - public bool Required { get; set; } - public bool Emphasize { get; set; } - public bool ShowInDiscoveryDocument { get; set; } - public List UserClaims { get; set; } + public string Scope { get; set; } } } diff --git a/src/EasyAbp.IdentityServerAdmin.Application.Contracts/EasyAbp.IdentityServerAdmin.Application.Contracts.csproj b/src/EasyAbp.IdentityServerAdmin.Application.Contracts/EasyAbp.IdentityServerAdmin.Application.Contracts.csproj index 8f62ea6..28cfc9f 100644 --- a/src/EasyAbp.IdentityServerAdmin.Application.Contracts/EasyAbp.IdentityServerAdmin.Application.Contracts.csproj +++ b/src/EasyAbp.IdentityServerAdmin.Application.Contracts/EasyAbp.IdentityServerAdmin.Application.Contracts.csproj @@ -3,13 +3,13 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - - + + diff --git a/src/EasyAbp.IdentityServerAdmin.Application/EasyAbp.IdentityServerAdmin.Application.csproj b/src/EasyAbp.IdentityServerAdmin.Application/EasyAbp.IdentityServerAdmin.Application.csproj index 331a4b1..aa22ada 100644 --- a/src/EasyAbp.IdentityServerAdmin.Application/EasyAbp.IdentityServerAdmin.Application.csproj +++ b/src/EasyAbp.IdentityServerAdmin.Application/EasyAbp.IdentityServerAdmin.Application.csproj @@ -3,13 +3,13 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - - + + diff --git a/src/EasyAbp.IdentityServerAdmin.Application/IdentityServerAdminApplicationAutoMapperProfile.cs b/src/EasyAbp.IdentityServerAdmin.Application/IdentityServerAdminApplicationAutoMapperProfile.cs index 78236f6..75c004f 100644 --- a/src/EasyAbp.IdentityServerAdmin.Application/IdentityServerAdminApplicationAutoMapperProfile.cs +++ b/src/EasyAbp.IdentityServerAdmin.Application/IdentityServerAdminApplicationAutoMapperProfile.cs @@ -27,8 +27,8 @@ public IdentityServerAdminApplicationAutoMapperProfile() .ForMember(des => des.UserClaims, opt => opt.MapFrom(src => src.UserClaims.Select(x => x.Type))) ; - CreateMap().ReverseMap(); - CreateMap().ReverseMap(); + CreateMap().ReverseMap(); + CreateMap().ReverseMap(); CreateMap() .Ignore(des => des.UserClaims) @@ -36,9 +36,9 @@ public IdentityServerAdminApplicationAutoMapperProfile() .Ignore(des => des.Properties) .Ignore(des => des.ExtraProperties) .Ignore(des => des.ConcurrencyStamp) - .IgnoreFullAuditedObjectProperties() - - ; + .Ignore(des => des.AllowedAccessTokenSigningAlgorithms) + .Ignore(des => des.ShowInDiscoveryDocument) + .IgnoreFullAuditedObjectProperties(); @@ -78,6 +78,8 @@ public IdentityServerAdminApplicationAutoMapperProfile() .Ignore(des => des.Properties) .Ignore(des => des.ExtraProperties) .Ignore(des => des.ConcurrencyStamp) + .Ignore(des=>des.AllowedIdentityTokenSigningAlgorithms) + .Ignore(des => des.RequireRequestObject) .IgnoreFullAuditedObjectProperties() ; diff --git a/src/EasyAbp.IdentityServerAdmin.Domain.Shared/EasyAbp.IdentityServerAdmin.Domain.Shared.csproj b/src/EasyAbp.IdentityServerAdmin.Domain.Shared/EasyAbp.IdentityServerAdmin.Domain.Shared.csproj index 22552d8..503a9e2 100644 --- a/src/EasyAbp.IdentityServerAdmin.Domain.Shared/EasyAbp.IdentityServerAdmin.Domain.Shared.csproj +++ b/src/EasyAbp.IdentityServerAdmin.Domain.Shared/EasyAbp.IdentityServerAdmin.Domain.Shared.csproj @@ -3,18 +3,18 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin true - - + + - + diff --git a/src/EasyAbp.IdentityServerAdmin.Domain/EasyAbp.IdentityServerAdmin.Domain.csproj b/src/EasyAbp.IdentityServerAdmin.Domain/EasyAbp.IdentityServerAdmin.Domain.csproj index 1b1fd7b..e1df0ef 100644 --- a/src/EasyAbp.IdentityServerAdmin.Domain/EasyAbp.IdentityServerAdmin.Domain.csproj +++ b/src/EasyAbp.IdentityServerAdmin.Domain/EasyAbp.IdentityServerAdmin.Domain.csproj @@ -3,13 +3,13 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - - + + diff --git a/src/EasyAbp.IdentityServerAdmin.EntityFrameworkCore/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.csproj b/src/EasyAbp.IdentityServerAdmin.EntityFrameworkCore/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.csproj index 9768afb..744296f 100644 --- a/src/EasyAbp.IdentityServerAdmin.EntityFrameworkCore/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.csproj +++ b/src/EasyAbp.IdentityServerAdmin.EntityFrameworkCore/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.csproj @@ -3,13 +3,13 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - - + + diff --git a/src/EasyAbp.IdentityServerAdmin.HttpApi.Client/EasyAbp.IdentityServerAdmin.HttpApi.Client.csproj b/src/EasyAbp.IdentityServerAdmin.HttpApi.Client/EasyAbp.IdentityServerAdmin.HttpApi.Client.csproj index eadaf3e..882d258 100644 --- a/src/EasyAbp.IdentityServerAdmin.HttpApi.Client/EasyAbp.IdentityServerAdmin.HttpApi.Client.csproj +++ b/src/EasyAbp.IdentityServerAdmin.HttpApi.Client/EasyAbp.IdentityServerAdmin.HttpApi.Client.csproj @@ -3,12 +3,12 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - + diff --git a/src/EasyAbp.IdentityServerAdmin.HttpApi/EasyAbp.IdentityServerAdmin.HttpApi.csproj b/src/EasyAbp.IdentityServerAdmin.HttpApi/EasyAbp.IdentityServerAdmin.HttpApi.csproj index 35b43e2..1fc8b00 100644 --- a/src/EasyAbp.IdentityServerAdmin.HttpApi/EasyAbp.IdentityServerAdmin.HttpApi.csproj +++ b/src/EasyAbp.IdentityServerAdmin.HttpApi/EasyAbp.IdentityServerAdmin.HttpApi.csproj @@ -3,12 +3,12 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - + diff --git a/src/EasyAbp.IdentityServerAdmin.MongoDB/EasyAbp.IdentityServerAdmin.MongoDB.csproj b/src/EasyAbp.IdentityServerAdmin.MongoDB/EasyAbp.IdentityServerAdmin.MongoDB.csproj index 0e90e9a..13d89c7 100644 --- a/src/EasyAbp.IdentityServerAdmin.MongoDB/EasyAbp.IdentityServerAdmin.MongoDB.csproj +++ b/src/EasyAbp.IdentityServerAdmin.MongoDB/EasyAbp.IdentityServerAdmin.MongoDB.csproj @@ -3,13 +3,13 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - - + + diff --git a/src/EasyAbp.IdentityServerAdmin.Web/EasyAbp.IdentityServerAdmin.Web.csproj b/src/EasyAbp.IdentityServerAdmin.Web/EasyAbp.IdentityServerAdmin.Web.csproj index 61b1ecb..9c72e6f 100644 --- a/src/EasyAbp.IdentityServerAdmin.Web/EasyAbp.IdentityServerAdmin.Web.csproj +++ b/src/EasyAbp.IdentityServerAdmin.Web/EasyAbp.IdentityServerAdmin.Web.csproj @@ -3,7 +3,7 @@ - netcoreapp3.1 + net5.0 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true Library @@ -12,10 +12,10 @@ - - - - + + + + @@ -23,8 +23,8 @@ - - + + diff --git a/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/ApiResources/Index.razor b/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/ApiResources/Index.razor index 6655e6d..7426d06 100644 --- a/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/ApiResources/Index.razor +++ b/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/ApiResources/Index.razor @@ -37,7 +37,7 @@ @if (haveUpdatePermission) { diff --git a/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/Clients/Index.razor b/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/Clients/Index.razor index 3d8a248..8c547d4 100644 --- a/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/Clients/Index.razor +++ b/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/Clients/Index.razor @@ -25,7 +25,7 @@ @if (haveUpdatePermission) { - diff --git a/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/IdentityResources/Index.razor b/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/IdentityResources/Index.razor index f506d4d..d2b9e80 100644 --- a/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/IdentityResources/Index.razor +++ b/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/IdentityResources/Index.razor @@ -30,7 +30,7 @@ @if (haveUpdatePermission) { diff --git a/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/Shared/MainLayout.razor b/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/Shared/MainLayout.razor index 5ba4695..60b2c5b 100644 --- a/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/Shared/MainLayout.razor +++ b/src/EasyAbp.IdentityServerAdmin.Web/Pages/IdentityServerAdmin/Shared/MainLayout.razor @@ -21,7 +21,7 @@ - Dashboard + Dashboarddd diff --git a/test/EasyAbp.IdentityServerAdmin.Application.Tests/EasyAbp.IdentityServerAdmin.Application.Tests.csproj b/test/EasyAbp.IdentityServerAdmin.Application.Tests/EasyAbp.IdentityServerAdmin.Application.Tests.csproj index c532410..ec222e2 100644 --- a/test/EasyAbp.IdentityServerAdmin.Application.Tests/EasyAbp.IdentityServerAdmin.Application.Tests.csproj +++ b/test/EasyAbp.IdentityServerAdmin.Application.Tests/EasyAbp.IdentityServerAdmin.Application.Tests.csproj @@ -3,14 +3,14 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - + diff --git a/test/EasyAbp.IdentityServerAdmin.Domain.Tests/EasyAbp.IdentityServerAdmin.Domain.Tests.csproj b/test/EasyAbp.IdentityServerAdmin.Domain.Tests/EasyAbp.IdentityServerAdmin.Domain.Tests.csproj index d4da134..7ca8200 100644 --- a/test/EasyAbp.IdentityServerAdmin.Domain.Tests/EasyAbp.IdentityServerAdmin.Domain.Tests.csproj +++ b/test/EasyAbp.IdentityServerAdmin.Domain.Tests/EasyAbp.IdentityServerAdmin.Domain.Tests.csproj @@ -3,12 +3,12 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - + diff --git a/test/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.Tests/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.Tests.csproj b/test/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.Tests/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.Tests.csproj index 69abf4a..62b1bbc 100644 --- a/test/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.Tests/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.Tests.csproj +++ b/test/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.Tests/EasyAbp.IdentityServerAdmin.EntityFrameworkCore.Tests.csproj @@ -3,16 +3,16 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - - + + - + diff --git a/test/EasyAbp.IdentityServerAdmin.HttpApi.Client.ConsoleTestApp/EasyAbp.IdentityServerAdmin.HttpApi.Client.ConsoleTestApp.csproj b/test/EasyAbp.IdentityServerAdmin.HttpApi.Client.ConsoleTestApp/EasyAbp.IdentityServerAdmin.HttpApi.Client.ConsoleTestApp.csproj index 388a2b5..3ab31c8 100644 --- a/test/EasyAbp.IdentityServerAdmin.HttpApi.Client.ConsoleTestApp/EasyAbp.IdentityServerAdmin.HttpApi.Client.ConsoleTestApp.csproj +++ b/test/EasyAbp.IdentityServerAdmin.HttpApi.Client.ConsoleTestApp/EasyAbp.IdentityServerAdmin.HttpApi.Client.ConsoleTestApp.csproj @@ -2,12 +2,12 @@ Exe - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - + @@ -20,7 +20,7 @@ - + diff --git a/test/EasyAbp.IdentityServerAdmin.MongoDB.Tests/EasyAbp.IdentityServerAdmin.MongoDB.Tests.csproj b/test/EasyAbp.IdentityServerAdmin.MongoDB.Tests/EasyAbp.IdentityServerAdmin.MongoDB.Tests.csproj index b9064a5..2cdfacf 100644 --- a/test/EasyAbp.IdentityServerAdmin.MongoDB.Tests/EasyAbp.IdentityServerAdmin.MongoDB.Tests.csproj +++ b/test/EasyAbp.IdentityServerAdmin.MongoDB.Tests/EasyAbp.IdentityServerAdmin.MongoDB.Tests.csproj @@ -3,13 +3,13 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - - + + diff --git a/test/EasyAbp.IdentityServerAdmin.TestBase/EasyAbp.IdentityServerAdmin.TestBase.csproj b/test/EasyAbp.IdentityServerAdmin.TestBase/EasyAbp.IdentityServerAdmin.TestBase.csproj index b2970dc..ce280c9 100644 --- a/test/EasyAbp.IdentityServerAdmin.TestBase/EasyAbp.IdentityServerAdmin.TestBase.csproj +++ b/test/EasyAbp.IdentityServerAdmin.TestBase/EasyAbp.IdentityServerAdmin.TestBase.csproj @@ -3,20 +3,23 @@ - netcoreapp3.1 + net5.0 EasyAbp.IdentityServerAdmin - + - + - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + +