From 16a417400229e33616edbd8d2f9b633fbd5dd52a Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 15 Aug 2024 19:20:11 +0800 Subject: [PATCH 1/4] fix(templates): Remove unnecessary openiddict dependencies --- ...ame.CompanyName.ProjectName.HttpApi.Host.csproj | 3 +-- .../ProjectNameHttpApiHostModule.cs | 14 +------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/PackageName.CompanyName.ProjectName.HttpApi.Host.csproj b/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/PackageName.CompanyName.ProjectName.HttpApi.Host.csproj index 77c5ff95f..92df8c8a2 100644 --- a/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/PackageName.CompanyName.ProjectName.HttpApi.Host.csproj +++ b/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/PackageName.CompanyName.ProjectName.HttpApi.Host.csproj @@ -56,8 +56,7 @@ - - + diff --git a/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs b/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs index fcaad0e2a..0419712fb 100644 --- a/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs +++ b/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs @@ -14,11 +14,7 @@ using PackageName.CompanyName.ProjectName.EntityFrameworkCore; using PackageName.CompanyName.ProjectName.SettingManagement; using Volo.Abp; -#if OpenIddict -using Volo.Abp.OpenIddict; -#elif IdentityServer4 using Volo.Abp.AspNetCore.Authentication.JwtBearer; -#endif using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; @@ -54,11 +50,7 @@ namespace PackageName.CompanyName.ProjectName; typeof(AbpSettingManagementEntityFrameworkCoreModule), typeof(AbpLocalizationManagementEntityFrameworkCoreModule), typeof(AbpTextTemplatingEntityFrameworkCoreModule), -#if OpenIddict - typeof(AbpOpenIddictAspNetCoreModule), -#elif IdentityServer4 typeof(AbpAspNetCoreAuthenticationJwtBearerModule), -#endif typeof(AbpCachingStackExchangeRedisModule), typeof(AbpDistributedLockingModule), typeof(AbpAspNetCoreMvcWrapperModule), @@ -113,14 +105,10 @@ public override void OnApplicationInitialization(ApplicationInitializationContex app.UseRouting(); app.UseCors(); app.UseAuthentication(); -#if OpenIddict - app.UseAbpOpenIddictValidation(); -#elif IdentityServer4 app.UseJwtTokenMiddleware(); -#endif + app.UseMultiTenancy(); app.UseAbpSession(); app.UseDynamicClaims(); - app.UseMultiTenancy(); app.UseAuthorization(); app.UseSwagger(); app.UseAbpSwaggerUI(options => From 0ad300ac0759dc0a29d0d937017d166275f9a537 Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 16 Aug 2024 15:09:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E4=BD=93?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BA=8B=E5=8A=A1=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/flutter/account/.flutter-plugins | 10 +- .../account/.flutter-plugins-dependencies | 2 +- apps/flutter/account/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- apps/flutter/account_core/.flutter-plugins | 10 +- .../.flutter-plugins-dependencies | 2 +- .../account_core/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- apps/flutter/components/.flutter-plugins | 10 +- .../components/.flutter-plugins-dependencies | 2 +- .../components/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- apps/flutter/core/.flutter-plugins | 10 +- .../core/.flutter-plugins-dependencies | 2 +- apps/flutter/core/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- apps/flutter/dev_app/pubspec.lock | 86 +++-- .../dev_app/windows/flutter/CMakeLists.txt | 7 +- .../dev_app/windows/runner/flutter_window.cpp | 5 + apps/flutter/notifications/.flutter-plugins | 24 +- .../.flutter-plugins-dependencies | 2 +- .../notifications/android/local.properties | 4 +- .../ios/Runner/GeneratedPluginRegistrant.m | 6 +- .../.plugin_symlinks/path_provider_linux | 2 +- .../.plugin_symlinks/url_launcher_linux | 2 +- apps/flutter/oauth/.flutter-plugins | 10 +- .../oauth/.flutter-plugins-dependencies | 2 +- apps/flutter/oauth/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- .../flutter/platform/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- .../Identity/Session/IIdentitySessionStore.cs | 4 + .../Session/IdentitySessionManager.cs | 74 ++-- .../Identity/Session/IdentitySessionStore.cs | 10 +- .../Portal/PortalGrantValidator.cs | 2 +- .../AbpOpenIddictAspNetCoreSessionModule.cs | 6 + .../AbpOpenIddictAspNetCoreSessionOptions.cs | 11 + .../Session/ProcessSignInIdentitySession.cs | 10 +- .../Session/RevocationIdentitySession.cs | 15 +- .../Session/UserinfoIdentitySession.cs | 23 +- .../Portal/PortalTokenExtensionGrant.cs | 2 +- ...rviceApplicationsSingleModule.Configure.cs | 15 + .../Program.cs | 3 +- .../AuthServerModule.Configure.cs | 18 +- kubernetes/mysql-config.yaml | 18 + kubernetes/mysql-dbdata.yaml | 11 + kubernetes/mysql-deployment.yaml | 43 +++ kubernetes/mysql-service.yaml | 13 + kubernetes/mysql/Dockerfile | 3 + kubernetes/mysql/conf.d/my.cnf | 10 + .../agile-initial.sql | 3 + .../elsa-migrations-initial.sql | 317 ++++++++++++++++++ kubernetes/mysql/my.cnf | 10 + 53 files changed, 714 insertions(+), 141 deletions(-) create mode 100644 aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs create mode 100644 kubernetes/mysql-config.yaml create mode 100644 kubernetes/mysql-dbdata.yaml create mode 100644 kubernetes/mysql-deployment.yaml create mode 100644 kubernetes/mysql-service.yaml create mode 100644 kubernetes/mysql/Dockerfile create mode 100644 kubernetes/mysql/conf.d/my.cnf create mode 100644 kubernetes/mysql/docker-entrypoint-initdb.d/agile-initial.sql create mode 100644 kubernetes/mysql/docker-entrypoint-initdb.d/elsa-migrations-initial.sql create mode 100644 kubernetes/mysql/my.cnf diff --git a/apps/flutter/account/.flutter-plugins b/apps/flutter/account/.flutter-plugins index 59e378d87..7c0dac52a 100644 --- a/apps/flutter/account/.flutter-plugins +++ b/apps/flutter/account/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ -path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ -path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.3\\ -path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ -path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ +path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ +path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ +path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ +path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ +path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ diff --git a/apps/flutter/account/.flutter-plugins-dependencies b/apps/flutter/account/.flutter-plugins-dependencies index 2be1851c0..0bb330852 100644 --- a/apps/flutter/account/.flutter-plugins-dependencies +++ b/apps/flutter/account/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-17 09:32:14.474983","version":"3.10.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:18.166260","version":"3.19.0"} \ No newline at end of file diff --git a/apps/flutter/account/android/local.properties b/apps/flutter/account/android/local.properties index 1a3be4ff1..1b1467dae 100644 --- a/apps/flutter/account/android/local.properties +++ b/apps/flutter/account/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk -flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file +sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk +flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file diff --git a/apps/flutter/account/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/account/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 4a72bc1ee..206f83ae3 120000 --- a/apps/flutter/account/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/account/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file +C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file diff --git a/apps/flutter/account_core/.flutter-plugins b/apps/flutter/account_core/.flutter-plugins index 22453877b..7c0dac52a 100644 --- a/apps/flutter/account_core/.flutter-plugins +++ b/apps/flutter/account_core/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ -path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ -path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.4\\ -path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ -path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ +path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ +path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ +path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ +path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ +path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ diff --git a/apps/flutter/account_core/.flutter-plugins-dependencies b/apps/flutter/account_core/.flutter-plugins-dependencies index fb694d548..c225b35b4 100644 --- a/apps/flutter/account_core/.flutter-plugins-dependencies +++ b/apps/flutter/account_core/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-18 08:33:58.742879","version":"3.10.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:19.951989","version":"3.19.0"} \ No newline at end of file diff --git a/apps/flutter/account_core/android/local.properties b/apps/flutter/account_core/android/local.properties index 1a3be4ff1..1b1467dae 100644 --- a/apps/flutter/account_core/android/local.properties +++ b/apps/flutter/account_core/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk -flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file +sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk +flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file diff --git a/apps/flutter/account_core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/account_core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 4a72bc1ee..206f83ae3 120000 --- a/apps/flutter/account_core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/account_core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file +C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file diff --git a/apps/flutter/components/.flutter-plugins b/apps/flutter/components/.flutter-plugins index 59e378d87..7c0dac52a 100644 --- a/apps/flutter/components/.flutter-plugins +++ b/apps/flutter/components/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ -path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ -path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.3\\ -path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ -path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ +path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ +path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ +path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ +path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ +path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ diff --git a/apps/flutter/components/.flutter-plugins-dependencies b/apps/flutter/components/.flutter-plugins-dependencies index 42a95a946..ce80c5a45 100644 --- a/apps/flutter/components/.flutter-plugins-dependencies +++ b/apps/flutter/components/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-17 09:32:19.079179","version":"3.10.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:21.448699","version":"3.19.0"} \ No newline at end of file diff --git a/apps/flutter/components/android/local.properties b/apps/flutter/components/android/local.properties index 1a3be4ff1..1b1467dae 100644 --- a/apps/flutter/components/android/local.properties +++ b/apps/flutter/components/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk -flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file +sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk +flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file diff --git a/apps/flutter/components/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/components/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 4a72bc1ee..206f83ae3 120000 --- a/apps/flutter/components/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/components/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file +C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file diff --git a/apps/flutter/core/.flutter-plugins b/apps/flutter/core/.flutter-plugins index 59e378d87..7c0dac52a 100644 --- a/apps/flutter/core/.flutter-plugins +++ b/apps/flutter/core/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ -path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ -path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.3\\ -path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ -path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ +path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ +path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ +path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ +path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ +path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ diff --git a/apps/flutter/core/.flutter-plugins-dependencies b/apps/flutter/core/.flutter-plugins-dependencies index b668bb06f..6f7486c1f 100644 --- a/apps/flutter/core/.flutter-plugins-dependencies +++ b/apps/flutter/core/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-19 11:21:40.892667","version":"3.10.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:23.136459","version":"3.19.0"} \ No newline at end of file diff --git a/apps/flutter/core/android/local.properties b/apps/flutter/core/android/local.properties index 1a3be4ff1..1b1467dae 100644 --- a/apps/flutter/core/android/local.properties +++ b/apps/flutter/core/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk -flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file +sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk +flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file diff --git a/apps/flutter/core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 4a72bc1ee..206f83ae3 120000 --- a/apps/flutter/core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file +C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file diff --git a/apps/flutter/dev_app/pubspec.lock b/apps/flutter/dev_app/pubspec.lock index bd7d65046..36c332582 100644 --- a/apps/flutter/dev_app/pubspec.lock +++ b/apps/flutter/dev_app/pubspec.lock @@ -164,10 +164,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.flutter-io.cn" source: hosted - version: "1.17.1" + version: "1.18.0" components: dependency: "direct main" description: @@ -218,10 +218,10 @@ packages: dependency: transitive description: name: dart_internal - sha256: dae3976f383beddcfcd07ad5291a422df2c8c0a8a03c52cda63ac7b4f26e0f4e + sha256: "17ad5e3da43df562bb98ca0d88e9f32aeb16c97ec33dee822b21c3b2d0875726" url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.8" + version: "0.2.12" dart_style: dependency: transitive description: @@ -376,6 +376,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_logs: + dependency: "direct main" + description: + name: flutter_logs + sha256: e13f1ca8ce76849b40aaf25a40bb58748e47093f1f36efd6b454e25e8e34e65f + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.1.12" flutter_picker: dependency: "direct main" description: @@ -478,10 +486,10 @@ packages: dependency: transitive description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.flutter-io.cn" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -514,6 +522,30 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "6.7.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.flutter-io.cn" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -566,18 +598,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.15" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.0" + version: "0.8.0" message_pack_dart: dependency: transitive description: @@ -590,10 +622,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.1" + version: "1.11.0" mime: dependency: transitive description: @@ -636,10 +668,10 @@ packages: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.3" + version: "1.9.0" path_drawing: dependency: transitive description: @@ -848,10 +880,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.1" + version: "1.10.0" sse_client: dependency: transitive description: @@ -864,18 +896,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.flutter-io.cn" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -904,10 +936,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.flutter-io.cn" source: hosted - version: "0.5.1" + version: "0.6.1" timezone: dependency: transitive description: @@ -1020,6 +1052,14 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.4.0+2" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.flutter-io.cn" + source: hosted + version: "13.0.0" watcher: dependency: transitive description: @@ -1069,5 +1109,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.5 <3.2.0" + dart: ">=3.2.0-0 <3.6.0" flutter: ">=3.10.0" diff --git a/apps/flutter/dev_app/windows/flutter/CMakeLists.txt b/apps/flutter/dev_app/windows/flutter/CMakeLists.txt index 930d2071a..903f4899d 100644 --- a/apps/flutter/dev_app/windows/flutter/CMakeLists.txt +++ b/apps/flutter/dev_app/windows/flutter/CMakeLists.txt @@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake) # https://github.com/flutter/flutter/issues/57146. set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + # === Flutter Library === set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") @@ -92,7 +97,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E env ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - windows-x64 $ + ${FLUTTER_TARGET_PLATFORM} $ VERBATIM ) add_custom_target(flutter_assemble DEPENDS diff --git a/apps/flutter/dev_app/windows/runner/flutter_window.cpp b/apps/flutter/dev_app/windows/runner/flutter_window.cpp index b25e363ef..955ee3038 100644 --- a/apps/flutter/dev_app/windows/runner/flutter_window.cpp +++ b/apps/flutter/dev_app/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/apps/flutter/notifications/.flutter-plugins b/apps/flutter/notifications/.flutter-plugins index 9b4283a44..5a01bd4f3 100644 --- a/apps/flutter/notifications/.flutter-plugins +++ b/apps/flutter/notifications/.flutter-plugins @@ -1,13 +1,13 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ -path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ -path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.4\\ -path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ -path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ -url_launcher=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher-6.1.12\\ -url_launcher_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_android-6.0.36\\ -url_launcher_ios=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_ios-6.1.4\\ -url_launcher_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_linux-3.0.5\\ -url_launcher_macos=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_macos-3.0.6\\ -url_launcher_web=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_web-2.0.18\\ -url_launcher_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_windows-3.0.7\\ +path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ +path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ +path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ +path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ +path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ +url_launcher=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher-6.2.6\\ +url_launcher_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_android-6.3.0\\ +url_launcher_ios=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_ios-6.3.0\\ +url_launcher_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_linux-3.1.1\\ +url_launcher_macos=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_macos-3.2.0\\ +url_launcher_web=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_web-2.3.0\\ +url_launcher_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_windows-3.1.1\\ diff --git a/apps/flutter/notifications/.flutter-plugins-dependencies b/apps/flutter/notifications/.flutter-plugins-dependencies index a76c5289c..6063a2058 100644 --- a/apps/flutter/notifications/.flutter-plugins-dependencies +++ b/apps/flutter/notifications/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_ios-6.1.4\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_android-6.0.36\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-3.0.6\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]},{"name":"url_launcher_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_linux-3.0.5\\\\","native_build":true,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]},{"name":"url_launcher_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_windows-3.0.7\\\\","native_build":true,"dependencies":[]}],"web":[{"name":"url_launcher_web","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-2.0.18\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2023-07-20 08:38:12.016329","version":"3.10.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_ios-6.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_android-6.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-3.2.0\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]},{"name":"url_launcher_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_linux-3.1.1\\\\","native_build":true,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]},{"name":"url_launcher_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_windows-3.1.1\\\\","native_build":true,"dependencies":[]}],"web":[{"name":"url_launcher_web","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-2.3.0\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:46.089870","version":"3.19.0"} \ No newline at end of file diff --git a/apps/flutter/notifications/android/local.properties b/apps/flutter/notifications/android/local.properties index 1a3be4ff1..1b1467dae 100644 --- a/apps/flutter/notifications/android/local.properties +++ b/apps/flutter/notifications/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk -flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file +sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk +flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file diff --git a/apps/flutter/notifications/ios/Runner/GeneratedPluginRegistrant.m b/apps/flutter/notifications/ios/Runner/GeneratedPluginRegistrant.m index a794592d2..c58696e23 100644 --- a/apps/flutter/notifications/ios/Runner/GeneratedPluginRegistrant.m +++ b/apps/flutter/notifications/ios/Runner/GeneratedPluginRegistrant.m @@ -12,8 +12,8 @@ @import path_provider_foundation; #endif -#if __has_include() -#import +#if __has_include() +#import #else @import url_launcher_ios; #endif @@ -22,7 +22,7 @@ @implementation GeneratedPluginRegistrant + (void)registerWithRegistry:(NSObject*)registry { [PathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"PathProviderPlugin"]]; - [FLTURLLauncherPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTURLLauncherPlugin"]]; + [URLLauncherPlugin registerWithRegistrar:[registry registrarForPlugin:@"URLLauncherPlugin"]]; } @end diff --git a/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 4a72bc1ee..206f83ae3 120000 --- a/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file +C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file diff --git a/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux b/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux index d5e0be9c6..d300385f2 120000 --- a/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux +++ b/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux @@ -1 +1 @@ -C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/url_launcher_linux-3.0.5/ \ No newline at end of file +C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/url_launcher_linux-3.1.1/ \ No newline at end of file diff --git a/apps/flutter/oauth/.flutter-plugins b/apps/flutter/oauth/.flutter-plugins index 22453877b..7c0dac52a 100644 --- a/apps/flutter/oauth/.flutter-plugins +++ b/apps/flutter/oauth/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ -path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ -path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.4\\ -path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ -path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ +path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ +path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ +path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ +path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ +path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ diff --git a/apps/flutter/oauth/.flutter-plugins-dependencies b/apps/flutter/oauth/.flutter-plugins-dependencies index 374a67012..ba0ef5ab4 100644 --- a/apps/flutter/oauth/.flutter-plugins-dependencies +++ b/apps/flutter/oauth/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-19 17:25:01.623054","version":"3.10.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:49.008940","version":"3.19.0"} \ No newline at end of file diff --git a/apps/flutter/oauth/android/local.properties b/apps/flutter/oauth/android/local.properties index 1a3be4ff1..1b1467dae 100644 --- a/apps/flutter/oauth/android/local.properties +++ b/apps/flutter/oauth/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk -flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file +sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk +flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file diff --git a/apps/flutter/oauth/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/oauth/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 4a72bc1ee..206f83ae3 120000 --- a/apps/flutter/oauth/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/oauth/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file +C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file diff --git a/apps/flutter/platform/android/local.properties b/apps/flutter/platform/android/local.properties index 1a3be4ff1..1b1467dae 100644 --- a/apps/flutter/platform/android/local.properties +++ b/apps/flutter/platform/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk -flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file +sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk +flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file diff --git a/apps/flutter/platform/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/platform/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 4a72bc1ee..206f83ae3 120000 --- a/apps/flutter/platform/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/platform/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file +C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs index 01c3fdfcd..9201d1988 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs @@ -19,6 +19,8 @@ public interface IIdentitySessionStore /// 用户id /// 客户端id /// ip地址 + /// 登录时间 + /// 上次访问时间 /// 租户id /// /// 创建完成的 @@ -29,6 +31,8 @@ Task CreateAsync( Guid userId, string clientId, string ipAddresses, + DateTime signedIn, + DateTime? lastAccessed = null, Guid? tenantId = null, CancellationToken cancellationToken = default); /// diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs index cc3ee30f0..e2382bfed 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs @@ -7,20 +7,24 @@ using Volo.Abp.Auditing; using Volo.Abp.Domain.Services; using Volo.Abp.Identity; +using Volo.Abp.Timing; namespace LINGYUN.Abp.Identity.Session; public class IdentitySessionManager : DomainService, IIdentitySessionManager { protected IDeviceInfoProvider DeviceInfoProvider { get; } + protected IIdentitySessionCache IdentitySessionCache { get; } protected IIdentitySessionStore IdentitySessionStore { get; } protected IdentityDynamicClaimsPrincipalContributorCache IdentityDynamicClaimsPrincipalContributorCache { get; } public IdentitySessionManager( IDeviceInfoProvider deviceInfoProvider, + IIdentitySessionCache identitySessionCache, IIdentitySessionStore identitySessionStore, IdentityDynamicClaimsPrincipalContributorCache identityDynamicClaimsPrincipalContributorCache) { DeviceInfoProvider = deviceInfoProvider; + IdentitySessionCache = identitySessionCache; IdentitySessionStore = identitySessionStore; IdentityDynamicClaimsPrincipalContributorCache = identityDynamicClaimsPrincipalContributorCache; } @@ -33,38 +37,56 @@ public async virtual Task SaveSessionAsync( if (claimsPrincipal != null) { var userId = claimsPrincipal.FindUserId(); - var sessionId = claimsPrincipal.FindSessionId(); - if (!userId.HasValue || sessionId.IsNullOrWhiteSpace()) - { - return; - } - if (await IdentitySessionStore.ExistAsync(sessionId, cancellationToken)) + var tenantId = claimsPrincipal.FindTenantId(); + + using (CurrentTenant.Change(tenantId)) { - return; - } - var deviceInfo = DeviceInfoProvider.DeviceInfo; + var sessionId = claimsPrincipal.FindSessionId(); + if (!userId.HasValue || sessionId.IsNullOrWhiteSpace()) + { + return; + } + if (await IdentitySessionStore.ExistAsync(sessionId, cancellationToken)) + { + return; + } + var deviceInfo = DeviceInfoProvider.DeviceInfo; - var device = deviceInfo.Device ?? IdentitySessionDevices.OAuth; - var deviceDesc = deviceInfo.Description; - var clientIpAddress = deviceInfo.ClientIpAddress; + var device = deviceInfo.Device ?? IdentitySessionDevices.OAuth; + var deviceDesc = deviceInfo.Description; + var clientIpAddress = deviceInfo.ClientIpAddress; - var tenantId = claimsPrincipal.FindTenantId(); - var clientId = claimsPrincipal.FindClientId(); + var clientId = claimsPrincipal.FindClientId(); + + Logger.LogDebug($"Save user session for user: {userId}, session: {sessionId}"); - Logger.LogDebug($"Save user session for user: {userId}, session: {sessionId}"); + await IdentitySessionStore.CreateAsync( + sessionId, + device, + deviceDesc, + userId.Value, + clientId, + clientIpAddress, + Clock.Now, + Clock.Now, + tenantId, + cancellationToken); - await IdentitySessionStore.CreateAsync( - sessionId, - device, - deviceDesc, - userId.Value, - clientId, - clientIpAddress, - tenantId, - cancellationToken); + Logger.LogDebug($"Remove dynamic claims cache for user: {userId}"); - Logger.LogDebug($"Remove dynamic claims cache for user: {userId}"); - await IdentityDynamicClaimsPrincipalContributorCache.ClearAsync(userId.Value, tenantId); + await IdentityDynamicClaimsPrincipalContributorCache.ClearAsync(userId.Value, tenantId); + + await IdentitySessionCache.RefreshAsync(sessionId, + new IdentitySessionCacheItem( + device, + deviceDesc, + userId.Value, + sessionId, + clientId, + clientIpAddress, + Clock.Now, + Clock.Now)); + } } } diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs index d4090952f..121746f27 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs @@ -7,24 +7,20 @@ using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; using Volo.Abp.Identity; -using Volo.Abp.Timing; using Volo.Abp.Users; namespace LINGYUN.Abp.Identity.Session; public class IdentitySessionStore : IIdentitySessionStore, ITransientDependency { - protected IClock Clock { get; } protected ICurrentUser CurrentUser { get; } protected IGuidGenerator GuidGenerator { get; } protected IIdentitySessionRepository IdentitySessionRepository { get; } public IdentitySessionStore( - IClock clock, ICurrentUser currentUser, IGuidGenerator guidGenerator, IIdentitySessionRepository identitySessionRepository) { - Clock = clock; CurrentUser = currentUser; GuidGenerator = guidGenerator; IdentitySessionRepository = identitySessionRepository; @@ -37,6 +33,8 @@ public async virtual Task CreateAsync( Guid userId, string clientId, string ipAddresses, + DateTime signedIn, + DateTime? lastAccessed = null, Guid? tenantId = null, CancellationToken cancellationToken = default) { @@ -52,8 +50,8 @@ public async virtual Task CreateAsync( tenantId, clientId, ipAddresses, - Clock.Now, - Clock.Now + signedIn, + lastAccessed ); identitySession = await IdentitySessionRepository.InsertAsync(identitySession, cancellationToken: cancellationToken); diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs index 9df9c0e19..12b41de98 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs @@ -89,7 +89,7 @@ public async virtual Task ValidateAsync(ExtensionGrantValidationContext context) Guid? tenantId = null; using (_currentTenant.Change(null)) { - var enterprise = parameters.Get("EnterpriseId"); + var enterprise = parameters.Get("enterpriseId") ?? parameters.Get("EnterpriseId"); if (enterprise.IsNullOrWhiteSpace() || !Guid.TryParse(enterprise, out var enterpriseId)) { // TODO: configurabled diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs index 331cfbb7f..bd864582f 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity; using Volo.Abp.OpenIddict; +using static OpenIddict.Abstractions.OpenIddictConstants; namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; @@ -31,5 +32,10 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.SignInSessionEnabled = true; options.SignOutSessionEnabled = true; }); + + Configure(options => + { + options.PersistentSessionGrantTypes.Add(GrantTypes.Password); + }); } } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs new file mode 100644 index 000000000..c2796845d --- /dev/null +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; + +namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; +public class AbpOpenIddictAspNetCoreSessionOptions +{ + public List PersistentSessionGrantTypes { get; set; } + public AbpOpenIddictAspNetCoreSessionOptions() + { + PersistentSessionGrantTypes = new List(); + } +} diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs index 1f1ccce98..90b4b29b2 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs @@ -1,4 +1,5 @@ using LINGYUN.Abp.Identity.Session; +using Microsoft.Extensions.Options; using OpenIddict.Abstractions; using OpenIddict.Server; using System.Threading.Tasks; @@ -10,6 +11,7 @@ namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; public class ProcessSignInIdentitySession : IOpenIddictServerHandler { protected IIdentitySessionManager IdentitySessionManager { get; } + protected AbpOpenIddictAspNetCoreSessionOptions AbpOpenIddictAspNetCoreSessionOptions { get; } public static OpenIddictServerHandlerDescriptor Descriptor { get; } = OpenIddictServerHandlerDescriptor.CreateBuilder() @@ -19,14 +21,18 @@ public class ProcessSignInIdentitySession : IOpenIddictServerHandler abpOpenIddictAspNetCoreSessionOptions) { IdentitySessionManager = identitySessionManager; + AbpOpenIddictAspNetCoreSessionOptions = abpOpenIddictAspNetCoreSessionOptions.Value; } public async virtual ValueTask HandleAsync(OpenIddictServerEvents.ProcessSignInContext context) { - if (context.Request.IsPasswordGrantType() && context.Principal != null) + if (AbpOpenIddictAspNetCoreSessionOptions.PersistentSessionGrantTypes.Contains(context.Request.GrantType) && + context.Principal != null) { await IdentitySessionManager.SaveSessionAsync(context.Principal, context.CancellationToken); } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs index 7e1109b23..41cbb9c89 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs @@ -3,6 +3,7 @@ using System; using System.Security.Principal; using System.Threading.Tasks; +using Volo.Abp.MultiTenancy; namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; /// @@ -10,6 +11,7 @@ namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; /// public class RevocationIdentitySession : IOpenIddictServerHandler { + protected ICurrentTenant CurrentTenant { get; } protected IIdentitySessionManager IdentitySessionManager { get; } public static OpenIddictServerHandlerDescriptor Descriptor { get; } @@ -20,17 +22,24 @@ public class RevocationIdentitySession : IOpenIddictServerHandler public class UserinfoIdentitySession : IOpenIddictServerHandler { + protected ICurrentTenant CurrentTenant { get; } protected IIdentitySessionChecker IdentitySessionChecker { get; } public static OpenIddictServerHandlerDescriptor Descriptor { get; } = OpenIddictServerHandlerDescriptor.CreateBuilder() .AddFilter() .UseScopedHandler() - .SetOrder(ValidateAccessTokenParameter.Descriptor.Order + 2_000) + .SetOrder(ValidateUserinfoRequest.Descriptor.Order + 2_000) .SetType(OpenIddictServerHandlerType.Custom) .Build(); - public UserinfoIdentitySession(IIdentitySessionChecker identitySessionChecker) + public UserinfoIdentitySession( + ICurrentTenant currentTenant, + IIdentitySessionChecker identitySessionChecker) { + CurrentTenant = currentTenant; IdentitySessionChecker = identitySessionChecker; } public async virtual ValueTask HandleAsync(OpenIddictServerEvents.HandleUserinfoRequestContext context) { + var tenantId = context.Principal.FindTenantId(); var sessionId = context.Principal.FindSessionId(); - if (sessionId.IsNullOrWhiteSpace() || - !await IdentitySessionChecker.ValidateSessionAsync(sessionId)) + using (CurrentTenant.Change(tenantId)) { - // Errors.InvalidToken ---> 401 - // Errors.ExpiredToken ---> 400 - context.Reject(Errors.InvalidToken, "The user session has expired."); + if (sessionId.IsNullOrWhiteSpace() || + !await IdentitySessionChecker.ValidateSessionAsync(sessionId)) + { + // Errors.InvalidToken ---> 401 + // Errors.ExpiredToken ---> 400 + context.Reject(Errors.InvalidToken, "The user session has expired."); + } } } } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs index 244bc5d99..bf231d4f9 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs @@ -52,7 +52,7 @@ public async virtual Task HandleAsync(ExtensionGrantContext conte { LazyServiceProvider = context.HttpContext.RequestServices.GetRequiredService(); - var enterprise = context.Request.GetParameter("EnterpriseId")?.ToString(); + var enterprise = context.Request.GetParameter("enterpriseId")?.ToString() ?? context.Request.GetParameter("EnterpriseId")?.ToString(); Guid? tenantId = null; using (CurrentTenant.Change(null)) diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs b/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs index ca7c31f5e..0838fecdf 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs @@ -9,7 +9,12 @@ using LINGYUN.Abp.IdentityServer.IdentityResources; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.Notifications; +using LINGYUN.Abp.OpenIddict.AspNetCore.Session; +using LINGYUN.Abp.OpenIddict.LinkUser; using LINGYUN.Abp.OpenIddict.Permissions; +using LINGYUN.Abp.OpenIddict.Portal; +using LINGYUN.Abp.OpenIddict.Sms; +using LINGYUN.Abp.OpenIddict.WeChat; using LINGYUN.Abp.Saas; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; @@ -18,6 +23,7 @@ using LINGYUN.Abp.WebhooksManagement; using LINGYUN.Abp.WeChat.Common.Messages.Handlers; using LINGYUN.Abp.WeChat.Localization; +using LINGYUN.Abp.WeChat.Work; using LINGYUN.Abp.Wrapper; using LINGYUN.Platform.Localization; using LY.MicroService.Applications.Single.Authentication; @@ -311,6 +317,15 @@ private void ConfigureAuthServer(IConfiguration configuration) options.RefreshTokenReuseLeeway = lifetime.GetValue("RefreshTokenReuseLeeway", options.RefreshTokenReuseLeeway); options.UserCodeLifetime = lifetime.GetValue("UserCode", options.UserCodeLifetime); }); + Configure(options => + { + options.PersistentSessionGrantTypes.Add(SmsTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(PortalTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(LinkUserTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.OfficialGrantType); + options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.MiniProgramGrantType); + options.PersistentSessionGrantTypes.Add(AbpWeChatWorkGlobalConsts.GrantType); + }); } private void ConfigureEndpoints(IServiceCollection services) diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs b/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs index bb6316cd8..1f3acce59 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs +++ b/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs @@ -65,10 +65,11 @@ await builder.AddApplicationAsync(options app.UseRouting(); app.UseCors(); app.UseAuthentication(); +app.UseMultiTenancy(); +app.UseUnitOfWork(); app.UseAbpOpenIddictValidation(); app.UseAbpSession(); app.UseDynamicClaims(); -app.UseMultiTenancy(); app.UseAuthorization(); app.UseSwagger(); app.UseSwaggerUI(options => diff --git a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs index 71ab8a4e3..adaed895d 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs @@ -1,7 +1,13 @@ using DotNetCore.CAP; using LINGYUN.Abp.Localization.CultureMap; +using LINGYUN.Abp.OpenIddict.AspNetCore.Session; +using LINGYUN.Abp.OpenIddict.LinkUser; +using LINGYUN.Abp.OpenIddict.Portal; +using LINGYUN.Abp.OpenIddict.Sms; +using LINGYUN.Abp.OpenIddict.WeChat; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; +using LINGYUN.Abp.WeChat.Work; using LY.MicroService.AuthServer.Authentication; using Medallion.Threading; using Medallion.Threading.Redis; @@ -10,7 +16,6 @@ using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Caching.StackExchangeRedis; @@ -19,7 +24,6 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.IdentityModel.Logging; -using OpenIddict.Validation.AspNetCore; using OpenTelemetry.Metrics; using OpenTelemetry.Resources; using OpenTelemetry.Trace; @@ -334,6 +338,16 @@ private void ConfigureIdentity(IConfiguration configuration) options.IsDynamicClaimsEnabled = true; options.IsRemoteRefreshEnabled = false; }); + + Configure(options => + { + options.PersistentSessionGrantTypes.Add(SmsTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(PortalTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(LinkUserTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.OfficialGrantType); + options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.MiniProgramGrantType); + options.PersistentSessionGrantTypes.Add(AbpWeChatWorkGlobalConsts.GrantType); + }); } private void ConfigureVirtualFileSystem() { diff --git a/kubernetes/mysql-config.yaml b/kubernetes/mysql-config.yaml new file mode 100644 index 000000000..23560997c --- /dev/null +++ b/kubernetes/mysql-config.yaml @@ -0,0 +1,18 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: mysql-config + namespace: abp +data: + my.cnf: |- + [client] + default-character-set=utf8mb4 + [mysql] + default-character-set=utf8mb4 + [mysqld] + default-authentication-plugin=mysql_native_password + collation-server=utf8mb4_general_ci + lower_case_table_names=1 + max_connections = 2000 + secure_file_priv=/var/lib/mysql + sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION \ No newline at end of file diff --git a/kubernetes/mysql-dbdata.yaml b/kubernetes/mysql-dbdata.yaml new file mode 100644 index 000000000..00d294448 --- /dev/null +++ b/kubernetes/mysql-dbdata.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: mysql-data + namespace: abp +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 20Gi diff --git a/kubernetes/mysql-deployment.yaml b/kubernetes/mysql-deployment.yaml new file mode 100644 index 000000000..b2e28be29 --- /dev/null +++ b/kubernetes/mysql-deployment.yaml @@ -0,0 +1,43 @@ +kind: Deployment +apiVersion: apps/v1 +metadata: + name: mysql + namespace: abp +spec: + selector: + matchLabels: + app: mysql + replicas: 1 + template: + metadata: + labels: + app: mysql + spec: + containers: + - name: mysql + image: abp-mysql:latest + imagePullPolicy: Never + ports: + - containerPort: 3306 + env: + - name: MYSQL_ROOT_PASSWORD + value: "123456" + - name: MYSQL_ROOT_HOST + value: "%" + - name: MYSQL_LOWER_CASE_TABLE_NAMES + value: "1" + - name: TZ + value: Asia/Shanghai + volumeMounts: + - name: dbdata + mountPath: /var/lib/mysql + - name: config + mountPath: /etc/mysql/my.cnf + subPath: my.cnf + volumes: + - name: dbdata + persistentVolumeClaim: + claimName: mysql-data + - name: config + configMap: + name: mysql-config diff --git a/kubernetes/mysql-service.yaml b/kubernetes/mysql-service.yaml new file mode 100644 index 000000000..dac5995bd --- /dev/null +++ b/kubernetes/mysql-service.yaml @@ -0,0 +1,13 @@ +kind: Service +apiVersion: v1 +metadata: + name: mysql + namespace: abp +spec: + type: NodePort + selector: + app: mysql + ports: + - protocol: TCP + port: 3306 + targetPort: 3306 \ No newline at end of file diff --git a/kubernetes/mysql/Dockerfile b/kubernetes/mysql/Dockerfile new file mode 100644 index 000000000..32a470cd3 --- /dev/null +++ b/kubernetes/mysql/Dockerfile @@ -0,0 +1,3 @@ +FROM mysql:latest +COPY ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d +EXPOSE 3306 \ No newline at end of file diff --git a/kubernetes/mysql/conf.d/my.cnf b/kubernetes/mysql/conf.d/my.cnf new file mode 100644 index 000000000..c35ecc7e1 --- /dev/null +++ b/kubernetes/mysql/conf.d/my.cnf @@ -0,0 +1,10 @@ +[mysqld] +default-authentication-plugin=mysql_native_password +character-set-server=utf8mb4 +collation-server=utf8mb4_general_ci +lower_case_table_names=1 +max_connections=1024 + +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +datadir = /var/lib/mysql \ No newline at end of file diff --git a/kubernetes/mysql/docker-entrypoint-initdb.d/agile-initial.sql b/kubernetes/mysql/docker-entrypoint-initdb.d/agile-initial.sql new file mode 100644 index 000000000..40964d112 --- /dev/null +++ b/kubernetes/mysql/docker-entrypoint-initdb.d/agile-initial.sql @@ -0,0 +1,3 @@ +-- basic script + +CREATE DATABASE `agile` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci'; diff --git a/kubernetes/mysql/docker-entrypoint-initdb.d/elsa-migrations-initial.sql b/kubernetes/mysql/docker-entrypoint-initdb.d/elsa-migrations-initial.sql new file mode 100644 index 000000000..715d72e41 --- /dev/null +++ b/kubernetes/mysql/docker-entrypoint-initdb.d/elsa-migrations-initial.sql @@ -0,0 +1,317 @@ +-- basic script + +CREATE DATABASE `Workflow-V70` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci'; + +USE `Workflow-V70`; + +CREATE TABLE IF NOT EXISTS `__EFMigrationsHistory` ( + `MigrationId` varchar(150) CHARACTER SET utf8mb4 NOT NULL, + `ProductVersion` varchar(32) CHARACTER SET utf8mb4 NOT NULL, + CONSTRAINT `PK___EFMigrationsHistory` PRIMARY KEY (`MigrationId`) +) CHARACTER SET utf8mb4; + +START TRANSACTION; + +ALTER DATABASE CHARACTER SET utf8mb4; + +CREATE TABLE `Bookmarks` ( + `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, + `Hash` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `Model` longtext CHARACTER SET utf8mb4 NOT NULL, + `ModelType` longtext CHARACTER SET utf8mb4 NOT NULL, + `ActivityType` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `ActivityId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `WorkflowInstanceId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `CorrelationId` varchar(255) CHARACTER SET utf8mb4 NULL, + CONSTRAINT `PK_Bookmarks` PRIMARY KEY (`Id`) +) CHARACTER SET utf8mb4; + +CREATE TABLE `WorkflowDefinitions` ( + `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `DefinitionId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, + `Name` varchar(255) CHARACTER SET utf8mb4 NULL, + `DisplayName` longtext CHARACTER SET utf8mb4 NULL, + `Description` longtext CHARACTER SET utf8mb4 NULL, + `Version` int NOT NULL, + `IsSingleton` tinyint(1) NOT NULL, + `PersistenceBehavior` int NOT NULL, + `DeleteCompletedInstances` tinyint(1) NOT NULL, + `IsPublished` tinyint(1) NOT NULL, + `IsLatest` tinyint(1) NOT NULL, + `Tag` varchar(255) CHARACTER SET utf8mb4 NULL, + `Data` longtext CHARACTER SET utf8mb4 NULL, + CONSTRAINT `PK_WorkflowDefinitions` PRIMARY KEY (`Id`) +) CHARACTER SET utf8mb4; + +CREATE TABLE `WorkflowExecutionLogRecords` ( + `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, + `WorkflowInstanceId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `ActivityId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `ActivityType` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `Timestamp` datetime(6) NOT NULL, + `EventName` longtext CHARACTER SET utf8mb4 NULL, + `Message` longtext CHARACTER SET utf8mb4 NULL, + `Source` longtext CHARACTER SET utf8mb4 NULL, + `Data` longtext CHARACTER SET utf8mb4 NULL, + CONSTRAINT `PK_WorkflowExecutionLogRecords` PRIMARY KEY (`Id`) +) CHARACTER SET utf8mb4; + +CREATE TABLE `WorkflowInstances` ( + `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `DefinitionId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, + `Version` int NOT NULL, + `WorkflowStatus` int NOT NULL, + `CorrelationId` varchar(255) CHARACTER SET utf8mb4 NULL, + `ContextType` varchar(255) CHARACTER SET utf8mb4 NULL, + `ContextId` varchar(255) CHARACTER SET utf8mb4 NULL, + `Name` varchar(255) CHARACTER SET utf8mb4 NULL, + `CreatedAt` datetime(6) NOT NULL, + `LastExecutedAt` datetime(6) NULL, + `FinishedAt` datetime(6) NULL, + `CancelledAt` datetime(6) NULL, + `FaultedAt` datetime(6) NULL, + `Data` longtext CHARACTER SET utf8mb4 NULL, + CONSTRAINT `PK_WorkflowInstances` PRIMARY KEY (`Id`) +) CHARACTER SET utf8mb4; + +CREATE INDEX `IX_Bookmark_ActivityId` ON `Bookmarks` (`ActivityId`); + +CREATE INDEX `IX_Bookmark_ActivityType` ON `Bookmarks` (`ActivityType`); + +CREATE INDEX `IX_Bookmark_ActivityType_TenantId_Hash` ON `Bookmarks` (`ActivityType`, `TenantId`, `Hash`); + +CREATE INDEX `IX_Bookmark_CorrelationId` ON `Bookmarks` (`CorrelationId`); + +CREATE INDEX `IX_Bookmark_Hash` ON `Bookmarks` (`Hash`); + +CREATE INDEX `IX_Bookmark_Hash_CorrelationId_TenantId` ON `Bookmarks` (`Hash`, `CorrelationId`, `TenantId`); + +CREATE INDEX `IX_Bookmark_TenantId` ON `Bookmarks` (`TenantId`); + +CREATE INDEX `IX_Bookmark_WorkflowInstanceId` ON `Bookmarks` (`WorkflowInstanceId`); + +CREATE UNIQUE INDEX `IX_WorkflowDefinition_DefinitionId_VersionId` ON `WorkflowDefinitions` (`DefinitionId`, `Version`); + +CREATE INDEX `IX_WorkflowDefinition_IsLatest` ON `WorkflowDefinitions` (`IsLatest`); + +CREATE INDEX `IX_WorkflowDefinition_IsPublished` ON `WorkflowDefinitions` (`IsPublished`); + +CREATE INDEX `IX_WorkflowDefinition_Name` ON `WorkflowDefinitions` (`Name`); + +CREATE INDEX `IX_WorkflowDefinition_Tag` ON `WorkflowDefinitions` (`Tag`); + +CREATE INDEX `IX_WorkflowDefinition_TenantId` ON `WorkflowDefinitions` (`TenantId`); + +CREATE INDEX `IX_WorkflowDefinition_Version` ON `WorkflowDefinitions` (`Version`); + +CREATE INDEX `IX_WorkflowExecutionLogRecord_ActivityId` ON `WorkflowExecutionLogRecords` (`ActivityId`); + +CREATE INDEX `IX_WorkflowExecutionLogRecord_ActivityType` ON `WorkflowExecutionLogRecords` (`ActivityType`); + +CREATE INDEX `IX_WorkflowExecutionLogRecord_TenantId` ON `WorkflowExecutionLogRecords` (`TenantId`); + +CREATE INDEX `IX_WorkflowExecutionLogRecord_Timestamp` ON `WorkflowExecutionLogRecords` (`Timestamp`); + +CREATE INDEX `IX_WorkflowExecutionLogRecord_WorkflowInstanceId` ON `WorkflowExecutionLogRecords` (`WorkflowInstanceId`); + +CREATE INDEX `IX_WorkflowInstance_ContextId` ON `WorkflowInstances` (`ContextId`); + +CREATE INDEX `IX_WorkflowInstance_ContextType` ON `WorkflowInstances` (`ContextType`); + +CREATE INDEX `IX_WorkflowInstance_CorrelationId` ON `WorkflowInstances` (`CorrelationId`); + +CREATE INDEX `IX_WorkflowInstance_CreatedAt` ON `WorkflowInstances` (`CreatedAt`); + +CREATE INDEX `IX_WorkflowInstance_DefinitionId` ON `WorkflowInstances` (`DefinitionId`); + +CREATE INDEX `IX_WorkflowInstance_FaultedAt` ON `WorkflowInstances` (`FaultedAt`); + +CREATE INDEX `IX_WorkflowInstance_FinishedAt` ON `WorkflowInstances` (`FinishedAt`); + +CREATE INDEX `IX_WorkflowInstance_LastExecutedAt` ON `WorkflowInstances` (`LastExecutedAt`); + +CREATE INDEX `IX_WorkflowInstance_Name` ON `WorkflowInstances` (`Name`); + +CREATE INDEX `IX_WorkflowInstance_TenantId` ON `WorkflowInstances` (`TenantId`); + +CREATE INDEX `IX_WorkflowInstance_WorkflowStatus` ON `WorkflowInstances` (`WorkflowStatus`); + +CREATE INDEX `IX_WorkflowInstance_WorkflowStatus_DefinitionId` ON `WorkflowInstances` (`WorkflowStatus`, `DefinitionId`); + +CREATE INDEX `IX_WorkflowInstance_WorkflowStatus_DefinitionId_Version` ON `WorkflowInstances` (`WorkflowStatus`, `DefinitionId`, `Version`); + +INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) +VALUES ('20210523093427_Initial', '5.0.10'); + +COMMIT; + +START TRANSACTION; + +ALTER TABLE `WorkflowInstances` MODIFY COLUMN `CorrelationId` varchar(255) CHARACTER SET utf8mb4 NOT NULL DEFAULT ''; + +ALTER TABLE `WorkflowInstances` ADD `LastExecutedActivityId` longtext CHARACTER SET utf8mb4 NULL; + +ALTER TABLE `WorkflowDefinitions` ADD `OutputStorageProviderName` longtext CHARACTER SET utf8mb4 NULL; + +INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) +VALUES ('20210611200027_Update21', '5.0.10'); + +COMMIT; + +START TRANSACTION; + +ALTER TABLE `WorkflowDefinitions` DROP COLUMN `OutputStorageProviderName`; + +ALTER TABLE `WorkflowInstances` RENAME `WorkflowInstances`; + +ALTER TABLE `WorkflowExecutionLogRecords` RENAME `WorkflowExecutionLogRecords`; + +ALTER TABLE `WorkflowDefinitions` RENAME `WorkflowDefinitions`; + +ALTER TABLE `Bookmarks` RENAME `Bookmarks`; + +INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) +VALUES ('20210923112211_Update23', '5.0.10'); + +COMMIT; + +START TRANSACTION; + +ALTER TABLE `WorkflowInstances` ADD `DefinitionVersionId` longtext CHARACTER SET utf8mb4 NOT NULL; + +ALTER TABLE `Bookmarks` MODIFY COLUMN `CorrelationId` varchar(255) CHARACTER SET utf8mb4 NOT NULL DEFAULT ''; + +INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) +VALUES ('20211215100204_Update24', '5.0.10'); + +COMMIT; + +START TRANSACTION; + +ALTER TABLE `WorkflowInstances` MODIFY COLUMN `DefinitionVersionId` varchar(255) CHARACTER SET utf8mb4 NOT NULL; + +CREATE INDEX `IX_WorkflowInstance_DefinitionVersionId` ON `WorkflowInstances` (`DefinitionVersionId`); + +INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) +VALUES ('20220120170050_Update241', '5.0.10'); + +COMMIT; + +START TRANSACTION; + +CREATE TABLE `Triggers` ( + `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, + `Hash` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `Model` longtext CHARACTER SET utf8mb4 NOT NULL, + `ModelType` longtext CHARACTER SET utf8mb4 NOT NULL, + `ActivityType` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `ActivityId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `WorkflowDefinitionId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + CONSTRAINT `PK_Triggers` PRIMARY KEY (`Id`) +) CHARACTER SET utf8mb4; + +CREATE INDEX `IX_Trigger_ActivityId` ON `Triggers` (`ActivityId`); + +CREATE INDEX `IX_Trigger_ActivityType` ON `Triggers` (`ActivityType`); + +CREATE INDEX `IX_Trigger_ActivityType_TenantId_Hash` ON `Triggers` (`ActivityType`, `TenantId`, `Hash`); + +CREATE INDEX `IX_Trigger_Hash` ON `Triggers` (`Hash`); + +CREATE INDEX `IX_Trigger_Hash_TenantId` ON `Triggers` (`Hash`, `TenantId`); + +CREATE INDEX `IX_Trigger_TenantId` ON `Triggers` (`TenantId`); + +CREATE INDEX `IX_Trigger_WorkflowDefinitionId` ON `Triggers` (`WorkflowDefinitionId`); + +INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) +VALUES ('20220120204150_Update25', '5.0.10'); + +COMMIT; + +START TRANSACTION; + +ALTER TABLE `WorkflowDefinitions` ADD `CreatedAt` datetime(6) NOT NULL DEFAULT '0001-01-01 00:00:00'; + +INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) +VALUES ('20220512203646_Update28', '5.0.10'); + +COMMIT; + + +-- webhooks + +CREATE TABLE IF NOT EXISTS `__EFMigrationsHistory` ( + `MigrationId` varchar(150) CHARACTER SET utf8mb4 NOT NULL, + `ProductVersion` varchar(32) CHARACTER SET utf8mb4 NOT NULL, + CONSTRAINT `PK___EFMigrationsHistory` PRIMARY KEY (`MigrationId`) +) CHARACTER SET utf8mb4; + +START TRANSACTION; + +ALTER DATABASE CHARACTER SET utf8mb4; + +CREATE TABLE `WebhookDefinitions` ( + `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, + `Name` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `Path` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `Description` varchar(255) CHARACTER SET utf8mb4 NULL, + `PayloadTypeName` varchar(255) CHARACTER SET utf8mb4 NULL, + `IsEnabled` tinyint(1) NOT NULL, + CONSTRAINT `PK_WebhookDefinitions` PRIMARY KEY (`Id`) +) CHARACTER SET utf8mb4; + +CREATE INDEX `IX_WebhookDefinition_Description` ON `WebhookDefinitions` (`Description`); + +CREATE INDEX `IX_WebhookDefinition_IsEnabled` ON `WebhookDefinitions` (`IsEnabled`); + +CREATE INDEX `IX_WebhookDefinition_Name` ON `WebhookDefinitions` (`Name`); + +CREATE INDEX `IX_WebhookDefinition_Path` ON `WebhookDefinitions` (`Path`); + +CREATE INDEX `IX_WebhookDefinition_PayloadTypeName` ON `WebhookDefinitions` (`PayloadTypeName`); + +CREATE INDEX `IX_WebhookDefinition_TenantId` ON `WebhookDefinitions` (`TenantId`); + +INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) +VALUES ('20210604065041_Initial', '5.0.10'); + +COMMIT; + + +-- workflow-settings + +CREATE TABLE IF NOT EXISTS `__EFMigrationsHistory` ( + `MigrationId` varchar(150) CHARACTER SET utf8mb4 NOT NULL, + `ProductVersion` varchar(32) CHARACTER SET utf8mb4 NOT NULL, + CONSTRAINT `PK___EFMigrationsHistory` PRIMARY KEY (`MigrationId`) +) CHARACTER SET utf8mb4; + +START TRANSACTION; + +ALTER DATABASE CHARACTER SET utf8mb4; + +CREATE TABLE `WorkflowSettings` ( + `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, + `WorkflowBlueprintId` varchar(255) CHARACTER SET utf8mb4 NULL, + `Key` varchar(255) CHARACTER SET utf8mb4 NULL, + `Value` varchar(255) CHARACTER SET utf8mb4 NULL, + CONSTRAINT `PK_WorkflowSettings` PRIMARY KEY (`Id`) +) CHARACTER SET utf8mb4; + +CREATE INDEX `IX_WorkflowSetting_Key` ON `WorkflowSettings` (`Key`); + +CREATE INDEX `IX_WorkflowSetting_Value` ON `WorkflowSettings` (`Value`); + +CREATE INDEX `IX_WorkflowSetting_WorkflowBlueprintId` ON `WorkflowSettings` (`WorkflowBlueprintId`); + +INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) +VALUES ('20210730112043_Initial', '5.0.10'); + +COMMIT; diff --git a/kubernetes/mysql/my.cnf b/kubernetes/mysql/my.cnf new file mode 100644 index 000000000..c35ecc7e1 --- /dev/null +++ b/kubernetes/mysql/my.cnf @@ -0,0 +1,10 @@ +[mysqld] +default-authentication-plugin=mysql_native_password +character-set-server=utf8mb4 +collation-server=utf8mb4_general_ci +lower_case_table_names=1 +max_connections=1024 + +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +datadir = /var/lib/mysql \ No newline at end of file From 9ad3ff00960824604cbc33aa3cc28917cd2201d1 Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 16 Aug 2024 15:10:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D=E5=8D=95?= =?UTF-8?q?=E4=BD=93=E9=A1=B9=E7=9B=AE=E4=BA=8B=E5=8A=A1=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0ad300ac0759dc0a29d0d937017d166275f9a537. --- apps/flutter/account/.flutter-plugins | 10 +- .../account/.flutter-plugins-dependencies | 2 +- apps/flutter/account/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- apps/flutter/account_core/.flutter-plugins | 10 +- .../.flutter-plugins-dependencies | 2 +- .../account_core/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- apps/flutter/components/.flutter-plugins | 10 +- .../components/.flutter-plugins-dependencies | 2 +- .../components/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- apps/flutter/core/.flutter-plugins | 10 +- .../core/.flutter-plugins-dependencies | 2 +- apps/flutter/core/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- apps/flutter/dev_app/pubspec.lock | 86 ++--- .../dev_app/windows/flutter/CMakeLists.txt | 7 +- .../dev_app/windows/runner/flutter_window.cpp | 5 - apps/flutter/notifications/.flutter-plugins | 24 +- .../.flutter-plugins-dependencies | 2 +- .../notifications/android/local.properties | 4 +- .../ios/Runner/GeneratedPluginRegistrant.m | 6 +- .../.plugin_symlinks/path_provider_linux | 2 +- .../.plugin_symlinks/url_launcher_linux | 2 +- apps/flutter/oauth/.flutter-plugins | 10 +- .../oauth/.flutter-plugins-dependencies | 2 +- apps/flutter/oauth/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- .../flutter/platform/android/local.properties | 4 +- .../.plugin_symlinks/path_provider_linux | 2 +- .../Identity/Session/IIdentitySessionStore.cs | 4 - .../Session/IdentitySessionManager.cs | 74 ++-- .../Identity/Session/IdentitySessionStore.cs | 10 +- .../Portal/PortalGrantValidator.cs | 2 +- .../AbpOpenIddictAspNetCoreSessionModule.cs | 6 - .../AbpOpenIddictAspNetCoreSessionOptions.cs | 11 - .../Session/ProcessSignInIdentitySession.cs | 10 +- .../Session/RevocationIdentitySession.cs | 15 +- .../Session/UserinfoIdentitySession.cs | 23 +- .../Portal/PortalTokenExtensionGrant.cs | 2 +- ...rviceApplicationsSingleModule.Configure.cs | 15 - .../Program.cs | 3 +- .../AuthServerModule.Configure.cs | 18 +- kubernetes/mysql-config.yaml | 18 - kubernetes/mysql-dbdata.yaml | 11 - kubernetes/mysql-deployment.yaml | 43 --- kubernetes/mysql-service.yaml | 13 - kubernetes/mysql/Dockerfile | 3 - kubernetes/mysql/conf.d/my.cnf | 10 - .../agile-initial.sql | 3 - .../elsa-migrations-initial.sql | 317 ------------------ kubernetes/mysql/my.cnf | 10 - 53 files changed, 141 insertions(+), 714 deletions(-) delete mode 100644 aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs delete mode 100644 kubernetes/mysql-config.yaml delete mode 100644 kubernetes/mysql-dbdata.yaml delete mode 100644 kubernetes/mysql-deployment.yaml delete mode 100644 kubernetes/mysql-service.yaml delete mode 100644 kubernetes/mysql/Dockerfile delete mode 100644 kubernetes/mysql/conf.d/my.cnf delete mode 100644 kubernetes/mysql/docker-entrypoint-initdb.d/agile-initial.sql delete mode 100644 kubernetes/mysql/docker-entrypoint-initdb.d/elsa-migrations-initial.sql delete mode 100644 kubernetes/mysql/my.cnf diff --git a/apps/flutter/account/.flutter-plugins b/apps/flutter/account/.flutter-plugins index 7c0dac52a..59e378d87 100644 --- a/apps/flutter/account/.flutter-plugins +++ b/apps/flutter/account/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ -path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ -path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ -path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ -path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ +path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ +path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ +path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.3\\ +path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ +path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ diff --git a/apps/flutter/account/.flutter-plugins-dependencies b/apps/flutter/account/.flutter-plugins-dependencies index 0bb330852..2be1851c0 100644 --- a/apps/flutter/account/.flutter-plugins-dependencies +++ b/apps/flutter/account/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:18.166260","version":"3.19.0"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-17 09:32:14.474983","version":"3.10.5"} \ No newline at end of file diff --git a/apps/flutter/account/android/local.properties b/apps/flutter/account/android/local.properties index 1b1467dae..1a3be4ff1 100644 --- a/apps/flutter/account/android/local.properties +++ b/apps/flutter/account/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk -flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file +sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk +flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file diff --git a/apps/flutter/account/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/account/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 206f83ae3..4a72bc1ee 120000 --- a/apps/flutter/account/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/account/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file +C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file diff --git a/apps/flutter/account_core/.flutter-plugins b/apps/flutter/account_core/.flutter-plugins index 7c0dac52a..22453877b 100644 --- a/apps/flutter/account_core/.flutter-plugins +++ b/apps/flutter/account_core/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ -path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ -path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ -path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ -path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ +path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ +path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ +path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.4\\ +path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ +path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ diff --git a/apps/flutter/account_core/.flutter-plugins-dependencies b/apps/flutter/account_core/.flutter-plugins-dependencies index c225b35b4..fb694d548 100644 --- a/apps/flutter/account_core/.flutter-plugins-dependencies +++ b/apps/flutter/account_core/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:19.951989","version":"3.19.0"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-18 08:33:58.742879","version":"3.10.5"} \ No newline at end of file diff --git a/apps/flutter/account_core/android/local.properties b/apps/flutter/account_core/android/local.properties index 1b1467dae..1a3be4ff1 100644 --- a/apps/flutter/account_core/android/local.properties +++ b/apps/flutter/account_core/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk -flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file +sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk +flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file diff --git a/apps/flutter/account_core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/account_core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 206f83ae3..4a72bc1ee 120000 --- a/apps/flutter/account_core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/account_core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file +C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file diff --git a/apps/flutter/components/.flutter-plugins b/apps/flutter/components/.flutter-plugins index 7c0dac52a..59e378d87 100644 --- a/apps/flutter/components/.flutter-plugins +++ b/apps/flutter/components/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ -path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ -path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ -path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ -path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ +path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ +path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ +path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.3\\ +path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ +path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ diff --git a/apps/flutter/components/.flutter-plugins-dependencies b/apps/flutter/components/.flutter-plugins-dependencies index ce80c5a45..42a95a946 100644 --- a/apps/flutter/components/.flutter-plugins-dependencies +++ b/apps/flutter/components/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:21.448699","version":"3.19.0"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-17 09:32:19.079179","version":"3.10.5"} \ No newline at end of file diff --git a/apps/flutter/components/android/local.properties b/apps/flutter/components/android/local.properties index 1b1467dae..1a3be4ff1 100644 --- a/apps/flutter/components/android/local.properties +++ b/apps/flutter/components/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk -flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file +sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk +flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file diff --git a/apps/flutter/components/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/components/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 206f83ae3..4a72bc1ee 120000 --- a/apps/flutter/components/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/components/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file +C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file diff --git a/apps/flutter/core/.flutter-plugins b/apps/flutter/core/.flutter-plugins index 7c0dac52a..59e378d87 100644 --- a/apps/flutter/core/.flutter-plugins +++ b/apps/flutter/core/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ -path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ -path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ -path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ -path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ +path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ +path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ +path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.3\\ +path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ +path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ diff --git a/apps/flutter/core/.flutter-plugins-dependencies b/apps/flutter/core/.flutter-plugins-dependencies index 6f7486c1f..b668bb06f 100644 --- a/apps/flutter/core/.flutter-plugins-dependencies +++ b/apps/flutter/core/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:23.136459","version":"3.19.0"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.3\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-19 11:21:40.892667","version":"3.10.5"} \ No newline at end of file diff --git a/apps/flutter/core/android/local.properties b/apps/flutter/core/android/local.properties index 1b1467dae..1a3be4ff1 100644 --- a/apps/flutter/core/android/local.properties +++ b/apps/flutter/core/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk -flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file +sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk +flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file diff --git a/apps/flutter/core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 206f83ae3..4a72bc1ee 120000 --- a/apps/flutter/core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/core/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file +C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file diff --git a/apps/flutter/dev_app/pubspec.lock b/apps/flutter/dev_app/pubspec.lock index 36c332582..bd7d65046 100644 --- a/apps/flutter/dev_app/pubspec.lock +++ b/apps/flutter/dev_app/pubspec.lock @@ -164,10 +164,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" url: "https://pub.flutter-io.cn" source: hosted - version: "1.18.0" + version: "1.17.1" components: dependency: "direct main" description: @@ -218,10 +218,10 @@ packages: dependency: transitive description: name: dart_internal - sha256: "17ad5e3da43df562bb98ca0d88e9f32aeb16c97ec33dee822b21c3b2d0875726" + sha256: dae3976f383beddcfcd07ad5291a422df2c8c0a8a03c52cda63ac7b4f26e0f4e url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.12" + version: "0.2.8" dart_style: dependency: transitive description: @@ -376,14 +376,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_logs: - dependency: "direct main" - description: - name: flutter_logs - sha256: e13f1ca8ce76849b40aaf25a40bb58748e47093f1f36efd6b454e25e8e34e65f - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.1.12" flutter_picker: dependency: "direct main" description: @@ -486,10 +478,10 @@ packages: dependency: transitive description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.flutter-io.cn" source: hosted - version: "0.18.1" + version: "0.18.0" io: dependency: transitive description: @@ -522,30 +514,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "6.7.1" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" - url: "https://pub.flutter-io.cn" - source: hosted - version: "10.0.0" - leak_tracker_flutter_testing: - dependency: transitive - description: - name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.0.1" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.0.1" lints: dependency: transitive description: @@ -598,18 +566,18 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.16+1" + version: "0.12.15" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 url: "https://pub.flutter-io.cn" source: hosted - version: "0.8.0" + version: "0.2.0" message_pack_dart: dependency: transitive description: @@ -622,10 +590,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.flutter-io.cn" source: hosted - version: "1.11.0" + version: "1.9.1" mime: dependency: transitive description: @@ -668,10 +636,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.0" + version: "1.8.3" path_drawing: dependency: transitive description: @@ -880,10 +848,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 url: "https://pub.flutter-io.cn" source: hosted - version: "1.10.0" + version: "1.9.1" sse_client: dependency: transitive description: @@ -896,18 +864,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.flutter-io.cn" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.2" + version: "2.1.1" stream_transform: dependency: transitive description: @@ -936,10 +904,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb url: "https://pub.flutter-io.cn" source: hosted - version: "0.6.1" + version: "0.5.1" timezone: dependency: transitive description: @@ -1052,14 +1020,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.4.0+2" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 - url: "https://pub.flutter-io.cn" - source: hosted - version: "13.0.0" watcher: dependency: transitive description: @@ -1109,5 +1069,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-0 <3.6.0" + dart: ">=3.0.5 <3.2.0" flutter: ">=3.10.0" diff --git a/apps/flutter/dev_app/windows/flutter/CMakeLists.txt b/apps/flutter/dev_app/windows/flutter/CMakeLists.txt index 903f4899d..930d2071a 100644 --- a/apps/flutter/dev_app/windows/flutter/CMakeLists.txt +++ b/apps/flutter/dev_app/windows/flutter/CMakeLists.txt @@ -10,11 +10,6 @@ include(${EPHEMERAL_DIR}/generated_config.cmake) # https://github.com/flutter/flutter/issues/57146. set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") -# Set fallback configurations for older versions of the flutter tool. -if (NOT DEFINED FLUTTER_TARGET_PLATFORM) - set(FLUTTER_TARGET_PLATFORM "windows-x64") -endif() - # === Flutter Library === set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") @@ -97,7 +92,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E env ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - ${FLUTTER_TARGET_PLATFORM} $ + windows-x64 $ VERBATIM ) add_custom_target(flutter_assemble DEPENDS diff --git a/apps/flutter/dev_app/windows/runner/flutter_window.cpp b/apps/flutter/dev_app/windows/runner/flutter_window.cpp index 955ee3038..b25e363ef 100644 --- a/apps/flutter/dev_app/windows/runner/flutter_window.cpp +++ b/apps/flutter/dev_app/windows/runner/flutter_window.cpp @@ -31,11 +31,6 @@ bool FlutterWindow::OnCreate() { this->Show(); }); - // Flutter can complete the first frame before the "show window" callback is - // registered. The following call ensures a frame is pending to ensure the - // window is shown. It is a no-op if the first frame hasn't completed yet. - flutter_controller_->ForceRedraw(); - return true; } diff --git a/apps/flutter/notifications/.flutter-plugins b/apps/flutter/notifications/.flutter-plugins index 5a01bd4f3..9b4283a44 100644 --- a/apps/flutter/notifications/.flutter-plugins +++ b/apps/flutter/notifications/.flutter-plugins @@ -1,13 +1,13 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ -path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ -path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ -path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ -path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ -url_launcher=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher-6.2.6\\ -url_launcher_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_android-6.3.0\\ -url_launcher_ios=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_ios-6.3.0\\ -url_launcher_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_linux-3.1.1\\ -url_launcher_macos=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_macos-3.2.0\\ -url_launcher_web=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_web-2.3.0\\ -url_launcher_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_windows-3.1.1\\ +path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ +path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ +path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.4\\ +path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ +path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ +url_launcher=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher-6.1.12\\ +url_launcher_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_android-6.0.36\\ +url_launcher_ios=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_ios-6.1.4\\ +url_launcher_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_linux-3.0.5\\ +url_launcher_macos=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_macos-3.0.6\\ +url_launcher_web=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_web-2.0.18\\ +url_launcher_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\url_launcher_windows-3.0.7\\ diff --git a/apps/flutter/notifications/.flutter-plugins-dependencies b/apps/flutter/notifications/.flutter-plugins-dependencies index 6063a2058..a76c5289c 100644 --- a/apps/flutter/notifications/.flutter-plugins-dependencies +++ b/apps/flutter/notifications/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_ios-6.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_android-6.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-3.2.0\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]},{"name":"url_launcher_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_linux-3.1.1\\\\","native_build":true,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]},{"name":"url_launcher_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_windows-3.1.1\\\\","native_build":true,"dependencies":[]}],"web":[{"name":"url_launcher_web","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-2.3.0\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:46.089870","version":"3.19.0"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_ios-6.1.4\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_android-6.0.36\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-3.0.6\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]},{"name":"url_launcher_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_linux-3.0.5\\\\","native_build":true,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]},{"name":"url_launcher_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_windows-3.0.7\\\\","native_build":true,"dependencies":[]}],"web":[{"name":"url_launcher_web","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-2.0.18\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2023-07-20 08:38:12.016329","version":"3.10.5"} \ No newline at end of file diff --git a/apps/flutter/notifications/android/local.properties b/apps/flutter/notifications/android/local.properties index 1b1467dae..1a3be4ff1 100644 --- a/apps/flutter/notifications/android/local.properties +++ b/apps/flutter/notifications/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk -flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file +sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk +flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file diff --git a/apps/flutter/notifications/ios/Runner/GeneratedPluginRegistrant.m b/apps/flutter/notifications/ios/Runner/GeneratedPluginRegistrant.m index c58696e23..a794592d2 100644 --- a/apps/flutter/notifications/ios/Runner/GeneratedPluginRegistrant.m +++ b/apps/flutter/notifications/ios/Runner/GeneratedPluginRegistrant.m @@ -12,8 +12,8 @@ @import path_provider_foundation; #endif -#if __has_include() -#import +#if __has_include() +#import #else @import url_launcher_ios; #endif @@ -22,7 +22,7 @@ @implementation GeneratedPluginRegistrant + (void)registerWithRegistry:(NSObject*)registry { [PathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"PathProviderPlugin"]]; - [URLLauncherPlugin registerWithRegistrar:[registry registrarForPlugin:@"URLLauncherPlugin"]]; + [FLTURLLauncherPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTURLLauncherPlugin"]]; } @end diff --git a/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 206f83ae3..4a72bc1ee 120000 --- a/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file +C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file diff --git a/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux b/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux index d300385f2..d5e0be9c6 120000 --- a/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux +++ b/apps/flutter/notifications/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux @@ -1 +1 @@ -C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/url_launcher_linux-3.1.1/ \ No newline at end of file +C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/url_launcher_linux-3.0.5/ \ No newline at end of file diff --git a/apps/flutter/oauth/.flutter-plugins b/apps/flutter/oauth/.flutter-plugins index 7c0dac52a..22453877b 100644 --- a/apps/flutter/oauth/.flutter-plugins +++ b/apps/flutter/oauth/.flutter-plugins @@ -1,6 +1,6 @@ # This is a generated file; do not edit or check into version control. -path_provider=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.1.3\\ -path_provider_android=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.2.4\\ -path_provider_foundation=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.4.0\\ -path_provider_linux=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.2.1\\ -path_provider_windows=C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.2.1\\ +path_provider=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider-2.0.15\\ +path_provider_android=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_android-2.0.27\\ +path_provider_foundation=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_foundation-2.2.4\\ +path_provider_linux=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_linux-2.1.11\\ +path_provider_windows=C:\\Users\\eddlevol\\AppData\\Local\\Pub\\Cache\\hosted\\pub.flutter-io.cn\\path_provider_windows-2.1.7\\ diff --git a/apps/flutter/oauth/.flutter-plugins-dependencies b/apps/flutter/oauth/.flutter-plugins-dependencies index ba0ef5ab4..374a67012 100644 --- a/apps/flutter/oauth/.flutter-plugins-dependencies +++ b/apps/flutter/oauth/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.2.4\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.4.0\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.2.1\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.2.1\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2024-05-13 09:19:49.008940","version":"3.19.0"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"path_provider_android","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_android-2.0.27\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"path_provider_foundation","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_foundation-2.2.4\\\\","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-2.1.11\\\\","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\Users\\\\eddlevol\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-2.1.7\\\\","native_build":false,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2023-07-19 17:25:01.623054","version":"3.10.5"} \ No newline at end of file diff --git a/apps/flutter/oauth/android/local.properties b/apps/flutter/oauth/android/local.properties index 1b1467dae..1a3be4ff1 100644 --- a/apps/flutter/oauth/android/local.properties +++ b/apps/flutter/oauth/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk -flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file +sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk +flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file diff --git a/apps/flutter/oauth/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/oauth/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 206f83ae3..4a72bc1ee 120000 --- a/apps/flutter/oauth/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/oauth/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file +C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file diff --git a/apps/flutter/platform/android/local.properties b/apps/flutter/platform/android/local.properties index 1b1467dae..1a3be4ff1 100644 --- a/apps/flutter/platform/android/local.properties +++ b/apps/flutter/platform/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk -flutter.sdk=C:\\Program Files\\flutter \ No newline at end of file +sdk.dir=C:\\Users\\eddlevol\\AppData\\Local\\Android\\sdk +flutter.sdk=D:\\Sdk\\Flutter \ No newline at end of file diff --git a/apps/flutter/platform/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/apps/flutter/platform/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux index 206f83ae3..4a72bc1ee 120000 --- a/apps/flutter/platform/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux +++ b/apps/flutter/platform/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux @@ -1 +1 @@ -C:/Users/Administrator/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.2.1/ \ No newline at end of file +C:/Users/eddlevol/AppData/Local/Pub/Cache/hosted/pub.flutter-io.cn/path_provider_linux-2.1.11/ \ No newline at end of file diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs index 9201d1988..01c3fdfcd 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs @@ -19,8 +19,6 @@ public interface IIdentitySessionStore /// 用户id /// 客户端id /// ip地址 - /// 登录时间 - /// 上次访问时间 /// 租户id /// /// 创建完成的 @@ -31,8 +29,6 @@ Task CreateAsync( Guid userId, string clientId, string ipAddresses, - DateTime signedIn, - DateTime? lastAccessed = null, Guid? tenantId = null, CancellationToken cancellationToken = default); /// diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs index e2382bfed..cc3ee30f0 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs @@ -7,24 +7,20 @@ using Volo.Abp.Auditing; using Volo.Abp.Domain.Services; using Volo.Abp.Identity; -using Volo.Abp.Timing; namespace LINGYUN.Abp.Identity.Session; public class IdentitySessionManager : DomainService, IIdentitySessionManager { protected IDeviceInfoProvider DeviceInfoProvider { get; } - protected IIdentitySessionCache IdentitySessionCache { get; } protected IIdentitySessionStore IdentitySessionStore { get; } protected IdentityDynamicClaimsPrincipalContributorCache IdentityDynamicClaimsPrincipalContributorCache { get; } public IdentitySessionManager( IDeviceInfoProvider deviceInfoProvider, - IIdentitySessionCache identitySessionCache, IIdentitySessionStore identitySessionStore, IdentityDynamicClaimsPrincipalContributorCache identityDynamicClaimsPrincipalContributorCache) { DeviceInfoProvider = deviceInfoProvider; - IdentitySessionCache = identitySessionCache; IdentitySessionStore = identitySessionStore; IdentityDynamicClaimsPrincipalContributorCache = identityDynamicClaimsPrincipalContributorCache; } @@ -37,56 +33,38 @@ public async virtual Task SaveSessionAsync( if (claimsPrincipal != null) { var userId = claimsPrincipal.FindUserId(); - var tenantId = claimsPrincipal.FindTenantId(); - - using (CurrentTenant.Change(tenantId)) + var sessionId = claimsPrincipal.FindSessionId(); + if (!userId.HasValue || sessionId.IsNullOrWhiteSpace()) { - var sessionId = claimsPrincipal.FindSessionId(); - if (!userId.HasValue || sessionId.IsNullOrWhiteSpace()) - { - return; - } - if (await IdentitySessionStore.ExistAsync(sessionId, cancellationToken)) - { - return; - } - var deviceInfo = DeviceInfoProvider.DeviceInfo; - - var device = deviceInfo.Device ?? IdentitySessionDevices.OAuth; - var deviceDesc = deviceInfo.Description; - var clientIpAddress = deviceInfo.ClientIpAddress; - - var clientId = claimsPrincipal.FindClientId(); + return; + } + if (await IdentitySessionStore.ExistAsync(sessionId, cancellationToken)) + { + return; + } + var deviceInfo = DeviceInfoProvider.DeviceInfo; - Logger.LogDebug($"Save user session for user: {userId}, session: {sessionId}"); + var device = deviceInfo.Device ?? IdentitySessionDevices.OAuth; + var deviceDesc = deviceInfo.Description; + var clientIpAddress = deviceInfo.ClientIpAddress; - await IdentitySessionStore.CreateAsync( - sessionId, - device, - deviceDesc, - userId.Value, - clientId, - clientIpAddress, - Clock.Now, - Clock.Now, - tenantId, - cancellationToken); + var tenantId = claimsPrincipal.FindTenantId(); + var clientId = claimsPrincipal.FindClientId(); - Logger.LogDebug($"Remove dynamic claims cache for user: {userId}"); + Logger.LogDebug($"Save user session for user: {userId}, session: {sessionId}"); - await IdentityDynamicClaimsPrincipalContributorCache.ClearAsync(userId.Value, tenantId); + await IdentitySessionStore.CreateAsync( + sessionId, + device, + deviceDesc, + userId.Value, + clientId, + clientIpAddress, + tenantId, + cancellationToken); - await IdentitySessionCache.RefreshAsync(sessionId, - new IdentitySessionCacheItem( - device, - deviceDesc, - userId.Value, - sessionId, - clientId, - clientIpAddress, - Clock.Now, - Clock.Now)); - } + Logger.LogDebug($"Remove dynamic claims cache for user: {userId}"); + await IdentityDynamicClaimsPrincipalContributorCache.ClearAsync(userId.Value, tenantId); } } diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs index 121746f27..d4090952f 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs @@ -7,20 +7,24 @@ using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; using Volo.Abp.Identity; +using Volo.Abp.Timing; using Volo.Abp.Users; namespace LINGYUN.Abp.Identity.Session; public class IdentitySessionStore : IIdentitySessionStore, ITransientDependency { + protected IClock Clock { get; } protected ICurrentUser CurrentUser { get; } protected IGuidGenerator GuidGenerator { get; } protected IIdentitySessionRepository IdentitySessionRepository { get; } public IdentitySessionStore( + IClock clock, ICurrentUser currentUser, IGuidGenerator guidGenerator, IIdentitySessionRepository identitySessionRepository) { + Clock = clock; CurrentUser = currentUser; GuidGenerator = guidGenerator; IdentitySessionRepository = identitySessionRepository; @@ -33,8 +37,6 @@ public async virtual Task CreateAsync( Guid userId, string clientId, string ipAddresses, - DateTime signedIn, - DateTime? lastAccessed = null, Guid? tenantId = null, CancellationToken cancellationToken = default) { @@ -50,8 +52,8 @@ public async virtual Task CreateAsync( tenantId, clientId, ipAddresses, - signedIn, - lastAccessed + Clock.Now, + Clock.Now ); identitySession = await IdentitySessionRepository.InsertAsync(identitySession, cancellationToken: cancellationToken); diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs index 12b41de98..9df9c0e19 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs @@ -89,7 +89,7 @@ public async virtual Task ValidateAsync(ExtensionGrantValidationContext context) Guid? tenantId = null; using (_currentTenant.Change(null)) { - var enterprise = parameters.Get("enterpriseId") ?? parameters.Get("EnterpriseId"); + var enterprise = parameters.Get("EnterpriseId"); if (enterprise.IsNullOrWhiteSpace() || !Guid.TryParse(enterprise, out var enterpriseId)) { // TODO: configurabled diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs index bd864582f..331cfbb7f 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity; using Volo.Abp.OpenIddict; -using static OpenIddict.Abstractions.OpenIddictConstants; namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; @@ -32,10 +31,5 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.SignInSessionEnabled = true; options.SignOutSessionEnabled = true; }); - - Configure(options => - { - options.PersistentSessionGrantTypes.Add(GrantTypes.Password); - }); } } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs deleted file mode 100644 index c2796845d..000000000 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; - -namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; -public class AbpOpenIddictAspNetCoreSessionOptions -{ - public List PersistentSessionGrantTypes { get; set; } - public AbpOpenIddictAspNetCoreSessionOptions() - { - PersistentSessionGrantTypes = new List(); - } -} diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs index 90b4b29b2..1f1ccce98 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs @@ -1,5 +1,4 @@ using LINGYUN.Abp.Identity.Session; -using Microsoft.Extensions.Options; using OpenIddict.Abstractions; using OpenIddict.Server; using System.Threading.Tasks; @@ -11,7 +10,6 @@ namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; public class ProcessSignInIdentitySession : IOpenIddictServerHandler { protected IIdentitySessionManager IdentitySessionManager { get; } - protected AbpOpenIddictAspNetCoreSessionOptions AbpOpenIddictAspNetCoreSessionOptions { get; } public static OpenIddictServerHandlerDescriptor Descriptor { get; } = OpenIddictServerHandlerDescriptor.CreateBuilder() @@ -21,18 +19,14 @@ public class ProcessSignInIdentitySession : IOpenIddictServerHandler abpOpenIddictAspNetCoreSessionOptions) + public ProcessSignInIdentitySession(IIdentitySessionManager identitySessionManager) { IdentitySessionManager = identitySessionManager; - AbpOpenIddictAspNetCoreSessionOptions = abpOpenIddictAspNetCoreSessionOptions.Value; } public async virtual ValueTask HandleAsync(OpenIddictServerEvents.ProcessSignInContext context) { - if (AbpOpenIddictAspNetCoreSessionOptions.PersistentSessionGrantTypes.Contains(context.Request.GrantType) && - context.Principal != null) + if (context.Request.IsPasswordGrantType() && context.Principal != null) { await IdentitySessionManager.SaveSessionAsync(context.Principal, context.CancellationToken); } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs index 41cbb9c89..7e1109b23 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs @@ -3,7 +3,6 @@ using System; using System.Security.Principal; using System.Threading.Tasks; -using Volo.Abp.MultiTenancy; namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; /// @@ -11,7 +10,6 @@ namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; /// public class RevocationIdentitySession : IOpenIddictServerHandler { - protected ICurrentTenant CurrentTenant { get; } protected IIdentitySessionManager IdentitySessionManager { get; } public static OpenIddictServerHandlerDescriptor Descriptor { get; } @@ -22,24 +20,17 @@ public class RevocationIdentitySession : IOpenIddictServerHandler public class UserinfoIdentitySession : IOpenIddictServerHandler { - protected ICurrentTenant CurrentTenant { get; } protected IIdentitySessionChecker IdentitySessionChecker { get; } public static OpenIddictServerHandlerDescriptor Descriptor { get; } = OpenIddictServerHandlerDescriptor.CreateBuilder() .AddFilter() .UseScopedHandler() - .SetOrder(ValidateUserinfoRequest.Descriptor.Order + 2_000) + .SetOrder(ValidateAccessTokenParameter.Descriptor.Order + 2_000) .SetType(OpenIddictServerHandlerType.Custom) .Build(); - public UserinfoIdentitySession( - ICurrentTenant currentTenant, - IIdentitySessionChecker identitySessionChecker) + public UserinfoIdentitySession(IIdentitySessionChecker identitySessionChecker) { - CurrentTenant = currentTenant; IdentitySessionChecker = identitySessionChecker; } public async virtual ValueTask HandleAsync(OpenIddictServerEvents.HandleUserinfoRequestContext context) { - var tenantId = context.Principal.FindTenantId(); var sessionId = context.Principal.FindSessionId(); - using (CurrentTenant.Change(tenantId)) - { - if (sessionId.IsNullOrWhiteSpace() || + if (sessionId.IsNullOrWhiteSpace() || !await IdentitySessionChecker.ValidateSessionAsync(sessionId)) - { - // Errors.InvalidToken ---> 401 - // Errors.ExpiredToken ---> 400 - context.Reject(Errors.InvalidToken, "The user session has expired."); - } + { + // Errors.InvalidToken ---> 401 + // Errors.ExpiredToken ---> 400 + context.Reject(Errors.InvalidToken, "The user session has expired."); } } } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs index bf231d4f9..244bc5d99 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs @@ -52,7 +52,7 @@ public async virtual Task HandleAsync(ExtensionGrantContext conte { LazyServiceProvider = context.HttpContext.RequestServices.GetRequiredService(); - var enterprise = context.Request.GetParameter("enterpriseId")?.ToString() ?? context.Request.GetParameter("EnterpriseId")?.ToString(); + var enterprise = context.Request.GetParameter("EnterpriseId")?.ToString(); Guid? tenantId = null; using (CurrentTenant.Change(null)) diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs b/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs index 0838fecdf..ca7c31f5e 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs @@ -9,12 +9,7 @@ using LINGYUN.Abp.IdentityServer.IdentityResources; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.Notifications; -using LINGYUN.Abp.OpenIddict.AspNetCore.Session; -using LINGYUN.Abp.OpenIddict.LinkUser; using LINGYUN.Abp.OpenIddict.Permissions; -using LINGYUN.Abp.OpenIddict.Portal; -using LINGYUN.Abp.OpenIddict.Sms; -using LINGYUN.Abp.OpenIddict.WeChat; using LINGYUN.Abp.Saas; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; @@ -23,7 +18,6 @@ using LINGYUN.Abp.WebhooksManagement; using LINGYUN.Abp.WeChat.Common.Messages.Handlers; using LINGYUN.Abp.WeChat.Localization; -using LINGYUN.Abp.WeChat.Work; using LINGYUN.Abp.Wrapper; using LINGYUN.Platform.Localization; using LY.MicroService.Applications.Single.Authentication; @@ -317,15 +311,6 @@ private void ConfigureAuthServer(IConfiguration configuration) options.RefreshTokenReuseLeeway = lifetime.GetValue("RefreshTokenReuseLeeway", options.RefreshTokenReuseLeeway); options.UserCodeLifetime = lifetime.GetValue("UserCode", options.UserCodeLifetime); }); - Configure(options => - { - options.PersistentSessionGrantTypes.Add(SmsTokenExtensionGrantConsts.GrantType); - options.PersistentSessionGrantTypes.Add(PortalTokenExtensionGrantConsts.GrantType); - options.PersistentSessionGrantTypes.Add(LinkUserTokenExtensionGrantConsts.GrantType); - options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.OfficialGrantType); - options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.MiniProgramGrantType); - options.PersistentSessionGrantTypes.Add(AbpWeChatWorkGlobalConsts.GrantType); - }); } private void ConfigureEndpoints(IServiceCollection services) diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs b/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs index 1f3acce59..bb6316cd8 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs +++ b/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs @@ -65,11 +65,10 @@ await builder.AddApplicationAsync(options app.UseRouting(); app.UseCors(); app.UseAuthentication(); -app.UseMultiTenancy(); -app.UseUnitOfWork(); app.UseAbpOpenIddictValidation(); app.UseAbpSession(); app.UseDynamicClaims(); +app.UseMultiTenancy(); app.UseAuthorization(); app.UseSwagger(); app.UseSwaggerUI(options => diff --git a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs index adaed895d..71ab8a4e3 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs @@ -1,13 +1,7 @@ using DotNetCore.CAP; using LINGYUN.Abp.Localization.CultureMap; -using LINGYUN.Abp.OpenIddict.AspNetCore.Session; -using LINGYUN.Abp.OpenIddict.LinkUser; -using LINGYUN.Abp.OpenIddict.Portal; -using LINGYUN.Abp.OpenIddict.Sms; -using LINGYUN.Abp.OpenIddict.WeChat; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; -using LINGYUN.Abp.WeChat.Work; using LY.MicroService.AuthServer.Authentication; using Medallion.Threading; using Medallion.Threading.Redis; @@ -16,6 +10,7 @@ using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Caching.StackExchangeRedis; @@ -24,6 +19,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.IdentityModel.Logging; +using OpenIddict.Validation.AspNetCore; using OpenTelemetry.Metrics; using OpenTelemetry.Resources; using OpenTelemetry.Trace; @@ -338,16 +334,6 @@ private void ConfigureIdentity(IConfiguration configuration) options.IsDynamicClaimsEnabled = true; options.IsRemoteRefreshEnabled = false; }); - - Configure(options => - { - options.PersistentSessionGrantTypes.Add(SmsTokenExtensionGrantConsts.GrantType); - options.PersistentSessionGrantTypes.Add(PortalTokenExtensionGrantConsts.GrantType); - options.PersistentSessionGrantTypes.Add(LinkUserTokenExtensionGrantConsts.GrantType); - options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.OfficialGrantType); - options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.MiniProgramGrantType); - options.PersistentSessionGrantTypes.Add(AbpWeChatWorkGlobalConsts.GrantType); - }); } private void ConfigureVirtualFileSystem() { diff --git a/kubernetes/mysql-config.yaml b/kubernetes/mysql-config.yaml deleted file mode 100644 index 23560997c..000000000 --- a/kubernetes/mysql-config.yaml +++ /dev/null @@ -1,18 +0,0 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: mysql-config - namespace: abp -data: - my.cnf: |- - [client] - default-character-set=utf8mb4 - [mysql] - default-character-set=utf8mb4 - [mysqld] - default-authentication-plugin=mysql_native_password - collation-server=utf8mb4_general_ci - lower_case_table_names=1 - max_connections = 2000 - secure_file_priv=/var/lib/mysql - sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION \ No newline at end of file diff --git a/kubernetes/mysql-dbdata.yaml b/kubernetes/mysql-dbdata.yaml deleted file mode 100644 index 00d294448..000000000 --- a/kubernetes/mysql-dbdata.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: mysql-data - namespace: abp -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 20Gi diff --git a/kubernetes/mysql-deployment.yaml b/kubernetes/mysql-deployment.yaml deleted file mode 100644 index b2e28be29..000000000 --- a/kubernetes/mysql-deployment.yaml +++ /dev/null @@ -1,43 +0,0 @@ -kind: Deployment -apiVersion: apps/v1 -metadata: - name: mysql - namespace: abp -spec: - selector: - matchLabels: - app: mysql - replicas: 1 - template: - metadata: - labels: - app: mysql - spec: - containers: - - name: mysql - image: abp-mysql:latest - imagePullPolicy: Never - ports: - - containerPort: 3306 - env: - - name: MYSQL_ROOT_PASSWORD - value: "123456" - - name: MYSQL_ROOT_HOST - value: "%" - - name: MYSQL_LOWER_CASE_TABLE_NAMES - value: "1" - - name: TZ - value: Asia/Shanghai - volumeMounts: - - name: dbdata - mountPath: /var/lib/mysql - - name: config - mountPath: /etc/mysql/my.cnf - subPath: my.cnf - volumes: - - name: dbdata - persistentVolumeClaim: - claimName: mysql-data - - name: config - configMap: - name: mysql-config diff --git a/kubernetes/mysql-service.yaml b/kubernetes/mysql-service.yaml deleted file mode 100644 index dac5995bd..000000000 --- a/kubernetes/mysql-service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: mysql - namespace: abp -spec: - type: NodePort - selector: - app: mysql - ports: - - protocol: TCP - port: 3306 - targetPort: 3306 \ No newline at end of file diff --git a/kubernetes/mysql/Dockerfile b/kubernetes/mysql/Dockerfile deleted file mode 100644 index 32a470cd3..000000000 --- a/kubernetes/mysql/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM mysql:latest -COPY ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d -EXPOSE 3306 \ No newline at end of file diff --git a/kubernetes/mysql/conf.d/my.cnf b/kubernetes/mysql/conf.d/my.cnf deleted file mode 100644 index c35ecc7e1..000000000 --- a/kubernetes/mysql/conf.d/my.cnf +++ /dev/null @@ -1,10 +0,0 @@ -[mysqld] -default-authentication-plugin=mysql_native_password -character-set-server=utf8mb4 -collation-server=utf8mb4_general_ci -lower_case_table_names=1 -max_connections=1024 - -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -datadir = /var/lib/mysql \ No newline at end of file diff --git a/kubernetes/mysql/docker-entrypoint-initdb.d/agile-initial.sql b/kubernetes/mysql/docker-entrypoint-initdb.d/agile-initial.sql deleted file mode 100644 index 40964d112..000000000 --- a/kubernetes/mysql/docker-entrypoint-initdb.d/agile-initial.sql +++ /dev/null @@ -1,3 +0,0 @@ --- basic script - -CREATE DATABASE `agile` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci'; diff --git a/kubernetes/mysql/docker-entrypoint-initdb.d/elsa-migrations-initial.sql b/kubernetes/mysql/docker-entrypoint-initdb.d/elsa-migrations-initial.sql deleted file mode 100644 index 715d72e41..000000000 --- a/kubernetes/mysql/docker-entrypoint-initdb.d/elsa-migrations-initial.sql +++ /dev/null @@ -1,317 +0,0 @@ --- basic script - -CREATE DATABASE `Workflow-V70` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci'; - -USE `Workflow-V70`; - -CREATE TABLE IF NOT EXISTS `__EFMigrationsHistory` ( - `MigrationId` varchar(150) CHARACTER SET utf8mb4 NOT NULL, - `ProductVersion` varchar(32) CHARACTER SET utf8mb4 NOT NULL, - CONSTRAINT `PK___EFMigrationsHistory` PRIMARY KEY (`MigrationId`) -) CHARACTER SET utf8mb4; - -START TRANSACTION; - -ALTER DATABASE CHARACTER SET utf8mb4; - -CREATE TABLE `Bookmarks` ( - `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, - `Hash` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `Model` longtext CHARACTER SET utf8mb4 NOT NULL, - `ModelType` longtext CHARACTER SET utf8mb4 NOT NULL, - `ActivityType` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `ActivityId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `WorkflowInstanceId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `CorrelationId` varchar(255) CHARACTER SET utf8mb4 NULL, - CONSTRAINT `PK_Bookmarks` PRIMARY KEY (`Id`) -) CHARACTER SET utf8mb4; - -CREATE TABLE `WorkflowDefinitions` ( - `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `DefinitionId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, - `Name` varchar(255) CHARACTER SET utf8mb4 NULL, - `DisplayName` longtext CHARACTER SET utf8mb4 NULL, - `Description` longtext CHARACTER SET utf8mb4 NULL, - `Version` int NOT NULL, - `IsSingleton` tinyint(1) NOT NULL, - `PersistenceBehavior` int NOT NULL, - `DeleteCompletedInstances` tinyint(1) NOT NULL, - `IsPublished` tinyint(1) NOT NULL, - `IsLatest` tinyint(1) NOT NULL, - `Tag` varchar(255) CHARACTER SET utf8mb4 NULL, - `Data` longtext CHARACTER SET utf8mb4 NULL, - CONSTRAINT `PK_WorkflowDefinitions` PRIMARY KEY (`Id`) -) CHARACTER SET utf8mb4; - -CREATE TABLE `WorkflowExecutionLogRecords` ( - `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, - `WorkflowInstanceId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `ActivityId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `ActivityType` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `Timestamp` datetime(6) NOT NULL, - `EventName` longtext CHARACTER SET utf8mb4 NULL, - `Message` longtext CHARACTER SET utf8mb4 NULL, - `Source` longtext CHARACTER SET utf8mb4 NULL, - `Data` longtext CHARACTER SET utf8mb4 NULL, - CONSTRAINT `PK_WorkflowExecutionLogRecords` PRIMARY KEY (`Id`) -) CHARACTER SET utf8mb4; - -CREATE TABLE `WorkflowInstances` ( - `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `DefinitionId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, - `Version` int NOT NULL, - `WorkflowStatus` int NOT NULL, - `CorrelationId` varchar(255) CHARACTER SET utf8mb4 NULL, - `ContextType` varchar(255) CHARACTER SET utf8mb4 NULL, - `ContextId` varchar(255) CHARACTER SET utf8mb4 NULL, - `Name` varchar(255) CHARACTER SET utf8mb4 NULL, - `CreatedAt` datetime(6) NOT NULL, - `LastExecutedAt` datetime(6) NULL, - `FinishedAt` datetime(6) NULL, - `CancelledAt` datetime(6) NULL, - `FaultedAt` datetime(6) NULL, - `Data` longtext CHARACTER SET utf8mb4 NULL, - CONSTRAINT `PK_WorkflowInstances` PRIMARY KEY (`Id`) -) CHARACTER SET utf8mb4; - -CREATE INDEX `IX_Bookmark_ActivityId` ON `Bookmarks` (`ActivityId`); - -CREATE INDEX `IX_Bookmark_ActivityType` ON `Bookmarks` (`ActivityType`); - -CREATE INDEX `IX_Bookmark_ActivityType_TenantId_Hash` ON `Bookmarks` (`ActivityType`, `TenantId`, `Hash`); - -CREATE INDEX `IX_Bookmark_CorrelationId` ON `Bookmarks` (`CorrelationId`); - -CREATE INDEX `IX_Bookmark_Hash` ON `Bookmarks` (`Hash`); - -CREATE INDEX `IX_Bookmark_Hash_CorrelationId_TenantId` ON `Bookmarks` (`Hash`, `CorrelationId`, `TenantId`); - -CREATE INDEX `IX_Bookmark_TenantId` ON `Bookmarks` (`TenantId`); - -CREATE INDEX `IX_Bookmark_WorkflowInstanceId` ON `Bookmarks` (`WorkflowInstanceId`); - -CREATE UNIQUE INDEX `IX_WorkflowDefinition_DefinitionId_VersionId` ON `WorkflowDefinitions` (`DefinitionId`, `Version`); - -CREATE INDEX `IX_WorkflowDefinition_IsLatest` ON `WorkflowDefinitions` (`IsLatest`); - -CREATE INDEX `IX_WorkflowDefinition_IsPublished` ON `WorkflowDefinitions` (`IsPublished`); - -CREATE INDEX `IX_WorkflowDefinition_Name` ON `WorkflowDefinitions` (`Name`); - -CREATE INDEX `IX_WorkflowDefinition_Tag` ON `WorkflowDefinitions` (`Tag`); - -CREATE INDEX `IX_WorkflowDefinition_TenantId` ON `WorkflowDefinitions` (`TenantId`); - -CREATE INDEX `IX_WorkflowDefinition_Version` ON `WorkflowDefinitions` (`Version`); - -CREATE INDEX `IX_WorkflowExecutionLogRecord_ActivityId` ON `WorkflowExecutionLogRecords` (`ActivityId`); - -CREATE INDEX `IX_WorkflowExecutionLogRecord_ActivityType` ON `WorkflowExecutionLogRecords` (`ActivityType`); - -CREATE INDEX `IX_WorkflowExecutionLogRecord_TenantId` ON `WorkflowExecutionLogRecords` (`TenantId`); - -CREATE INDEX `IX_WorkflowExecutionLogRecord_Timestamp` ON `WorkflowExecutionLogRecords` (`Timestamp`); - -CREATE INDEX `IX_WorkflowExecutionLogRecord_WorkflowInstanceId` ON `WorkflowExecutionLogRecords` (`WorkflowInstanceId`); - -CREATE INDEX `IX_WorkflowInstance_ContextId` ON `WorkflowInstances` (`ContextId`); - -CREATE INDEX `IX_WorkflowInstance_ContextType` ON `WorkflowInstances` (`ContextType`); - -CREATE INDEX `IX_WorkflowInstance_CorrelationId` ON `WorkflowInstances` (`CorrelationId`); - -CREATE INDEX `IX_WorkflowInstance_CreatedAt` ON `WorkflowInstances` (`CreatedAt`); - -CREATE INDEX `IX_WorkflowInstance_DefinitionId` ON `WorkflowInstances` (`DefinitionId`); - -CREATE INDEX `IX_WorkflowInstance_FaultedAt` ON `WorkflowInstances` (`FaultedAt`); - -CREATE INDEX `IX_WorkflowInstance_FinishedAt` ON `WorkflowInstances` (`FinishedAt`); - -CREATE INDEX `IX_WorkflowInstance_LastExecutedAt` ON `WorkflowInstances` (`LastExecutedAt`); - -CREATE INDEX `IX_WorkflowInstance_Name` ON `WorkflowInstances` (`Name`); - -CREATE INDEX `IX_WorkflowInstance_TenantId` ON `WorkflowInstances` (`TenantId`); - -CREATE INDEX `IX_WorkflowInstance_WorkflowStatus` ON `WorkflowInstances` (`WorkflowStatus`); - -CREATE INDEX `IX_WorkflowInstance_WorkflowStatus_DefinitionId` ON `WorkflowInstances` (`WorkflowStatus`, `DefinitionId`); - -CREATE INDEX `IX_WorkflowInstance_WorkflowStatus_DefinitionId_Version` ON `WorkflowInstances` (`WorkflowStatus`, `DefinitionId`, `Version`); - -INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) -VALUES ('20210523093427_Initial', '5.0.10'); - -COMMIT; - -START TRANSACTION; - -ALTER TABLE `WorkflowInstances` MODIFY COLUMN `CorrelationId` varchar(255) CHARACTER SET utf8mb4 NOT NULL DEFAULT ''; - -ALTER TABLE `WorkflowInstances` ADD `LastExecutedActivityId` longtext CHARACTER SET utf8mb4 NULL; - -ALTER TABLE `WorkflowDefinitions` ADD `OutputStorageProviderName` longtext CHARACTER SET utf8mb4 NULL; - -INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) -VALUES ('20210611200027_Update21', '5.0.10'); - -COMMIT; - -START TRANSACTION; - -ALTER TABLE `WorkflowDefinitions` DROP COLUMN `OutputStorageProviderName`; - -ALTER TABLE `WorkflowInstances` RENAME `WorkflowInstances`; - -ALTER TABLE `WorkflowExecutionLogRecords` RENAME `WorkflowExecutionLogRecords`; - -ALTER TABLE `WorkflowDefinitions` RENAME `WorkflowDefinitions`; - -ALTER TABLE `Bookmarks` RENAME `Bookmarks`; - -INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) -VALUES ('20210923112211_Update23', '5.0.10'); - -COMMIT; - -START TRANSACTION; - -ALTER TABLE `WorkflowInstances` ADD `DefinitionVersionId` longtext CHARACTER SET utf8mb4 NOT NULL; - -ALTER TABLE `Bookmarks` MODIFY COLUMN `CorrelationId` varchar(255) CHARACTER SET utf8mb4 NOT NULL DEFAULT ''; - -INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) -VALUES ('20211215100204_Update24', '5.0.10'); - -COMMIT; - -START TRANSACTION; - -ALTER TABLE `WorkflowInstances` MODIFY COLUMN `DefinitionVersionId` varchar(255) CHARACTER SET utf8mb4 NOT NULL; - -CREATE INDEX `IX_WorkflowInstance_DefinitionVersionId` ON `WorkflowInstances` (`DefinitionVersionId`); - -INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) -VALUES ('20220120170050_Update241', '5.0.10'); - -COMMIT; - -START TRANSACTION; - -CREATE TABLE `Triggers` ( - `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, - `Hash` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `Model` longtext CHARACTER SET utf8mb4 NOT NULL, - `ModelType` longtext CHARACTER SET utf8mb4 NOT NULL, - `ActivityType` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `ActivityId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `WorkflowDefinitionId` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - CONSTRAINT `PK_Triggers` PRIMARY KEY (`Id`) -) CHARACTER SET utf8mb4; - -CREATE INDEX `IX_Trigger_ActivityId` ON `Triggers` (`ActivityId`); - -CREATE INDEX `IX_Trigger_ActivityType` ON `Triggers` (`ActivityType`); - -CREATE INDEX `IX_Trigger_ActivityType_TenantId_Hash` ON `Triggers` (`ActivityType`, `TenantId`, `Hash`); - -CREATE INDEX `IX_Trigger_Hash` ON `Triggers` (`Hash`); - -CREATE INDEX `IX_Trigger_Hash_TenantId` ON `Triggers` (`Hash`, `TenantId`); - -CREATE INDEX `IX_Trigger_TenantId` ON `Triggers` (`TenantId`); - -CREATE INDEX `IX_Trigger_WorkflowDefinitionId` ON `Triggers` (`WorkflowDefinitionId`); - -INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) -VALUES ('20220120204150_Update25', '5.0.10'); - -COMMIT; - -START TRANSACTION; - -ALTER TABLE `WorkflowDefinitions` ADD `CreatedAt` datetime(6) NOT NULL DEFAULT '0001-01-01 00:00:00'; - -INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) -VALUES ('20220512203646_Update28', '5.0.10'); - -COMMIT; - - --- webhooks - -CREATE TABLE IF NOT EXISTS `__EFMigrationsHistory` ( - `MigrationId` varchar(150) CHARACTER SET utf8mb4 NOT NULL, - `ProductVersion` varchar(32) CHARACTER SET utf8mb4 NOT NULL, - CONSTRAINT `PK___EFMigrationsHistory` PRIMARY KEY (`MigrationId`) -) CHARACTER SET utf8mb4; - -START TRANSACTION; - -ALTER DATABASE CHARACTER SET utf8mb4; - -CREATE TABLE `WebhookDefinitions` ( - `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `TenantId` varchar(255) CHARACTER SET utf8mb4 NULL, - `Name` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `Path` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `Description` varchar(255) CHARACTER SET utf8mb4 NULL, - `PayloadTypeName` varchar(255) CHARACTER SET utf8mb4 NULL, - `IsEnabled` tinyint(1) NOT NULL, - CONSTRAINT `PK_WebhookDefinitions` PRIMARY KEY (`Id`) -) CHARACTER SET utf8mb4; - -CREATE INDEX `IX_WebhookDefinition_Description` ON `WebhookDefinitions` (`Description`); - -CREATE INDEX `IX_WebhookDefinition_IsEnabled` ON `WebhookDefinitions` (`IsEnabled`); - -CREATE INDEX `IX_WebhookDefinition_Name` ON `WebhookDefinitions` (`Name`); - -CREATE INDEX `IX_WebhookDefinition_Path` ON `WebhookDefinitions` (`Path`); - -CREATE INDEX `IX_WebhookDefinition_PayloadTypeName` ON `WebhookDefinitions` (`PayloadTypeName`); - -CREATE INDEX `IX_WebhookDefinition_TenantId` ON `WebhookDefinitions` (`TenantId`); - -INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) -VALUES ('20210604065041_Initial', '5.0.10'); - -COMMIT; - - --- workflow-settings - -CREATE TABLE IF NOT EXISTS `__EFMigrationsHistory` ( - `MigrationId` varchar(150) CHARACTER SET utf8mb4 NOT NULL, - `ProductVersion` varchar(32) CHARACTER SET utf8mb4 NOT NULL, - CONSTRAINT `PK___EFMigrationsHistory` PRIMARY KEY (`MigrationId`) -) CHARACTER SET utf8mb4; - -START TRANSACTION; - -ALTER DATABASE CHARACTER SET utf8mb4; - -CREATE TABLE `WorkflowSettings` ( - `Id` varchar(255) CHARACTER SET utf8mb4 NOT NULL, - `WorkflowBlueprintId` varchar(255) CHARACTER SET utf8mb4 NULL, - `Key` varchar(255) CHARACTER SET utf8mb4 NULL, - `Value` varchar(255) CHARACTER SET utf8mb4 NULL, - CONSTRAINT `PK_WorkflowSettings` PRIMARY KEY (`Id`) -) CHARACTER SET utf8mb4; - -CREATE INDEX `IX_WorkflowSetting_Key` ON `WorkflowSettings` (`Key`); - -CREATE INDEX `IX_WorkflowSetting_Value` ON `WorkflowSettings` (`Value`); - -CREATE INDEX `IX_WorkflowSetting_WorkflowBlueprintId` ON `WorkflowSettings` (`WorkflowBlueprintId`); - -INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) -VALUES ('20210730112043_Initial', '5.0.10'); - -COMMIT; diff --git a/kubernetes/mysql/my.cnf b/kubernetes/mysql/my.cnf deleted file mode 100644 index c35ecc7e1..000000000 --- a/kubernetes/mysql/my.cnf +++ /dev/null @@ -1,10 +0,0 @@ -[mysqld] -default-authentication-plugin=mysql_native_password -character-set-server=utf8mb4 -collation-server=utf8mb4_general_ci -lower_case_table_names=1 -max_connections=1024 - -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -datadir = /var/lib/mysql \ No newline at end of file From d242320e2cf32f1f8c4a0b8afb296b42d3895170 Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 16 Aug 2024 15:34:53 +0800 Subject: [PATCH 4/4] fix(single): fix transaction --- .../Identity/Session/IIdentitySessionStore.cs | 10 ++- .../Session/IdentitySessionManager.cs | 78 ++++++++++++------- .../Identity/Session/IdentitySessionStore.cs | 26 +++---- .../Portal/PortalGrantValidator.cs | 16 ++-- .../AbpOpenIddictAspNetCoreSessionModule.cs | 6 ++ .../AbpOpenIddictAspNetCoreSessionOptions.cs | 11 +++ .../Session/ProcessSignInIdentitySession.cs | 11 ++- .../Session/RevocationIdentitySession.cs | 15 +++- .../Session/UserinfoIdentitySession.cs | 23 ++++-- .../Portal/PortalTokenExtensionGrant.cs | 2 +- ...rviceApplicationsSingleModule.Configure.cs | 19 ++++- .../Program.cs | 3 +- .../AuthServerModule.Configure.cs | 18 ++++- 13 files changed, 166 insertions(+), 72 deletions(-) create mode 100644 aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs index 01c3fdfcd..e49c0fa02 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IIdentitySessionStore.cs @@ -19,6 +19,8 @@ public interface IIdentitySessionStore /// 用户id /// 客户端id /// ip地址 + /// 登录时间 + /// 上次访问时间 /// 租户id /// /// 创建完成的 @@ -29,6 +31,8 @@ Task CreateAsync( Guid userId, string clientId, string ipAddresses, + DateTime signedIn, + DateTime? lastAccessed = null, Guid? tenantId = null, CancellationToken cancellationToken = default); /// @@ -124,7 +128,7 @@ Task RevokeAsync( /// /// Task RevokeAllAsync( - Guid userId, + Guid userId, Guid? exceptSessionId = null, CancellationToken cancellationToken = default); /// @@ -136,7 +140,7 @@ Task RevokeAllAsync( /// /// Task RevokeAllAsync( - Guid userId, + Guid userId, string device, Guid? exceptSessionId = null, CancellationToken cancellationToken = default); @@ -147,7 +151,7 @@ Task RevokeAllAsync( /// /// Task RevokeAllAsync( - TimeSpan inactiveTimeSpan, + TimeSpan inactiveTimeSpan, CancellationToken cancellationToken = default); /// /// 撤销指定的会话 diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs index cc3ee30f0..be02117c4 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionManager.cs @@ -7,64 +7,86 @@ using Volo.Abp.Auditing; using Volo.Abp.Domain.Services; using Volo.Abp.Identity; +using Volo.Abp.Timing; namespace LINGYUN.Abp.Identity.Session; public class IdentitySessionManager : DomainService, IIdentitySessionManager { protected IDeviceInfoProvider DeviceInfoProvider { get; } + protected IIdentitySessionCache IdentitySessionCache { get; } protected IIdentitySessionStore IdentitySessionStore { get; } protected IdentityDynamicClaimsPrincipalContributorCache IdentityDynamicClaimsPrincipalContributorCache { get; } public IdentitySessionManager( IDeviceInfoProvider deviceInfoProvider, + IIdentitySessionCache identitySessionCache, IIdentitySessionStore identitySessionStore, IdentityDynamicClaimsPrincipalContributorCache identityDynamicClaimsPrincipalContributorCache) { DeviceInfoProvider = deviceInfoProvider; + IdentitySessionCache = identitySessionCache; IdentitySessionStore = identitySessionStore; IdentityDynamicClaimsPrincipalContributorCache = identityDynamicClaimsPrincipalContributorCache; } [DisableAuditing] public async virtual Task SaveSessionAsync( - ClaimsPrincipal claimsPrincipal, + ClaimsPrincipal claimsPrincipal, CancellationToken cancellationToken = default) - { + { if (claimsPrincipal != null) { var userId = claimsPrincipal.FindUserId(); - var sessionId = claimsPrincipal.FindSessionId(); - if (!userId.HasValue || sessionId.IsNullOrWhiteSpace()) - { - return; - } - if (await IdentitySessionStore.ExistAsync(sessionId, cancellationToken)) + var tenantId = claimsPrincipal.FindTenantId(); + + using (CurrentTenant.Change(tenantId)) { - return; - } - var deviceInfo = DeviceInfoProvider.DeviceInfo; + var sessionId = claimsPrincipal.FindSessionId(); + if (!userId.HasValue || sessionId.IsNullOrWhiteSpace()) + { + return; + } + if (await IdentitySessionStore.ExistAsync(sessionId, cancellationToken)) + { + return; + } + var deviceInfo = DeviceInfoProvider.DeviceInfo; - var device = deviceInfo.Device ?? IdentitySessionDevices.OAuth; - var deviceDesc = deviceInfo.Description; - var clientIpAddress = deviceInfo.ClientIpAddress; + var device = deviceInfo.Device ?? IdentitySessionDevices.OAuth; + var deviceDesc = deviceInfo.Description; + var clientIpAddress = deviceInfo.ClientIpAddress; - var tenantId = claimsPrincipal.FindTenantId(); - var clientId = claimsPrincipal.FindClientId(); + var clientId = claimsPrincipal.FindClientId(); + + Logger.LogDebug($"Save user session for user: {userId}, session: {sessionId}"); - Logger.LogDebug($"Save user session for user: {userId}, session: {sessionId}"); + await IdentitySessionStore.CreateAsync( + sessionId, + device, + deviceDesc, + userId.Value, + clientId, + clientIpAddress, + Clock.Now, + Clock.Now, + tenantId, + cancellationToken); - await IdentitySessionStore.CreateAsync( - sessionId, - device, - deviceDesc, - userId.Value, - clientId, - clientIpAddress, - tenantId, - cancellationToken); + Logger.LogDebug($"Remove dynamic claims cache for user: {userId}"); - Logger.LogDebug($"Remove dynamic claims cache for user: {userId}"); - await IdentityDynamicClaimsPrincipalContributorCache.ClearAsync(userId.Value, tenantId); + await IdentityDynamicClaimsPrincipalContributorCache.ClearAsync(userId.Value, tenantId); + + await IdentitySessionCache.RefreshAsync(sessionId, + new IdentitySessionCacheItem( + device, + deviceDesc, + userId.Value, + sessionId, + clientId, + clientIpAddress, + Clock.Now, + Clock.Now)); + } } } diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs index d4090952f..626a86d0d 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN/Abp/Identity/Session/IdentitySessionStore.cs @@ -7,24 +7,20 @@ using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; using Volo.Abp.Identity; -using Volo.Abp.Timing; using Volo.Abp.Users; namespace LINGYUN.Abp.Identity.Session; public class IdentitySessionStore : IIdentitySessionStore, ITransientDependency { - protected IClock Clock { get; } protected ICurrentUser CurrentUser { get; } protected IGuidGenerator GuidGenerator { get; } protected IIdentitySessionRepository IdentitySessionRepository { get; } public IdentitySessionStore( - IClock clock, ICurrentUser currentUser, IGuidGenerator guidGenerator, IIdentitySessionRepository identitySessionRepository) { - Clock = clock; CurrentUser = currentUser; GuidGenerator = guidGenerator; IdentitySessionRepository = identitySessionRepository; @@ -37,6 +33,8 @@ public async virtual Task CreateAsync( Guid userId, string clientId, string ipAddresses, + DateTime signedIn, + DateTime? lastAccessed = null, Guid? tenantId = null, CancellationToken cancellationToken = default) { @@ -52,8 +50,8 @@ public async virtual Task CreateAsync( tenantId, clientId, ipAddresses, - Clock.Now, - Clock.Now + signedIn, + lastAccessed ); identitySession = await IdentitySessionRepository.InsertAsync(identitySession, cancellationToken: cancellationToken); @@ -90,14 +88,14 @@ public async virtual Task GetAsync( } public async virtual Task FindAsync( - string sessionId, + string sessionId, CancellationToken cancellationToken = default) { return await IdentitySessionRepository.FindAsync(sessionId, cancellationToken: cancellationToken); } public async virtual Task FindLastAsync( - Guid userId, + Guid userId, string device, CancellationToken cancellationToken = default) { @@ -105,7 +103,7 @@ public async virtual Task FindLastAsync( } public async virtual Task ExistAsync( - string sessionId, + string sessionId, CancellationToken cancellationToken = default) { return await IdentitySessionRepository.ExistAsync(sessionId, cancellationToken: cancellationToken); @@ -126,7 +124,7 @@ public async virtual Task RevokeAsync( } public async virtual Task RevokeAllAsync( - Guid userId, + Guid userId, Guid? exceptSessionId = null, CancellationToken cancellationToken = default) { @@ -134,8 +132,8 @@ public async virtual Task RevokeAllAsync( } public async virtual Task RevokeAllAsync( - Guid userId, - string device, + Guid userId, + string device, Guid? exceptSessionId = null, CancellationToken cancellationToken = default) { @@ -150,8 +148,8 @@ public async virtual Task RevokeAllAsync( } public async virtual Task RevokeWithAsync( - Guid userId, - string device = null, + Guid userId, + string device = null, Guid? exceptSessionId = null, int maxCount = 0, CancellationToken cancellationToken = default) diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs index 9df9c0e19..e5275048a 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN/Abp/IdentityServer/Portal/PortalGrantValidator.cs @@ -46,13 +46,13 @@ public class PortalGrantValidator : IExtensionGrantValidator private readonly IHttpContextAccessor _httpContextAccessor; public PortalGrantValidator( - ILogger logger, - IOptions options, - IEventService events, - IResourceOwnerPasswordValidator resourceOwnerValidator, - IdentitySecurityLogManager identitySecurityLogManager, - UserManager userManager, - ICurrentTenant currentTenant, + ILogger logger, + IOptions options, + IEventService events, + IResourceOwnerPasswordValidator resourceOwnerValidator, + IdentitySecurityLogManager identitySecurityLogManager, + UserManager userManager, + ICurrentTenant currentTenant, IEnterpriseRepository enterpriseRepository, IOptions multiTenancyOptions, IHttpContextAccessor httpContextAccessor) @@ -89,7 +89,7 @@ public async virtual Task ValidateAsync(ExtensionGrantValidationContext context) Guid? tenantId = null; using (_currentTenant.Change(null)) { - var enterprise = parameters.Get("EnterpriseId"); + var enterprise = parameters.Get("enterpriseId") ?? parameters.Get("EnterpriseId"); if (enterprise.IsNullOrWhiteSpace() || !Guid.TryParse(enterprise, out var enterpriseId)) { // TODO: configurabled diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs index 331cfbb7f..bd864582f 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionModule.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity; using Volo.Abp.OpenIddict; +using static OpenIddict.Abstractions.OpenIddictConstants; namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; @@ -31,5 +32,10 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.SignInSessionEnabled = true; options.SignOutSessionEnabled = true; }); + + Configure(options => + { + options.PersistentSessionGrantTypes.Add(GrantTypes.Password); + }); } } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs new file mode 100644 index 000000000..c2796845d --- /dev/null +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/AbpOpenIddictAspNetCoreSessionOptions.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; + +namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; +public class AbpOpenIddictAspNetCoreSessionOptions +{ + public List PersistentSessionGrantTypes { get; set; } + public AbpOpenIddictAspNetCoreSessionOptions() + { + PersistentSessionGrantTypes = new List(); + } +} diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs index 1f1ccce98..bbb55f773 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/ProcessSignInIdentitySession.cs @@ -1,5 +1,5 @@ using LINGYUN.Abp.Identity.Session; -using OpenIddict.Abstractions; +using Microsoft.Extensions.Options; using OpenIddict.Server; using System.Threading.Tasks; @@ -10,6 +10,7 @@ namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; public class ProcessSignInIdentitySession : IOpenIddictServerHandler { protected IIdentitySessionManager IdentitySessionManager { get; } + protected AbpOpenIddictAspNetCoreSessionOptions AbpOpenIddictAspNetCoreSessionOptions { get; } public static OpenIddictServerHandlerDescriptor Descriptor { get; } = OpenIddictServerHandlerDescriptor.CreateBuilder() @@ -19,14 +20,18 @@ public class ProcessSignInIdentitySession : IOpenIddictServerHandler abpOpenIddictAspNetCoreSessionOptions) { IdentitySessionManager = identitySessionManager; + AbpOpenIddictAspNetCoreSessionOptions = abpOpenIddictAspNetCoreSessionOptions.Value; } public async virtual ValueTask HandleAsync(OpenIddictServerEvents.ProcessSignInContext context) { - if (context.Request.IsPasswordGrantType() && context.Principal != null) + if (AbpOpenIddictAspNetCoreSessionOptions.PersistentSessionGrantTypes.Contains(context.Request.GrantType) && + context.Principal != null) { await IdentitySessionManager.SaveSessionAsync(context.Principal, context.CancellationToken); } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs index 7e1109b23..41cbb9c89 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore.Session/LINGYUN/Abp/OpenIddict/AspNetCore/Session/RevocationIdentitySession.cs @@ -3,6 +3,7 @@ using System; using System.Security.Principal; using System.Threading.Tasks; +using Volo.Abp.MultiTenancy; namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; /// @@ -10,6 +11,7 @@ namespace LINGYUN.Abp.OpenIddict.AspNetCore.Session; /// public class RevocationIdentitySession : IOpenIddictServerHandler { + protected ICurrentTenant CurrentTenant { get; } protected IIdentitySessionManager IdentitySessionManager { get; } public static OpenIddictServerHandlerDescriptor Descriptor { get; } @@ -20,17 +22,24 @@ public class RevocationIdentitySession : IOpenIddictServerHandler public class UserinfoIdentitySession : IOpenIddictServerHandler { + protected ICurrentTenant CurrentTenant { get; } protected IIdentitySessionChecker IdentitySessionChecker { get; } public static OpenIddictServerHandlerDescriptor Descriptor { get; } = OpenIddictServerHandlerDescriptor.CreateBuilder() .AddFilter() .UseScopedHandler() - .SetOrder(ValidateAccessTokenParameter.Descriptor.Order + 2_000) + .SetOrder(ValidateUserinfoRequest.Descriptor.Order + 2_000) .SetType(OpenIddictServerHandlerType.Custom) .Build(); - public UserinfoIdentitySession(IIdentitySessionChecker identitySessionChecker) + public UserinfoIdentitySession( + ICurrentTenant currentTenant, + IIdentitySessionChecker identitySessionChecker) { + CurrentTenant = currentTenant; IdentitySessionChecker = identitySessionChecker; } public async virtual ValueTask HandleAsync(OpenIddictServerEvents.HandleUserinfoRequestContext context) { + var tenantId = context.Principal.FindTenantId(); var sessionId = context.Principal.FindSessionId(); - if (sessionId.IsNullOrWhiteSpace() || - !await IdentitySessionChecker.ValidateSessionAsync(sessionId)) + using (CurrentTenant.Change(tenantId)) { - // Errors.InvalidToken ---> 401 - // Errors.ExpiredToken ---> 400 - context.Reject(Errors.InvalidToken, "The user session has expired."); + if (sessionId.IsNullOrWhiteSpace() || + !await IdentitySessionChecker.ValidateSessionAsync(sessionId)) + { + // Errors.InvalidToken ---> 401 + // Errors.ExpiredToken ---> 400 + context.Reject(Errors.InvalidToken, "The user session has expired."); + } } } } diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs index 244bc5d99..bf231d4f9 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs @@ -52,7 +52,7 @@ public async virtual Task HandleAsync(ExtensionGrantContext conte { LazyServiceProvider = context.HttpContext.RequestServices.GetRequiredService(); - var enterprise = context.Request.GetParameter("EnterpriseId")?.ToString(); + var enterprise = context.Request.GetParameter("enterpriseId")?.ToString() ?? context.Request.GetParameter("EnterpriseId")?.ToString(); Guid? tenantId = null; using (CurrentTenant.Change(null)) diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs b/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs index ca7c31f5e..6678173d0 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.Applications.Single/MicroServiceApplicationsSingleModule.Configure.cs @@ -9,7 +9,12 @@ using LINGYUN.Abp.IdentityServer.IdentityResources; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.Notifications; +using LINGYUN.Abp.OpenIddict.AspNetCore.Session; +using LINGYUN.Abp.OpenIddict.LinkUser; using LINGYUN.Abp.OpenIddict.Permissions; +using LINGYUN.Abp.OpenIddict.Portal; +using LINGYUN.Abp.OpenIddict.Sms; +using LINGYUN.Abp.OpenIddict.WeChat; using LINGYUN.Abp.Saas; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; @@ -18,6 +23,7 @@ using LINGYUN.Abp.WebhooksManagement; using LINGYUN.Abp.WeChat.Common.Messages.Handlers; using LINGYUN.Abp.WeChat.Localization; +using LINGYUN.Abp.WeChat.Work; using LINGYUN.Abp.Wrapper; using LINGYUN.Platform.Localization; using LY.MicroService.Applications.Single.Authentication; @@ -311,6 +317,15 @@ private void ConfigureAuthServer(IConfiguration configuration) options.RefreshTokenReuseLeeway = lifetime.GetValue("RefreshTokenReuseLeeway", options.RefreshTokenReuseLeeway); options.UserCodeLifetime = lifetime.GetValue("UserCode", options.UserCodeLifetime); }); + Configure(options => + { + options.PersistentSessionGrantTypes.Add(SmsTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(PortalTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(LinkUserTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.OfficialGrantType); + options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.MiniProgramGrantType); + options.PersistentSessionGrantTypes.Add(AbpWeChatWorkGlobalConsts.GrantType); + }); } private void ConfigureEndpoints(IServiceCollection services) @@ -454,8 +469,8 @@ private void ConfigurePermissionManagement(IConfiguration configuration) { // Rename IdentityServer.Client.ManagePermissions // See https://github.com/abpframework/abp/blob/dev/modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo/Abp/PermissionManagement/IdentityServer/AbpPermissionManagementDomainIdentityServerModule.cs - options.ProviderPolicies[ClientPermissionValueProvider.ProviderName] = AbpOpenIddictPermissions.Applications.ManagePermissions; - + options.ProviderPolicies[ClientPermissionValueProvider.ProviderName] = AbpOpenIddictPermissions.Applications.ManagePermissions; + //if (configuration.GetValue("AuthServer:UseOpenIddict")) //{ // options.ProviderPolicies[ClientPermissionValueProvider.ProviderName] = AbpOpenIddictPermissions.Applications.ManagePermissions; diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs b/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs index bb6316cd8..1f3acce59 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs +++ b/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs @@ -65,10 +65,11 @@ await builder.AddApplicationAsync(options app.UseRouting(); app.UseCors(); app.UseAuthentication(); +app.UseMultiTenancy(); +app.UseUnitOfWork(); app.UseAbpOpenIddictValidation(); app.UseAbpSession(); app.UseDynamicClaims(); -app.UseMultiTenancy(); app.UseAuthorization(); app.UseSwagger(); app.UseSwaggerUI(options => diff --git a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs index 71ab8a4e3..adaed895d 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/AuthServerModule.Configure.cs @@ -1,7 +1,13 @@ using DotNetCore.CAP; using LINGYUN.Abp.Localization.CultureMap; +using LINGYUN.Abp.OpenIddict.AspNetCore.Session; +using LINGYUN.Abp.OpenIddict.LinkUser; +using LINGYUN.Abp.OpenIddict.Portal; +using LINGYUN.Abp.OpenIddict.Sms; +using LINGYUN.Abp.OpenIddict.WeChat; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; +using LINGYUN.Abp.WeChat.Work; using LY.MicroService.AuthServer.Authentication; using Medallion.Threading; using Medallion.Threading.Redis; @@ -10,7 +16,6 @@ using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Caching.StackExchangeRedis; @@ -19,7 +24,6 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.IdentityModel.Logging; -using OpenIddict.Validation.AspNetCore; using OpenTelemetry.Metrics; using OpenTelemetry.Resources; using OpenTelemetry.Trace; @@ -334,6 +338,16 @@ private void ConfigureIdentity(IConfiguration configuration) options.IsDynamicClaimsEnabled = true; options.IsRemoteRefreshEnabled = false; }); + + Configure(options => + { + options.PersistentSessionGrantTypes.Add(SmsTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(PortalTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(LinkUserTokenExtensionGrantConsts.GrantType); + options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.OfficialGrantType); + options.PersistentSessionGrantTypes.Add(WeChatTokenExtensionGrantConsts.MiniProgramGrantType); + options.PersistentSessionGrantTypes.Add(AbpWeChatWorkGlobalConsts.GrantType); + }); } private void ConfigureVirtualFileSystem() {