Merge pull request #865 from colinin/fix-issues

fix: fix some issues.
colinin · Aug 28, 2023 · c8ad940 · c8ad940
2 parents 7c72807 + adbd12c
commit c8ad940
Show file tree

Hide file tree

Showing 12 changed files with 104 additions and 22 deletions.
diff --git a/apps/flutter/dev_app/lib/utils/logging.flutter.dart 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() ?? '',
+    );
+  }
+}
diff --git 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<Language>({
     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
@@ -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<boolean>>,
 };

diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props
@@ -22,16 +22,16 @@
 		<OpenTelemetryContribInstrumentationEntityFrameworkCorePackageVersion>1.0.0-beta2</OpenTelemetryContribInstrumentationEntityFrameworkCorePackageVersion>
 		<QuartzNETPackageVersion>3.3.3</QuartzNETPackageVersion>
 		<StackExchangeRedisPackageVersion>2.2.4</StackExchangeRedisPackageVersion>
-		<SerilogPackageVersion>2.10.0</SerilogPackageVersion>
-		<SerilogAspNetCorePackageVersion>5.0.0</SerilogAspNetCorePackageVersion>
+		<SerilogPackageVersion>2.12.0</SerilogPackageVersion>
+		<SerilogAspNetCorePackageVersion>7.0.0</SerilogAspNetCorePackageVersion>
 		<SerilogEnrichersEnvironmentPackageVersion>2.2.0</SerilogEnrichersEnvironmentPackageVersion>
 		<SerilogEnrichersAssemblyPackageVersion>2.0.0</SerilogEnrichersAssemblyPackageVersion>
-		<SerilogEnrichersProcessPackageVersion>2.0.1</SerilogEnrichersProcessPackageVersion>
+		<SerilogEnrichersProcessPackageVersion>2.0.2</SerilogEnrichersProcessPackageVersion>
 		<SerilogEnrichersThreadPackageVersion>3.1.0</SerilogEnrichersThreadPackageVersion>
 		<SerilogExtensionsLoggingPackageVersion>3.0.1</SerilogExtensionsLoggingPackageVersion>
-		<SerilogSettingsConfigurationPackageVersion>3.4.0</SerilogSettingsConfigurationPackageVersion>
+		<SerilogSettingsConfigurationPackageVersion>7.0.1</SerilogSettingsConfigurationPackageVersion>
 		<SerilogSinksConsolePackageVersion>4.0.0</SerilogSinksConsolePackageVersion>
-		<SerilogSinksElasticsearchPackageVersion>8.4.1</SerilogSinksElasticsearchPackageVersion>
+		<SerilogSinksElasticsearchPackageVersion>9.0.3</SerilogSinksElasticsearchPackageVersion>
 		<SerilogSinksFilePackageVersion>5.0.0</SerilogSinksFilePackageVersion>
 		<SwashbuckleAspNetCorePackageVersion>6.3.0</SwashbuckleAspNetCorePackageVersion>
 		<PollyPackageVersion>7.2.3</PollyPackageVersion>

diff --git a/...anagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json b/...anagement.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/...ment.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json b/...ment.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
@@ -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
@@ -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
@@ -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
@@ -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"
   }
 }
diff --git 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
@@ -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"
   }
 }