colin
11 months ago
143 changed files with 14017 additions and 31657 deletions
@ -1,3 +0,0 @@ |
|||
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"> |
|||
<ConfigureAwait ContinueOnCapturedContext="false" /> |
|||
</Weavers> |
|||
@ -1,30 +0,0 @@ |
|||
<?xml version="1.0" encoding="utf-8"?> |
|||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> |
|||
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. --> |
|||
<xs:element name="Weavers"> |
|||
<xs:complexType> |
|||
<xs:all> |
|||
<xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1"> |
|||
<xs:complexType> |
|||
<xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" /> |
|||
</xs:complexType> |
|||
</xs:element> |
|||
</xs:all> |
|||
<xs:attribute name="VerifyAssembly" type="xs:boolean"> |
|||
<xs:annotation> |
|||
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation> |
|||
</xs:annotation> |
|||
</xs:attribute> |
|||
<xs:attribute name="VerifyIgnoreCodes" type="xs:string"> |
|||
<xs:annotation> |
|||
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation> |
|||
</xs:annotation> |
|||
</xs:attribute> |
|||
<xs:attribute name="GenerateXsd" type="xs:boolean"> |
|||
<xs:annotation> |
|||
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation> |
|||
</xs:annotation> |
|||
</xs:attribute> |
|||
</xs:complexType> |
|||
</xs:element> |
|||
</xs:schema> |
|||
@ -1,20 +0,0 @@ |
|||
<Project Sdk="Microsoft.NET.Sdk"> |
|||
|
|||
<Import Project="..\..\..\..\configureawait.props" /> |
|||
<Import Project="..\..\..\..\common.props" /> |
|||
|
|||
<PropertyGroup> |
|||
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks> |
|||
<AssemblyName>LINGYUN.Abp.Localization.Persistence</AssemblyName> |
|||
<PackageId>LINGYUN.Abp.Localization.Persistence</PackageId> |
|||
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> |
|||
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> |
|||
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> |
|||
<RootNamespace /> |
|||
</PropertyGroup> |
|||
|
|||
<ItemGroup> |
|||
<PackageReference Include="Volo.Abp.Localization" /> |
|||
</ItemGroup> |
|||
|
|||
</Project> |
|||
@ -1,20 +0,0 @@ |
|||
using Microsoft.Extensions.DependencyInjection; |
|||
using Volo.Abp.Localization; |
|||
using Volo.Abp.Modularity; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
|
|||
[DependsOn( |
|||
typeof(AbpLocalizationModule))] |
|||
public class AbpLocalizationPersistenceModule : AbpModule |
|||
{ |
|||
public override void ConfigureServices(ServiceConfigurationContext context) |
|||
{ |
|||
context.Services.AddHostedService<StaticLocalizationSaverHostService>(); |
|||
|
|||
Configure<AbpLocalizationOptions>(options => |
|||
{ |
|||
options.GlobalContributors.Add<LocalizationPersistenceContributor>(); |
|||
}); |
|||
} |
|||
} |
|||
@ -1,35 +0,0 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
|
|||
public class AbpLocalizationPersistenceOptions |
|||
{ |
|||
public bool SaveStaticLocalizationsToPersistence { get; set; } |
|||
|
|||
public HashSet<string> SaveToPersistenceResources { get; } |
|||
|
|||
public AbpLocalizationPersistenceOptions() |
|||
{ |
|||
SaveStaticLocalizationsToPersistence = true; |
|||
|
|||
SaveToPersistenceResources = new HashSet<string>(); |
|||
} |
|||
|
|||
public void AddPersistenceResource<TResource>() |
|||
{ |
|||
AddPersistenceResource(typeof(TResource)); |
|||
} |
|||
|
|||
public void AddPersistenceResource(Type resourceType) |
|||
{ |
|||
var resourceName = LocalizationResourceNameAttribute.GetName(resourceType); |
|||
if (SaveToPersistenceResources.Contains(resourceName)) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
SaveToPersistenceResources.Add(resourceName); |
|||
} |
|||
} |
|||
@ -1,135 +0,0 @@ |
|||
using Microsoft.Extensions.Localization; |
|||
using Microsoft.Extensions.Options; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Localization; |
|||
using Volo.Abp.Uow; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
|
|||
[Dependency(ReplaceServices = true)] |
|||
public class DefaultStaticLocalizationSaver : IStaticLocalizationSaver, ITransientDependency |
|||
{ |
|||
protected ILocalizationPersistenceWriter LocalizationPersistenceWriter { get; } |
|||
|
|||
protected AbpLocalizationOptions LocalizationOptions { get; } |
|||
protected IServiceProvider ServiceProvider { get; } |
|||
protected AbpLocalizationPersistenceOptions LocalizationPersistenceOptions { get; } |
|||
|
|||
public DefaultStaticLocalizationSaver( |
|||
IServiceProvider serviceProvider, |
|||
ILocalizationPersistenceWriter localizationPersistenceWriter, |
|||
IOptions<AbpLocalizationOptions> localizationOptions, |
|||
IOptions<AbpLocalizationPersistenceOptions> localizationPersistenceOptions) |
|||
{ |
|||
ServiceProvider = serviceProvider; |
|||
LocalizationPersistenceWriter = localizationPersistenceWriter; |
|||
LocalizationOptions = localizationOptions.Value; |
|||
LocalizationPersistenceOptions = localizationPersistenceOptions.Value; |
|||
} |
|||
|
|||
[UnitOfWork] |
|||
public async virtual Task SaveAsync() |
|||
{ |
|||
if (!LocalizationPersistenceOptions.SaveStaticLocalizationsToPersistence) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
var canWriterTexts = new List<LocalizableStringText>(); |
|||
|
|||
foreach (var localizationResource in LocalizationOptions.Resources) |
|||
{ |
|||
if (ShouldSaveToPersistence(localizationResource.Value)) |
|||
{ |
|||
if (!await LocalizationPersistenceWriter.WriteResourceAsync(localizationResource.Value)) |
|||
{ |
|||
continue; |
|||
} |
|||
|
|||
foreach (var language in LocalizationOptions.Languages) |
|||
{ |
|||
if (!await LocalizationPersistenceWriter.WriteLanguageAsync(language)) |
|||
{ |
|||
continue; |
|||
} |
|||
|
|||
using (CultureHelper.Use(language.CultureName, language.UiCultureName)) |
|||
{ |
|||
await FillCanWriterTextxAsync(localizationResource.Value, language, canWriterTexts); |
|||
} |
|||
} |
|||
} |
|||
} |
|||
|
|||
if (canWriterTexts.Any()) |
|||
{ |
|||
await LocalizationPersistenceWriter.WriteTextsAsync(canWriterTexts); |
|||
} |
|||
} |
|||
|
|||
protected virtual bool ShouldSaveToPersistence(LocalizationResourceBase localizationResource) |
|||
{ |
|||
var saveResource = false; |
|||
if (localizationResource.Contributors.Exists(IsMatchSaveToPersistenceContributor)) |
|||
{ |
|||
saveResource = true; |
|||
} |
|||
if (!saveResource) |
|||
{ |
|||
saveResource = LocalizationPersistenceOptions |
|||
.SaveToPersistenceResources |
|||
.Contains(localizationResource.ResourceName); |
|||
} |
|||
|
|||
return saveResource; |
|||
} |
|||
|
|||
protected virtual bool IsMatchSaveToPersistenceContributor(ILocalizationResourceContributor contributor) |
|||
{ |
|||
return typeof(LocalizationSaveToPersistenceContributor).IsAssignableFrom(contributor.GetType()); |
|||
} |
|||
|
|||
protected async virtual Task FillCanWriterTextxAsync( |
|||
LocalizationResourceBase localizationResource, |
|||
LanguageInfo language, |
|||
List<LocalizableStringText> canWriterTexts) |
|||
{ |
|||
var fillTexts = new Dictionary<string, LocalizedString>(); |
|||
var context = new LocalizationResourceInitializationContext(localizationResource, ServiceProvider); |
|||
foreach (var contributor in localizationResource.Contributors) |
|||
{ |
|||
if (contributor.IsDynamic) |
|||
{ |
|||
continue; |
|||
} |
|||
|
|||
contributor.Initialize(context); |
|||
|
|||
await contributor.FillAsync(language.CultureName, fillTexts); |
|||
} |
|||
|
|||
var existsKeys = await LocalizationPersistenceWriter.GetExistsTextsAsync( |
|||
localizationResource.ResourceName, |
|||
language.CultureName, |
|||
fillTexts.Values.Select(x => x.Name)); |
|||
|
|||
var notExistsKeys = fillTexts.Values.Where(x => !existsKeys.Contains(x.Name)); |
|||
|
|||
foreach (var notExistsKey in notExistsKeys) |
|||
{ |
|||
if (!canWriterTexts.Any(x => x.CultureName == language.CultureName && x.Name == notExistsKey.Name)) |
|||
{ |
|||
canWriterTexts.Add( |
|||
new LocalizableStringText( |
|||
localizationResource.ResourceName, |
|||
language.CultureName, |
|||
notExistsKey.Name, |
|||
notExistsKey.Value)); |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -1,16 +0,0 @@ |
|||
using Microsoft.Extensions.Localization; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
|
|||
public interface ILocalizationPersistenceReader |
|||
{ |
|||
LocalizedString GetOrNull(string resourceName, string cultureName, string name); |
|||
|
|||
void Fill(string resourceName, string cultureName, Dictionary<string, LocalizedString> dictionary); |
|||
|
|||
Task FillAsync(string resourceName, string cultureName, Dictionary<string, LocalizedString> dictionary); |
|||
|
|||
Task<IEnumerable<string>> GetSupportedCulturesAsync(); |
|||
} |
|||
@ -1,26 +0,0 @@ |
|||
using System.Collections.Generic; |
|||
using System.Threading; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
public interface ILocalizationPersistenceWriter |
|||
{ |
|||
Task<bool> WriteLanguageAsync( |
|||
LanguageInfo language, |
|||
CancellationToken cancellationToken = default); |
|||
|
|||
Task<bool> WriteResourceAsync( |
|||
LocalizationResourceBase resource, |
|||
CancellationToken cancellationToken = default); |
|||
|
|||
Task<IEnumerable<string>> GetExistsTextsAsync( |
|||
string resourceName, |
|||
string cultureName, |
|||
IEnumerable<string> keys, |
|||
CancellationToken cancellationToken = default); |
|||
|
|||
Task<bool> WriteTextsAsync( |
|||
IEnumerable<LocalizableStringText> texts, |
|||
CancellationToken cancellationToken = default); |
|||
} |
|||
@ -1,24 +0,0 @@ |
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
public class LocalizableStringText |
|||
{ |
|||
public LocalizableStringText( |
|||
string resourceName, |
|||
string cultureName, |
|||
string name, |
|||
string value) |
|||
{ |
|||
ResourceName = resourceName; |
|||
CultureName = cultureName; |
|||
Name = name; |
|||
Value = value; |
|||
} |
|||
|
|||
public string ResourceName { get; set; } |
|||
public string CultureName { get; set; } |
|||
public string Name { get; set; } |
|||
public string Value { get; set; } |
|||
public override string ToString() |
|||
{ |
|||
return $"[R]:{ResourceName},[C]:{CultureName ?? ""},[N]:{Name},[V]:{Value ?? ""}"; |
|||
} |
|||
} |
|||
@ -1,40 +0,0 @@ |
|||
using Microsoft.Extensions.DependencyInjection; |
|||
using Microsoft.Extensions.Localization; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
|
|||
public class LocalizationPersistenceContributor : ILocalizationResourceContributor |
|||
{ |
|||
public bool IsDynamic => true; |
|||
|
|||
private LocalizationResourceBase _resource; |
|||
private ILocalizationPersistenceReader _persistenceSupport; |
|||
public void Initialize(LocalizationResourceInitializationContext context) |
|||
{ |
|||
_resource = context.Resource; |
|||
_persistenceSupport = context.ServiceProvider.GetRequiredService<ILocalizationPersistenceReader>(); |
|||
} |
|||
|
|||
public virtual void Fill(string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
_persistenceSupport.Fill(_resource.ResourceName, cultureName, dictionary); |
|||
} |
|||
|
|||
public async virtual Task FillAsync(string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
await _persistenceSupport.FillAsync(_resource.ResourceName, cultureName, dictionary); |
|||
} |
|||
|
|||
public virtual LocalizedString GetOrNull(string cultureName, string name) |
|||
{ |
|||
return _persistenceSupport.GetOrNull(_resource.ResourceName, cultureName, name); |
|||
} |
|||
|
|||
public async virtual Task<IEnumerable<string>> GetSupportedCulturesAsync() |
|||
{ |
|||
return await _persistenceSupport.GetSupportedCulturesAsync(); |
|||
} |
|||
} |
|||
@ -1,39 +0,0 @@ |
|||
using Microsoft.Extensions.Localization; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
|
|||
/// <summary>
|
|||
/// 空接口, 使用此提供者可持久化本地化资源到持久设施
|
|||
/// </summary>
|
|||
public class LocalizationSaveToPersistenceContributor : ILocalizationResourceContributor |
|||
{ |
|||
public bool IsDynamic => true; |
|||
|
|||
public void Fill(string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
} |
|||
|
|||
public Task FillAsync(string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
return Task.CompletedTask; |
|||
} |
|||
|
|||
public LocalizedString GetOrNull(string cultureName, string name) |
|||
{ |
|||
return null; |
|||
} |
|||
|
|||
public Task<IEnumerable<string>> GetSupportedCulturesAsync() |
|||
{ |
|||
IEnumerable<string> emptyCultures = new string[0]; |
|||
|
|||
return Task.FromResult(emptyCultures); |
|||
} |
|||
|
|||
public void Initialize(LocalizationResourceInitializationContext context) |
|||
{ |
|||
} |
|||
} |
|||
@ -1,32 +0,0 @@ |
|||
using Microsoft.Extensions.Localization; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.DependencyInjection; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
|
|||
[Dependency(TryRegister = true)] |
|||
public class NoneLocalizationPersistenceReader : ILocalizationPersistenceReader, ISingletonDependency |
|||
{ |
|||
public void Fill(string resourceName, string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
|
|||
} |
|||
|
|||
public Task FillAsync(string resourceName, string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
return Task.CompletedTask; |
|||
} |
|||
|
|||
public LocalizedString GetOrNull(string resourceName, string cultureName, string name) |
|||
{ |
|||
return null; |
|||
} |
|||
|
|||
public Task<IEnumerable<string>> GetSupportedCulturesAsync() |
|||
{ |
|||
IEnumerable<string> emptyCultures = new string[0]; |
|||
|
|||
return Task.FromResult(emptyCultures); |
|||
} |
|||
} |
|||
@ -1,35 +0,0 @@ |
|||
using System.Collections.Generic; |
|||
using System.Threading; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
|
|||
[Dependency(TryRegister = true)] |
|||
public class NoneLocalizationPersistenceWriter : ILocalizationPersistenceWriter, ISingletonDependency |
|||
{ |
|||
public Task<IEnumerable<string>> GetExistsTextsAsync( |
|||
string resourceName, |
|||
string cultureName, |
|||
IEnumerable<string> keys, |
|||
CancellationToken cancellationToken = default) |
|||
{ |
|||
return Task.FromResult(keys); |
|||
} |
|||
|
|||
public Task<bool> WriteLanguageAsync(LanguageInfo language, CancellationToken cancellationToken = default) |
|||
{ |
|||
return Task.FromResult(false); |
|||
} |
|||
|
|||
public Task<bool> WriteResourceAsync(LocalizationResourceBase resource, CancellationToken cancellationToken = default) |
|||
{ |
|||
return Task.FromResult(false); |
|||
} |
|||
|
|||
public Task<bool> WriteTextsAsync(IEnumerable<LocalizableStringText> texts, CancellationToken cancellationToken = default) |
|||
{ |
|||
return Task.FromResult(false); |
|||
} |
|||
} |
|||
@ -1,37 +0,0 @@ |
|||
using Microsoft.Extensions.Hosting; |
|||
using Microsoft.Extensions.Options; |
|||
using System; |
|||
using System.Threading; |
|||
using System.Threading.Tasks; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
|
|||
public class StaticLocalizationSaverHostService : BackgroundService |
|||
{ |
|||
private readonly AbpLocalizationPersistenceOptions _options; |
|||
private readonly IStaticLocalizationSaver _staticLocalizationSaver; |
|||
|
|||
public StaticLocalizationSaverHostService( |
|||
IOptions<AbpLocalizationPersistenceOptions> options, |
|||
IStaticLocalizationSaver staticLocalizationSaver) |
|||
{ |
|||
_options = options.Value; |
|||
_staticLocalizationSaver = staticLocalizationSaver; |
|||
} |
|||
|
|||
protected async override Task ExecuteAsync(CancellationToken stoppingToken) |
|||
{ |
|||
if (_options.SaveStaticLocalizationsToPersistence) |
|||
{ |
|||
try |
|||
{ |
|||
await _staticLocalizationSaver.SaveAsync(); |
|||
} |
|||
catch (OperationCanceledException) |
|||
{ |
|||
// Ignore
|
|||
return; |
|||
} |
|||
} |
|||
} |
|||
} |
|||
@ -1,129 +0,0 @@ |
|||
# LINGYUN.Abp.Localization.Persistence |
|||
|
|||
## Module Description |
|||
|
|||
Localization component persistence module, providing functionality to persist localization resources to storage facilities. This module allows you to save static localization documents to persistent storage for easier management and maintenance. |
|||
|
|||
## Features |
|||
|
|||
* Support persisting static localization resources to storage facilities |
|||
* Provide read and write interfaces for localization resources |
|||
* Support custom persistence storage implementation |
|||
* Support asynchronous read and write operations |
|||
* Support multi-language culture support |
|||
* Support selective persistence of specified resources |
|||
|
|||
## Installation |
|||
|
|||
```bash |
|||
dotnet add package LINGYUN.Abp.Localization.Persistence |
|||
``` |
|||
|
|||
## Base Modules |
|||
|
|||
* Volo.Abp.Localization |
|||
|
|||
## Configuration |
|||
|
|||
The module provides the following configuration options: |
|||
|
|||
* SaveStaticLocalizationsToPersistence: Whether to enable localization resource persistence (default: true) |
|||
* SaveToPersistenceResources: List of resources to be persisted |
|||
|
|||
## Usage |
|||
|
|||
1. Add module dependency: |
|||
|
|||
```csharp |
|||
[DependsOn( |
|||
typeof(AbpLocalizationPersistenceModule))] |
|||
public class YouProjectModule : AbpModule |
|||
{ |
|||
public override void ConfigureServices(ServiceConfigurationContext context) |
|||
{ |
|||
Configure<AbpLocalizationPersistenceOptions>(options => |
|||
{ |
|||
// Enable persistence facility |
|||
options.SaveStaticLocalizationsToPersistence = true; |
|||
|
|||
// Specify your localization resource type, static documents under this type will be persisted to storage facilities |
|||
options.AddPersistenceResource<YouProjectResource>(); |
|||
}); |
|||
|
|||
// Or use extension method to persist localization resource type |
|||
Configure<AbpLocalizationOptions>(options => |
|||
{ |
|||
// Same effect as above |
|||
options.UsePersistence<YouProjectResource>(); |
|||
}); |
|||
} |
|||
} |
|||
``` |
|||
|
|||
## Extension Interfaces |
|||
|
|||
### ILocalizationPersistenceReader |
|||
|
|||
Used to read localization resources from persistent storage: |
|||
|
|||
```csharp |
|||
public interface ILocalizationPersistenceReader |
|||
{ |
|||
// Get localized string for specified resource |
|||
LocalizedString GetOrNull(string resourceName, string cultureName, string name); |
|||
|
|||
// Fill localization dictionary |
|||
void Fill(string resourceName, string cultureName, Dictionary<string, LocalizedString> dictionary); |
|||
|
|||
// Asynchronously fill localization dictionary |
|||
Task FillAsync(string resourceName, string cultureName, Dictionary<string, LocalizedString> dictionary); |
|||
|
|||
// Get supported cultures list |
|||
Task<IEnumerable<string>> GetSupportedCulturesAsync(); |
|||
} |
|||
``` |
|||
|
|||
### ILocalizationPersistenceWriter |
|||
|
|||
Used to write localization resources to persistent storage: |
|||
|
|||
```csharp |
|||
public interface ILocalizationPersistenceWriter |
|||
{ |
|||
// Write language information |
|||
Task<bool> WriteLanguageAsync(LanguageInfo language); |
|||
|
|||
// Write resource information |
|||
Task<bool> WriteResourceAsync(LocalizationResourceBase resource); |
|||
|
|||
// Get existing texts |
|||
Task<IEnumerable<string>> GetExistsTextsAsync( |
|||
string resourceName, |
|||
string cultureName, |
|||
IEnumerable<string> keys); |
|||
|
|||
// Write localization texts |
|||
Task<bool> WriteTextsAsync(IEnumerable<LocalizableStringText> texts); |
|||
} |
|||
``` |
|||
|
|||
## Custom Persistence Implementation |
|||
|
|||
To implement custom persistence storage, you need to: |
|||
|
|||
1. Implement `ILocalizationPersistenceReader` interface |
|||
2. Implement `ILocalizationPersistenceWriter` interface |
|||
3. Register your implementation in the module: |
|||
|
|||
```csharp |
|||
public override void ConfigureServices(ServiceConfigurationContext context) |
|||
{ |
|||
context.Services.AddTransient<ILocalizationPersistenceReader, YourCustomReader>(); |
|||
context.Services.AddTransient<ILocalizationPersistenceWriter, YourCustomWriter>(); |
|||
} |
|||
``` |
|||
|
|||
## More Information |
|||
|
|||
* [中文文档](./README.md) |
|||
* [ABP Localization Documentation](https://docs.abp.io/en/abp/latest/Localization) |
|||
@ -1,129 +0,0 @@ |
|||
# LINGYUN.Abp.Localization.Persistence |
|||
|
|||
## 模块说明 |
|||
|
|||
本地化组件持久层模块，提供将本地化资源持久化到存储设施的功能。此模块允许你将静态本地化文档保存到持久化存储中，方便管理和维护。 |
|||
|
|||
## 功能特性 |
|||
|
|||
* 支持将静态本地化资源持久化到存储设施 |
|||
* 提供本地化资源的读写接口 |
|||
* 支持自定义持久化存储实现 |
|||
* 支持异步读写操作 |
|||
* 支持多语言文化支持 |
|||
* 支持选择性持久化指定的资源 |
|||
|
|||
## 安装 |
|||
|
|||
```bash |
|||
dotnet add package LINGYUN.Abp.Localization.Persistence |
|||
``` |
|||
|
|||
## 基础模块 |
|||
|
|||
* Volo.Abp.Localization |
|||
|
|||
## 配置说明 |
|||
|
|||
模块提供以下配置选项： |
|||
|
|||
* SaveStaticLocalizationsToPersistence：是否启用本地化资源持久化（默认：true） |
|||
* SaveToPersistenceResources：需要持久化的资源列表 |
|||
|
|||
## 使用方法 |
|||
|
|||
1. 添加模块依赖： |
|||
|
|||
```csharp |
|||
[DependsOn( |
|||
typeof(AbpLocalizationPersistenceModule))] |
|||
public class YouProjectModule : AbpModule |
|||
{ |
|||
public override void ConfigureServices(ServiceConfigurationContext context) |
|||
{ |
|||
Configure<AbpLocalizationPersistenceOptions>(options => |
|||
{ |
|||
// 启用持久化设施 |
|||
options.SaveStaticLocalizationsToPersistence = true; |
|||
|
|||
// 指定你的本地化资源类型, 此类型下定义的静态文档将被持久化到存储设施 |
|||
options.AddPersistenceResource<YouProjectResource>(); |
|||
}); |
|||
|
|||
// 或者使用扩展方法持久化本地化资源类型 |
|||
Configure<AbpLocalizationOptions>(options => |
|||
{ |
|||
// 效果如上 |
|||
options.UsePersistence<YouProjectResource>(); |
|||
}); |
|||
} |
|||
} |
|||
``` |
|||
|
|||
## 扩展接口 |
|||
|
|||
### ILocalizationPersistenceReader |
|||
|
|||
用于从持久化存储中读取本地化资源： |
|||
|
|||
```csharp |
|||
public interface ILocalizationPersistenceReader |
|||
{ |
|||
// 获取指定资源的本地化字符串 |
|||
LocalizedString GetOrNull(string resourceName, string cultureName, string name); |
|||
|
|||
// 填充本地化字典 |
|||
void Fill(string resourceName, string cultureName, Dictionary<string, LocalizedString> dictionary); |
|||
|
|||
// 异步填充本地化字典 |
|||
Task FillAsync(string resourceName, string cultureName, Dictionary<string, LocalizedString> dictionary); |
|||
|
|||
// 获取支持的文化列表 |
|||
Task<IEnumerable<string>> GetSupportedCulturesAsync(); |
|||
} |
|||
``` |
|||
|
|||
### ILocalizationPersistenceWriter |
|||
|
|||
用于将本地化资源写入持久化存储： |
|||
|
|||
```csharp |
|||
public interface ILocalizationPersistenceWriter |
|||
{ |
|||
// 写入语言信息 |
|||
Task<bool> WriteLanguageAsync(LanguageInfo language); |
|||
|
|||
// 写入资源信息 |
|||
Task<bool> WriteResourceAsync(LocalizationResourceBase resource); |
|||
|
|||
// 获取已存在的文本 |
|||
Task<IEnumerable<string>> GetExistsTextsAsync( |
|||
string resourceName, |
|||
string cultureName, |
|||
IEnumerable<string> keys); |
|||
|
|||
// 写入本地化文本 |
|||
Task<bool> WriteTextsAsync(IEnumerable<LocalizableStringText> texts); |
|||
} |
|||
``` |
|||
|
|||
## 自定义持久化实现 |
|||
|
|||
要实现自定义的持久化存储，需要： |
|||
|
|||
1. 实现 `ILocalizationPersistenceReader` 接口 |
|||
2. 实现 `ILocalizationPersistenceWriter` 接口 |
|||
3. 在模块中注册你的实现： |
|||
|
|||
```csharp |
|||
public override void ConfigureServices(ServiceConfigurationContext context) |
|||
{ |
|||
context.Services.AddTransient<ILocalizationPersistenceReader, YourCustomReader>(); |
|||
context.Services.AddTransient<ILocalizationPersistenceWriter, YourCustomWriter>(); |
|||
} |
|||
``` |
|||
|
|||
## 更多信息 |
|||
|
|||
* [English Documentation](./README.EN.md) |
|||
* [ABP本地化文档](https://docs.abp.io/zh-Hans/abp/latest/Localization) |
|||
@ -1,44 +0,0 @@ |
|||
using LINGYUN.Abp.Localization.Persistence; |
|||
using System; |
|||
|
|||
namespace Volo.Abp.Localization; |
|||
public static class AbpLocalizationOptionsExtensions |
|||
{ |
|||
public static void UsePersistence<TResource>( |
|||
this AbpLocalizationOptions options) |
|||
{ |
|||
options.Resources |
|||
.Get<TResource>() |
|||
.Contributors |
|||
.Add(new LocalizationSaveToPersistenceContributor()); |
|||
} |
|||
|
|||
public static void UsePersistence( |
|||
this AbpLocalizationOptions options, |
|||
Type localizationResourceType) |
|||
{ |
|||
options.Resources |
|||
.Get(localizationResourceType) |
|||
.Contributors |
|||
.Add(new LocalizationSaveToPersistenceContributor()); |
|||
} |
|||
|
|||
public static void UsePersistences( |
|||
this AbpLocalizationOptions options, |
|||
params Type[] localizationResourceTypes) |
|||
{ |
|||
foreach (var localizationResourceType in localizationResourceTypes) |
|||
{ |
|||
options.UsePersistence(localizationResourceType); |
|||
} |
|||
} |
|||
|
|||
public static void UseAllPersistence( |
|||
this AbpLocalizationOptions options) |
|||
{ |
|||
foreach (var resource in options.Resources) |
|||
{ |
|||
resource.Value.Contributors.Add(new LocalizationSaveToPersistenceContributor()); |
|||
} |
|||
} |
|||
} |
|||
@ -1,74 +0,0 @@ |
|||
using LINGYUN.Abp.Auditing.Web.ProfileManagement; |
|||
using Microsoft.Extensions.DependencyInjection; |
|||
using Volo.Abp.Account.Web; |
|||
using Volo.Abp.Account.Web.Pages.Account; |
|||
using Volo.Abp.Account.Web.ProfileManagement; |
|||
using Volo.Abp.AspNetCore.Mvc.Localization; |
|||
using Volo.Abp.AspNetCore.Mvc.UI.Bundling; |
|||
using Volo.Abp.AuditLogging.Localization; |
|||
using Volo.Abp.AutoMapper; |
|||
using Volo.Abp.Http.ProxyScripting.Generators.JQuery; |
|||
using Volo.Abp.Modularity; |
|||
using Volo.Abp.UI.Navigation; |
|||
using Volo.Abp.VirtualFileSystem; |
|||
|
|||
namespace LINGYUN.Abp.Auditing.Web; |
|||
|
|||
[DependsOn( |
|||
typeof(AbpAccountWebModule), |
|||
typeof(AbpAuditingApplicationContractsModule))] |
|||
public class AbpAuditingWebModule : AbpModule |
|||
{ |
|||
public override void PreConfigureServices(ServiceConfigurationContext context) |
|||
{ |
|||
context.Services.PreConfigure<AbpMvcDataAnnotationsLocalizationOptions>(options => |
|||
{ |
|||
options.AddAssemblyResource(typeof(AuditLoggingResource), typeof(AbpAuditingWebModule).Assembly); |
|||
}); |
|||
|
|||
PreConfigure<IMvcBuilder>(mvcBuilder => |
|||
{ |
|||
mvcBuilder.AddApplicationPartIfNotExists(typeof(AbpAuditingWebModule).Assembly); |
|||
}); |
|||
} |
|||
|
|||
public override void ConfigureServices(ServiceConfigurationContext context) |
|||
{ |
|||
Configure<AbpVirtualFileSystemOptions>(options => |
|||
{ |
|||
options.FileSets.AddEmbedded<AbpAuditingWebModule>(); |
|||
}); |
|||
|
|||
ConfigureProfileManagementPage(); |
|||
|
|||
context.Services.AddAutoMapperObjectMapper<AbpAuditingWebModule>(); |
|||
Configure<AbpAutoMapperOptions>(options => |
|||
{ |
|||
options.AddMaps<AbpAuditingWebModule>(validate: true); |
|||
}); |
|||
|
|||
Configure<DynamicJavaScriptProxyOptions>(options => |
|||
{ |
|||
options.DisableModule(AuditingRemoteServiceConsts.ModuleName); |
|||
}); |
|||
} |
|||
|
|||
private void ConfigureProfileManagementPage() |
|||
{ |
|||
Configure<ProfileManagementPageOptions>(options => |
|||
{ |
|||
options.Contributors.Add(new SecurityLogManagementPageContributor()); |
|||
}); |
|||
|
|||
Configure<AbpBundlingOptions>(options => |
|||
{ |
|||
options.ScriptBundles |
|||
.Configure(typeof(ManageModel).FullName, |
|||
configuration => |
|||
{ |
|||
configuration.AddFiles("/client-proxies/auditing-proxy.js"); |
|||
configuration.AddFiles("/Pages/Account/Components/ProfileManagementGroup/SecurityLog/Index.js"); |
|||
}); |
|||
}); |
|||
} |
|||
} |
|||
@ -1,3 +0,0 @@ |
|||
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd"> |
|||
<ConfigureAwait ContinueOnCapturedContext="false" /> |
|||
</Weavers> |
|||
@ -1,39 +0,0 @@ |
|||
<Project Sdk="Microsoft.NET.Sdk.Web"> |
|||
|
|||
<Import Project="..\..\..\..\configureawait.props" /> |
|||
<Import Project="..\..\..\..\common.props" /> |
|||
|
|||
<PropertyGroup> |
|||
<TargetFramework>net9.0</TargetFramework> |
|||
<AssemblyName>LINGYUN.Abp.Auditing.Web</AssemblyName> |
|||
<PackageId>LINGYUN.Abp.Auditing.Web</PackageId> |
|||
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> |
|||
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> |
|||
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> |
|||
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> |
|||
<RootNamespace>LINGYUN.Abp.Auditing.Web</RootNamespace> |
|||
<IsPackable>true</IsPackable> |
|||
<OutputType>Library</OutputType> |
|||
</PropertyGroup> |
|||
|
|||
<ItemGroup> |
|||
<EmbeddedResource Include="Modules\**\*.js" /> |
|||
<EmbeddedResource Include="Modules\**\*.css" /> |
|||
<EmbeddedResource Include="Pages\**\*.js" /> |
|||
<EmbeddedResource Include="Pages\**\*.css" /> |
|||
<EmbeddedResource Include="wwwroot\**\*.js" /> |
|||
<EmbeddedResource Include="wwwroot\**\*.css" /> |
|||
<Content Remove="Modules\**\*.js" /> |
|||
<Content Remove="Modules\**\*.css" /> |
|||
</ItemGroup> |
|||
|
|||
<ItemGroup> |
|||
<PackageReference Include="Volo.Abp.Account.Web" /> |
|||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" /> |
|||
</ItemGroup> |
|||
|
|||
<ItemGroup> |
|||
<ProjectReference Include="..\LINGYUN.Abp.Auditing.Application.Contracts\LINGYUN.Abp.Auditing.Application.Contracts.csproj" /> |
|||
</ItemGroup> |
|||
|
|||
</Project> |
|||
@ -1,19 +0,0 @@ |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.AspNetCore.Mvc; |
|||
|
|||
namespace LINGYUN.Abp.Auditing.Web.Pages.Account.Components.ProfileManagementGroup.SecurityLog; |
|||
|
|||
public class AccountProfileSecurityLogManagementGroupViewComponent : AbpViewComponent |
|||
{ |
|||
public AccountProfileSecurityLogManagementGroupViewComponent() |
|||
{ |
|||
} |
|||
|
|||
public async virtual Task<IViewComponentResult> InvokeAsync() |
|||
{ |
|||
await Task.CompletedTask; |
|||
|
|||
return View("~/Pages/Account/Components/ProfileManagementGroup/SecurityLog/Index.cshtml"); |
|||
} |
|||
} |
|||
@ -1,22 +0,0 @@ |
|||
@using Microsoft.AspNetCore.Mvc.Localization |
|||
@using Volo.Abp.Account.Localization |
|||
@using Volo.Abp.Localization |
|||
|
|||
@inject IHtmlLocalizer<AccountResource> L |
|||
|
|||
@section scripts { |
|||
<abp-script src="/Pages/Account/Components/ProfileManagementGroup/SecurityLog/Index.js" /> |
|||
} |
|||
|
|||
<abp-card> |
|||
<abp-card-header> |
|||
<abp-row> |
|||
<abp-column size-md="_6"> |
|||
<abp-card-title>@L["SecurityLog"]</abp-card-title> |
|||
</abp-column> |
|||
</abp-row> |
|||
</abp-card-header> |
|||
<abp-card-body> |
|||
<abp-table striped-rows="true" id="SecurityLogTable"></abp-table> |
|||
</abp-card-body> |
|||
</abp-card> |
|||
@ -1,60 +0,0 @@ |
|||
$(function () { |
|||
var ul = abp.localization.getResource('AbpUi'); |
|||
var il = abp.localization.getResource('AbpIdentity'); |
|||
var dataTable = $('#SecurityLogTable').DataTable( |
|||
abp.libs.datatables.normalizeConfiguration({ |
|||
serverSide: true, |
|||
paging: true, |
|||
searching: false, |
|||
scrollX: true, |
|||
ajax: abp.libs.datatables.createAjax(labp.auditing.securityLogs.securityLog.getList), |
|||
columnDefs: [ |
|||
{ |
|||
title: ul('Actions'), |
|||
rowAction: { |
|||
items: |
|||
[ |
|||
{ |
|||
text: il('RevokeSession'), |
|||
confirmMessage: function () { |
|||
return il('SessionWillBeRevokedMessage'); |
|||
}, |
|||
visible: function (data) { |
|||
return data.sessionId !== abp.currentUser?.sessionId; |
|||
}, |
|||
action: function (data) { |
|||
labp.account.myProfile |
|||
.revokeSession(data.record.sessionId) |
|||
.then(function () { |
|||
abp.notify.info( |
|||
il('SuccessfullyRevoked') |
|||
); |
|||
dataTable.ajax.reload(); |
|||
}); |
|||
} |
|||
} |
|||
] |
|||
} |
|||
}, |
|||
{ |
|||
title: il('DisplayName:Device'), |
|||
data: "device" |
|||
}, |
|||
{ |
|||
title: il('DisplayName:IpAddresses'), |
|||
data: "ipAddresses" |
|||
}, |
|||
{ |
|||
title: il('DisplayName:SignedIn'), |
|||
data: "signedIn", |
|||
render: function (data) { |
|||
return luxon |
|||
.DateTime |
|||
.fromISO(data, { |
|||
locale: abp.localization.currentCulture.name |
|||
}).toLocaleString(luxon.DateTime.DATETIME_FULL_WITH_SECONDS); |
|||
} |
|||
}] |
|||
}) |
|||
); |
|||
}); |
|||
@ -1,26 +0,0 @@ |
|||
using LINGYUN.Abp.Auditing.Web.Pages.Account.Components.ProfileManagementGroup.SecurityLog; |
|||
using Microsoft.Extensions.DependencyInjection; |
|||
using Microsoft.Extensions.Localization; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Account.Web.ProfileManagement; |
|||
using Volo.Abp.AuditLogging.Localization; |
|||
|
|||
namespace LINGYUN.Abp.Auditing.Web.ProfileManagement; |
|||
|
|||
public class SecurityLogManagementPageContributor : IProfileManagementPageContributor |
|||
{ |
|||
public virtual Task ConfigureAsync(ProfileManagementPageCreationContext context) |
|||
{ |
|||
var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<AuditLoggingResource>>(); |
|||
|
|||
context.Groups.Add( |
|||
new ProfileManagementPageGroup( |
|||
"LINGYUN.Abp.Account.SecurityLog", |
|||
l["SecurityLog"], |
|||
typeof(AccountProfileSecurityLogManagementGroupViewComponent) |
|||
) |
|||
); |
|||
|
|||
return Task.CompletedTask; |
|||
} |
|||
} |
|||
@ -1,12 +0,0 @@ |
|||
{ |
|||
"profiles": { |
|||
"LINGYUN.Abp.Auditing.Web": { |
|||
"commandName": "Project", |
|||
"launchBrowser": true, |
|||
"environmentVariables": { |
|||
"ASPNETCORE_ENVIRONMENT": "Development" |
|||
}, |
|||
"applicationUrl": "https://localhost:62925;http://localhost:62926" |
|||
} |
|||
} |
|||
} |
|||
@ -1,146 +0,0 @@ |
|||
/* This file is automatically generated by ABP framework to use MVC Controllers from javascript. */ |
|||
|
|||
|
|||
// module auditing
|
|||
|
|||
(function(){ |
|||
|
|||
// controller labp.auditing.auditLogs.auditLog
|
|||
|
|||
(function(){ |
|||
|
|||
abp.utils.createNamespace(window, 'labp.auditing.auditLogs.auditLog'); |
|||
|
|||
labp.auditing.auditLogs.auditLog['delete'] = function(id, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/audit-log/' + id + '', |
|||
type: 'DELETE', |
|||
dataType: null |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
labp.auditing.auditLogs.auditLog.deleteMany = function(input, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/audit-log/bulk', |
|||
type: 'DELETE', |
|||
dataType: null, |
|||
data: JSON.stringify(input) |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
labp.auditing.auditLogs.auditLog.get = function(id, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/audit-log/' + id + '', |
|||
type: 'GET' |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
labp.auditing.auditLogs.auditLog.getList = function(input, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/audit-log' + abp.utils.buildQueryString([{ name: 'startTime', value: input.startTime }, { name: 'endTime', value: input.endTime }, { name: 'httpMethod', value: input.httpMethod }, { name: 'url', value: input.url }, { name: 'userId', value: input.userId }, { name: 'userName', value: input.userName }, { name: 'applicationName', value: input.applicationName }, { name: 'correlationId', value: input.correlationId }, { name: 'clientId', value: input.clientId }, { name: 'clientIpAddress', value: input.clientIpAddress }, { name: 'maxExecutionDuration', value: input.maxExecutionDuration }, { name: 'minExecutionDuration', value: input.minExecutionDuration }, { name: 'hasException', value: input.hasException }, { name: 'httpStatusCode', value: input.httpStatusCode }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', |
|||
type: 'GET' |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
})(); |
|||
|
|||
// controller labp.auditing.auditLogs.entityChanges
|
|||
|
|||
(function(){ |
|||
|
|||
abp.utils.createNamespace(window, 'labp.auditing.auditLogs.entityChanges'); |
|||
|
|||
labp.auditing.auditLogs.entityChanges.get = function(id, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/entity-changes/' + id + '', |
|||
type: 'GET' |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
labp.auditing.auditLogs.entityChanges.getList = function(input, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/entity-changes' + abp.utils.buildQueryString([{ name: 'auditLogId', value: input.auditLogId }, { name: 'startTime', value: input.startTime }, { name: 'endTime', value: input.endTime }, { name: 'changeType', value: input.changeType }, { name: 'entityId', value: input.entityId }, { name: 'entityTypeFullName', value: input.entityTypeFullName }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', |
|||
type: 'GET' |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
labp.auditing.auditLogs.entityChanges.getWithUsernameAsyncById = function(id, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/entity-changes/with-username/' + id + '', |
|||
type: 'GET' |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
labp.auditing.auditLogs.entityChanges.getWithUsernameAsyncByInput = function(input, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/entity-changes/with-username' + abp.utils.buildQueryString([{ name: 'entityId', value: input.entityId }, { name: 'entityTypeFullName', value: input.entityTypeFullName }]) + '', |
|||
type: 'GET' |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
})(); |
|||
|
|||
// controller labp.auditing.logging.log
|
|||
|
|||
(function(){ |
|||
|
|||
abp.utils.createNamespace(window, 'labp.auditing.logging.log'); |
|||
|
|||
labp.auditing.logging.log.get = function(id, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/logging/' + id + '', |
|||
type: 'GET' |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
labp.auditing.logging.log.getList = function(input, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/logging' + abp.utils.buildQueryString([{ name: 'startTime', value: input.startTime }, { name: 'endTime', value: input.endTime }, { name: 'level', value: input.level }, { name: 'machineName', value: input.machineName }, { name: 'environment', value: input.environment }, { name: 'application', value: input.application }, { name: 'context', value: input.context }, { name: 'requestId', value: input.requestId }, { name: 'requestPath', value: input.requestPath }, { name: 'correlationId', value: input.correlationId }, { name: 'processId', value: input.processId }, { name: 'threadId', value: input.threadId }, { name: 'hasException', value: input.hasException }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', |
|||
type: 'GET' |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
})(); |
|||
|
|||
// controller labp.auditing.securityLogs.securityLog
|
|||
|
|||
(function(){ |
|||
|
|||
abp.utils.createNamespace(window, 'labp.auditing.securityLogs.securityLog'); |
|||
|
|||
labp.auditing.securityLogs.securityLog['delete'] = function(id, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/security-log/' + id + '', |
|||
type: 'DELETE', |
|||
dataType: null |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
labp.auditing.securityLogs.securityLog.deleteMany = function(input, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/security-log/bulk', |
|||
type: 'DELETE', |
|||
dataType: null, |
|||
data: JSON.stringify(input) |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
labp.auditing.securityLogs.securityLog.get = function(id, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/security-log/' + id + '', |
|||
type: 'GET' |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
labp.auditing.securityLogs.securityLog.getList = function(input, ajaxParams) { |
|||
return abp.ajax($.extend(true, { |
|||
url: abp.appPath + 'api/auditing/security-log' + abp.utils.buildQueryString([{ name: 'startTime', value: input.startTime }, { name: 'endTime', value: input.endTime }, { name: 'applicationName', value: input.applicationName }, { name: 'identity', value: input.identity }, { name: 'actionName', value: input.actionName }, { name: 'userId', value: input.userId }, { name: 'userName', value: input.userName }, { name: 'clientId', value: input.clientId }, { name: 'correlationId', value: input.correlationId }, { name: 'sorting', value: input.sorting }, { name: 'skipCount', value: input.skipCount }, { name: 'maxResultCount', value: input.maxResultCount }]) + '', |
|||
type: 'GET' |
|||
}, ajaxParams)); |
|||
}; |
|||
|
|||
})(); |
|||
|
|||
})(); |
|||
|
|||
|
|||
@ -1,24 +1,13 @@ |
|||
using System; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public class AbpLocalizationManagementOptions |
|||
{ |
|||
/// <summary>
|
|||
/// 申请时间戳超时时间
|
|||
/// default: 2 minutes
|
|||
/// </summary>
|
|||
public TimeSpan LocalizationCacheStampTimeOut { get; set; } |
|||
/// <summary>
|
|||
/// 时间戳过期时间
|
|||
/// default: 30 minutes
|
|||
/// 保存本地化文本到数据库
|
|||
/// </summary>
|
|||
public TimeSpan LocalizationCacheStampExpiration { get; set; } |
|||
public bool SaveStaticLocalizationsToDatabase { get; set; } |
|||
|
|||
public AbpLocalizationManagementOptions() |
|||
{ |
|||
LocalizationCacheStampTimeOut = TimeSpan.FromMinutes(2); |
|||
// 30分钟过期重新刷新缓存
|
|||
LocalizationCacheStampExpiration = TimeSpan.FromMinutes(30); |
|||
} |
|||
} |
|||
|
|||
@ -0,0 +1,10 @@ |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public interface ILocalizationLanguageStoreCache |
|||
{ |
|||
Task<IReadOnlyList<LanguageInfo>> GetLanguagesAsync(); |
|||
} |
|||
@ -1,29 +0,0 @@ |
|||
using Microsoft.Extensions.Localization; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Threading; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public interface ILocalizationStoreCache |
|||
{ |
|||
string CacheStamp { get; set; } |
|||
|
|||
SemaphoreSlim SyncSemaphore { get; } |
|||
|
|||
DateTime? LastCheckTime { get; set; } |
|||
|
|||
Task InitializeAsync(LocalizationStoreCacheInitializeContext context); |
|||
|
|||
LocalizationResourceBase GetResourceOrNull(string resourceName); |
|||
|
|||
LocalizedString GetLocalizedStringOrNull(string resourceName, string cultureName, string name); |
|||
|
|||
IReadOnlyList<LocalizationResourceBase> GetResources(); |
|||
|
|||
IReadOnlyList<LanguageInfo> GetLanguages(); |
|||
|
|||
IDictionary<string, LocalizationDictionary> GetAllLocalizedStrings(string cultureName); |
|||
} |
|||
@ -0,0 +1,15 @@ |
|||
using Microsoft.Extensions.Localization; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public interface ILocalizationTextStoreCache |
|||
{ |
|||
LocalizedString GetOrNull(LocalizationResourceBase resource, string cultureName, string name); |
|||
|
|||
void Fill(LocalizationResourceBase resource, string cultureName, Dictionary<string, LocalizedString> dictionary); |
|||
|
|||
Task FillAsync(LocalizationResourceBase resource, string cultureName, Dictionary<string, LocalizedString> dictionary); |
|||
} |
|||
@ -1,6 +1,6 @@ |
|||
using System.Threading.Tasks; |
|||
|
|||
namespace LINGYUN.Abp.Localization.Persistence; |
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public interface IStaticLocalizationSaver |
|||
{ |
|||
@ -1,124 +0,0 @@ |
|||
using Microsoft.Extensions.Caching.Distributed; |
|||
using Microsoft.Extensions.Options; |
|||
using System; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Caching; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Domain.Entities.Events; |
|||
using Volo.Abp.Domain.Entities.Events.Distributed; |
|||
using Volo.Abp.EventBus; |
|||
using Volo.Abp.EventBus.Distributed; |
|||
using Volo.Abp.Threading; |
|||
using Volo.Abp.Timing; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public class LocalizationCacheInvalidator : |
|||
ILocalEventHandler<EntityChangedEventData<Language>>, |
|||
ILocalEventHandler<EntityChangedEventData<Resource>>, |
|||
ILocalEventHandler<EntityChangedEventData<Text>>, |
|||
|
|||
IDistributedEventHandler<EntityCreatedEto<TextEto>>, |
|||
IDistributedEventHandler<EntityUpdatedEto<TextEto>>, |
|||
IDistributedEventHandler<EntityDeletedEto<TextEto>>, |
|||
|
|||
IDistributedEventHandler<EntityCreatedEto<ResourceEto>>, |
|||
IDistributedEventHandler<EntityUpdatedEto<ResourceEto>>, |
|||
IDistributedEventHandler<EntityDeletedEto<ResourceEto>>, |
|||
|
|||
IDistributedEventHandler<EntityCreatedEto<LanguageEto>>, |
|||
IDistributedEventHandler<EntityUpdatedEto<LanguageEto>>, |
|||
IDistributedEventHandler<EntityDeletedEto<LanguageEto>>, |
|||
|
|||
ITransientDependency |
|||
{ |
|||
private readonly IClock _clock; |
|||
private readonly IDistributedCache _distributedCache; |
|||
private readonly ILocalizationStoreCache _storeCache; |
|||
private readonly AbpDistributedCacheOptions _distributedCacheOptions; |
|||
|
|||
public LocalizationCacheInvalidator( |
|||
IClock clock, |
|||
ILocalizationStoreCache storeCache, |
|||
IDistributedCache distributedCache, |
|||
IOptions<AbpDistributedCacheOptions> options) |
|||
{ |
|||
_clock = clock; |
|||
_storeCache = storeCache; |
|||
_distributedCache = distributedCache; |
|||
_distributedCacheOptions = options.Value; |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityChangedEventData<Language> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityChangedEventData<Resource> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityChangedEventData<Text> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityCreatedEto<TextEto> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityUpdatedEto<TextEto> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityDeletedEto<TextEto> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityCreatedEto<ResourceEto> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityDeletedEto<ResourceEto> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityCreatedEto<LanguageEto> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityUpdatedEto<LanguageEto> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityDeletedEto<LanguageEto> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityUpdatedEto<ResourceEto> eventData) |
|||
{ |
|||
await RemoveStampInDistributedCacheAsync(); |
|||
} |
|||
|
|||
protected async virtual Task RemoveStampInDistributedCacheAsync() |
|||
{ |
|||
using (await _storeCache.SyncSemaphore.LockAsync()) |
|||
{ |
|||
var cacheKey = $"{_distributedCacheOptions.KeyPrefix}_AbpInMemoryLocalizationCacheStamp"; |
|||
|
|||
await _distributedCache.RemoveAsync(cacheKey); |
|||
|
|||
_storeCache.CacheStamp = Guid.NewGuid().ToString(); |
|||
_storeCache.LastCheckTime = _clock.Now.AddMinutes(-5); |
|||
} |
|||
} |
|||
} |
|||
@ -1,8 +0,0 @@ |
|||
using Microsoft.Extensions.Localization; |
|||
using System.Collections.Generic; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
public class LocalizationDictionary : Dictionary<string, LocalizedString> |
|||
{ |
|||
|
|||
} |
|||
@ -1,6 +0,0 @@ |
|||
using System.Collections.Generic; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
public class LocalizationDictionaryWithCulture : Dictionary<string, LocalizationDictionary> |
|||
{ |
|||
} |
|||
@ -1,6 +0,0 @@ |
|||
using System.Collections.Generic; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
public class LocalizationDictionaryWithResource : Dictionary<string, LocalizationDictionaryWithCulture> |
|||
{ |
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Caching; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Domain.Entities.Events; |
|||
using Volo.Abp.EventBus; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public class LocalizationLanguageCacheInvalidator: ILocalEventHandler<EntityChangedEventData<Language>>, ITransientDependency |
|||
{ |
|||
private readonly IDistributedCache<LocalizationLanguageCacheItem> _localizationLanguageCache; |
|||
public LocalizationLanguageCacheInvalidator(IDistributedCache<LocalizationLanguageCacheItem> localizationLanguageCache) |
|||
{ |
|||
_localizationLanguageCache = localizationLanguageCache; |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityChangedEventData<Language> eventData) |
|||
{ |
|||
await _localizationLanguageCache.RemoveAsync(LocalizationLanguageCacheItem.CacheKey); |
|||
} |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using Volo.Abp.Localization; |
|||
using Volo.Abp.MultiTenancy; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
[Serializable] |
|||
[IgnoreMultiTenancy] |
|||
public class LocalizationLanguageCacheItem |
|||
{ |
|||
internal const string CacheKey = "Abp.Localization.Languages"; |
|||
public List<LanguageInfo> Languages { get; set; } |
|||
|
|||
public LocalizationLanguageCacheItem() |
|||
{ |
|||
|
|||
} |
|||
|
|||
public LocalizationLanguageCacheItem(List<LanguageInfo> languages) |
|||
{ |
|||
Languages = languages; |
|||
} |
|||
} |
|||
@ -1,7 +0,0 @@ |
|||
using System.Collections.Generic; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
public class LocalizationLanguageDictionary : Dictionary<string, LanguageInfo> |
|||
{ |
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
[Dependency(ReplaceServices = true)] |
|||
public class LocalizationLanguageProvider : ILanguageProvider, ITransientDependency |
|||
{ |
|||
protected ILocalizationLanguageStoreCache LocalizationLanguageStore { get; } |
|||
public LocalizationLanguageProvider(ILocalizationLanguageStoreCache localizationLanguageStore) |
|||
{ |
|||
LocalizationLanguageStore = localizationLanguageStore; |
|||
} |
|||
|
|||
public async virtual Task<IReadOnlyList<LanguageInfo>> GetLanguagesAsync() |
|||
{ |
|||
return await LocalizationLanguageStore.GetLanguagesAsync(); |
|||
} |
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
using System.Collections.Generic; |
|||
using System.Collections.Immutable; |
|||
using System.Linq; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Caching; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Domain.ChangeTracking; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public class LocalizationLanguageStoreCache : ILocalizationLanguageStoreCache, ITransientDependency |
|||
{ |
|||
protected IDistributedCache<LocalizationLanguageCacheItem> LanguageCache { get; } |
|||
protected ILanguageRepository LanguageRepository { get; } |
|||
|
|||
public LocalizationLanguageStoreCache( |
|||
IDistributedCache<LocalizationLanguageCacheItem> languageCache, |
|||
ILanguageRepository languageRepository) |
|||
{ |
|||
LanguageCache = languageCache; |
|||
LanguageRepository = languageRepository; |
|||
} |
|||
|
|||
[DisableEntityChangeTracking] |
|||
public async virtual Task<IReadOnlyList<LanguageInfo>> GetLanguagesAsync() |
|||
{ |
|||
var cacheItem = await GetCacheItemAsync(); |
|||
|
|||
return cacheItem.Languages.ToImmutableList(); |
|||
} |
|||
|
|||
protected async virtual Task<LocalizationLanguageCacheItem> GetCacheItemAsync() |
|||
{ |
|||
var cacheItem = await LanguageCache.GetAsync(LocalizationLanguageCacheItem.CacheKey); |
|||
if (cacheItem != null) |
|||
{ |
|||
return cacheItem; |
|||
} |
|||
|
|||
var languages = await LanguageRepository.GetListAsync(); |
|||
|
|||
cacheItem = new LocalizationLanguageCacheItem( |
|||
languages.Select(x => |
|||
new LanguageInfo(x.CultureName, x.UiCultureName, x.DisplayName)) |
|||
.ToList()); |
|||
|
|||
return cacheItem; |
|||
} |
|||
} |
|||
@ -1,65 +0,0 @@ |
|||
using LINGYUN.Abp.Localization.Persistence; |
|||
using Microsoft.Extensions.Localization; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Threading; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
[Dependency(ReplaceServices = true)] |
|||
[ExposeServices( |
|||
typeof(ILocalizationPersistenceReader), |
|||
typeof(LocalizationManagementPersistenceReader))] |
|||
public class LocalizationManagementPersistenceReader : ILocalizationPersistenceReader, ITransientDependency |
|||
{ |
|||
private readonly ILocalizationStoreCache _localizationStoreCache; |
|||
private readonly LocalizationStoreCacheInitializeContext _cacheInitializeContext; |
|||
|
|||
public LocalizationManagementPersistenceReader( |
|||
IServiceProvider serviceProvider, |
|||
ILocalizationStoreCache localizationStoreCache) |
|||
{ |
|||
_localizationStoreCache = localizationStoreCache; |
|||
_cacheInitializeContext = new LocalizationStoreCacheInitializeContext(serviceProvider); |
|||
} |
|||
|
|||
public virtual void Fill(string resourceName, string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
AsyncHelper.RunSync(async () => await FillAsync(resourceName, cultureName, dictionary)); |
|||
} |
|||
|
|||
public async virtual Task FillAsync(string resourceName, string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
await _localizationStoreCache.InitializeAsync(_cacheInitializeContext); |
|||
|
|||
var localizedStrings = _localizationStoreCache.GetAllLocalizedStrings(cultureName); |
|||
|
|||
var localizedStringsInResource = localizedStrings.GetOrDefault(resourceName); |
|||
if (localizedStringsInResource != null) |
|||
{ |
|||
foreach (var localizedString in localizedStringsInResource) |
|||
{ |
|||
dictionary[localizedString.Key] = localizedString.Value; |
|||
} |
|||
} |
|||
} |
|||
|
|||
public virtual LocalizedString GetOrNull(string resourceName, string cultureName, string name) |
|||
{ |
|||
return _localizationStoreCache.GetLocalizedStringOrNull(resourceName, cultureName, name); |
|||
} |
|||
|
|||
public virtual Task<IEnumerable<string>> GetSupportedCulturesAsync() |
|||
{ |
|||
var languageInfos = _localizationStoreCache.GetLanguages(); |
|||
|
|||
IEnumerable<string> languages = languageInfos |
|||
.Select(x => x.CultureName) |
|||
.ToList(); |
|||
|
|||
return Task.FromResult(languages); |
|||
} |
|||
} |
|||
@ -1,203 +0,0 @@ |
|||
using LINGYUN.Abp.Localization.Persistence; |
|||
using Microsoft.Extensions.Caching.Distributed; |
|||
using Microsoft.Extensions.Options; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Text; |
|||
using System.Threading; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp; |
|||
using Volo.Abp.Caching; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.DistributedLocking; |
|||
using Volo.Abp.Guids; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
[Dependency(ReplaceServices = true)] |
|||
[ExposeServices( |
|||
typeof(ILocalizationPersistenceWriter), |
|||
typeof(LocalizationManagementPersistenceWriter))] |
|||
public class LocalizationManagementPersistenceWriter : ILocalizationPersistenceWriter, ITransientDependency |
|||
{ |
|||
protected IDistributedCache Cache { get; } |
|||
protected IAbpDistributedLock DistributedLock { get; } |
|||
protected AbpDistributedCacheOptions CacheOptions { get; } |
|||
protected IApplicationInfoAccessor ApplicationInfoAccessor { get; } |
|||
|
|||
protected IGuidGenerator GuidGenerator { get; } |
|||
protected ILanguageRepository LanguageRepository { get; } |
|||
protected ITextRepository TextRepository { get; } |
|||
protected IResourceRepository ResourceRepository { get; } |
|||
|
|||
public LocalizationManagementPersistenceWriter( |
|||
IDistributedCache cache, |
|||
IGuidGenerator guidGenerator, |
|||
IAbpDistributedLock distributedLock, |
|||
ITextRepository textRepository, |
|||
ILanguageRepository languageRepository, |
|||
IResourceRepository resourceRepository, |
|||
IApplicationInfoAccessor applicationInfoAccessor, |
|||
IOptions<AbpDistributedCacheOptions> cacheOptions) |
|||
{ |
|||
Cache = cache; |
|||
GuidGenerator = guidGenerator; |
|||
DistributedLock = distributedLock; |
|||
LanguageRepository = languageRepository; |
|||
TextRepository = textRepository; |
|||
ResourceRepository = resourceRepository; |
|||
ApplicationInfoAccessor = applicationInfoAccessor; |
|||
CacheOptions = cacheOptions.Value; |
|||
} |
|||
|
|||
public async virtual Task<IEnumerable<string>> GetExistsTextsAsync( |
|||
string resourceName, |
|||
string cultureName, |
|||
IEnumerable<string> keys, |
|||
CancellationToken cancellationToken = default) |
|||
{ |
|||
if (!await ShouldCalculateTextsHash(keys, cancellationToken)) |
|||
{ |
|||
return keys; |
|||
} |
|||
|
|||
return await TextRepository.GetExistsKeysAsync( |
|||
resourceName, |
|||
cultureName, |
|||
keys, |
|||
cancellationToken); |
|||
} |
|||
|
|||
|
|||
|
|||
public async virtual Task<bool> WriteLanguageAsync( |
|||
LanguageInfo language, |
|||
CancellationToken cancellationToken = default) |
|||
{ |
|||
var commonDistributedLockKey = GetCommonDistributedLockKey("Language", language.CultureName); |
|||
await using var lockHandle = await DistributedLock.TryAcquireAsync(commonDistributedLockKey); |
|||
if (lockHandle == null) |
|||
{ |
|||
return false; |
|||
} |
|||
|
|||
if (await LanguageRepository.FindByCultureNameAsync(language.CultureName, cancellationToken) == null) |
|||
{ |
|||
await LanguageRepository.InsertAsync( |
|||
new Language( |
|||
GuidGenerator.Create(), |
|||
language.CultureName, |
|||
language.UiCultureName, |
|||
language.DisplayName, |
|||
language.TwoLetterISOLanguageName), |
|||
autoSave: true, |
|||
cancellationToken: cancellationToken); |
|||
} |
|||
|
|||
return true; |
|||
} |
|||
|
|||
public async virtual Task<bool> WriteResourceAsync( |
|||
LocalizationResourceBase resource, |
|||
CancellationToken cancellationToken = default) |
|||
{ |
|||
var commonDistributedLockKey = GetCommonDistributedLockKey("Resource", resource.ResourceName); |
|||
await using var lockHandle = await DistributedLock.TryAcquireAsync(commonDistributedLockKey); |
|||
if (lockHandle == null) |
|||
{ |
|||
return false; |
|||
} |
|||
|
|||
if (await ResourceRepository.FindByNameAsync(resource.ResourceName, cancellationToken) == null) |
|||
{ |
|||
await ResourceRepository.InsertAsync( |
|||
new Resource( |
|||
GuidGenerator.Create(), |
|||
resource.ResourceName, |
|||
resource.ResourceName, |
|||
resource.ResourceName, |
|||
resource.DefaultCultureName), |
|||
autoSave: true, |
|||
cancellationToken: cancellationToken); |
|||
} |
|||
|
|||
return true; |
|||
} |
|||
|
|||
public async virtual Task<bool> WriteTextsAsync( |
|||
IEnumerable<LocalizableStringText> texts, |
|||
CancellationToken cancellationToken = default) |
|||
{ |
|||
if (!await ShouldCalculateTextsHash(texts.Select(x => x.Name), cancellationToken)) |
|||
{ |
|||
return false; |
|||
} |
|||
|
|||
var cacheKey = GetApplicationHashCacheKey(); |
|||
var currentHash = CalculateTextsHash(texts.Select(x => x.Name)); |
|||
|
|||
var savedTexts = texts.Select(text => |
|||
new Text( |
|||
text.ResourceName, |
|||
text.CultureName, |
|||
text.Name, |
|||
text.Value)); |
|||
|
|||
await TextRepository.InsertManyAsync( |
|||
savedTexts, |
|||
autoSave: true, |
|||
cancellationToken: cancellationToken); |
|||
|
|||
await Cache.SetStringAsync( |
|||
cacheKey, |
|||
currentHash, |
|||
new DistributedCacheEntryOptions |
|||
{ |
|||
SlidingExpiration = TimeSpan.FromDays(30) |
|||
}, |
|||
cancellationToken); |
|||
|
|||
return true; |
|||
} |
|||
|
|||
private async Task<bool> ShouldCalculateTextsHash(IEnumerable<string> texts, CancellationToken cancellationToken = default) |
|||
{ |
|||
var cacheKey = GetApplicationHashCacheKey(); |
|||
var cachedHash = await Cache.GetStringAsync(cacheKey, cancellationToken); |
|||
|
|||
var currentHash = CalculateTextsHash(texts); |
|||
|
|||
if (cachedHash == currentHash) |
|||
{ |
|||
return false; |
|||
} |
|||
|
|||
return cachedHash != currentHash; |
|||
} |
|||
|
|||
private static string CalculateTextsHash(IEnumerable<string> texts) |
|||
{ |
|||
var stringBuilder = new StringBuilder(); |
|||
|
|||
stringBuilder.Append("LocalizableStrings:"); |
|||
stringBuilder.Append(texts.JoinAsString(",")); |
|||
|
|||
return stringBuilder |
|||
.ToString() |
|||
.ToMd5(); |
|||
} |
|||
|
|||
private string GetCommonDistributedLockKey( |
|||
string lockResourceName, |
|||
string lockResourceKey) |
|||
{ |
|||
return $"{CacheOptions.KeyPrefix}_Common_AbpLocalizationWriter_{lockResourceName}_{lockResourceKey}_Lock"; |
|||
} |
|||
|
|||
private string GetApplicationHashCacheKey() |
|||
{ |
|||
return $"{CacheOptions.KeyPrefix}_{ApplicationInfoAccessor.ApplicationName}_AbpLocalizationHash"; |
|||
} |
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
using Microsoft.Extensions.DependencyInjection; |
|||
using Microsoft.Extensions.Localization; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public class LocalizationResourceContributor : ILocalizationResourceContributor |
|||
{ |
|||
public bool IsDynamic => true; |
|||
protected LocalizationResourceBase Resource { get; private set; } |
|||
protected ILocalizationTextStoreCache LocalizationTextStoreCache { get; private set; } |
|||
protected ILocalizationLanguageStoreCache LocalizationLanguageStoreCache { get; private set; } |
|||
|
|||
public virtual void Fill(string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
LocalizationTextStoreCache.Fill(Resource, cultureName, dictionary); |
|||
} |
|||
|
|||
public async virtual Task FillAsync(string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
await LocalizationTextStoreCache.FillAsync(Resource, cultureName, dictionary); |
|||
} |
|||
|
|||
public virtual LocalizedString GetOrNull(string cultureName, string name) |
|||
{ |
|||
return LocalizationTextStoreCache.GetOrNull(Resource, cultureName, name); |
|||
} |
|||
|
|||
public async virtual Task<IEnumerable<string>> GetSupportedCulturesAsync() |
|||
{ |
|||
var languageInfos = await LocalizationLanguageStoreCache.GetLanguagesAsync(); |
|||
|
|||
return languageInfos.Select(x => x.CultureName); |
|||
} |
|||
|
|||
public void Initialize(LocalizationResourceInitializationContext context) |
|||
{ |
|||
Resource = context.Resource; |
|||
LocalizationTextStoreCache = context.ServiceProvider.GetRequiredService<ILocalizationTextStoreCache>(); |
|||
LocalizationLanguageStoreCache = context.ServiceProvider.GetRequiredService<ILocalizationLanguageStoreCache>(); |
|||
} |
|||
} |
|||
@ -1,160 +0,0 @@ |
|||
using Microsoft.Extensions.DependencyInjection; |
|||
using Microsoft.Extensions.Localization; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Globalization; |
|||
using System.Linq; |
|||
using System.Threading; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Localization; |
|||
using Volo.Abp.Localization.External; |
|||
using Volo.Abp.Threading; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] |
|||
[ExposeServices( |
|||
typeof(IExternalLocalizationStore), |
|||
typeof(LocalizationStore))] |
|||
public class LocalizationStore : IExternalLocalizationStore |
|||
{ |
|||
protected IServiceProvider ServiceProvider { get; } |
|||
protected ILocalizationStoreCache LocalizationStoreCache { get; } |
|||
|
|||
public LocalizationStore( |
|||
IServiceProvider serviceProvider, |
|||
ILocalizationStoreCache localizationStoreCache) |
|||
{ |
|||
ServiceProvider = serviceProvider; |
|||
LocalizationStoreCache = localizationStoreCache; |
|||
} |
|||
|
|||
[Obsolete("The framework already supports dynamic languages and will be deprecated in the next release")] |
|||
public async virtual Task<List<LanguageInfo>> GetLanguageListAsync( |
|||
CancellationToken cancellationToken = default) |
|||
{ |
|||
var context = new LocalizationStoreCacheInitializeContext(ServiceProvider); |
|||
await LocalizationStoreCache.InitializeAsync(context); |
|||
|
|||
return LocalizationStoreCache.GetLanguages().ToList(); |
|||
} |
|||
|
|||
[Obsolete("The framework already supports dynamic languages and will be deprecated in the next release")] |
|||
public async virtual Task<Dictionary<string, ILocalizationDictionary>> GetLocalizationDictionaryAsync( |
|||
string resourceName, |
|||
CancellationToken cancellationToken = default) |
|||
{ |
|||
var dictionaries = new Dictionary<string, ILocalizationDictionary>(); |
|||
|
|||
var context = new LocalizationStoreCacheInitializeContext(ServiceProvider); |
|||
await LocalizationStoreCache.InitializeAsync(context); |
|||
|
|||
var resource = LocalizationStoreCache.GetResourceOrNull(resourceName); |
|||
|
|||
if (resource == null) |
|||
{ |
|||
// 资源不存在或未启用返回空
|
|||
return dictionaries; |
|||
} |
|||
|
|||
var texts = LocalizationStoreCache.GetAllLocalizedStrings(CultureInfo.CurrentCulture.Name); |
|||
|
|||
foreach (var textGroup in texts) |
|||
{ |
|||
var cultureTextDictionaires = new Dictionary<string, LocalizedString>(); |
|||
|
|||
foreach (var text in textGroup.Value) |
|||
{ |
|||
// 本地化名称去重
|
|||
if (!cultureTextDictionaires.ContainsKey(text.Key)) |
|||
{ |
|||
cultureTextDictionaires[text.Key] = new LocalizedString(text.Key, text.Value.Value.NormalizeLineEndings()); |
|||
} |
|||
} |
|||
|
|||
// 本地化语言去重
|
|||
if (!dictionaries.ContainsKey(textGroup.Key)) |
|||
{ |
|||
dictionaries[textGroup.Key] = new StaticLocalizationDictionary(textGroup.Key, cultureTextDictionaires); |
|||
} |
|||
} |
|||
|
|||
return dictionaries; |
|||
} |
|||
|
|||
[Obsolete("The framework already supports dynamic languages and will be deprecated in the next release")] |
|||
public async virtual Task<Dictionary<string, Dictionary<string, ILocalizationDictionary>>> GetAllLocalizationDictionaryAsync(CancellationToken cancellationToken = default) |
|||
{ |
|||
var result = new Dictionary<string, Dictionary<string, ILocalizationDictionary>>(); |
|||
|
|||
var context = new LocalizationStoreCacheInitializeContext(ServiceProvider); |
|||
await LocalizationStoreCache.InitializeAsync(context); |
|||
|
|||
var textList = LocalizationStoreCache.GetAllLocalizedStrings(CultureInfo.CurrentCulture.Name); |
|||
|
|||
foreach (var resourcesGroup in textList) |
|||
{ |
|||
var dictionaries = new Dictionary<string, ILocalizationDictionary>(); |
|||
foreach (var text in resourcesGroup.Value) |
|||
{ |
|||
var cultureTextDictionaires = new Dictionary<string, LocalizedString>(); |
|||
// 本地化名称去重
|
|||
if (!cultureTextDictionaires.ContainsKey(text.Key)) |
|||
{ |
|||
cultureTextDictionaires[text.Key] = new LocalizedString(text.Key, text.Value.Value.NormalizeLineEndings()); |
|||
} |
|||
|
|||
// 本地化语言去重
|
|||
if (!dictionaries.ContainsKey(text.Key)) |
|||
{ |
|||
dictionaries[text.Key] = new StaticLocalizationDictionary(text.Key, cultureTextDictionaires); |
|||
} |
|||
} |
|||
|
|||
result.Add(resourcesGroup.Key, dictionaries); |
|||
} |
|||
|
|||
return result; |
|||
} |
|||
|
|||
[Obsolete("The framework already supports dynamic languages and will be deprecated in the next release")] |
|||
public async virtual Task<bool> ResourceExistsAsync(string resourceName, CancellationToken cancellationToken = default) |
|||
{ |
|||
var context = new LocalizationStoreCacheInitializeContext(ServiceProvider); |
|||
await LocalizationStoreCache.InitializeAsync(context); |
|||
|
|||
return LocalizationStoreCache.GetResourceOrNull(resourceName) != null; |
|||
} |
|||
|
|||
public LocalizationResourceBase GetResourceOrNull(string resourceName) |
|||
{ |
|||
return AsyncHelper.RunSync(async () => await GetResourceOrNullAsync(resourceName)); |
|||
} |
|||
|
|||
public async virtual Task<LocalizationResourceBase> GetResourceOrNullAsync(string resourceName) |
|||
{ |
|||
var context = new LocalizationStoreCacheInitializeContext(ServiceProvider); |
|||
await LocalizationStoreCache.InitializeAsync(context); |
|||
|
|||
return LocalizationStoreCache.GetResourceOrNull(resourceName); |
|||
} |
|||
|
|||
public async virtual Task<string[]> GetResourceNamesAsync() |
|||
{ |
|||
var context = new LocalizationStoreCacheInitializeContext(ServiceProvider); |
|||
await LocalizationStoreCache.InitializeAsync(context); |
|||
|
|||
return LocalizationStoreCache.GetResources() |
|||
.Select(x => x.ResourceName) |
|||
.ToArray(); |
|||
} |
|||
|
|||
public async virtual Task<LocalizationResourceBase[]> GetResourcesAsync() |
|||
{ |
|||
var context = new LocalizationStoreCacheInitializeContext(ServiceProvider); |
|||
await LocalizationStoreCache.InitializeAsync(context); |
|||
|
|||
return LocalizationStoreCache.GetResources().ToArray(); |
|||
} |
|||
} |
|||
@ -1,12 +0,0 @@ |
|||
using System; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public class LocalizationStoreCacheInitializeContext |
|||
{ |
|||
public IServiceProvider ServiceProvider { get; } |
|||
public LocalizationStoreCacheInitializeContext(IServiceProvider serviceProvider) |
|||
{ |
|||
ServiceProvider = serviceProvider; |
|||
} |
|||
} |
|||
@ -1,243 +0,0 @@ |
|||
using Microsoft.Extensions.Caching.Distributed; |
|||
using Microsoft.Extensions.DependencyInjection; |
|||
using Microsoft.Extensions.Localization; |
|||
using Microsoft.Extensions.Options; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Collections.Immutable; |
|||
using System.Globalization; |
|||
using System.Linq; |
|||
using System.Threading; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp; |
|||
using Volo.Abp.Caching; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.DistributedLocking; |
|||
using Volo.Abp.Localization; |
|||
using Volo.Abp.Threading; |
|||
using Volo.Abp.Timing; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
[ExposeServices( |
|||
typeof(ILocalizationStoreCache), |
|||
typeof(LocalizationStoreInMemoryCache))] |
|||
public class LocalizationStoreInMemoryCache : ILocalizationStoreCache, ISingletonDependency |
|||
{ |
|||
public string CacheStamp { get; set; } |
|||
public DateTime? LastCheckTime { get; set; } |
|||
|
|||
public SemaphoreSlim SyncSemaphore { get; } = new(1, 1); |
|||
|
|||
protected LocalizationResourceDictionary Resources { get; } |
|||
protected LocalizationLanguageDictionary Languages { get; } |
|||
protected LocalizationDictionaryWithResource LocalizedStrings { get; } |
|||
|
|||
private readonly IClock _clock; |
|||
private readonly IDistributedCache _distributedCache; |
|||
private readonly IAbpDistributedLock _distributedLock; |
|||
private readonly AbpDistributedCacheOptions _distributedCacheOptions; |
|||
private readonly AbpLocalizationManagementOptions _managementOptions; |
|||
|
|||
public LocalizationStoreInMemoryCache( |
|||
IClock clock, |
|||
IDistributedCache distributedCache, |
|||
IAbpDistributedLock distributedLock, |
|||
IOptions<AbpDistributedCacheOptions> distributedCacheOptions, |
|||
IOptions<AbpLocalizationManagementOptions> managementOptions) |
|||
{ |
|||
_clock = clock; |
|||
_distributedCache = distributedCache; |
|||
_distributedLock = distributedLock; |
|||
_distributedCacheOptions = distributedCacheOptions.Value; |
|||
_managementOptions = managementOptions.Value; |
|||
|
|||
Resources = new LocalizationResourceDictionary(); |
|||
Languages = new LocalizationLanguageDictionary(); |
|||
LocalizedStrings = new LocalizationDictionaryWithResource(); |
|||
} |
|||
|
|||
public async virtual Task InitializeAsync(LocalizationStoreCacheInitializeContext context) |
|||
{ |
|||
using (await SyncSemaphore.LockAsync()) |
|||
{ |
|||
await EnsureCacheIsUptoDateAsync(context); |
|||
} |
|||
} |
|||
|
|||
public virtual IDictionary<string, LocalizationDictionary> GetAllLocalizedStrings(string cultureName) |
|||
{ |
|||
var localizedStrings = new Dictionary<string, LocalizationDictionary>(); |
|||
|
|||
foreach (var resource in Resources) |
|||
{ |
|||
var localizedStringsInResource = LocalizedStrings.GetOrDefault(resource.Key); |
|||
if (localizedStringsInResource == null) |
|||
{ |
|||
continue; |
|||
} |
|||
|
|||
var localizedStringsInCurrentCulture = localizedStringsInResource.GetOrDefault(cultureName); |
|||
if (localizedStringsInCurrentCulture == null) |
|||
{ |
|||
continue; |
|||
} |
|||
|
|||
var currentCultureLocalizedStrings = new LocalizationDictionary(); |
|||
|
|||
foreach (var localizedString in localizedStringsInCurrentCulture) |
|||
{ |
|||
if (!currentCultureLocalizedStrings.ContainsKey(localizedString.Key)) |
|||
{ |
|||
currentCultureLocalizedStrings.Add(localizedString.Key, localizedString.Value); |
|||
} |
|||
} |
|||
|
|||
localizedStrings[resource.Key] = currentCultureLocalizedStrings; |
|||
} |
|||
|
|||
return localizedStrings; |
|||
} |
|||
|
|||
public virtual LocalizedString GetLocalizedStringOrNull(string resourceName, string cultureName, string name) |
|||
{ |
|||
var localizedStringsInResource = LocalizedStrings.GetOrDefault(resourceName); |
|||
if (localizedStringsInResource == null) |
|||
{ |
|||
return null; |
|||
} |
|||
|
|||
var currentCultureLocalizedStrings = localizedStringsInResource.GetOrDefault(cultureName); |
|||
if (currentCultureLocalizedStrings == null) |
|||
{ |
|||
return null; |
|||
} |
|||
|
|||
return currentCultureLocalizedStrings.GetOrDefault(name); |
|||
} |
|||
|
|||
public virtual LocalizationResourceBase GetResourceOrNull(string resourceName) |
|||
{ |
|||
return Resources.GetOrDefault(resourceName); |
|||
} |
|||
|
|||
public virtual IReadOnlyList<LocalizationResourceBase> GetResources() |
|||
{ |
|||
return Resources.Values.ToImmutableList(); |
|||
} |
|||
|
|||
public virtual IReadOnlyList<LanguageInfo> GetLanguages() |
|||
{ |
|||
return Languages.Values.ToImmutableList(); |
|||
} |
|||
|
|||
protected async virtual Task EnsureCacheIsUptoDateAsync(LocalizationStoreCacheInitializeContext context) |
|||
{ |
|||
if (LastCheckTime.HasValue && |
|||
_clock.Now.Subtract(LastCheckTime.Value).TotalSeconds < 30) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
var stampInDistributedCache = await GetOrSetStampInDistributedCache(); |
|||
|
|||
if (stampInDistributedCache == CacheStamp) |
|||
{ |
|||
LastCheckTime = _clock.Now; |
|||
return; |
|||
} |
|||
|
|||
await UpdateInMemoryStoreCache(context); |
|||
|
|||
CacheStamp = stampInDistributedCache; |
|||
LastCheckTime = _clock.Now; |
|||
} |
|||
|
|||
protected async virtual Task UpdateInMemoryStoreCache(LocalizationStoreCacheInitializeContext context) |
|||
{ |
|||
var textRepository = context.ServiceProvider.GetRequiredService<ITextRepository>(); |
|||
var languageRepository = context.ServiceProvider.GetRequiredService<ILanguageRepository>(); |
|||
var resourceRepository = context.ServiceProvider.GetRequiredService<IResourceRepository>(); |
|||
|
|||
var resourceRecords = await resourceRepository.GetListAsync(); |
|||
var languageRecords = await languageRepository.GetActivedListAsync(); |
|||
var textRecords = await textRepository.GetListAsync(); |
|||
|
|||
Resources.Clear(); |
|||
Languages.Clear(); |
|||
|
|||
foreach (var resourceRecord in resourceRecords) |
|||
{ |
|||
Resources[resourceRecord.Name] = new NonTypedLocalizationResource(resourceRecord.Name, resourceRecord.DefaultCultureName); |
|||
|
|||
var localizedStrings = LocalizedStrings.GetOrDefault(resourceRecord.Name); |
|||
|
|||
localizedStrings ??= new LocalizationDictionaryWithCulture(); |
|||
localizedStrings.Clear(); |
|||
|
|||
// 需要按照不同文化聚合
|
|||
foreach (var textRecordByCulture in textRecords.Where(x => x.ResourceName == resourceRecord.Name).GroupBy(x => x.CultureName)) |
|||
{ |
|||
var currentCultureLocalizedStrings = new LocalizationDictionary(); |
|||
foreach (var textRecord in textRecordByCulture) |
|||
{ |
|||
currentCultureLocalizedStrings[textRecord.Key] = new LocalizedString(textRecord.Key, textRecord.Value); |
|||
} |
|||
localizedStrings[textRecordByCulture.Key] = currentCultureLocalizedStrings; |
|||
} |
|||
|
|||
LocalizedStrings[resourceRecord.Name] = localizedStrings; |
|||
} |
|||
|
|||
foreach (var language in languageRecords) |
|||
{ |
|||
Languages[language.CultureName] = new LanguageInfo( |
|||
language.CultureName, |
|||
language.UiCultureName, |
|||
language.DisplayName); |
|||
} |
|||
} |
|||
|
|||
protected async virtual Task<string> GetOrSetStampInDistributedCache() |
|||
{ |
|||
var cacheKey = $"{_distributedCacheOptions.KeyPrefix}_AbpInMemoryLocalizationCacheStamp"; |
|||
|
|||
var stampInDistributedCache = await _distributedCache.GetStringAsync(cacheKey); |
|||
if (stampInDistributedCache != null) |
|||
{ |
|||
return stampInDistributedCache; |
|||
} |
|||
|
|||
var distributedLockKey = $"{_distributedCacheOptions.KeyPrefix}_AbpLocalizationUpdateLock"; |
|||
await using (var commonLockHandle = await _distributedLock |
|||
.TryAcquireAsync(distributedLockKey, _managementOptions.LocalizationCacheStampTimeOut)) |
|||
{ |
|||
if (commonLockHandle == null) |
|||
{ |
|||
/* This request will fail */ |
|||
throw new AbpException( |
|||
"Could not acquire distributed lock for localization stamp check!" |
|||
); |
|||
} |
|||
|
|||
stampInDistributedCache = await _distributedCache.GetStringAsync(cacheKey); |
|||
if (stampInDistributedCache != null) |
|||
{ |
|||
return stampInDistributedCache; |
|||
} |
|||
|
|||
stampInDistributedCache = Guid.NewGuid().ToString(); |
|||
|
|||
await _distributedCache.SetStringAsync( |
|||
cacheKey, |
|||
stampInDistributedCache, |
|||
new DistributedCacheEntryOptions |
|||
{ |
|||
SlidingExpiration = _managementOptions.LocalizationCacheStampExpiration |
|||
} |
|||
); |
|||
} |
|||
|
|||
return stampInDistributedCache; |
|||
} |
|||
} |
|||
@ -0,0 +1,25 @@ |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Caching; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Domain.Entities.Events; |
|||
using Volo.Abp.EventBus; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public class LocalizationTextCacheInvalidator : ILocalEventHandler<EntityChangedEventData<Text>>, ITransientDependency |
|||
{ |
|||
private readonly IDistributedCache<LocalizationTextCacheItem> _localizationTextCache; |
|||
public LocalizationTextCacheInvalidator(IDistributedCache<LocalizationTextCacheItem> localizationTextCache) |
|||
{ |
|||
_localizationTextCache = localizationTextCache; |
|||
} |
|||
|
|||
public async virtual Task HandleEventAsync(EntityChangedEventData<Text> eventData) |
|||
{ |
|||
var cacheKey = LocalizationTextCacheItem.CalculateCacheKey( |
|||
eventData.Entity.ResourceName, |
|||
eventData.Entity.CultureName); |
|||
|
|||
await _localizationTextCache.RemoveAsync(cacheKey); |
|||
} |
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using Volo.Abp.MultiTenancy; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
[Serializable] |
|||
[IgnoreMultiTenancy] |
|||
public class LocalizationTextCacheItem |
|||
{ |
|||
private const string CacheKeyFormat = "r:{0},c:{1}"; |
|||
public string ResourceName { get; set; } |
|||
public string CultureName { get; set; } |
|||
public Dictionary<string, string> Texts { get; set; } |
|||
public LocalizationTextCacheItem() |
|||
{ |
|||
Texts = new Dictionary<string, string>(); |
|||
} |
|||
public LocalizationTextCacheItem(string resourceName, string cultureName, Dictionary<string, string> texts) |
|||
{ |
|||
ResourceName = resourceName; |
|||
CultureName = cultureName; |
|||
Texts = texts; |
|||
} |
|||
|
|||
public static string CalculateCacheKey(string resourceName, string cultureName) |
|||
{ |
|||
return string.Format(CacheKeyFormat, resourceName, cultureName); |
|||
} |
|||
} |
|||
@ -0,0 +1,119 @@ |
|||
using Microsoft.Extensions.DependencyInjection; |
|||
using Microsoft.Extensions.Localization; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Caching; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Domain.Repositories; |
|||
using Volo.Abp.Localization; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public class LocalizationTextStoreCache : ILocalizationTextStoreCache, ISingletonDependency |
|||
{ |
|||
protected IServiceScopeFactory ServiceScopeFactory { get; } |
|||
protected IDistributedCache<LocalizationTextCacheItem> LocalizationTextCache { get; } |
|||
public LocalizationTextStoreCache( |
|||
IServiceScopeFactory serviceScopeFactory, |
|||
IDistributedCache<LocalizationTextCacheItem> localizationTextCache) |
|||
{ |
|||
ServiceScopeFactory = serviceScopeFactory; |
|||
LocalizationTextCache = localizationTextCache; |
|||
} |
|||
|
|||
public virtual void Fill(LocalizationResourceBase resource, string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
var cacheItem = GetCacheItem(resource, cultureName); |
|||
|
|||
foreach (var text in cacheItem.Texts) |
|||
{ |
|||
dictionary[text.Key] = new LocalizedString(text.Key, text.Value); |
|||
} |
|||
} |
|||
|
|||
public async virtual Task FillAsync(LocalizationResourceBase resource, string cultureName, Dictionary<string, LocalizedString> dictionary) |
|||
{ |
|||
var cacheItem = await GetCacheItemAsync(resource, cultureName); |
|||
|
|||
foreach (var text in cacheItem.Texts) |
|||
{ |
|||
dictionary[text.Key] = new LocalizedString(text.Key, text.Value); |
|||
} |
|||
} |
|||
|
|||
public virtual LocalizedString GetOrNull(LocalizationResourceBase resource, string cultureName, string name) |
|||
{ |
|||
var cacheItem = GetCacheItem(resource, cultureName); |
|||
|
|||
var value = cacheItem.Texts.GetOrDefault(name); |
|||
if (value.IsNullOrWhiteSpace()) |
|||
{ |
|||
return null; |
|||
} |
|||
|
|||
return new LocalizedString(name, value); |
|||
} |
|||
|
|||
protected virtual LocalizationTextCacheItem GetCacheItem(LocalizationResourceBase resource, string cultureName) |
|||
{ |
|||
var cacheKey = LocalizationTextCacheItem.CalculateCacheKey(resource.ResourceName, cultureName); |
|||
var cacheItem = LocalizationTextCache.Get(cacheKey); |
|||
if (cacheItem != null) |
|||
{ |
|||
return cacheItem; |
|||
} |
|||
|
|||
var setTexts = new Dictionary<string, string>(); |
|||
using (var scope = ServiceScopeFactory.CreateScope()) |
|||
{ |
|||
var provider = scope.ServiceProvider.GetRequiredService<IEntityChangeTrackingProvider>(); |
|||
using (provider.Change(false)) |
|||
{ |
|||
var repo = scope.ServiceProvider.GetRequiredService<ITextRepository>(); |
|||
var texts = repo.GetList(resource.ResourceName, cultureName); |
|||
foreach (var text in texts) |
|||
{ |
|||
setTexts[text.Key] = text.Value; |
|||
} |
|||
} |
|||
} |
|||
|
|||
cacheItem = new LocalizationTextCacheItem(resource.ResourceName, cultureName, setTexts); |
|||
|
|||
LocalizationTextCache.Set(cacheKey, cacheItem); |
|||
|
|||
return cacheItem; |
|||
} |
|||
|
|||
protected async virtual Task<LocalizationTextCacheItem> GetCacheItemAsync(LocalizationResourceBase resource, string cultureName) |
|||
{ |
|||
var cacheKey = LocalizationTextCacheItem.CalculateCacheKey(resource.ResourceName, cultureName); |
|||
var cacheItem = await LocalizationTextCache.GetAsync(cacheKey); |
|||
if (cacheItem != null) |
|||
{ |
|||
return cacheItem; |
|||
} |
|||
|
|||
var setTexts = new Dictionary<string, string>(); |
|||
using (var scope = ServiceScopeFactory.CreateScope()) |
|||
{ |
|||
var provider = scope.ServiceProvider.GetRequiredService<IEntityChangeTrackingProvider>(); |
|||
using (provider.Change(false)) |
|||
{ |
|||
var repo = scope.ServiceProvider.GetRequiredService<ITextRepository>(); |
|||
var texts = await repo.GetListAsync(resource.ResourceName, cultureName); |
|||
foreach (var text in texts) |
|||
{ |
|||
setTexts[text.Key] = text.Value; |
|||
} |
|||
} |
|||
} |
|||
|
|||
cacheItem = new LocalizationTextCacheItem(resource.ResourceName, cultureName, setTexts); |
|||
|
|||
await LocalizationTextCache.SetAsync(cacheKey, cacheItem); |
|||
|
|||
return cacheItem; |
|||
} |
|||
} |
|||
@ -0,0 +1,309 @@ |
|||
using Microsoft.Extensions.Caching.Distributed; |
|||
using Microsoft.Extensions.Localization; |
|||
using Microsoft.Extensions.Logging; |
|||
using Microsoft.Extensions.Options; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Text; |
|||
using System.Text.Json; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp; |
|||
using Volo.Abp.Caching; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.DistributedLocking; |
|||
using Volo.Abp.Guids; |
|||
using Volo.Abp.Localization; |
|||
using Volo.Abp.Threading; |
|||
using Volo.Abp.Uow; |
|||
|
|||
namespace LINGYUN.Abp.LocalizationManagement; |
|||
|
|||
public class StaticLocalizationSaver : IStaticLocalizationSaver, ITransientDependency |
|||
{ |
|||
protected ILogger<StaticLocalizationSaver> Logger { get; } |
|||
|
|||
protected IDistributedCache Cache { get; } |
|||
protected IGuidGenerator GuidGenerator { get; } |
|||
protected IAbpDistributedLock DistributedLock { get; } |
|||
protected IUnitOfWorkManager UnitOfWorkManager { get; } |
|||
protected AbpDistributedCacheOptions CacheOptions { get; } |
|||
protected IApplicationInfoAccessor ApplicationInfoAccessor { get; } |
|||
protected ICancellationTokenProvider CancellationTokenProvider { get; } |
|||
protected IStringLocalizerFactory StringLocalizerFactory { get; } |
|||
protected AbpLocalizationOptions LocalizationOptions { get; } |
|||
protected AbpLocalizationManagementOptions LocalizationManagementOptions { get; } |
|||
|
|||
protected ILanguageRepository LanguageRepository { get; } |
|||
protected IResourceRepository ResourceRepository { get; } |
|||
protected ITextRepository TextRepository { get; } |
|||
|
|||
public StaticLocalizationSaver( |
|||
ILogger<StaticLocalizationSaver> logger, |
|||
IDistributedCache cache, |
|||
IGuidGenerator guidGenerator, |
|||
IAbpDistributedLock distributedLock, |
|||
IUnitOfWorkManager unitOfWorkManager, |
|||
IApplicationInfoAccessor applicationInfoAccessor, |
|||
ICancellationTokenProvider cancellationTokenProvider, |
|||
IStringLocalizerFactory stringLocalizerFactory, |
|||
IOptions<AbpDistributedCacheOptions> cacheOptions, |
|||
IOptions<AbpLocalizationOptions> localizationOptions, |
|||
IOptions<AbpLocalizationManagementOptions> localizationManagementOptions, |
|||
ILanguageRepository languageRepository, |
|||
IResourceRepository resourceRepository, |
|||
ITextRepository textRepository) |
|||
{ |
|||
Logger = logger; |
|||
Cache = cache; |
|||
GuidGenerator = guidGenerator; |
|||
DistributedLock = distributedLock; |
|||
UnitOfWorkManager = unitOfWorkManager; |
|||
CacheOptions = cacheOptions.Value; |
|||
ApplicationInfoAccessor = applicationInfoAccessor; |
|||
CancellationTokenProvider = cancellationTokenProvider; |
|||
StringLocalizerFactory = stringLocalizerFactory; |
|||
LocalizationOptions = localizationOptions.Value; |
|||
LocalizationManagementOptions = localizationManagementOptions.Value; |
|||
LanguageRepository = languageRepository; |
|||
ResourceRepository = resourceRepository; |
|||
TextRepository = textRepository; |
|||
} |
|||
|
|||
public async virtual Task SaveAsync() |
|||
{ |
|||
if (!LocalizationManagementOptions.SaveStaticLocalizationsToDatabase) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
Logger.LogDebug("Waiting to acquire the distributed lock for saving static localizations..."); |
|||
|
|||
await using var applicationLockHandle = await DistributedLock.TryAcquireAsync(GetApplicationDistributedLockKey()); |
|||
if (applicationLockHandle == null) |
|||
{ |
|||
return; |
|||
} |
|||
|
|||
using var unitOfWork = UnitOfWorkManager.Begin(true, true); |
|||
try |
|||
{ |
|||
await SaveLanguagesAsync(); |
|||
await SaveResourcesAsync(); |
|||
await SaveTextsAsync(); |
|||
} |
|||
catch (Exception ex) |
|||
{ |
|||
Logger.LogInformation("Filed to save static localizations."); |
|||
Logger.LogWarning(ex.ToString()); |
|||
try |
|||
{ |
|||
await unitOfWork.RollbackAsync(); |
|||
} |
|||
catch |
|||
{ |
|||
Logger.LogInformation("Filed to rollback saving static localizations."); |
|||
} |
|||
throw; |
|||
} |
|||
|
|||
await unitOfWork.CompleteAsync(); |
|||
|
|||
Logger.LogInformation("Completed to save static localizations."); |
|||
} |
|||
|
|||
private async Task SaveLanguagesAsync() |
|||
{ |
|||
var languageHashKey = GetApplicationLanguageHashKey(); |
|||
var languageHashCache = await Cache.GetStringAsync(languageHashKey, CancellationTokenProvider.Token); |
|||
var languageHash = CalculateLanguagesHash(LocalizationOptions.Languages); |
|||
if (languageHashCache != languageHash) |
|||
{ |
|||
var newLanguages = new List<Language>(); |
|||
foreach (var language in LocalizationOptions.Languages) |
|||
{ |
|||
if (await LanguageRepository.FindByCultureNameAsync(language.CultureName, cancellationToken: CancellationTokenProvider.Token) == null) |
|||
{ |
|||
newLanguages.Add( |
|||
new Language( |
|||
GuidGenerator.Create(), |
|||
language.CultureName, |
|||
language.UiCultureName, |
|||
language.DisplayName, |
|||
language.TwoLetterISOLanguageName)); |
|||
} |
|||
} |
|||
|
|||
if (newLanguages.Any()) |
|||
{ |
|||
Logger.LogInformation("Saved {0} new languages.", newLanguages.Count); |
|||
|
|||
await LanguageRepository.InsertManyAsync(newLanguages, cancellationToken: CancellationTokenProvider.Token); |
|||
} |
|||
|
|||
await Cache.SetStringAsync(languageHashKey, languageHash, CancellationTokenProvider.Token); |
|||
} |
|||
} |
|||
|
|||
private async Task SaveResourcesAsync() |
|||
{ |
|||
var resourceHashKey = GetApplicationResourceHashKey(); |
|||
var resourceHashCache = await Cache.GetStringAsync(resourceHashKey, CancellationTokenProvider.Token); |
|||
var resourceHash = CalculateResourceHash(LocalizationOptions.Resources.Select(x => x.Value).ToList()); |
|||
if (resourceHashCache != resourceHash) |
|||
{ |
|||
var newResources = new List<Resource>(); |
|||
foreach (var resource in LocalizationOptions.Resources) |
|||
{ |
|||
if (await ResourceRepository.FindByNameAsync(resource.Key, cancellationToken: CancellationTokenProvider.Token) == null) |
|||
{ |
|||
newResources.Add( |
|||
new Resource( |
|||
GuidGenerator.Create(), |
|||
resource.Value.ResourceName, |
|||
resource.Value.ResourceName, |
|||
resource.Value.ResourceName, |
|||
resource.Value.DefaultCultureName)); |
|||
} |
|||
} |
|||
if (newResources.Any()) |
|||
{ |
|||
Logger.LogInformation("Saved {0} new resources.", newResources.Count); |
|||
|
|||
await ResourceRepository.InsertManyAsync(newResources, cancellationToken: CancellationTokenProvider.Token); |
|||
} |
|||
|
|||
await Cache.SetStringAsync(resourceHashKey, resourceHash, CancellationTokenProvider.Token); |
|||
} |
|||
} |
|||
|
|||
private async Task SaveTextsAsync() |
|||
{ |
|||
var createTexts = new List<Text>(); |
|||
var updateTexts = new List<Text>(); |
|||
|
|||
var localizationResources = LocalizationOptions.Resources.Values.OfType<LocalizationResource>().ToArray(); |
|||
|
|||
var languageResourceTexts = new Dictionary<string, Dictionary<string, Dictionary<string, LocalizedString>>>(); |
|||
|
|||
foreach (var language in LocalizationOptions.Languages) |
|||
{ |
|||
var resourceTexts = new Dictionary<string, Dictionary<string, LocalizedString>>(); |
|||
foreach (var resource in localizationResources) |
|||
{ |
|||
using (CultureHelper.Use(language.CultureName, language.UiCultureName)) |
|||
{ |
|||
var stringLocalizer = StringLocalizerFactory.Create(resource.ResourceType); |
|||
|
|||
var localizedStrings = await stringLocalizer.GetAllStringsAsync(false, false, false); |
|||
|
|||
var textHashKey = GetApplicationTextHashKey(resource.ResourceName, language.CultureName); |
|||
var textHashCache = await Cache.GetStringAsync(textHashKey, CancellationTokenProvider.Token); |
|||
var textHash = CalculateTextsHash(localizedStrings); |
|||
if (textHashCache == textHash) |
|||
{ |
|||
continue; |
|||
} |
|||
|
|||
var savedLocalizedStrings = await TextRepository.GetListAsync( |
|||
resource.ResourceName, |
|||
language.CultureName); |
|||
|
|||
foreach (var localizedString in localizedStrings) |
|||
{ |
|||
var findLocalizedString = savedLocalizedStrings.FirstOrDefault(x => x.Key == localizedString.Name); |
|||
if (findLocalizedString == null) |
|||
{ |
|||
createTexts.Add( |
|||
new Text( |
|||
resource.ResourceName, |
|||
language.CultureName, |
|||
localizedString.Name, |
|||
localizedString.Value)); |
|||
continue; |
|||
} |
|||
|
|||
if (!string.Equals(findLocalizedString.Value, localizedString.Value, StringComparison.InvariantCultureIgnoreCase)) |
|||
{ |
|||
findLocalizedString.SetValue(localizedString.Value); |
|||
updateTexts.Add(findLocalizedString); |
|||
} |
|||
} |
|||
|
|||
await Cache.SetStringAsync(textHashKey, textHash, CancellationTokenProvider.Token); |
|||
} |
|||
} |
|||
|
|||
languageResourceTexts[language.CultureName] = resourceTexts; |
|||
} |
|||
|
|||
if (createTexts.Any()) |
|||
{ |
|||
Logger.LogInformation("Saved {0} new texts.", createTexts.Count); |
|||
|
|||
await TextRepository.InsertManyAsync(createTexts, cancellationToken: CancellationTokenProvider.Token); |
|||
} |
|||
if (updateTexts.Any()) |
|||
{ |
|||
Logger.LogInformation("Update {0} changed texts.", updateTexts.Count); |
|||
|
|||
await TextRepository.UpdateManyAsync(updateTexts, cancellationToken: CancellationTokenProvider.Token); |
|||
} |
|||
} |
|||
|
|||
private string GetApplicationDistributedLockKey() |
|||
{ |
|||
return $"{CacheOptions.KeyPrefix}_{ApplicationInfoAccessor.ApplicationName}_AbpLocalizationsUpdateLock"; |
|||
} |
|||
|
|||
private string GetApplicationResourceHashKey() |
|||
{ |
|||
return $"{CacheOptions.KeyPrefix}_{ApplicationInfoAccessor.ApplicationName}_AbpLocalizationResourcesHash"; |
|||
} |
|||
|
|||
private string GetApplicationLanguageHashKey() |
|||
{ |
|||
return $"{CacheOptions.KeyPrefix}_{ApplicationInfoAccessor.ApplicationName}_AbpLocalizationLanguagesHash"; |
|||
} |
|||
private string GetApplicationTextHashKey(string resourceName, string cultureName) |
|||
{ |
|||
return $"{CacheOptions.KeyPrefix}_{ApplicationInfoAccessor.ApplicationName}_{resourceName}_{cultureName}_AbpLocalizationTextsHash"; |
|||
} |
|||
|
|||
private static string CalculateResourceHash(List<LocalizationResourceBase> localizationResources) |
|||
{ |
|||
var stringBuilder = new StringBuilder(); |
|||
|
|||
stringBuilder.Append("LocalizationResources:"); |
|||
stringBuilder.AppendLine(JsonSerializer.Serialize(localizationResources)); |
|||
|
|||
return stringBuilder |
|||
.ToString() |
|||
.ToMd5(); |
|||
} |
|||
|
|||
private static string CalculateLanguagesHash(List<LanguageInfo> languageInfos) |
|||
{ |
|||
var stringBuilder = new StringBuilder(); |
|||
|
|||
stringBuilder.Append("LocalizationLanguages:"); |
|||
stringBuilder.AppendLine(JsonSerializer.Serialize(languageInfos)); |
|||
|
|||
return stringBuilder |
|||
.ToString() |
|||
.ToMd5(); |
|||
} |
|||
|
|||
private static string CalculateTextsHash(IEnumerable<LocalizedString> localizers) |
|||
{ |
|||
var stringBuilder = new StringBuilder(); |
|||
|
|||
stringBuilder.Append("LocalizationTexts:"); |
|||
stringBuilder.AppendLine(JsonSerializer.Serialize( |
|||
localizers.Select(x => new NameValue(x.Name, x.Value)).ToList())); |
|||
|
|||
return stringBuilder |
|||
.ToString() |
|||
.ToMd5(); |
|||
} |
|||
} |
|||
@ -1,35 +1,35 @@ |
|||
using System; |
|||
using System; |
|||
using Volo.Abp; |
|||
using Volo.Abp.MultiTenancy; |
|||
|
|||
namespace LINGYUN.Abp.Saas.Tenants; |
|||
|
|||
[Serializable] |
|||
[IgnoreMultiTenancy] |
|||
public class TenantCacheItem |
|||
{ |
|||
private const string CacheKeyFormat = "i:{0},n:{1}"; |
|||
|
|||
public TenantConfiguration Value { get; set; } |
|||
|
|||
public TenantCacheItem() |
|||
{ |
|||
} |
|||
|
|||
public TenantCacheItem(TenantConfiguration value) |
|||
{ |
|||
Value = value; |
|||
} |
|||
|
|||
public static string CalculateCacheKey(Guid? id, string name) |
|||
{ |
|||
if (id == null && name.IsNullOrWhiteSpace()) |
|||
{ |
|||
throw new AbpException("Both id and name can't be invalid."); |
|||
} |
|||
|
|||
return string.Format(CacheKeyFormat, |
|||
id?.ToString() ?? "null", |
|||
(name.IsNullOrWhiteSpace() ? "null" : name)); |
|||
} |
|||
} |
|||
using Volo.Abp.MultiTenancy; |
|||
|
|||
namespace LINGYUN.Abp.Saas.Tenants; |
|||
|
|||
[Serializable] |
|||
[IgnoreMultiTenancy] |
|||
public class TenantCacheItem |
|||
{ |
|||
private const string CacheKeyFormat = "i:{0},n:{1}"; |
|||
|
|||
public TenantConfiguration Value { get; set; } |
|||
|
|||
public TenantCacheItem() |
|||
{ |
|||
} |
|||
|
|||
public TenantCacheItem(TenantConfiguration value) |
|||
{ |
|||
Value = value; |
|||
} |
|||
|
|||
public static string CalculateCacheKey(Guid? id, string name) |
|||
{ |
|||
if (id == null && name.IsNullOrWhiteSpace()) |
|||
{ |
|||
throw new AbpException("Both id and name can't be invalid."); |
|||
} |
|||
|
|||
return string.Format(CacheKeyFormat, |
|||
id?.ToString() ?? "null", |
|||
(name.IsNullOrWhiteSpace() ? "null" : name)); |
|||
} |
|||
} |
|||
|
|||
@ -0,0 +1,16 @@ |
|||
namespace LY.MicroService.Applications.Single.DataSeeder; |
|||
|
|||
public class DataSeederWorker : BackgroundService |
|||
{ |
|||
protected IDataSeeder DataSeeder { get; } |
|||
|
|||
public DataSeederWorker(IDataSeeder dataSeeder) |
|||
{ |
|||
DataSeeder = dataSeeder; |
|||
} |
|||
|
|||
protected async override Task ExecuteAsync(CancellationToken stoppingToken) |
|||
{ |
|||
await DataSeeder.SeedAsync(); |
|||
} |
|||
} |
|||
@ -1,103 +0,0 @@ |
|||
@using Volo.Abp.Account.Localization |
|||
@using Volo.Abp.Users |
|||
@using Microsoft.AspNetCore.Mvc.Localization |
|||
@using Microsoft.Extensions.Localization |
|||
@using Volo.Abp.Account.Web.Pages.Account.Components.ProfileManagementGroup.PersonalInfo |
|||
@using Volo.Abp.AspNetCore.Mvc.UI.Theming |
|||
@using Volo.Abp.Data |
|||
@using Volo.Abp.Identity.Settings |
|||
@using Volo.Abp.Localization |
|||
@using Volo.Abp.Settings |
|||
@using Volo.Abp.ObjectExtending |
|||
@inject IHtmlLocalizer<AccountResource> L |
|||
@inject ICurrentUser CurrentUser |
|||
@inject ISettingProvider SettingManager |
|||
@inject IThemeManager ThemeManager |
|||
@inject IStringLocalizerFactory StringLocalizerFactory |
|||
@model Volo.Abp.Account.Web.Pages.Account.Components.ProfileManagementGroup.PersonalInfo.AccountProfilePersonalInfoManagementGroupViewComponent.PersonalInfoModel |
|||
@{ |
|||
var isUserNameUpdateEnabled = string.Equals(await SettingManager.GetOrNullAsync(IdentitySettingNames.User.IsUserNameUpdateEnabled), "true", |
|||
StringComparison.OrdinalIgnoreCase); |
|||
|
|||
var isEmailUpdateEnabled = string.Equals(await SettingManager.GetOrNullAsync(IdentitySettingNames.User.IsEmailUpdateEnabled), "true", |
|||
StringComparison.OrdinalIgnoreCase); |
|||
} |
|||
|
|||
<h4>@L["PersonalSettings"]</h4><hr/> |
|||
<form method="post" id="PersonalSettingsForm"> |
|||
|
|||
<input asp-for="ConcurrencyStamp" /> |
|||
|
|||
<abp-input asp-for="UserName" readonly="!isUserNameUpdateEnabled"/> |
|||
|
|||
<abp-row> |
|||
<abp-column size-md="_6"> |
|||
<abp-input asp-for="Name"/> |
|||
</abp-column> |
|||
<abp-column size-md="_6"> |
|||
<abp-input asp-for="Surname"/> |
|||
</abp-column> |
|||
</abp-row> |
|||
|
|||
<abp-row> |
|||
<abp-column size-md="_9"> |
|||
<abp-input asp-for="Email" readonly="!isEmailUpdateEnabled"/> |
|||
</abp-column> |
|||
<abp-column size-md="_3"> |
|||
@if (CurrentUser.EmailVerified) |
|||
{ |
|||
<abp-button button-type="Success" text="@L["Confirmed"].Value"/> |
|||
} |
|||
else |
|||
{ |
|||
@*<abp-button href="/Account/SendEmailConfirm" button-type="Link" text="@L["Validation"].Value" />*@ |
|||
<a href="/Account/SendEmailConfirm">@L["Validation"].Value</a> |
|||
} |
|||
</abp-column> |
|||
</abp-row> |
|||
|
|||
<abp-input asp-for="PhoneNumber"/> |
|||
|
|||
@foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<AccountProfilePersonalInfoManagementGroupViewComponent.PersonalInfoModel>()) |
|||
{ |
|||
var isAllowed = propertyInfo.Configuration.GetOrDefault(IdentityModuleExtensionConsts.ConfigurationNames.AllowUserToEdit); |
|||
|
|||
if (isAllowed == null || !isAllowed.Equals(true)) |
|||
{ |
|||
continue; |
|||
} |
|||
|
|||
if (!propertyInfo.Name.EndsWith("_Text")) |
|||
{ |
|||
if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty()) |
|||
{ |
|||
if (propertyInfo.Type.IsEnum) |
|||
{ |
|||
Model.ExtraProperties.ToEnum(propertyInfo.Name, propertyInfo.Type); |
|||
} |
|||
<abp-select asp-for="ExtraProperties[propertyInfo.Name]" |
|||
name="ExtraProperties.@propertyInfo.Name" |
|||
label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)" |
|||
autocomplete-api-url="@propertyInfo.Lookup.Url" |
|||
autocomplete-selected-item-name="@Model.GetProperty(propertyInfo.Name + "_Text")" |
|||
autocomplete-selected-item-value="@Model.GetProperty(propertyInfo.Name)" |
|||
autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName" |
|||
autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName" |
|||
autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName" |
|||
autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"> |
|||
</abp-select> |
|||
} |
|||
else |
|||
{ |
|||
<abp-input type="@propertyInfo.GetInputType()" |
|||
asp-for="ExtraProperties[propertyInfo.Name]" |
|||
name="ExtraProperties.@propertyInfo.Name" |
|||
label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)" |
|||
asp-format="@propertyInfo.GetInputFormatOrNull()" |
|||
value="@propertyInfo.GetInputValueOrNull(Model.GetProperty(propertyInfo.Name))" /> |
|||
} |
|||
} |
|||
} |
|||
|
|||
<abp-button type="submit" button-type="Primary" text="@L["Submit"].Value"/> |
|||
</form> |
|||
@ -1,28 +0,0 @@ |
|||
(function ($) { |
|||
$(function () { |
|||
var l = abp.localization.getResource("AbpAccount"); |
|||
|
|||
$('#PersonalSettingsForm').submit(function (e) { |
|||
e.preventDefault(); |
|||
|
|||
if (!$('#PersonalSettingsForm').valid()) { |
|||
return false; |
|||
} |
|||
|
|||
var input = $('#PersonalSettingsForm').serializeFormToObject(); |
|||
|
|||
volo.abp.account.profile.update(input).then(function (result) { |
|||
abp.notify.success(l('PersonalSettingsSaved')); |
|||
updateConcurrencyStamp(); |
|||
}); |
|||
}); |
|||
}); |
|||
|
|||
abp.event.on('passwordChanged', updateConcurrencyStamp); |
|||
|
|||
function updateConcurrencyStamp(){ |
|||
volo.abp.account.profile.get().then(function(profile){ |
|||
$("#ConcurrencyStamp").val(profile.concurrencyStamp); |
|||
}); |
|||
} |
|||
})(jQuery); |
|||
@ -1,17 +0,0 @@ |
|||
@page |
|||
@inject IHtmlLocalizer<AccountResource> L |
|||
@using Microsoft.AspNetCore.Mvc.Localization |
|||
@using Volo.Abp.Account.Localization |
|||
@model LY.MicroService.Applications.Single.Pages.Account.EmailConfirmModel |
|||
@inject Volo.Abp.AspNetCore.Mvc.UI.Layout.IPageLayout PageLayout |
|||
<div class="card mt-3 shadow-sm rounded"> |
|||
<div class="card-body p-5"> |
|||
<h4>@L["EmailConfirm"]</h4> |
|||
<form method="post"> |
|||
<abp-input asp-for="UserId"/> |
|||
<abp-input asp-for="ConfirmToken"/> |
|||
<a abp-button="Secondary" asp-page="./Login">@L["Cancel"]</a> |
|||
<abp-button type="submit" button-type="Primary" text="@L["Submit"].Value"/> |
|||
</form> |
|||
</div> |
|||
</div> |
|||
@ -1,74 +0,0 @@ |
|||
using LINGYUN.Abp.Account; |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using System; |
|||
using System.ComponentModel.DataAnnotations; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Account.Localization; |
|||
using Volo.Abp.Account.Web.Pages.Account; |
|||
using Volo.Abp.Identity; |
|||
using Volo.Abp.Validation; |
|||
|
|||
namespace LY.MicroService.Applications.Single.Pages.Account |
|||
{ |
|||
public class EmailConfirmModel : AccountPageModel |
|||
{ |
|||
[Required] |
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public Guid UserId { get; set; } |
|||
|
|||
[Required] |
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ConfirmToken { get; set; } |
|||
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrl { get; set; } |
|||
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrlHash { get; set; } |
|||
|
|||
public IMyProfileAppService MyProfileAppService { get; set; } |
|||
|
|||
public EmailConfirmModel() |
|||
{ |
|||
LocalizationResourceType = typeof(AccountResource); |
|||
} |
|||
|
|||
public async virtual Task<IActionResult> OnPostAsync() |
|||
{ |
|||
try |
|||
{ |
|||
ValidateModel(); |
|||
|
|||
await MyProfileAppService.ConfirmEmailAsync( |
|||
new ConfirmEmailInput |
|||
{ |
|||
ConfirmToken = ConfirmToken, |
|||
}); |
|||
} |
|||
catch (AbpIdentityResultException e) |
|||
{ |
|||
if (!string.IsNullOrWhiteSpace(e.Message)) |
|||
{ |
|||
Alerts.Warning(GetLocalizeExceptionMessage(e)); |
|||
return Page(); |
|||
} |
|||
|
|||
throw; |
|||
} |
|||
catch (AbpValidationException) |
|||
{ |
|||
return Page(); |
|||
} |
|||
|
|||
return RedirectToPage("./ConfirmEmailConfirmation", new |
|||
{ |
|||
returnUrl = ReturnUrl, |
|||
returnUrlHash = ReturnUrlHash |
|||
}); |
|||
} |
|||
} |
|||
} |
|||
@ -1,13 +0,0 @@ |
|||
@page |
|||
@model LY.MicroService.Applications.Single.Pages.Account.EmailConfirmConfirmationModel |
|||
@inject Volo.Abp.AspNetCore.Mvc.UI.Layout.IPageLayout PageLayout |
|||
@using Microsoft.AspNetCore.Mvc.Localization |
|||
@using Volo.Abp.Account.Localization |
|||
@inject IHtmlLocalizer<AccountResource> L |
|||
<div class="card mt-3 shadow-sm rounded"> |
|||
<div class="card-body p-5"> |
|||
<h4>@L["EmailConfirm"]</h4> |
|||
<p>@L["YourEmailIsSuccessfullyConfirm"]</p> |
|||
<a abp-button="Primary" href="@Url.Content(Model.ReturnUrl)">@L["GoToTheApplication"]</a> |
|||
</div> |
|||
</div> |
|||
@ -1,23 +0,0 @@ |
|||
using Microsoft.AspNetCore.Authorization; |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Account.Web.Pages.Account; |
|||
|
|||
namespace LY.MicroService.Applications.Single.Pages.Account; |
|||
|
|||
[AllowAnonymous] |
|||
public class EmailConfirmConfirmationModel : AccountPageModel |
|||
{ |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrl { get; set; } |
|||
|
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrlHash { get; set; } |
|||
|
|||
public async virtual Task<IActionResult> OnGetAsync() |
|||
{ |
|||
ReturnUrl = await GetRedirectUrlAsync(ReturnUrl, ReturnUrlHash); |
|||
|
|||
return Page(); |
|||
} |
|||
} |
|||
@ -1,26 +0,0 @@ |
|||
@page |
|||
@using Microsoft.AspNetCore.Mvc.Localization |
|||
@using Volo.Abp.Account.Localization |
|||
@model LY.MicroService.Applications.Single.Pages.Account.SendCodeModel |
|||
@inject IHtmlLocalizer<AccountResource> L |
|||
|
|||
<div class="card mt-3 shadow-sm rounded"> |
|||
<div class="card-body p-5"> |
|||
<h4>@L["TwoFactor"]</h4> |
|||
<form method="post" class="mt-4"> |
|||
<abp-input asp-for="RememberMe" /> |
|||
<input asp-for="ReturnUrl" /> |
|||
<input asp-for="ReturnUrlHash" /> |
|||
<div class="form-group"> |
|||
<abp-select asp-for="Input.SelectedProvider" label="@L["SelectedProvider"].Value" asp-items="@Model.Providers"></abp-select> |
|||
</div> |
|||
<div class="d-grid gap-2"> |
|||
<abp-button type="submit" button-type="Primary" class="mt-2 mb-3">@L["SendVerifyCode"]</abp-button> |
|||
</div> |
|||
<a asp-page="./Login" asp-all-route-data="@(new Dictionary<string, string> {{"returnUrl", Model.ReturnUrl}, {"returnUrlHash", Model.ReturnUrlHash}})"> |
|||
<i class="fa fa-long-arrow-left"></i> @L["Login"] |
|||
</a> |
|||
</form> |
|||
</div> |
|||
</div> |
|||
|
|||
@ -1,128 +0,0 @@ |
|||
using LINGYUN.Abp.Account.Emailing; |
|||
using LINGYUN.Abp.Identity.Settings; |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using Microsoft.AspNetCore.Mvc.Rendering; |
|||
using System.Collections.Generic; |
|||
using System.Linq; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp; |
|||
using Volo.Abp.Account.Localization; |
|||
using Volo.Abp.Account.Web.Pages.Account; |
|||
using Volo.Abp.Sms; |
|||
|
|||
namespace LY.MicroService.Applications.Single.Pages.Account |
|||
{ |
|||
public class SendCodeModel : AccountPageModel |
|||
{ |
|||
[BindProperty] |
|||
public SendCodeInputModel Input { get; set; } |
|||
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrl { get; set; } |
|||
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrlHash { get; set; } |
|||
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public bool RememberMe { get; set; } |
|||
|
|||
public IEnumerable<SelectListItem> Providers { get; set; } |
|||
|
|||
protected ISmsSender SmsSender { get; } |
|||
|
|||
protected IAccountEmailVerifySender AccountEmailVerifySender { get; } |
|||
|
|||
public SendCodeModel( |
|||
ISmsSender smsSender, |
|||
IAccountEmailVerifySender accountEmailVerifySender) |
|||
{ |
|||
SmsSender = smsSender; |
|||
AccountEmailVerifySender = accountEmailVerifySender; |
|||
|
|||
LocalizationResourceType = typeof(AccountResource); |
|||
} |
|||
|
|||
public virtual async Task<IActionResult> OnGetAsync() |
|||
{ |
|||
Input = new SendCodeInputModel(); |
|||
|
|||
var user = await SignInManager.GetTwoFactorAuthenticationUserAsync(); |
|||
if (user == null) |
|||
{ |
|||
// 双因素信息验证失败,一般都是超时了或者用户信息变更
|
|||
Alerts.Warning(L["TwoFactorAuthenticationInvaidUser"]); |
|||
return Page(); |
|||
} |
|||
var userFactors = await UserManager.GetValidTwoFactorProvidersAsync(user); |
|||
Providers = userFactors.Select(purpose => new SelectListItem { Text = purpose, Value = purpose }).ToList(); |
|||
|
|||
return Page(); |
|||
} |
|||
|
|||
public virtual async Task<IActionResult> OnPostAsync() |
|||
{ |
|||
var user = await SignInManager.GetTwoFactorAuthenticationUserAsync(); |
|||
if (user == null) |
|||
{ |
|||
Alerts.Warning(L["TwoFactorAuthenticationInvaidUser"]); |
|||
return Page(); |
|||
} |
|||
|
|||
if (Input.SelectedProvider == "Authenticator") |
|||
{ |
|||
// 用户通过邮件/短信链接进入授权页面
|
|||
return RedirectToPage("VerifyAuthenticatorCode", new |
|||
{ |
|||
returnUrl = ReturnUrl, |
|||
returnUrlHash = ReturnUrlHash, |
|||
rememberMe = RememberMe |
|||
}); |
|||
} |
|||
// 生成验证码
|
|||
var code = await UserManager.GenerateTwoFactorTokenAsync(user, Input.SelectedProvider); |
|||
if (string.IsNullOrWhiteSpace(code)) |
|||
{ |
|||
Alerts.Warning(L["InvaidGenerateTwoFactorToken"]); |
|||
return Page(); |
|||
} |
|||
|
|||
if (Input.SelectedProvider == "Email") |
|||
{ |
|||
await AccountEmailVerifySender |
|||
.SendMailLoginVerifyCodeAsync( |
|||
code, |
|||
user.UserName, |
|||
user.Email); |
|||
} |
|||
else if (Input.SelectedProvider == "Phone") |
|||
{ |
|||
var phoneNumber = await UserManager.GetPhoneNumberAsync(user); |
|||
var templateCode = await SettingProvider.GetOrNullAsync(IdentitySettingNames.User.SmsUserSignin); |
|||
Check.NotNullOrWhiteSpace(templateCode, nameof(IdentitySettingNames.User.SmsUserSignin)); |
|||
|
|||
// TODO: 以后扩展短信模板发送
|
|||
var smsMessage = new SmsMessage(phoneNumber, code); |
|||
smsMessage.Properties.Add("code", code); |
|||
smsMessage.Properties.Add("TemplateCode", templateCode); |
|||
|
|||
await SmsSender.SendAsync(smsMessage); |
|||
} |
|||
|
|||
return RedirectToPage("VerifyCode", new |
|||
{ |
|||
provider = Input.SelectedProvider, |
|||
returnUrl = ReturnUrl, |
|||
returnUrlHash = ReturnUrlHash, |
|||
rememberMe = RememberMe |
|||
}); |
|||
} |
|||
} |
|||
|
|||
public class SendCodeInputModel |
|||
{ |
|||
public string SelectedProvider { get; set; } |
|||
} |
|||
} |
|||
@ -1,16 +0,0 @@ |
|||
@page |
|||
@inject IHtmlLocalizer<AccountResource> L |
|||
@using Microsoft.AspNetCore.Mvc.Localization |
|||
@using Volo.Abp.Account.Localization |
|||
@model LY.MicroService.Applications.Single.Pages.Account.SendEmailConfirmModel |
|||
@inject Volo.Abp.AspNetCore.Mvc.UI.Layout.IPageLayout PageLayout |
|||
<div class="card mt-3 shadow-sm rounded"> |
|||
<div class="card-body p-5"> |
|||
<h4>@L["EmailConfirm"]</h4> |
|||
<form method="post"> |
|||
<abp-input asp-for="Email" readonly="true" /> |
|||
<a abp-button="Secondary" asp-page="./Login">@L["Cancel"]</a> |
|||
<abp-button type="submit" button-type="Primary" text="@L["ClickToValidation"].Value"/> |
|||
</form> |
|||
</div> |
|||
</div> |
|||
@ -1,75 +0,0 @@ |
|||
using LINGYUN.Abp.Account; |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using System.ComponentModel.DataAnnotations; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Account.Localization; |
|||
using Volo.Abp.Account.Web.Pages.Account; |
|||
using Volo.Abp.Identity; |
|||
using Volo.Abp.Validation; |
|||
|
|||
namespace LY.MicroService.Applications.Single.Pages.Account |
|||
{ |
|||
public class SendEmailConfirmModel : AccountPageModel |
|||
{ |
|||
[BindProperty(SupportsGet = true)] |
|||
public string Email { get; set; } |
|||
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrl { get; set; } |
|||
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrlHash { get; set; } |
|||
|
|||
public IMyProfileAppService MyProfileAppService { get; set; } |
|||
|
|||
public SendEmailConfirmModel() |
|||
{ |
|||
LocalizationResourceType = typeof(AccountResource); |
|||
} |
|||
|
|||
public virtual Task<IActionResult> OnGetAsync() |
|||
{ |
|||
Email = CurrentUser.Email; |
|||
|
|||
return Task.FromResult<IActionResult>(Page()); |
|||
} |
|||
|
|||
public async virtual Task<IActionResult> OnPostAsync() |
|||
{ |
|||
try |
|||
{ |
|||
ValidateModel(); |
|||
|
|||
await MyProfileAppService.SendEmailConfirmLinkAsync( |
|||
new SendEmailConfirmCodeDto |
|||
{ |
|||
Email = Email, |
|||
AppName = "MVC", |
|||
ReturnUrl = ReturnUrl, |
|||
ReturnUrlHash = ReturnUrlHash |
|||
}); |
|||
} |
|||
catch (AbpIdentityResultException e) |
|||
{ |
|||
if (!string.IsNullOrWhiteSpace(e.Message)) |
|||
{ |
|||
Alerts.Warning(GetLocalizeExceptionMessage(e)); |
|||
return Page(); |
|||
} |
|||
|
|||
throw; |
|||
} |
|||
catch (AbpValidationException) |
|||
{ |
|||
return Page(); |
|||
} |
|||
|
|||
return RedirectToPage("~/Account/Manage", new |
|||
{ |
|||
returnUrl = ReturnUrl |
|||
}); |
|||
} |
|||
} |
|||
} |
|||
@ -1,65 +0,0 @@ |
|||
using Microsoft.AspNetCore.Authentication; |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using Microsoft.Extensions.Options; |
|||
using System.Collections.Generic; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Account.Web; |
|||
using Volo.Abp.Account.Web.Pages.Account; |
|||
using Volo.Abp.DependencyInjection; |
|||
using Volo.Abp.Identity; |
|||
using Volo.Abp.OpenIddict; |
|||
using IdentityOptions = Microsoft.AspNetCore.Identity.IdentityOptions; |
|||
|
|||
namespace LY.MicroService.Applications.Single.Pages.Account |
|||
{ |
|||
/// <summary>
|
|||
/// 重写登录模型,实现双因素登录
|
|||
/// </summary>
|
|||
[Dependency(ReplaceServices = true)] |
|||
[ExposeServices(typeof(LoginModel), typeof(OpenIddictSupportedLoginModel))] |
|||
public class TwoFactorSupportedLoginModel : OpenIddictSupportedLoginModel |
|||
{ |
|||
public TwoFactorSupportedLoginModel( |
|||
IAuthenticationSchemeProvider schemeProvider, |
|||
IOptions<AbpAccountOptions> accountOptions, |
|||
IOptions<IdentityOptions> identityOptions, |
|||
IdentityDynamicClaimsPrincipalContributorCache identityDynamicClaimsPrincipalContributorCache, |
|||
AbpOpenIddictRequestHelper openIddictRequestHelper) |
|||
: base(schemeProvider, accountOptions, identityOptions, identityDynamicClaimsPrincipalContributorCache, openIddictRequestHelper) |
|||
{ |
|||
|
|||
} |
|||
|
|||
protected async override Task<List<ExternalProviderModel>> GetExternalProviders() |
|||
{ |
|||
var providers = await base.GetExternalProviders(); |
|||
|
|||
foreach (var provider in providers) |
|||
{ |
|||
var localizedDisplayName = L[provider.DisplayName]; |
|||
if (localizedDisplayName.ResourceNotFound) |
|||
{ |
|||
localizedDisplayName = L["AuthenticationScheme:" + provider.DisplayName]; |
|||
} |
|||
|
|||
if (!localizedDisplayName.ResourceNotFound) |
|||
{ |
|||
provider.DisplayName = localizedDisplayName.Value; |
|||
} |
|||
} |
|||
|
|||
return providers; |
|||
} |
|||
|
|||
protected override Task<IActionResult> TwoFactorLoginResultAsync() |
|||
{ |
|||
// 重定向双因素认证页面
|
|||
return Task.FromResult<IActionResult>(RedirectToPage("SendCode", new |
|||
{ |
|||
returnUrl = ReturnUrl, |
|||
returnUrlHash = ReturnUrlHash, |
|||
rememberMe = LoginInput.RememberMe |
|||
})); |
|||
} |
|||
} |
|||
} |
|||
@ -1,4 +0,0 @@ |
|||
@page |
|||
@model LY.MicroService.Applications.Single.Pages.Account.UseRecoveryCodeModel |
|||
@{ |
|||
} |
|||
@ -1,11 +0,0 @@ |
|||
using Microsoft.AspNetCore.Mvc.RazorPages; |
|||
|
|||
namespace LY.MicroService.Applications.Single.Pages.Account |
|||
{ |
|||
public class UseRecoveryCodeModel : PageModel |
|||
{ |
|||
public void OnGet() |
|||
{ |
|||
} |
|||
} |
|||
} |
|||
@ -1,26 +0,0 @@ |
|||
@page |
|||
@using Microsoft.AspNetCore.Mvc.Localization |
|||
@using Volo.Abp.Account.Localization |
|||
@model LY.MicroService.Applications.Single.Pages.Account.VerifyAuthenticatorCodeModel |
|||
@inject IHtmlLocalizer<AccountResource> L |
|||
<div class="card mt-3 shadow-sm rounded"> |
|||
<div class="card-body p-5"> |
|||
<form method="post" class="mt-4"> |
|||
<input asp-for="RememberMe" /> |
|||
<input asp-for="ReturnUrlHash" /> |
|||
<div class="form-group"> |
|||
<label asp-for="Input.VerifyCode"></label> |
|||
<input asp-for="Input.VerifyCode" class="form-control" /> |
|||
<span asp-validation-for="Input.VerifyCode" class="text-danger"></span> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label asp-for="RememberBrowser"></label> |
|||
<abp-input asp-for="RememberBrowser" /> |
|||
</div> |
|||
<abp-button type="submit" button-type="Primary" class="btn-block btn-lg mt-3">@L["VerifyAuthenticatorCode"]</abp-button> |
|||
<a asp-page="./Login" asp-all-route-data="@(new Dictionary<string, string> {{"returnUrl", Model.ReturnUrl}, {"returnUrlHash", Model.ReturnUrlHash}})"> |
|||
<i class="fa fa-long-arrow-left"></i> @L["Login"] |
|||
</a> |
|||
</form> |
|||
</div> |
|||
</div> |
|||
@ -1,61 +0,0 @@ |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using Microsoft.Extensions.Logging; |
|||
using System.ComponentModel.DataAnnotations; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Account.Web.Pages.Account; |
|||
|
|||
namespace LY.MicroService.Applications.Single.Pages.Account |
|||
{ |
|||
public class VerifyAuthenticatorCodeModel : AccountPageModel |
|||
{ |
|||
[BindProperty] |
|||
public VerifyAuthenticatorCodeInputModel Input { get; set; } |
|||
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrl { get; set; } |
|||
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrlHash { get; set; } |
|||
|
|||
[BindProperty(SupportsGet = true)] |
|||
public bool RememberBrowser { get; set; } |
|||
|
|||
[HiddenInput] |
|||
public bool RememberMe { get; set; } |
|||
|
|||
public virtual IActionResult OnGet() |
|||
{ |
|||
Input = new VerifyAuthenticatorCodeInputModel(); |
|||
|
|||
return Page(); |
|||
} |
|||
|
|||
public virtual async Task<IActionResult> OnPostAsync() |
|||
{ |
|||
var result = await SignInManager.TwoFactorAuthenticatorSignInAsync(Input.VerifyCode, RememberMe, RememberBrowser); |
|||
if (result.Succeeded) |
|||
{ |
|||
return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash); |
|||
} |
|||
if (result.IsLockedOut) |
|||
{ |
|||
Logger.LogWarning(7, "User account locked out."); |
|||
Alerts.Warning(L["UserLockedOutMessage"]); |
|||
return Page(); |
|||
} |
|||
else |
|||
{ |
|||
Alerts.Danger(L["TwoFactorAuthenticationInvaidUser"]);// TODO: ¸ü¶à״̬ÂëµÄ½â¶Á
|
|||
return Page(); |
|||
} |
|||
} |
|||
} |
|||
|
|||
public class VerifyAuthenticatorCodeInputModel |
|||
{ |
|||
[Required] |
|||
public string VerifyCode { get; set; } |
|||
} |
|||
} |
|||
@ -1,29 +0,0 @@ |
|||
@page |
|||
@inject IHtmlLocalizer<AccountResource> L |
|||
@using Microsoft.AspNetCore.Mvc.Localization |
|||
@using Volo.Abp.Account.Localization |
|||
@model LY.MicroService.Applications.Single.Pages.Account.VerifyCodeModel |
|||
<div class="card mt-3 shadow-sm rounded"> |
|||
<div class="card-body p-5"> |
|||
<form method="post" class="mt-4"> |
|||
<input asp-for="Provider" /> |
|||
<input asp-for="ReturnUrl" /> |
|||
<input asp-for="ReturnUrlHash" /> |
|||
<input asp-for="RememberMe" /> |
|||
<div class="form-group"> |
|||
<abp-input asp-for="Input.VerifyCode" label="@L["VerifyCode"].Value" class="form-control" /> |
|||
</div> |
|||
<abp-row> |
|||
<abp-column> |
|||
<abp-input asp-for="Input.RememberBrowser" label="@L["RememberBrowser"].Value" /> |
|||
</abp-column> |
|||
</abp-row> |
|||
<div class="d-grid gap-2"> |
|||
<abp-button type="submit" button-type="Primary" class="mt-2 mb-3">@L["VerifyAuthenticatorCode"]</abp-button> |
|||
</div> |
|||
<a asp-page="./SendCode" asp-all-route-data="@(new Dictionary<string, string> {{"returnUrl", Model.ReturnUrl}, {"returnUrlHash", Model.ReturnUrlHash}})"> |
|||
<i class="fa fa-long-arrow-left"></i> @L["ReSendVerifyCode"] |
|||
</a> |
|||
</form> |
|||
</div> |
|||
</div> |
|||
@ -1,92 +0,0 @@ |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using Microsoft.Extensions.Logging; |
|||
using System.ComponentModel.DataAnnotations; |
|||
using System.Threading.Tasks; |
|||
using Volo.Abp.Account.Localization; |
|||
using Volo.Abp.Account.Web.Pages.Account; |
|||
|
|||
namespace LY.MicroService.Applications.Single.Pages.Account |
|||
{ |
|||
public class VerifyCodeModel : AccountPageModel |
|||
{ |
|||
[BindProperty] |
|||
public VerifyCodeInputModel Input { get; set; } |
|||
/// <summary>
|
|||
/// 双因素认证提供程序
|
|||
/// </summary>
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string Provider { get; set; } |
|||
/// <summary>
|
|||
/// 重定向Url
|
|||
/// </summary>
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrl { get; set; } |
|||
/// <summary>
|
|||
///
|
|||
/// </summary>
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public string ReturnUrlHash { get; set; } |
|||
/// <summary>
|
|||
/// 是否记住登录状态
|
|||
/// </summary>
|
|||
[HiddenInput] |
|||
[BindProperty(SupportsGet = true)] |
|||
public bool RememberMe { get; set; } |
|||
|
|||
public VerifyCodeModel() |
|||
{ |
|||
LocalizationResourceType = typeof(AccountResource); |
|||
} |
|||
|
|||
public virtual IActionResult OnGet() |
|||
{ |
|||
Input = new VerifyCodeInputModel(); |
|||
|
|||
return Page(); |
|||
} |
|||
|
|||
public virtual async Task<IActionResult> OnPostAsync() |
|||
{ |
|||
// 验证用户登录状态
|
|||
var user = await SignInManager.GetTwoFactorAuthenticationUserAsync(); |
|||
if (user == null) |
|||
{ |
|||
Alerts.Warning(L["TwoFactorAuthenticationInvaidUser"]); |
|||
return Page(); |
|||
} |
|||
// 双因素登录
|
|||
var result = await SignInManager.TwoFactorSignInAsync(Provider, Input.VerifyCode, RememberMe, Input.RememberBrowser); |
|||
if (result.Succeeded) |
|||
{ |
|||
return await RedirectSafelyAsync(ReturnUrl, ReturnUrlHash); |
|||
} |
|||
if (result.IsLockedOut) |
|||
{ |
|||
Logger.LogWarning(7, "User account locked out."); |
|||
Alerts.Warning(L["UserLockedOutMessage"]); |
|||
return Page(); |
|||
} |
|||
else |
|||
{ |
|||
Alerts.Danger(L["TwoFactorAuthenticationInvaidUser"]);// TODO: 更多状态码的解读
|
|||
return Page(); |
|||
} |
|||
} |
|||
} |
|||
|
|||
public class VerifyCodeInputModel |
|||
{ |
|||
/// <summary>
|
|||
/// 是否在浏览器中记住登录状态
|
|||
/// </summary>
|
|||
public bool RememberBrowser { get; set; } |
|||
/// <summary>
|
|||
/// 发送的验证码
|
|||
/// </summary>
|
|||
[Required] |
|||
public string VerifyCode { get; set; } |
|||
} |
|||
} |
|||
@ -1,10 +0,0 @@ |
|||
"use strict"; |
|||
|
|||
var gulp = require("gulp"), |
|||
path = require('path'), |
|||
copyResources = require('./node_modules/@abp/aspnetcore.mvc.ui/gulp/copy-resources.js'); |
|||
|
|||
exports.default = function(done){ |
|||
copyResources(path.resolve('./')); |
|||
done(); |
|||
}; |
|||
File diff suppressed because it is too large
File diff suppressed because it is too large
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
@ -1,4 +1,4 @@ |
|||
/*! jQuery Validation Plugin - v1.20.0 - 10/10/2023 |
|||
/*! jQuery Validation Plugin - v1.21.0 - 7/17/2024 |
|||
* https://jqueryvalidation.org/
|
|||
* Copyright (c) 2023 Jörn Zaefferer; Licensed MIT */ |
|||
!function(a){"function"==typeof define&&define.amd?define(["jquery","../jquery.validate.min"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){return a.extend(a.validator.messages,{required:"هذا الحقل إلزامي",remote:"يرجى تصحيح هذا الحقل للمتابعة",email:"رجاء إدخال عنوان بريد إلكتروني صحيح",url:"رجاء إدخال عنوان موقع إلكتروني صحيح",date:"رجاء إدخال تاريخ صحيح",dateISO:"رجاء إدخال تاريخ صحيح (ISO)",number:"رجاء إدخال عدد بطريقة صحيحة",digits:"رجاء إدخال أرقام فقط",creditcard:"رجاء إدخال رقم بطاقة ائتمان صحيح",equalTo:"رجاء إدخال نفس القيمة",extension:"رجاء إدخال ملف بامتداد موافق عليه",maxlength:a.validator.format("الحد الأقصى لعدد الحروف هو {0}"),minlength:a.validator.format("الحد الأدنى لعدد الحروف هو {0}"),rangelength:a.validator.format("عدد الحروف يجب أن يكون بين {0} و {1}"),range:a.validator.format("رجاء إدخال عدد قيمته بين {0} و {1}"),max:a.validator.format("رجاء إدخال عدد أقل من أو يساوي {0}"),min:a.validator.format("رجاء إدخال عدد أكبر من أو يساوي {0}")}),a}); |
|||
* Copyright (c) 2024 Jörn Zaefferer; Licensed MIT */ |
|||
!function(a){"function"==typeof define&&define.amd?define(["jquery","../jquery.validate.min"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){return a.extend(a.validator.messages,{required:"هذا الحقل إلزامي",remote:"يرجى تصحيح هذا الحقل للمتابعة",email:"رجاء إدخال عنوان بريد إلكتروني صحيح",url:"رجاء إدخال عنوان موقع إلكتروني صحيح",date:"رجاء إدخال تاريخ صحيح",dateISO:"رجاء إدخال تاريخ صحيح (ISO)",number:"رجاء إدخال عدد بطريقة صحيحة",digits:"رجاء إدخال أرقام فقط",creditcard:"رجاء إدخال رقم بطاقة ائتمان صحيح",equalTo:"رجاء إدخال نفس القيمة",extension:"رجاء إدخال ملف بامتداد موافق عليه",maxlength:a.validator.format("الحد الأقصى لعدد الحروف هو {0}"),minlength:a.validator.format("الحد الأدنى لعدد الحروف هو {0}"),rangelength:a.validator.format("عدد الحروف يجب أن يكون بين {0} و {1}"),range:a.validator.format("رجاء إدخال عدد قيمته بين {0} و {1}"),max:a.validator.format("رجاء إدخال عدد أقل من أو يساوي {0}"),min:a.validator.format("رجاء إدخال عدد أكبر من أو يساوي {0}"),step:a.validator.format("يرجى تقديم قيمة من مضاعفات {0}"),maxWords:a.validator.format("يرجى تقديم ما لا يزيد عن {0} كلمات"),minWords:a.validator.format("يرجى تقديم {0} كلمات على الأقل"),rangeWords:a.validator.format("يرجى تقديم ما بين {0} و{1} كلمة"),letterswithbasicpunc:"يرجى تقديم الحروف وعلامات الترقيم فقط",alphanumeric:"يرجى تقديم الحروف والأرقام والمسافات والتسطير فقط",lettersonly:"يرجى تقديم الحروف فقط",nowhitespace:"من فضلك لا تدخل المساحات البيضاء",ziprange:"يرجى تقديم الرمز البريدي بين 902xx-xxxx و905-xx-xxxx",integer:"يرجى تقديم رقم غير عشري موجب أو سالب",vinUS:"يرجى تقديم رقم تعريف المركبة (VIN)",dateITA:"يرجى تقديم تاريخ صالح",time:"يرجى تقديم وقت صالح بين 00:00 و23:59",phoneUS:"الرجاء تقديم رقم هاتف صالح",phoneUK:"الرجاء تقديم رقم هاتف صالح",mobileUK:"يرجى تقديم رقم هاتف محمول صالح",strippedminlength:a.validator.format("يرجى تقديم {0} حرفًا على الأقل"),email2:"يرجى تقديم عنوان بريد إلكتروني صالح",url2:"يرجى إدخال عنوان بريد إلكتروني صحيح",creditcardtypes:"يرجى تقديم رقم بطاقة ائتمان صالح",currency:"يرجى تقديم عملة صالحة",ipv4:"يرجى تقديم عنوان IP v4 صالح",ipv6:"يرجى تقديم عنوان IP v6 صالح",require_from_group:a.validator.format("يرجى تقديم ما لا يقل عن {0} من هذه الحقول"),nifES:"يرجى تقديم رقم TIN صالح",nieES:"يرجى تقديم رقم NIE صالح",cifES:"يرجى تقديم رقم CIF صالح",postalCodeCA:"يرجى تقديم رمز بريدي صالح",pattern:"التنسيق غير صالح"}),a}); |
|||
@ -1,4 +1,4 @@ |
|||
/*! jQuery Validation Plugin - v1.20.0 - 10/10/2023 |
|||
/*! jQuery Validation Plugin - v1.21.0 - 7/17/2024 |
|||
* https://jqueryvalidation.org/
|
|||
* Copyright (c) 2023 Jörn Zaefferer; Licensed MIT */ |
|||
* Copyright (c) 2024 Jörn Zaefferer; Licensed MIT */ |
|||
!function(a){"function"==typeof define&&define.amd?define(["jquery","../jquery.validate.min"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){return a.extend(a.validator.messages,{required:"Bu xana mütləq doldurulmalıdır.",remote:"Zəhmət olmasa, düzgün məna daxil edin.",email:"Zəhmət olmasa, düzgün elektron poçt daxil edin.",url:"Zəhmət olmasa, düzgün URL daxil edin.",date:"Zəhmət olmasa, düzgün tarix daxil edin.",dateISO:"Zəhmət olmasa, düzgün ISO formatlı tarix daxil edin.",number:"Zəhmət olmasa, düzgün rəqəm daxil edin.",digits:"Zəhmət olmasa, yalnız rəqəm daxil edin.",creditcard:"Zəhmət olmasa, düzgün kredit kart nömrəsini daxil edin.",equalTo:"Zəhmət olmasa, eyni mənanı bir daha daxil edin.",extension:"Zəhmət olmasa, düzgün genişlənməyə malik faylı seçin.",maxlength:a.validator.format("Zəhmət olmasa, {0} simvoldan çox olmayaraq daxil edin."),minlength:a.validator.format("Zəhmət olmasa, {0} simvoldan az olmayaraq daxil edin."),rangelength:a.validator.format("Zəhmət olmasa, {0} - {1} aralığında uzunluğa malik simvol daxil edin."),range:a.validator.format("Zəhmət olmasa, {0} - {1} aralığında rəqəm daxil edin."),max:a.validator.format("Zəhmət olmasa, {0} və ondan kiçik rəqəm daxil edin."),min:a.validator.format("Zəhmət olmasa, {0} və ondan böyük rəqəm daxil edin.")}),a}); |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue