Browse Source

fix: fix some issues.

pull/865/head
colin 2 years ago
parent
commit
adbd12cdd7
  1. 74
      apps/flutter/dev_app/lib/utils/logging.flutter.dart
  2. 4
      apps/vue/src/api/localization/languages.ts
  3. 4
      apps/vue/src/components/Modal/src/props.ts
  4. 10
      aspnet-core/Directory.Build.props
  5. 1
      aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json
  6. 1
      aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json
  7. 2
      aspnet-core/services/LY.MicroService.AuthServer/DataSeeder/AuthServerDataSeedContributor.cs
  8. 10
      aspnet-core/services/LY.MicroService.AuthServer/EventBus/Handlers/TenantSynchronizer.cs
  9. 2
      aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json
  10. 4
      aspnet-core/services/LY.MicroService.AuthServer/package.json
  11. 10
      aspnet-core/services/LY.MicroService.identityServer/EventBus/Handlers/TenantSynchronizer.cs
  12. 4
      aspnet-core/services/LY.MicroService.identityServer/package.json

74
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() ?? '',
);
}
}

4
apps/vue/src/api/localization/languages.ts

@ -19,8 +19,8 @@ export const GetAsyncByName = (name: string) => {
return defAbpHttp.request<Language>({ return defAbpHttp.request<Language>({
service: remoteServiceName, service: remoteServiceName,
controller: controllerName, controller: controllerName,
action: 'GetAsync', action: 'GetByNameAsync',
uniqueName: 'GetAsyncByName', uniqueName: 'GetByNameAsyncByName',
params: { params: {
name: name, name: name,
}, },

4
apps/vue/src/components/Modal/src/props.ts

@ -10,8 +10,8 @@ export const modalProps = {
// open drag // open drag
draggable: { type: Boolean, default: true }, draggable: { type: Boolean, default: true },
centered: { type: Boolean }, centered: { type: Boolean },
cancelText: { type: String, default: 'Cancel' }, cancelText: { type: String },
okText: { type: String, default: 'Ok' }, okText: { type: String },
closeFunc: Function as PropType<() => Promise<boolean>>, closeFunc: Function as PropType<() => Promise<boolean>>,
}; };

10
aspnet-core/Directory.Build.props

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

1
aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/en.json

@ -2,6 +2,7 @@
"culture": "en", "culture": "en",
"texts": { "texts": {
"Delete": "Delete", "Delete": "Delete",
"DisplayName:Enable": "Enable",
"DisplayName:CreationTime": "Creation Time", "DisplayName:CreationTime": "Creation Time",
"DisplayName:LastModificationTime": "Modification Time", "DisplayName:LastModificationTime": "Modification Time",
"DisplayName:SaveAndNext": "Save & Next", "DisplayName:SaveAndNext": "Save & Next",

1
aspnet-core/modules/lt/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN/Abp/LocalizationManagement/Localization/Resources/zh-Hans.json

@ -2,6 +2,7 @@
"culture": "zh-Hans", "culture": "zh-Hans",
"texts": { "texts": {
"Delete": "删除", "Delete": "删除",
"DisplayName:Enable": "启用",
"DisplayName:CreationTime": "创建时间", "DisplayName:CreationTime": "创建时间",
"DisplayName:LastModificationTime": "变更时间", "DisplayName:LastModificationTime": "变更时间",
"DisplayName:SaveAndNext": "保存并下一步", "DisplayName:SaveAndNext": "保存并下一步",

2
aspnet-core/services/LY.MicroService.AuthServer/DataSeeder/AuthServerDataSeedContributor.cs

@ -130,6 +130,8 @@ public class ServerDataSeedContributor : IDataSeedContributor, ITransientDepende
await _applicationManager.CreateAsync(new OpenIddictApplicationDescriptor await _applicationManager.CreateAsync(new OpenIddictApplicationDescriptor
{ {
ClientId = "InternalServiceClient", ClientId = "InternalServiceClient",
ClientSecret = "1q2w3e*",
Type = OpenIddictConstants.ClientTypes.Confidential,
ConsentType = OpenIddictConstants.ConsentTypes.Explicit, ConsentType = OpenIddictConstants.ConsentTypes.Explicit,
DisplayName = "Internal Service Client", DisplayName = "Internal Service Client",
PostLogoutRedirectUris = {}, PostLogoutRedirectUris = {},

10
aspnet-core/services/LY.MicroService.AuthServer/EventBus/Handlers/TenantSynchronizer.cs

@ -90,10 +90,12 @@ public class TenantSynchronizer : IDistributedEventHandler<CreateEventData>, ITr
await PermissionDataSeeder.SeedAsync( await PermissionDataSeeder.SeedAsync(
RolePermissionValueProvider.ProviderName, RolePermissionValueProvider.ProviderName,
defaultRole.Name, defaultRole.Name,
new string[] { new string[]
IdentityPermissions.UserLookup.Default, {
IdentityPermissions.Users.Default IdentityPermissions.UserLookup.Default,
}); IdentityPermissions.Users.Default
},
tenantId: tenantId);
} }
private async Task SeedTenantAdminAsync(CreateEventData eventData) private async Task SeedTenantAdminAsync(CreateEventData eventData)

2
aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json

@ -26,7 +26,7 @@
} }
}, },
"ConnectionStrings": { "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", "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", "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", "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456",

4
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", "name": "my-app-auth-server",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.0.4" "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.3.2"
} }
} }

10
aspnet-core/services/LY.MicroService.identityServer/EventBus/Handlers/TenantSynchronizer.cs

@ -90,10 +90,12 @@ public class TenantSynchronizer : IDistributedEventHandler<CreateEventData>, ITr
await PermissionDataSeeder.SeedAsync( await PermissionDataSeeder.SeedAsync(
RolePermissionValueProvider.ProviderName, RolePermissionValueProvider.ProviderName,
defaultRole.Name, defaultRole.Name,
new string[] { new string[]
IdentityPermissions.UserLookup.Default, {
IdentityPermissions.Users.Default IdentityPermissions.UserLookup.Default,
}); IdentityPermissions.Users.Default
},
tenantId: tenantId);
} }
private async Task SeedTenantAdminAsync(CreateEventData eventData) private async Task SeedTenantAdminAsync(CreateEventData eventData)

4
aspnet-core/services/LY.MicroService.identityServer/package.json

@ -1,8 +1,8 @@
{ {
"version": "7.0.2", "version": "7.3.2",
"name": "my-app-identityserver", "name": "my-app-identityserver",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.0.1" "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.3.2"
} }
} }
Loading…
Cancel
Save