diff --git a/apps/flutter/dev_app/lib/utils/logging.flutter.dart b/apps/flutter/dev_app/lib/utils/logging.flutter.dart new file mode 100644 index 000000000..394798e8d --- /dev/null +++ b/apps/flutter/dev_app/lib/utils/logging.flutter.dart @@ -0,0 +1,74 @@ +import 'package:core/abstracts/logging.dart'; +import 'package:core/models/environment.dart'; +import 'package:flutter_logs/flutter_logs.dart'; + +class FlutterLogging implements ILogger { + FlutterLogging(this._environment); + final Environment _environment; + + @override + void all(message, [error, StackTrace? stackTrace]) { + FlutterLogs.logThis( + tag: _environment.application.name, + logMessage: message, + level: LogLevel.INFO, + error: error, + errorMessage: stackTrace?.toString() ?? '', + ); + } + + @override + void debug(message, [error, StackTrace? stackTrace]) { + FlutterLogs.logThis( + tag: _environment.application.name, + logMessage: message, + level: LogLevel.INFO, + error: error, + errorMessage: stackTrace?.toString() ?? '', + ); + } + + @override + void error(message, [error, StackTrace? stackTrace]) { + FlutterLogs.logThis( + tag: _environment.application.name, + logMessage: message, + level: LogLevel.ERROR, + error: error, + errorMessage: stackTrace?.toString() ?? '', + ); + } + + @override + void info(message, [error, StackTrace? stackTrace]) { + FlutterLogs.logThis( + tag: _environment.application.name, + logMessage: message, + level: LogLevel.INFO, + error: error, + errorMessage: stackTrace?.toString() ?? '', + ); + } + + @override + void trace(message, [error, StackTrace? stackTrace]) { + FlutterLogs.logThis( + tag: _environment.application.name, + logMessage: message, + level: LogLevel.INFO, + error: error, + errorMessage: stackTrace?.toString() ?? '', + ); + } + + @override + void warn(message, [error, StackTrace? stackTrace]) { + FlutterLogs.logThis( + tag: _environment.application.name, + logMessage: message, + level: LogLevel.WARNING, + error: error, + errorMessage: stackTrace?.toString() ?? '', + ); + } +} \ No newline at end of file diff --git a/apps/vue/src/api/localization/languages.ts b/apps/vue/src/api/localization/languages.ts index 87ac273ae..7f995a224 100644 --- a/apps/vue/src/api/localization/languages.ts +++ b/apps/vue/src/api/localization/languages.ts @@ -19,8 +19,8 @@ export const GetAsyncByName = (name: string) => { return defAbpHttp.request({ service: remoteServiceName, controller: controllerName, - action: 'GetAsync', - uniqueName: 'GetAsyncByName', + action: 'GetByNameAsync', + uniqueName: 'GetByNameAsyncByName', params: { name: name, }, diff --git a/apps/vue/src/components/Modal/src/props.ts b/apps/vue/src/components/Modal/src/props.ts index f18bf8394..5214ccdc2 100644 --- a/apps/vue/src/components/Modal/src/props.ts +++ b/apps/vue/src/components/Modal/src/props.ts @@ -10,8 +10,8 @@ export const modalProps = { // open drag draggable: { type: Boolean, default: true }, centered: { type: Boolean }, - cancelText: { type: String, default: 'Cancel' }, - okText: { type: String, default: 'Ok' }, + cancelText: { type: String }, + okText: { type: String }, closeFunc: Function as PropType<() => Promise>, }; diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index 74ace592f..dc45008c6 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -22,16 +22,16 @@ 1.0.0-beta2 3.3.3 2.2.4 - 2.10.0 - 5.0.0 + 2.12.0 + 7.0.0 2.2.0 2.0.0 - 2.0.1 + 2.0.2 3.1.0 3.0.1 - 3.4.0 + 7.0.1 4.0.0 - 8.4.1 + 9.0.3 5.0.0 6.3.0 7.2.3 diff --git a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json index f0669b5b6..70e9d1801 100644 --- a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json +++ b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json @@ -2,6 +2,7 @@ "culture": "en", "texts": { "Delete": "Delete", + "DisplayName:Enable": "Enable", "DisplayName:CreationTime": "Creation Time", "DisplayName:LastModificationTime": "Modification Time", "DisplayName:SaveAndNext": "Save & Next", diff --git a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json index 3b607829d..7bc476760 100644 --- a/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json +++ b/aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json @@ -2,6 +2,7 @@ "culture": "zh-Hans", "texts": { "Delete": "删除", + "DisplayName:Enable": "启用", "DisplayName:CreationTime": "创建时间", "DisplayName:LastModificationTime": "变更时间", "DisplayName:SaveAndNext": "保存并下一步", diff --git a/aspnet-core/services/LY.MicroService.AuthServer/DataSeeder/AuthServerDataSeedContributor.cs b/aspnet-core/services/LY.MicroService.AuthServer/DataSeeder/AuthServerDataSeedContributor.cs index 8f1a86881..8796844b5 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/DataSeeder/AuthServerDataSeedContributor.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/DataSeeder/AuthServerDataSeedContributor.cs @@ -130,6 +130,8 @@ await _applicationManager.CreateAsync(new OpenIddictApplicationDescriptor await _applicationManager.CreateAsync(new OpenIddictApplicationDescriptor { ClientId = "InternalServiceClient", + ClientSecret = "1q2w3e*", + Type = OpenIddictConstants.ClientTypes.Confidential, ConsentType = OpenIddictConstants.ConsentTypes.Explicit, DisplayName = "Internal Service Client", PostLogoutRedirectUris = {}, diff --git a/aspnet-core/services/LY.MicroService.AuthServer/EventBus/Handlers/TenantSynchronizer.cs b/aspnet-core/services/LY.MicroService.AuthServer/EventBus/Handlers/TenantSynchronizer.cs index a1692d705..c20ddb748 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/EventBus/Handlers/TenantSynchronizer.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/EventBus/Handlers/TenantSynchronizer.cs @@ -90,10 +90,12 @@ private async Task SeedTenantDefaultRoleAsync(Guid tenantId) await PermissionDataSeeder.SeedAsync( RolePermissionValueProvider.ProviderName, defaultRole.Name, - new string[] { - IdentityPermissions.UserLookup.Default, - IdentityPermissions.Users.Default - }); + new string[] + { + IdentityPermissions.UserLookup.Default, + IdentityPermissions.Users.Default + }, + tenantId: tenantId); } private async Task SeedTenantAdminAsync(CreateEventData eventData) diff --git a/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json b/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json index 51df92007..b39579c35 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json @@ -26,7 +26,7 @@ } }, "ConnectionStrings": { - "Default": "Server=127.0.0.1;Database=AuthServer-v70;User Id=root;Password=123456", + "Default": "Server=127.0.0.1;Database=AuthServer-v70;User Id=root;Password=123456;", "AbpIdentity": "Server=127.0.0.1;Database=AuthServer-v70;User Id=root;Password=123456", "OpenIddict": "Server=127.0.0.1;Database=AuthServer-v70;User Id=root;Password=123456", "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", diff --git a/aspnet-core/services/LY.MicroService.AuthServer/package.json b/aspnet-core/services/LY.MicroService.AuthServer/package.json index c952e3b0c..6e78a8038 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/package.json +++ b/aspnet-core/services/LY.MicroService.AuthServer/package.json @@ -1,8 +1,8 @@ { - "version": "7.0.2", + "version": "7.3.2", "name": "my-app-auth-server", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.0.4" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.3.2" } } \ No newline at end of file diff --git a/aspnet-core/services/LY.MicroService.identityServer/EventBus/Handlers/TenantSynchronizer.cs b/aspnet-core/services/LY.MicroService.identityServer/EventBus/Handlers/TenantSynchronizer.cs index e0724495b..e13696bce 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/EventBus/Handlers/TenantSynchronizer.cs +++ b/aspnet-core/services/LY.MicroService.identityServer/EventBus/Handlers/TenantSynchronizer.cs @@ -90,10 +90,12 @@ private async Task SeedTenantDefaultRoleAsync(Guid tenantId) await PermissionDataSeeder.SeedAsync( RolePermissionValueProvider.ProviderName, defaultRole.Name, - new string[] { - IdentityPermissions.UserLookup.Default, - IdentityPermissions.Users.Default - }); + new string[] + { + IdentityPermissions.UserLookup.Default, + IdentityPermissions.Users.Default + }, + tenantId: tenantId); } private async Task SeedTenantAdminAsync(CreateEventData eventData) diff --git a/aspnet-core/services/LY.MicroService.identityServer/package.json b/aspnet-core/services/LY.MicroService.identityServer/package.json index 4a26b4452..5501ccad5 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/package.json +++ b/aspnet-core/services/LY.MicroService.identityServer/package.json @@ -1,8 +1,8 @@ { - "version": "7.0.2", + "version": "7.3.2", "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.0.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.3.2" } } \ No newline at end of file