From 7fa00f47b1a794f18ba9f61ffc767146f904f15c Mon Sep 17 00:00:00 2001 From: "Marcelo M. M" <4993482+marcelo-maciel@users.noreply.github.com> Date: Thu, 16 Jun 2022 06:54:32 -0300 Subject: [PATCH 1/8] PT-BR localization correction PT-BR localization correction --- .../Localization/Resources/AbpUi/pt-BR.json | 4 +- .../Abp/Validation/Localization/pt-BR.json | 14 ++-- .../Volo/Abp/Http/Localization/pt-BR.json | 2 +- .../Account/Localization/Resources/en.json | 2 +- .../Account/Localization/Resources/pt-BR.json | 6 +- .../Blogging/Localization/Resources/en.json | 2 +- .../CmsKit/Localization/Resources/en.json | 2 +- .../CmsKit/Localization/Resources/pt-BR.json | 65 +++++++++++++------ .../Docs/ApplicationContracts/en.json | 2 +- .../Docs/ApplicationContracts/pt-BR.json | 14 ++-- .../Volo/Docs/Localization/Domain/en.json | 2 +- .../Volo/Docs/Localization/Domain/pt-BR.json | 12 ++-- .../Localization/Domain/pt-BR.json | 2 +- .../Volo/Abp/Identity/Localization/en.json | 2 +- .../Volo/Abp/Identity/Localization/pt-BR.json | 4 +- .../Volo.Abp.OpenIddict.Domain.Shared.csproj | 4 ++ .../Localization/Domain/pt-BR.json | 3 +- .../Resources/AbpSettingManagement/pt-BR.json | 10 +++ .../Localization/Resources/pt-BR.json | 4 +- .../Localization/Resources/en.json | 18 ++--- 20 files changed, 106 insertions(+), 68 deletions(-) diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json index e03a77f7fa..aa915a704f 100644 --- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json +++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json @@ -15,9 +15,9 @@ "Delete": "Excluir", "SuccessfullyDeleted": "Excluído com sucesso", "Edit": "Editar", - "Refresh": "Refrescar", + "Refresh": "Atualizar", "Language": "Língua", - "LoadMore": "Carregue mais", + "LoadMore": "Carregar mais", "ProcessingWithThreeDot": "Processando...", "LoadingWithThreeDot": "Carregando...", "Welcome": "Bem Vindo", diff --git a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pt-BR.json b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pt-BR.json index 2af525b373..4adbd81e80 100644 --- a/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pt-BR.json +++ b/framework/src/Volo.Abp.Validation/Volo/Abp/Validation/Localization/pt-BR.json @@ -1,11 +1,11 @@ { "culture": "pt-BR", "texts": { - "'{0}' and '{1}' do not match.": "'{0}' e '{1}' não encontrado.", + "'{0}' and '{1}' do not match.": "'{0}' e '{1}' não coincidem.", "The {0} field is not a valid credit card number.": "O campo {0} não é um número de cartão de crédito válido.", "{0} is not valid.": "{0} é inválido.", "The {0} field is not a valid e-mail address.": "O campo {0} não é um e-mail válido.", - "The {0} field only accepts files with the following extensions: {1}": "O campo {0} aceita somente arquivos com estensões: {1}", + "The {0} field only accepts files with the following extensions: {1}": "O campo {0} aceita somente arquivos com extensões: {1}", "The field {0} must be a string or array type with a maximum length of '{1}'.": "O campo {0} deve ser uma palavra ou matriz com o tamanho máximo de '{1}'.", "The field {0} must be a string or array type with a minimum length of '{1}'.": "O campo {0} deve ser uma palavra ou matriz com o tamanho mínimo de '{1}'.", "The {0} field is not a valid phone number.": "O campo {0} não é um telefone válido.", @@ -19,16 +19,16 @@ "ThisFieldIsNotAValidCreditCardNumber.": "Não é um cartão de crédito válido.", "ThisFieldIsNotValid.": "Campo inválido.", "ThisFieldIsNotAValidEmailAddress.": "E-mail inválido.", - "ThisFieldOnlyAcceptsFilesWithTheFollowingExtensions:{0}": "Este campo só aceita arquivos com asseguintes extensões: {0}", - "ThisFieldMustBeAStringOrArrayTypeWithAMaximumLengthOf{0}": "This field must be a string or array type with a maximum length of '{0}'.", - "ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf{0}": "This field must be a string or array type with a minimum length of '{0}'.", + "ThisFieldOnlyAcceptsFilesWithTheFollowingExtensions:{0}": "Este campo só aceita arquivos com as seguintes extensões: {0}", + "ThisFieldMustBeAStringOrArrayTypeWithAMaximumLengthOf{0}": "Este campo deve ser do tipo palavra ou matriz com comprimento máximo de '{0}'.", + "ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf{0}": "Este campo deve ser do tipo palavra ou matriz com comprimento mínimo de '{0}'.", "ThisFieldIsNotAValidPhoneNumber.": "Número de telefone inválido.", "ThisFieldMustBeBetween{0}And{1}": "Este campo deve estar entre {0} e {1}.", - "ThisFieldMustMatchTheRegularExpression{0}": "Este campo deve ser compatível com a expressao regular: '{0}'.", + "ThisFieldMustMatchTheRegularExpression{0}": "Este campo deve ser compatível com a expressão regular: '{0}'.", "ThisFieldIsRequired.": "Campo Obrigatório.", "ThisFieldMustBeAStringWithAMaximumLengthOf{0}": "Campo com no máximo {0} caracteres.", "ThisFieldMustBeAStringWithAMinimumLengthOf{1}AndAMaximumLengthOf{0}": "Este campo deve possuir entre {1} e {0} caracteres.", - "ThisFieldIsNotAValidFullyQualifiedHttpHttpsOrFtpUrl": "Este campo não é um http, https, ou ftp complatamente qualificado.", + "ThisFieldIsNotAValidFullyQualifiedHttpHttpsOrFtpUrl": "Este campo não é um http, https, ou ftp completamente qualificado.", "ThisFieldIsInvalid.": "Campo inválido." } } \ No newline at end of file diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Localization/pt-BR.json b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Localization/pt-BR.json index a28533e079..1de3028774 100644 --- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Localization/pt-BR.json +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Localization/pt-BR.json @@ -1,6 +1,6 @@ { "culture": "pt-BR", "texts": { - "Volo.Abp.Http.DynamicProxying:10001": "Exceção comercial com dados: {0}" + "Volo.Abp.Http.DynamicProxying:10001": "Exceção de negócio com dados: {0}" } } \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json index 17f05fe29b..d5f881e365 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/en.json @@ -65,4 +65,4 @@ "AccessDenied": "Access denied!", "AccessDeniedMessage": "You do not have access to this resource." } -} +} \ No newline at end of file diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json index b590b50d8a..71adf7be31 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/Localization/Resources/pt-BR.json @@ -8,7 +8,7 @@ "Password": "Senha", "RememberMe": "Lembrar", "UseAnotherServiceToLogin": "Usar outro serviço para entrar", - "UserLockedOutMessage": "Esta conta de usuário está bloqueada devido a muitas tentativas de acesso. Por favor, espero alguns instantes e tente novamente.", + "UserLockedOutMessage": "Esta conta de usuário está bloqueada devido a muitas tentativas de acesso. Por favor, espere alguns instantes e tente novamente.", "InvalidUserNameOrPassword": "Usuário ou senha estão incorretos!", "LoginIsNotAllowed": "Você não tem permissão para fazer o login! Sua conta está inativa ou precisa confirmar seu e-mail/número de telefone.", "SelfRegistrationDisabledMessage": "Não é permitido que você crie uma nova conta neste site. Contate um administrador para que ele crie uma conta para você.", @@ -42,13 +42,13 @@ "Description:Abp.Account.IsSelfRegistrationEnabled": "Se um usuário pode registrar a conta por si mesmo.", "DisplayName:Abp.Account.EnableLocalLogin": "Autenticar com uma conta local", "Description:Abp.Account.EnableLocalLogin": "Indica se o servidor permitirá que os usuários se autentiquem com uma conta local.", - "LoggedOutTitle": "Assinado", + "LoggedOutTitle": "Desconectado", "LoggedOutText": "Você foi desconectado e será redirecionado em breve.", "ReturnToText": "Clique aqui para retornar ao aplicativo", "OrLoginWith": "Ou faça login com:", "ForgotPassword": "Esqueceu sua senha?", "SendPasswordResetLink_Information": "Um link de redefinição de senha será enviado ao seu e-mail para redefinir sua senha. Se você não receber um e-mail em alguns minutos, tente novamente.", - "PasswordResetMailSentMessage": "Email de recuperação de conta enviado para o seu endereço de e-mail. Se você não vir este e-mail em sua caixa de entrada em 15 minutos, procure-o na pasta de lixo eletrônico. Se você encontrá-lo lá, marque-o como -Não Lixo-.", + "PasswordResetMailSentMessage": "E-mail de recuperação de conta enviado para o seu endereço de e-mail. Se você não vir este e-mail em sua caixa de entrada em 15 minutos, procure-o na pasta de lixo eletrônico. Se você encontrá-lo lá, marque-o como -Não é Lixo Eletrônico-.", "ResetPassword": "Redefinir senha", "ConfirmPassword": "Confirme (repita) a senha", "ResetPassword_Information": "Por favor insira sua nova senha.", diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json index 2219aa9fcd..9823d30f73 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json @@ -58,4 +58,4 @@ "ClearCache": "Clear cache", "ClearCacheConfirmationMessage": "Are you sure you want to clear the cache?" } -} +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json index 7b63218493..6926fdb771 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json @@ -183,4 +183,4 @@ "Status": "Status", "CmsKit.BlogPost.ScrollIndex": "Quick navigation bar in blog posts" } -} +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/pt-BR.json b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/pt-BR.json index 2aa9c1b768..5ec2a64799 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/pt-BR.json +++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/pt-BR.json @@ -22,23 +22,23 @@ "CmsKit:Comments:0001": "A entidade {EntityType} não pode ser comentada.", "CmsKit:Media:0001": "'{Name}' não é um nome de mídia válido.", "CmsKit:Media:0002": "A entidade não pode ter mídia.", - "CmsKit:Page:0001": "O url fornecido ({Slug}) já existe. Por favor, tente com url diferente.", + "CmsKit:Page:0001": "A url fornecida ({Slug}) já existe. Por favor, tente com uma url diferente.", "CmsKit:Rating:0001": "A entidade {EntityType} não pode ser avaliada.", "CmsKit:Reaction:0001": "A entidade {EntityType} não pode ter reações.", "CmsKit:Tag:0002": "A entidade não pode ser etiquetada!", "CommentAuthorizationExceptionMessage": "Esses comentários não são permitidos para exibição pública.", "CommentDeletionConfirmationMessage": "Este comentário e todas as respostas serão excluídos!", "Comments": "Comentários", - "Content": "Contente", + "Content": "Conteúdo", "ContentDeletionConfirmationMessage": "Tem certeza de que deseja excluir este conteúdo?", - "Contents": "Conteúdo", + "Contents": "Conteúdos", "CoverImage": "Imagem de capa", "CreateBlogPostPage": "Nova postagem no blog", "CreationTime": "Tempo de Criação", "Delete": "Excluir", "Detail": "Detalhe", "Details": "Detalhes", - "DisplayName": "Nome em Exibição", + "DisplayName": "Nome para Exibição", "DoYouPreferAdditionalEmails": "Você prefere e-mails adicionais?", "Edit": "Editar", "EndDate": "Data final", @@ -51,8 +51,8 @@ "LastModification": "Última modificação", "LastModificationTime": "Hora da Última Modificação", "LoginToAddComment": "Faça login para adicionar comentário", - "LoginToRate": "Faça login para avaliar", - "LoginToReact": "Faça login para reagir", + "LoginToRate": "Entre para avaliar", + "LoginToReact": "Entre para reagir", "LoginToReply": "Entre para responder", "MainMenu": "Menu principal", "MakeMainMenu": "Faça o Menu Principal", @@ -75,46 +75,48 @@ "PageDeletionConfirmationMessage": "Tem certeza que deseja deletar esta página?", "PageId": "Página", "Pages": "Páginas", - "PageSlugInformation": "Slug é usado no url. Seu url será '/pages/{{slug}}'.", + "PageSlugInformation": "Slug é usado na url. Sua url será '/pages/{{slug}}'.", "Permission:BlogManagement": "Gerenciamento de blogs", - "Permission:BlogManagement.Create": "Crio", + "Permission:BlogManagement.Create": "Criar", "Permission:BlogManagement.Delete": "Excluir", "Permission:BlogManagement.Features": "Recursos", "Permission:BlogManagement.Update": "Atualizar", "Permission:BlogPostManagement": "Gerenciamento de postagem no blog", - "Permission:BlogPostManagement.Create": "Crio", + "Permission:BlogPostManagement.Create": "Criar", "Permission:BlogPostManagement.Delete": "Excluir", "Permission:BlogPostManagement.Update": "Atualizar", + "Permission:BlogPostManagement.Publish": "Publicar", "Permission:CmsKit": "CmsKit", "Permission:Comments": "Gerenciamento de comentários", "Permission:Comments.Delete": "Excluir", "Permission:Contents": "Gerenciamento de conteúdo", "Permission:Contents.Create": "Criar conteúdo", "Permission:Contents.Delete": "Excluir conteúdo", - "Permission:Contents.Update": "Conteúdo de atualização", + "Permission:Contents.Update": "Editar conteúdo", "Permission:MediaDescriptorManagement": "Gestão de mídia", - "Permission:MediaDescriptorManagement:Create": "Crio", + "Permission:MediaDescriptorManagement:Create": "Criar", "Permission:MediaDescriptorManagement:Delete": "Excluir", "Permission:MenuItemManagement": "Gerenciamento de item de menu", - "Permission:MenuItemManagement.Create": "Crio", + "Permission:MenuItemManagement.Create": "Criar", "Permission:MenuItemManagement.Delete": "Excluir", "Permission:MenuItemManagement.Update": "Atualizar", "Permission:MenuManagement": "Gestão do Menu", - "Permission:MenuManagement.Create": "Crio", + "Permission:MenuManagement.Create": "Criar", "Permission:MenuManagement.Delete": "Excluir", "Permission:MenuManagement.Update": "Atualizar", "Permission:Menus": "Gestão do Menu", - "Permission:Menus.Create": "Crio", + "Permission:Menus.Create": "Criar", "Permission:Menus.Delete": "Excluir", "Permission:Menus.Update": "Atualizar", "Permission:PageManagement": "Gerenciamento de página", - "Permission:PageManagement:Create": "Crio", + "Permission:PageManagement:Create": "Criar", "Permission:PageManagement:Delete": "Excluir", "Permission:PageManagement:Update": "Atualizar", "Permission:TagManagement": "Gestão de Tag", - "Permission:TagManagement.Create": "Crio", + "Permission:TagManagement.Create": "Criar", "Permission:TagManagement.Delete": "Excluir", "Permission:TagManagement.Update": "Atualizar", + "Permission:GlobalResources": "Recursos globais", "PickYourReaction": "Escolha sua reação", "Rating": "Avaliação", "RatingUndoMessage": "Sua classificação será desfeita.", @@ -127,10 +129,11 @@ "SaveChanges": "Salvar alterações", "Script": "Roteiro", "SelectAll": "Selecionar tudo", - "Send": "Mandar", + "Send": "Enviar", "SendMessage": "Enviar mensagem", + "SelectedAuthor": "Autor", "ShortDescription": "Pequena descrição", - "Slug": "Lesma", + "Slug": "Slug", "Source": "Fonte", "SourceUrl": "URL da fonte", "Star": "Estrela", @@ -139,7 +142,7 @@ "Subject": "Sujeito", "SubjectPlaceholder": "Por favor digite um assunto", "Submit": "Enviar", - "Subscribe": "Se inscrever", + "Subscribe": "Inscrever-se", "SuccessfullySaved": "Salvo com sucesso!", "TagDeletionConfirmationMessage": "Tem certeza que deseja excluir a tag '{0}'?", "Tags": "Tag", @@ -155,9 +158,29 @@ "UserId": "ID do usuário", "Username": "Nome do usuário", "YourComment": "Seu comentário", - "YourEmailAddress": "Seu endereço de email", + "YourEmailAddress": "Seu endereço de e-mail", "YourFullName": "Seu nome completo", "YourMessage": "Sua mensagem", - "YourReply": "Sua resposta" + "YourReply": "Sua resposta", + "MarkdownSupported": "Markdown supported.", + "GlobalResources": "Recursos globais", + "SavedSuccessfully": "Salvo com sucesso", + "CmsKit.BlogPost.Status.0": "Rascunho", + "CmsKit.BlogPost.Status.1": "Publicado", + "CmsKit.BlogPost.Status.2": "Aguardando revisão", + "BlogPostPublishConfirmationMessage": "Tem certeza que deseja publicar a postagem \"{0}\"?", + "SuccessfullyPublished": "Publicado com sucesso!", + "Draft": "Rascunho", + "Publish": "Publicado", + "BlogPostDraftConfirmationMessage": "Tem certeza que deseja marcar a postagem \"{0}\" como rascunho?", + "BlogPostSendToReviewConfirmationMessage": "Tem certeza que deseja enviar a postagem \"{0}\" para o admin revisor para publicação?", + "SaveAsDraft": "Salvar como rascunho", + "SendToReview": "Enviar para revisão", + "SendToReviewToPublish": "Enviar para revisão para publicar", + "BlogPostSendToReviewSuccessMessage": "A postagem \"{0}\" foi enviada para o admin revisor para publicação.", + "HasBlogPostWaitingForReviewMessage": "Você tem uma postagem para revisão. Clique para listar.", + "SelectAStatus": "Selecione um status", + "Status": "Status", + "CmsKit.BlogPost.ScrollIndex": "Barra de navegação rápida em postagens" } } \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json index fa6a130c94..d19bef7adf 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/en.json @@ -56,4 +56,4 @@ "FileName": "File name", "LastCachedTime": "Cache time" } -} +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/pt-BR.json b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/pt-BR.json index 98447e6427..7daa4964b3 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/pt-BR.json +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Localization/Resources/Docs/ApplicationContracts/pt-BR.json @@ -19,18 +19,18 @@ "ShortName": "Nome Curto", "DocumentStoreType": "DocumentStoreType", "Format": "Formato", - "ShortNameInfoText": "Ser� utilizado para URL �nica.", + "ShortNameInfoText": "Será utilizado para URL única.", "DisplayName:Name": "Nome", "DisplayName:ShortName": "Nome Curto", "DisplayName:Format": "Formatar", - "DisplayName:DefaultDocumentName": "Nome padr�o do documento", - "DisplayName:NavigationDocumentName": "Nome de navega��o do documento", - "DisplayName:MinimumVersion": "Vers�o m�nima", + "DisplayName:DefaultDocumentName": "Nome padrão do documento", + "DisplayName:NavigationDocumentName": "Nome de navegação do documento", + "DisplayName:MinimumVersion": "Versão mínima", "DisplayName:MainWebsiteUrl": "URL do site principal", - "DisplayName:LatestVersionBranchName": "Nome do branch da �ltima vers�o", - "DisplayName:GitHubRootUrl": "URL ra�z do GitHub", + "DisplayName:LatestVersionBranchName": "Nome do branch da última versão", + "DisplayName:GitHubRootUrl": "URL raíz do GitHub", "DisplayName:GitHubAccessToken": "Token de acesso do GitHub", - "DisplayName:GitHubUserAgent": "Usu�rio agente do GitHub", + "DisplayName:GitHubUserAgent": "Usuário agente do GitHub", "DisplayName:GithubVersionProviderSource": "Fonte do provedor de versão do GitHub", "DisplayName:VersionBranchPrefix": "Prefixo da ramificação da versão", "DisplayName:All": "Puxe tudo", diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json index 62913fa806..bc5c7cf826 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json @@ -38,4 +38,4 @@ "Search": "Search", "SearchResults": "Search Results" } -} +} \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/pt-BR.json b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/pt-BR.json index 1009a2a90e..ec0e91eb56 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/pt-BR.json +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/pt-BR.json @@ -11,9 +11,9 @@ "Delete": "Excluir", "ClearCache": "Limpar cache", "ClearCacheConfirmationMessage": "Tem certeza que deseja limpar todos os caches do projeto \"{0}\"", - "ReIndexAllProjects": "ReIndexar todos os projetos", - "ReIndexProject": "Projeto ReIndex", - "ReIndexProjectConfirmationMessage": "Tem certeza que deseja reindexar para o projeto \"{0}\"", + "ReIndexAllProjects": "Reindexar todos os projetos", + "ReIndexProject": "Reindexar Projeto", + "ReIndexProjectConfirmationMessage": "Tem certeza que deseja reindexar o projeto \"{0}\"", "SuccessfullyReIndexProject": "Reindexado com sucesso: \"{0}\"", "ReIndexAllProjectConfirmationMessage": "Tem certeza de que deseja reindexar todos os projetos?", "SuccessfullyReIndexAllProject": "Todos os projetos foram reindexados com sucesso", @@ -30,11 +30,11 @@ "Volo.Docs.Domain:010001": "A pesquisa elástica não está ativada.", "MultipleVersionDocumentInfo": "Este documento possui várias versões. Selecione as opções mais adequadas para você.", "New": "Novo", - "Upd": "Upd", + "Upd": "Atualizar", "NewExplanation": "Criado nas últimas duas semanas.", "UpdatedExplanation": "Atualizado nas últimas duas semanas.", - "Volo.Docs.Domain:010002": "ShortName {ShortName} já existe.", - "Preview": "antevisão", + "Volo.Docs.Domain:010002": "Nome curto {ShortName} já existe.", + "Preview": "Previsualizar", "Search": "Procurar", "SearchResults": "Procurar Resultados" } diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json index f87f7ae811..a50ec6d471 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json @@ -2,7 +2,7 @@ "culture": "pt-BR", "texts": { "Features": "Funcionalidades", - "NoFeatureFoundMessage": "N�o h� nenhuma funcionalidade dispon�vel.", + "NoFeatureFoundMessage": "Não há nenhuma funcionalidade disponivel.", "Permission:FeatureManagement": "Gerenciamento de recursos", "Permission:FeatureManagement.ManageHostFeatures": "Gerenciar recursos do Host", "Volo.Abp.FeatureManagement:InvalidFeatureValue": "O valor do recurso {0} não é válido!" diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json index d0485b1e93..97d5bbcd75 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json @@ -109,4 +109,4 @@ "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "Whether the username can be updated by the user.", "Description:Abp.Identity.User.IsEmailUpdateEnabled": "Whether the email can be updated by the user." } -} +} \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json index 1701a17613..23befda585 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json @@ -65,7 +65,7 @@ "Volo.Abp.Identity:010001": "Você não pode deletar sua própria conta!", "Volo.Abp.Identity:010002": "Não é possível definir mais de {MaxUserMembershipCount} unidade de organização para um usuário!", "Volo.Abp.Identity:010003": "Não é possível alterar a senha de um usuário conectado externamente!", - "Volo.Abp.Identity:010004": "Já existe uma unidade organizacional com o nome {0}. Duas unidades com o mesmo nome não pode ser criada no mesmo nível.", + "Volo.Abp.Identity:010004": "Já existe uma unidade organizacional com o nome {0}. Duas unidades com o mesmo nome não podem ser criadas no mesmo nível.", "Volo.Abp.Identity:010005": "Perfis estáticos não podem ser renomeados.", "Volo.Abp.Identity:010006": "Perfis estáticos não podem ser excluídos.", "Volo.Abp.Identity:010007": "Você não pode alterar sua configuração de dois fatores.", @@ -104,7 +104,7 @@ "Description:Abp.Identity.Lockout.LockoutDuration": "A duração que um usuário fica bloqueado quando ocorre um bloqueio.", "Description:Abp.Identity.Lockout.MaxFailedAccessAttempts": "O número de tentativas de acesso malsucedidas permitidas antes que um usuário seja bloqueado, assumindo que o bloqueio esteja habilitado.", "Description:Abp.Identity.SignIn.RequireConfirmedEmail": "Se um endereço de e-mail confirmado é necessário para fazer login.", - "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "Se o phoneNumber pode ser confirmado pelo usuário.", + "Description:Abp.Identity.SignIn.EnablePhoneNumberConfirmation": "Se o número de telefone pode ser confirmado pelo usuário.", "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "Se um número de telefone confirmado é necessário para fazer login.", "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "Se o nome de usuário pode ser atualizado pelo usuário.", "Description:Abp.Identity.User.IsEmailUpdateEnabled": "Se o e-mail pode ser atualizado pelo usuário." diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj index 34a4d6c334..fc5080b687 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj @@ -23,4 +23,8 @@ + + + + diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pt-BR.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pt-BR.json index ac1a771466..c70a1b190b 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pt-BR.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pt-BR.json @@ -5,6 +5,7 @@ "OnlyProviderPermissons": "Apenas este provedor", "All": "Todos", "SelectAllInAllTabs": "Conceder todas as permissões", - "SelectAllInThisTab": "Selecionar todos" + "SelectAllInThisTab": "Selecionar todos", + "SaveWithoutAnyPermissionsWarningMessage": "Tem certeza que deseja salvar sem nenhuma permissão?" } } \ No newline at end of file diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json index 27e0cf58d7..4237afe6ea 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/pt-BR.json @@ -5,6 +5,16 @@ "SuccessfullySaved": "Salvo com sucesso!", "Permission:SettingManagement": "Gestão de Cenários", "Permission:Emailing": "Enviando por e-mail", + "Permission:EmailingTest": "Teste de e-mail", + "SendTestEmail": "Enviar e-mail de teste", + "SenderEmailAddress": "E-mail remetente", + "TargetEmailAddress": "E-mail destinatário", + "Subject": "Título", + "Body": "Corpo", + "TestEmailSubject": "E-mail teste {0}", + "TestEmailBody": "Corpo de e-mail de teste aqui", + "SuccessfullySent": "Enviado com sucesso", + "Send": "Enviar", "Menu:Emailing": "Enviando por e-mail", "SmtpHost": "Hospedeiro", "SmtpPort": "Porta", diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json index 672d2c49ad..6f43740161 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/pt-BR.json @@ -7,8 +7,8 @@ "TenantName": "Inquilino", "DisplayName:TenantName": "Inquilino", "TenantDeletionConfirmationMessage": "Inquilino '{0}' será excluído. Tem certeza?", - "ConnectionStrings": "String de Conexão", - "DisplayName:DefaultConnectionString": "String de Conexão Padrão", + "ConnectionStrings": "Cadeia de Conexão", + "DisplayName:DefaultConnectionString": "Cadeia de Conexão Padrão", "DisplayName:UseSharedDatabase": "Use o banco de dados compartilhado", "ManageHostFeatures": "Gerenciar recursos do Host", "Permission:TenantManagement": "Inquilinos", diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Localization/Resources/en.json b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Localization/Resources/en.json index dceede4439..6b794bf791 100644 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Localization/Resources/en.json +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Localization/Resources/en.json @@ -1,14 +1,14 @@ { "culture": "en", "texts": { - "VirtualFileExplorer" : "Virtual file explorer", - "VirtualFileType" : "Virtual file type", - "Menu:VirtualFileExplorer" : "Virtual file explorer", - "LastUpdateTime" : "Last update time", - "VirtualFileName" : "Virtual file name", - "FileContent" : "File content", - "Size" : "Size", - "BackToRoot" : "Back to root", - "EmptyFileInfoList" : "There are no virtual files" + "VirtualFileExplorer": "Virtual file explorer", + "VirtualFileType": "Virtual file type", + "Menu:VirtualFileExplorer": "Virtual file explorer", + "LastUpdateTime": "Last update time", + "VirtualFileName": "Virtual file name", + "FileContent": "File content", + "Size": "Size", + "BackToRoot": "Back to root", + "EmptyFileInfoList": "There are no virtual files" } } From 7a830637eca9c5e0c9d72908c0d3c256eac0f824 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 17 Jun 2022 16:30:30 +0800 Subject: [PATCH 2/8] Add `ClientUri ` and `LogoUri ` to `OpenIddictApplication`. --- .../OpenIddict/AbpOpenIddictDomainModule.cs | 6 ++ .../Applications/AbpApplicationDescriptor.cs | 16 +++++ .../Applications/AbpApplicationManager.cs | 61 +++++++++++++++++++ .../AbpOpenIddictApplicationStore.cs | 19 +++++- .../Applications/IAbpApplicationManager.cs | 12 ++++ .../IAbpOpenIdApplicationStore.cs | 12 ++++ .../Applications/OpenIddictApplication.cs | 10 +++ .../OpenIddictApplicationExtensions.cs | 10 ++- .../OpenIddictApplicationModel.cs | 10 +++ 9 files changed, 151 insertions(+), 5 deletions(-) create mode 100644 modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationDescriptor.cs create mode 100644 modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationManager.cs create mode 100644 modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/IAbpApplicationManager.cs create mode 100644 modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/IAbpOpenIdApplicationStore.cs diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs index 16c3ab49c5..428f5a7062 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs @@ -1,6 +1,8 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; +using OpenIddict.Abstractions; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Caching; using Volo.Abp.DistributedLocking; @@ -68,6 +70,10 @@ public class AbpOpenIddictDomainModule : AbpModule .AddScopeStore() .AddTokenStore(); + builder.ReplaceApplicationManager(typeof(AbpApplicationManager)); + + builder.Services.TryAddScoped(provider => (IAbpApplicationManager)provider.GetRequiredService()); + services.ExecutePreConfiguredActions(builder); }); diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationDescriptor.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationDescriptor.cs new file mode 100644 index 0000000000..3b5a4fc247 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationDescriptor.cs @@ -0,0 +1,16 @@ +using OpenIddict.Abstractions; + +namespace Volo.Abp.OpenIddict.Applications; + +public class AbpApplicationDescriptor : OpenIddictApplicationDescriptor +{ + /// + /// URI to further information about client. + /// + public string ClientUri { get; set; } + + /// + /// URI to client logo. + /// + public string LogoUri { get; set; } +} diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationManager.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationManager.cs new file mode 100644 index 0000000000..b205f60be2 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationManager.cs @@ -0,0 +1,61 @@ +using System; +using System.Threading; +using System.Threading.Tasks; +using JetBrains.Annotations; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using OpenIddict.Abstractions; +using OpenIddict.Core; + +namespace Volo.Abp.OpenIddict.Applications; + +public class AbpApplicationManager : OpenIddictApplicationManager, IAbpApplicationManager +{ + public AbpApplicationManager( + [NotNull] IOpenIddictApplicationCache cache, + [NotNull] ILogger logger, + [NotNull] IOptionsMonitor options, + [NotNull] IOpenIddictApplicationStoreResolver resolver) + : base(cache, logger, options, resolver) + { + + } + + public async override ValueTask PopulateAsync(OpenIddictApplicationDescriptor descriptor, OpenIddictApplicationModel application, CancellationToken cancellationToken = default) + { + await base.PopulateAsync(descriptor, application, cancellationToken); + + if (descriptor is AbpApplicationDescriptor model) + { + application.ClientUri = model.ClientUri; + application.LogoUri = model.LogoUri; + } + } + + public async override ValueTask PopulateAsync(OpenIddictApplicationModel application, OpenIddictApplicationDescriptor descriptor, CancellationToken cancellationToken = default) + { + await base.PopulateAsync(application, descriptor, cancellationToken); + + if (descriptor is AbpApplicationDescriptor model) + { + application.ClientUri = model.ClientUri; + application.LogoUri = model.LogoUri; + } + } + + public virtual async ValueTask GetClientUriAsync(object application, CancellationToken cancellationToken = default) + { + Check.NotNull(application, nameof(application)); + Check.AssignableTo(application.GetType(), nameof(application)); + + return await Store.As().GetClientUriAsync(application.As(), cancellationToken); + } + + public virtual async ValueTask GetLogoUriAsync(object application, CancellationToken cancellationToken = default) + { + Check.NotNull(application, nameof(application)); + Check.AssignableTo(application.GetType(), nameof(application)); + + return await Store.As().GetLogoUriAsync(application.As(), cancellationToken); + } +} diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpOpenIddictApplicationStore.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpOpenIddictApplicationStore.cs index 35c37bb657..1f740ecfcd 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpOpenIddictApplicationStore.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpOpenIddictApplicationStore.cs @@ -8,14 +8,13 @@ using System.Runtime.CompilerServices; using System.Text.Json; using System.Threading; using System.Threading.Tasks; -using OpenIddict.Abstractions; using Volo.Abp.Guids; using Volo.Abp.OpenIddict.Tokens; using Volo.Abp.Uow; namespace Volo.Abp.OpenIddict.Applications; -public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase, IOpenIddictApplicationStore +public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase, IAbpOpenIdApplicationStore { protected IOpenIddictTokenRepository TokenRepository { get; } @@ -44,7 +43,7 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase GetClientUriAsync(OpenIddictApplicationModel application, CancellationToken cancellationToken = default) + { + Check.NotNull(application, nameof(application)); + + return new ValueTask(application.ClientUri); + } + + public virtual ValueTask GetLogoUriAsync(OpenIddictApplicationModel application, CancellationToken cancellationToken = default) + { + Check.NotNull(application, nameof(application)); + + return new ValueTask(application.LogoUri); + } } diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/IAbpApplicationManager.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/IAbpApplicationManager.cs new file mode 100644 index 0000000000..1f12a9d088 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/IAbpApplicationManager.cs @@ -0,0 +1,12 @@ +using System.Threading; +using System.Threading.Tasks; +using OpenIddict.Abstractions; + +namespace Volo.Abp.OpenIddict.Applications; + +public interface IAbpApplicationManager : IOpenIddictApplicationManager +{ + ValueTask GetClientUriAsync(object application, CancellationToken cancellationToken = default); + + ValueTask GetLogoUriAsync(object application, CancellationToken cancellationToken = default); +} diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/IAbpOpenIdApplicationStore.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/IAbpOpenIdApplicationStore.cs new file mode 100644 index 0000000000..ca2cd50102 --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/IAbpOpenIdApplicationStore.cs @@ -0,0 +1,12 @@ +using System.Threading; +using System.Threading.Tasks; +using OpenIddict.Abstractions; + +namespace Volo.Abp.OpenIddict.Applications; + +public interface IAbpOpenIdApplicationStore : IOpenIddictApplicationStore +{ + ValueTask GetClientUriAsync(OpenIddictApplicationModel application, CancellationToken cancellationToken = default); + + ValueTask GetLogoUriAsync(OpenIddictApplicationModel application, CancellationToken cancellationToken = default); +} diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplication.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplication.cs index 6ef1fea798..6098f67392 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplication.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplication.cs @@ -77,4 +77,14 @@ public class OpenIddictApplication : FullAuditedAggregateRoot /// Gets or sets the application type associated with the current application. /// public virtual string Type { get; set; } + + /// + /// URI to further information about client. + /// + public string ClientUri { get; set; } + + /// + /// URI to client logo. + /// + public string LogoUri { get; set; } } diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs index 8f492efe06..87ef747f7b 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationExtensions.cs @@ -18,7 +18,9 @@ public static class OpenIddictApplicationExtensions Properties = model.Properties, RedirectUris = model.RedirectUris, Requirements = model.Requirements, - Type = model.Type + Type = model.Type, + ClientUri = model.ClientUri, + LogoUri = model.LogoUri }; foreach (var extraProperty in model.ExtraProperties) @@ -45,6 +47,8 @@ public static class OpenIddictApplicationExtensions entity.RedirectUris = model.RedirectUris; entity.Requirements = model.Requirements; entity.Type = model.Type; + entity.ClientUri = model.ClientUri; + entity.LogoUri = model.LogoUri; foreach (var extraProperty in model.ExtraProperties) { @@ -75,7 +79,9 @@ public static class OpenIddictApplicationExtensions Properties = entity.Properties, RedirectUris = entity.RedirectUris, Requirements = entity.Requirements, - Type = entity.Type + Type = entity.Type, + ClientUri = entity.ClientUri, + LogoUri = entity.LogoUri }; foreach (var extraProperty in entity.ExtraProperties) diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationModel.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationModel.cs index 762099cc89..ff13ef2355 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationModel.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/OpenIddictApplicationModel.cs @@ -72,4 +72,14 @@ public class OpenIddictApplicationModel : ExtensibleObject /// Gets or sets the application type associated with the current application. /// public virtual string Type { get; set; } + + /// + /// URI to further information about client. + /// + public string ClientUri { get; set; } + + /// + /// URI to client logo. + /// + public string LogoUri { get; set; } } From b9ab7e1b8c573df4942bab438b9fe8e9157a1d80 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 17 Jun 2022 16:41:55 +0800 Subject: [PATCH 3/8] Update templates migrations. --- ...signer.cs => 20220617083820_Initial.Designer.cs} | 13 ++++++++++--- ...9051356_Initial.cs => 20220617083820_Initial.cs} | 2 ++ .../MyProjectNameDbContextModelSnapshot.cs | 11 +++++++++-- ...signer.cs => 20220617083539_Initial.Designer.cs} | 13 ++++++++++--- ...9051355_Initial.cs => 20220617083539_Initial.cs} | 2 ++ .../MyProjectNameDbContextModelSnapshot.cs | 11 +++++++++-- ...signer.cs => 20220617083649_Initial.Designer.cs} | 13 ++++++++++--- ...9051401_Initial.cs => 20220617083649_Initial.cs} | 2 ++ .../MyProjectNameDbContextModelSnapshot.cs | 11 +++++++++-- ...signer.cs => 20220617083228_Initial.Designer.cs} | 8 +++++++- ...6082402_Initial.cs => 20220617083228_Initial.cs} | 2 ++ .../MyProjectNameDbContextModelSnapshot.cs | 6 ++++++ ...signer.cs => 20220617083652_Initial.Designer.cs} | 13 ++++++++++--- ...0080813_Initial.cs => 20220617083652_Initial.cs} | 2 ++ .../Migrations/AuthServerDbContextModelSnapshot.cs | 8 +++++++- ...signer.cs => 20220617083658_Initial.Designer.cs} | 7 ++++--- ...4020351_Initial.cs => 20220617083658_Initial.cs} | 0 .../Migrations/UnifiedDbContextModelSnapshot.cs | 5 +++-- ...signer.cs => 20220617083659_Initial.Designer.cs} | 7 ++++--- ...4020406_Initial.cs => 20220617083659_Initial.cs} | 0 .../Migrations/UnifiedDbContextModelSnapshot.cs | 5 +++-- 21 files changed, 111 insertions(+), 30 deletions(-) rename templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/{20220519051356_Initial.Designer.cs => 20220617083820_Initial.Designer.cs} (99%) rename templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/{20220519051356_Initial.cs => 20220617083820_Initial.cs} (99%) rename templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/{20220519051355_Initial.Designer.cs => 20220617083539_Initial.Designer.cs} (99%) rename templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/{20220519051355_Initial.cs => 20220617083539_Initial.cs} (99%) rename templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/{20220519051401_Initial.Designer.cs => 20220617083649_Initial.Designer.cs} (99%) rename templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/{20220519051401_Initial.cs => 20220617083649_Initial.cs} (99%) rename templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/{20220606082402_Initial.Designer.cs => 20220617083228_Initial.Designer.cs} (99%) rename templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/{20220606082402_Initial.cs => 20220617083228_Initial.cs} (99%) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/{20220520080813_Initial.Designer.cs => 20220617083652_Initial.Designer.cs} (99%) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/{20220520080813_Initial.cs => 20220617083652_Initial.cs} (99%) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/{20211124020351_Initial.Designer.cs => 20220617083658_Initial.Designer.cs} (99%) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/{20211124020351_Initial.cs => 20220617083658_Initial.cs} (100%) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/{20211124020406_Initial.Designer.cs => 20220617083659_Initial.Designer.cs} (99%) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/{20211124020406_Initial.cs => 20220617083659_Initial.cs} (100%) diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220519051356_Initial.Designer.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220617083820_Initial.Designer.cs similarity index 99% rename from templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220519051356_Initial.Designer.cs rename to templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220617083820_Initial.Designer.cs index 423841ae21..9e1a8f9cd8 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220519051356_Initial.Designer.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220617083820_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations { [DbContext(typeof(MyProjectNameDbContext))] - [Migration("20220519051356_Initial")] + [Migration("20220617083820_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -21,7 +21,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.1") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -598,7 +598,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -944,6 +945,9 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations b.Property("ClientSecret") .HasColumnType("nvarchar(max)"); + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) @@ -994,6 +998,9 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + b.Property("Permissions") .HasColumnType("nvarchar(max)"); diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220519051356_Initial.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220617083820_Initial.cs similarity index 99% rename from templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220519051356_Initial.cs rename to templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220617083820_Initial.cs index 906d908cb4..85d36d8b57 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220519051356_Initial.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/20220617083820_Initial.cs @@ -271,6 +271,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations RedirectUris = table.Column(type: "nvarchar(max)", nullable: true), Requirements = table.Column(type: "nvarchar(max)", nullable: true), Type = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), + ClientUri = table.Column(type: "nvarchar(max)", nullable: true), + LogoUri = table.Column(type: "nvarchar(max)", nullable: true), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/MyProjectNameDbContextModelSnapshot.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/MyProjectNameDbContextModelSnapshot.cs index cbb2af9f96..0a32c8664e 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/MyProjectNameDbContextModelSnapshot.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Migrations/MyProjectNameDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.1") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -596,7 +596,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -942,6 +943,9 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations b.Property("ClientSecret") .HasColumnType("nvarchar(max)"); + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) @@ -992,6 +996,9 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + b.Property("Permissions") .HasColumnType("nvarchar(max)"); diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220519051355_Initial.Designer.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220617083539_Initial.Designer.cs similarity index 99% rename from templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220519051355_Initial.Designer.cs rename to templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220617083539_Initial.Designer.cs index 17e18cfdaf..5b55ca75a9 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220519051355_Initial.Designer.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220617083539_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Host.Migrations { [DbContext(typeof(MyProjectNameDbContext))] - [Migration("20220519051355_Initial")] + [Migration("20220617083539_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -21,7 +21,7 @@ namespace MyCompanyName.MyProjectName.Host.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.1") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -598,7 +598,8 @@ namespace MyCompanyName.MyProjectName.Host.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -944,6 +945,9 @@ namespace MyCompanyName.MyProjectName.Host.Migrations b.Property("ClientSecret") .HasColumnType("nvarchar(max)"); + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) @@ -994,6 +998,9 @@ namespace MyCompanyName.MyProjectName.Host.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + b.Property("Permissions") .HasColumnType("nvarchar(max)"); diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220519051355_Initial.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220617083539_Initial.cs similarity index 99% rename from templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220519051355_Initial.cs rename to templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220617083539_Initial.cs index bddc83db55..29cc53b046 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220519051355_Initial.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/20220617083539_Initial.cs @@ -271,6 +271,8 @@ namespace MyCompanyName.MyProjectName.Host.Migrations RedirectUris = table.Column(type: "nvarchar(max)", nullable: true), Requirements = table.Column(type: "nvarchar(max)", nullable: true), Type = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), + ClientUri = table.Column(type: "nvarchar(max)", nullable: true), + LogoUri = table.Column(type: "nvarchar(max)", nullable: true), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/MyProjectNameDbContextModelSnapshot.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/MyProjectNameDbContextModelSnapshot.cs index de96183c79..2597920679 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/MyProjectNameDbContextModelSnapshot.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Migrations/MyProjectNameDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName.Host.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.1") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -596,7 +596,8 @@ namespace MyCompanyName.MyProjectName.Host.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -942,6 +943,9 @@ namespace MyCompanyName.MyProjectName.Host.Migrations b.Property("ClientSecret") .HasColumnType("nvarchar(max)"); + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) @@ -992,6 +996,9 @@ namespace MyCompanyName.MyProjectName.Host.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + b.Property("Permissions") .HasColumnType("nvarchar(max)"); diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220519051401_Initial.Designer.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220617083649_Initial.Designer.cs similarity index 99% rename from templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220519051401_Initial.Designer.cs rename to templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220617083649_Initial.Designer.cs index c0a1035988..213ce02572 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220519051401_Initial.Designer.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220617083649_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Mvc.Migrations { [DbContext(typeof(MyProjectNameDbContext))] - [Migration("20220519051401_Initial")] + [Migration("20220617083649_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -21,7 +21,7 @@ namespace MyCompanyName.MyProjectName.Mvc.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.1") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -598,7 +598,8 @@ namespace MyCompanyName.MyProjectName.Mvc.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -944,6 +945,9 @@ namespace MyCompanyName.MyProjectName.Mvc.Migrations b.Property("ClientSecret") .HasColumnType("nvarchar(max)"); + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) @@ -994,6 +998,9 @@ namespace MyCompanyName.MyProjectName.Mvc.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + b.Property("Permissions") .HasColumnType("nvarchar(max)"); diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220519051401_Initial.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220617083649_Initial.cs similarity index 99% rename from templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220519051401_Initial.cs rename to templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220617083649_Initial.cs index 012a5de1ad..2a30fba759 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220519051401_Initial.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/20220617083649_Initial.cs @@ -271,6 +271,8 @@ namespace MyCompanyName.MyProjectName.Mvc.Migrations RedirectUris = table.Column(type: "nvarchar(max)", nullable: true), Requirements = table.Column(type: "nvarchar(max)", nullable: true), Type = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), + ClientUri = table.Column(type: "nvarchar(max)", nullable: true), + LogoUri = table.Column(type: "nvarchar(max)", nullable: true), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/MyProjectNameDbContextModelSnapshot.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/MyProjectNameDbContextModelSnapshot.cs index 6366763ca2..350f086968 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/MyProjectNameDbContextModelSnapshot.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Migrations/MyProjectNameDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName.Mvc.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.1") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -596,7 +596,8 @@ namespace MyCompanyName.MyProjectName.Mvc.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -942,6 +943,9 @@ namespace MyCompanyName.MyProjectName.Mvc.Migrations b.Property("ClientSecret") .HasColumnType("nvarchar(max)"); + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) @@ -992,6 +996,9 @@ namespace MyCompanyName.MyProjectName.Mvc.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + b.Property("Permissions") .HasColumnType("nvarchar(max)"); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220606082402_Initial.Designer.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220617083228_Initial.Designer.cs similarity index 99% rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220606082402_Initial.Designer.cs rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220617083228_Initial.Designer.cs index 3def67345f..1ea724aa5b 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220606082402_Initial.Designer.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220617083228_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Migrations { [DbContext(typeof(MyProjectNameDbContext))] - [Migration("20220606082402_Initial")] + [Migration("20220617083228_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -997,6 +997,9 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("ClientSecret") .HasColumnType("nvarchar(max)"); + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) @@ -1047,6 +1050,9 @@ namespace MyCompanyName.MyProjectName.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + b.Property("Permissions") .HasColumnType("nvarchar(max)"); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220606082402_Initial.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220617083228_Initial.cs similarity index 99% rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220606082402_Initial.cs rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220617083228_Initial.cs index 6025706c2a..55ae609199 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220606082402_Initial.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20220617083228_Initial.cs @@ -292,6 +292,8 @@ namespace MyCompanyName.MyProjectName.Migrations RedirectUris = table.Column(type: "nvarchar(max)", nullable: true), Requirements = table.Column(type: "nvarchar(max)", nullable: true), Type = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), + ClientUri = table.Column(type: "nvarchar(max)", nullable: true), + LogoUri = table.Column(type: "nvarchar(max)", nullable: true), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs index 8526ba02de..781691a3d2 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs @@ -995,6 +995,9 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("ClientSecret") .HasColumnType("nvarchar(max)"); + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) @@ -1045,6 +1048,9 @@ namespace MyCompanyName.MyProjectName.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + b.Property("Permissions") .HasColumnType("nvarchar(max)"); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220520080813_Initial.Designer.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220617083652_Initial.Designer.cs similarity index 99% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220520080813_Initial.Designer.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220617083652_Initial.Designer.cs index 77eab9db55..ae32d5daa9 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220520080813_Initial.Designer.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220617083652_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Migrations { [DbContext(typeof(AuthServerDbContext))] - [Migration("20220520080813_Initial")] + [Migration("20220617083652_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -21,7 +21,7 @@ namespace MyCompanyName.MyProjectName.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -598,7 +598,8 @@ namespace MyCompanyName.MyProjectName.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -944,6 +945,9 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("ClientSecret") .HasColumnType("nvarchar(max)"); + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) @@ -994,6 +998,9 @@ namespace MyCompanyName.MyProjectName.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + b.Property("Permissions") .HasColumnType("nvarchar(max)"); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220520080813_Initial.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220617083652_Initial.cs similarity index 99% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220520080813_Initial.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220617083652_Initial.cs index 4a83874cba..cbc01e3dfe 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220520080813_Initial.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/20220617083652_Initial.cs @@ -271,6 +271,8 @@ namespace MyCompanyName.MyProjectName.Migrations RedirectUris = table.Column(type: "nvarchar(max)", nullable: true), Requirements = table.Column(type: "nvarchar(max)", nullable: true), Type = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), + ClientUri = table.Column(type: "nvarchar(max)", nullable: true), + LogoUri = table.Column(type: "nvarchar(max)", nullable: true), ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true), ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/AuthServerDbContextModelSnapshot.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/AuthServerDbContextModelSnapshot.cs index 3181405337..e483e20a49 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/AuthServerDbContextModelSnapshot.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/Migrations/AuthServerDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -943,6 +943,9 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("ClientSecret") .HasColumnType("nvarchar(max)"); + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + b.Property("ConcurrencyStamp") .IsConcurrencyToken() .HasMaxLength(40) @@ -993,6 +996,9 @@ namespace MyCompanyName.MyProjectName.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + b.Property("Permissions") .HasColumnType("nvarchar(max)"); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/20211124020351_Initial.Designer.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/20220617083658_Initial.Designer.cs similarity index 99% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/20211124020351_Initial.Designer.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/20220617083658_Initial.Designer.cs index 11fbd05d18..da5ce77b3f 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/20211124020351_Initial.Designer.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/20220617083658_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Blazor.Server.Host.Migrations { [DbContext(typeof(UnifiedDbContext))] - [Migration("20211124020351_Initial")] + [Migration("20220617083658_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -21,7 +21,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Host.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -598,7 +598,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Host.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/20211124020351_Initial.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/20220617083658_Initial.cs similarity index 100% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/20211124020351_Initial.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/20220617083658_Initial.cs diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/UnifiedDbContextModelSnapshot.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/UnifiedDbContextModelSnapshot.cs index 3b693ab607..7ef4a80da0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/UnifiedDbContextModelSnapshot.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Migrations/UnifiedDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Host.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -596,7 +596,8 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Host.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20211124020406_Initial.Designer.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20220617083659_Initial.Designer.cs similarity index 99% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20211124020406_Initial.Designer.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20220617083659_Initial.Designer.cs index c29ed70204..e9f1df7c94 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20211124020406_Initial.Designer.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20220617083659_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Migrations { [DbContext(typeof(UnifiedDbContext))] - [Migration("20211124020406_Initial")] + [Migration("20220617083659_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -21,7 +21,7 @@ namespace MyCompanyName.MyProjectName.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -598,7 +598,8 @@ namespace MyCompanyName.MyProjectName.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20211124020406_Initial.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20220617083659_Initial.cs similarity index 100% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20211124020406_Initial.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/20220617083659_Initial.cs diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs index 55e6741d12..39b8871ef6 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName.Migrations #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "6.0.0") + .HasAnnotation("ProductVersion", "6.0.5") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); @@ -596,7 +596,8 @@ namespace MyCompanyName.MyProjectName.Migrations .HasColumnName("ExtraProperties"); b.Property("IsActive") - .HasColumnType("bit"); + .HasColumnType("bit") + .HasColumnName("IsActive"); b.Property("IsDeleted") .ValueGeneratedOnAdd() From a1044013565ddf970b36424d30807eac462ad188 Mon Sep 17 00:00:00 2001 From: "Marcelo M. M" <4993482+marcelo-maciel@users.noreply.github.com> Date: Fri, 17 Jun 2022 05:46:36 -0300 Subject: [PATCH 4/8] add missing file and refreshing .csproj file --- .../Volo.Abp.OpenIddict.Domain.Shared.csproj | 4 ---- .../Localization/OpenIddict/pt-BR.json | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/pt-BR.json diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj index fc5080b687..34a4d6c334 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj @@ -23,8 +23,4 @@ - - - - diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/pt-BR.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/pt-BR.json new file mode 100644 index 0000000000..7a8cbc7b4e --- /dev/null +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/pt-BR.json @@ -0,0 +1,17 @@ +{ + "culture": "en", + "texts": { + "TheOpenIDConnectRequestCannotBeRetrieved": "Não foi possivel recuperar a requisição do OpenID Connect", + "TheUserDetailsCannotBbeRetrieved": "Não foi possivel recuperar os detalhes do usuário", + "TheApplicationDetailsCannotBeFound": "Os detalhes da aplicação não foram encontrados", + "DetailsConcerningTheCallingClientApplicationCannotBeFound": "Os detalhes relativos ao aplicativo cliente requisitante não firam encontrados.", + "TheSpecifiedGrantTypeIsNotImplemented.": "O tipo de permissão {0} não está implementando.", + "Authorization": "Autorização", + "DoYouWantToGrantAccessToYourData": "Deseja permitir {0} acesse seus dados?", + "ScopesRequested": "Escopo solicitado", + "Accept": "Aceitar", + "Deny": "Negar", + "LogOut": "Sair", + "AreYouSureYouWantToSignOut": "Tem certeza que deseja sair??" + } +} \ No newline at end of file From db7733b00836211f770806f3ff497489af818545 Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Fri, 17 Jun 2022 16:04:10 +0300 Subject: [PATCH 5/8] Update localization for platform --- .../AbpIoLocalization/Admin/Localization/Resources/en.json | 3 ++- .../Commercial/Localization/Resources/en.json | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json index 6fb597d335..22ef0df894 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json @@ -396,6 +396,7 @@ "CreateABookDiscount": "Create a book discount", "BookDiscountDeletionConfirmationMessage": "Are you sure you want to delete this book discount?", "CustomPaymentFlexSwitchDescription": "With license", - "AllowFeatureUpgradeOnLicenseExpire": "Allow feature upgrade on license expire" + "AllowFeatureUpgradeOnLicenseExpire": "Allow feature upgrade on license expire", + "Deleted{0}": "[Deleted {0}]" } } diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 25c4093a4d..0fdcd10747 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -603,7 +603,6 @@ "Trainings_Content": "Content of Training", "Trial_Page_StartYourFreeTrial": "Start Your Free Trial", "TrialLicenseFeatures": "You'll be able to benefit from all ABP commercial features", - "WhatHappensWhenTrialLicenseExpires": "You cannot continue to develop your project after the license expiration", "TrialPeriodDays": "You'll have a {0} days Team License", "TrialForumSupportIncident": "You'll have {0} forum support incidents", "Contact_Page_Title": "Contact with ABP Development Team", From 94b9f3809965e7ba40294716ac79c3b462380e40 Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Fri, 17 Jun 2022 16:53:32 +0300 Subject: [PATCH 6/8] Update pt-BR.json --- .../Abp/OpenIddict/Localization/OpenIddict/pt-BR.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/pt-BR.json b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/pt-BR.json index 7a8cbc7b4e..ebcf57b00e 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/pt-BR.json +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Localization/OpenIddict/pt-BR.json @@ -1,9 +1,9 @@ { - "culture": "en", + "culture": "pt-BR", "texts": { - "TheOpenIDConnectRequestCannotBeRetrieved": "Não foi possivel recuperar a requisição do OpenID Connect", - "TheUserDetailsCannotBbeRetrieved": "Não foi possivel recuperar os detalhes do usuário", - "TheApplicationDetailsCannotBeFound": "Os detalhes da aplicação não foram encontrados", + "TheOpenIDConnectRequestCannotBeRetrieved": "Não foi possivel recuperar a requisição do OpenID Connect.", + "TheUserDetailsCannotBbeRetrieved": "Não foi possivel recuperar os detalhes do usuário.", + "TheApplicationDetailsCannotBeFound": "Os detalhes da aplicação não foram encontrados.", "DetailsConcerningTheCallingClientApplicationCannotBeFound": "Os detalhes relativos ao aplicativo cliente requisitante não firam encontrados.", "TheSpecifiedGrantTypeIsNotImplemented.": "O tipo de permissão {0} não está implementando.", "Authorization": "Autorização", @@ -12,6 +12,6 @@ "Accept": "Aceitar", "Deny": "Negar", "LogOut": "Sair", - "AreYouSureYouWantToSignOut": "Tem certeza que deseja sair??" + "AreYouSureYouWantToSignOut": "Tem certeza que deseja sair?" } } \ No newline at end of file From 27c8d408204ad9e00df3d40f10e87a997a9da0b8 Mon Sep 17 00:00:00 2001 From: wangjun Date: Sat, 18 Jun 2022 13:58:25 +0800 Subject: [PATCH 7/8] refactor OnAfterRenderAsync of AbpCrudPageBase --- framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs index f777eb2cdc..500a3dfd86 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs @@ -224,10 +224,10 @@ public abstract class AbpCrudPageBase< { if (firstRender) { - await base.OnAfterRenderAsync(firstRender); await SetToolbarItemsAsync(); await SetBreadcrumbItemsAsync(); } + await base.OnAfterRenderAsync(firstRender); } From eb7f1961d461d6cac747505c0b673fa186f92fb8 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 20 Jun 2022 10:58:17 +0300 Subject: [PATCH 8/8] Cli: Switch-To commands update all available solutions in subfolders --- .../PackagePreviewSwitcher.cs | 134 +++++++++--------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/PackagePreviewSwitcher.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/PackagePreviewSwitcher.cs index 0673606572..03fcf65036 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/PackagePreviewSwitcher.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/PackagePreviewSwitcher.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; @@ -29,114 +30,113 @@ public class PackagePreviewSwitcher : ITransientDependency public async Task SwitchToPreview(CommandLineArgs commandLineArgs) { - var solutionPath = GetSolutionPath(commandLineArgs); - var solutionFolder = GetSolutionFolder(commandLineArgs); - var solutionAngularFolder = GetSolutionAngularFolder(solutionFolder); + var solutionPaths = GetSolutionPaths(commandLineArgs); - await _nugetPackagesVersionUpdater.UpdateSolutionAsync( - solutionPath, - includeReleaseCandidates: true); + foreach (var solutionPath in solutionPaths) + { + var solutionFolder = Path.GetDirectoryName(solutionPath); + var solutionAngularFolder = GetSolutionAngularFolder(solutionFolder); - await _npmPackagesUpdater.Update( - solutionFolder, - false, - true); + await _nugetPackagesVersionUpdater.UpdateSolutionAsync( + solutionPath, + includeReleaseCandidates: true); - if (solutionAngularFolder != null) - { await _npmPackagesUpdater.Update( - solutionAngularFolder, + solutionFolder, false, true); + + if (solutionAngularFolder != null) + { + await _npmPackagesUpdater.Update( + solutionAngularFolder, + false, + true); + } } } public async Task SwitchToNightlyPreview(CommandLineArgs commandLineArgs) { - var solutionPath = GetSolutionPath(commandLineArgs); - var solutionFolder = GetSolutionFolder(commandLineArgs); - var solutionAngularFolder = GetSolutionAngularFolder(solutionFolder); - - _packageSourceManager.Add(solutionFolder, "ABP Nightly", "https://www.myget.org/F/abp-nightly/api/v3/index.json"); + var solutionPaths = GetSolutionPaths(commandLineArgs); - if (solutionPath != null) + foreach (var solutionPath in solutionPaths) { - await _nugetPackagesVersionUpdater.UpdateSolutionAsync( - solutionPath, - true); - } + var solutionFolder = Path.GetDirectoryName(solutionPath); + var solutionAngularFolder = GetSolutionAngularFolder(solutionFolder); - await _npmPackagesUpdater.Update( - solutionFolder, - true); + _packageSourceManager.Add(solutionFolder, "ABP Nightly", "https://www.myget.org/F/abp-nightly/api/v3/index.json"); + + if (solutionPath != null) + { + await _nugetPackagesVersionUpdater.UpdateSolutionAsync( + solutionPath, + true); + } - if (solutionAngularFolder != null) - { await _npmPackagesUpdater.Update( - solutionAngularFolder, + solutionFolder, true); + + if (solutionAngularFolder != null) + { + await _npmPackagesUpdater.Update( + solutionAngularFolder, + true); + } } } public async Task SwitchToStable(CommandLineArgs commandLineArgs) { - var solutionPath = GetSolutionPath(commandLineArgs); - var solutionFolder = GetSolutionFolder(commandLineArgs); - var solutionAngularFolder = GetSolutionAngularFolder(solutionFolder); + var solutionPaths = GetSolutionPaths(commandLineArgs); - _packageSourceManager.Remove(solutionFolder, "ABP Nightly"); - - if (solutionPath != null) + foreach (var solutionPath in solutionPaths) { - await _nugetPackagesVersionUpdater.UpdateSolutionAsync( - solutionPath, - false, - false, - true); - } + var solutionFolder = Path.GetDirectoryName(solutionPath); + var solutionAngularFolder = GetSolutionAngularFolder(solutionFolder); - await _npmPackagesUpdater.Update( - solutionFolder, - false, - false, - true); + _packageSourceManager.Remove(solutionFolder, "ABP Nightly"); + + if (solutionPath != null) + { + await _nugetPackagesVersionUpdater.UpdateSolutionAsync( + solutionPath, + false, + false, + true); + } - if (solutionAngularFolder != null) - { await _npmPackagesUpdater.Update( - solutionAngularFolder, + solutionFolder, false, false, true); + + if (solutionAngularFolder != null) + { + await _npmPackagesUpdater.Update( + solutionAngularFolder, + false, + false, + true); + } } } - private string GetSolutionPath(CommandLineArgs commandLineArgs) + private List GetSolutionPaths(CommandLineArgs commandLineArgs) { var directory = commandLineArgs.Options.GetOrNull(Options.SolutionDirectory.Short, Options.SolutionDirectory.Long) ?? Directory.GetCurrentDirectory(); - var solutionPath = Directory.GetFiles(directory, "*.sln").FirstOrDefault(); + var solutionPaths = Directory.GetFiles(directory, "*.sln", SearchOption.AllDirectories); - if (solutionPath == null) + if (!solutionPaths.Any()) { - var subDirectories = Directory.GetDirectories(directory); - - foreach (var subDirectory in subDirectories) - { - var slnInSubDirectory = Directory.GetFiles(subDirectory, "*.sln").FirstOrDefault(); - - if (slnInSubDirectory != null) - { - return Path.Combine(subDirectory, slnInSubDirectory); - } - } - - Logger.LogWarning("There is no solution or more that one solution in current directory."); - return null; + Logger.LogWarning("No solution (.sln) found to change version."); } - return solutionPath; + return solutionPaths.ToList(); } private string GetSolutionFolder(CommandLineArgs commandLineArgs)