From 2bed25cfafb3a951d51fd10c5450eed89e1359b4 Mon Sep 17 00:00:00 2001 From: Tony Han Date: Mon, 6 Mar 2023 22:16:06 +0800 Subject: [PATCH 1/7] Delete pack.ps1 --- pack.ps1 | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 pack.ps1 diff --git a/pack.ps1 b/pack.ps1 deleted file mode 100644 index 4b1ebac..0000000 --- a/pack.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -$x = Split-Path -Parent $MyInvocation.MyCommand.Definition -cd $x - -dotnet build --configuration Release --framework net6.0 - -Get-ChildItem ./src/ -recurse *.nupkg | Remove-Item -dotnet pack -c Release --no-restore --no-build --include-symbols --include-source -$pkgs = Get-ChildItem ./src/ -recurse *.nupkg; - -foreach($pkg in $pkgs) -{ - dotnet nuget push $pkg.FullName -n true --skip-duplicate -} -$spkgs = Get-ChildItem ./src/ -recurse *.snupkg; -foreach($spkg in $spkgs) -{ - dotnet nuget push $spkg.FullName -n true --skip-duplicate -} From 812f579507ad2963337743e97ff3744f048f7db0 Mon Sep 17 00:00:00 2001 From: hyzx86 Date: Thu, 16 Mar 2023 08:26:08 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EasyOC.ReplaceAction/ActionReplaceOption.cs | 3 --- src/Modules/EasyOC.ReplaceAction/Startup.cs | 1 - .../EasyOC.Users/Controllers/EocAccountController.cs | 10 ++++------ .../Controllers/EocOpenIdAccessController.cs | 2 +- .../Handlers/EocScriptExternalLoginEventHandler.cs | 2 -- src/Modules/EasyOC.Users/Models/UpdateUserContext.cs | 1 - src/Modules/EasyOC.Users/Startup.cs | 2 +- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/Modules/EasyOC.ReplaceAction/ActionReplaceOption.cs b/src/Modules/EasyOC.ReplaceAction/ActionReplaceOption.cs index d8ddc2e..ac800f4 100644 --- a/src/Modules/EasyOC.ReplaceAction/ActionReplaceOption.cs +++ b/src/Modules/EasyOC.ReplaceAction/ActionReplaceOption.cs @@ -1,7 +1,4 @@ using Microsoft.AspNetCore.Mvc.Controllers; -using System; -using System.Collections.Generic; -using System.Linq; using System.Reflection; namespace EasyOC.ReplaceAction diff --git a/src/Modules/EasyOC.ReplaceAction/Startup.cs b/src/Modules/EasyOC.ReplaceAction/Startup.cs index 0f5c24d..df06566 100644 --- a/src/Modules/EasyOC.ReplaceAction/Startup.cs +++ b/src/Modules/EasyOC.ReplaceAction/Startup.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; -using System; namespace EasyOC.ReplaceAction { diff --git a/src/Modules/EasyOC.Users/Controllers/EocAccountController.cs b/src/Modules/EasyOC.Users/Controllers/EocAccountController.cs index 4e90c97..49014d4 100644 --- a/src/Modules/EasyOC.Users/Controllers/EocAccountController.cs +++ b/src/Modules/EasyOC.Users/Controllers/EocAccountController.cs @@ -1,3 +1,4 @@ +using EasyOC.Users.Models; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.DataProtection; @@ -8,25 +9,22 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; +using OrchardCore; using OrchardCore.DisplayManagement.Notify; using OrchardCore.Entities; using OrchardCore.Modules; using OrchardCore.Scripting; using OrchardCore.Settings; using OrchardCore.Users; +using OrchardCore.Users.Controllers; using OrchardCore.Users.Events; using OrchardCore.Users.Handlers; using OrchardCore.Users.Models; using OrchardCore.Users.Services; using OrchardCore.Users.ViewModels; -using OrchardCore.Workflows.Services; using System.Security.Claims; -using SignInResult = Microsoft.AspNetCore.Identity.SignInResult; - using IWorkflowManager = OrchardCore.Workflows.Services.IWorkflowManager; -using OrchardCore; -using OrchardCore.Users.Controllers; -using EasyOC.Users.Models; +using SignInResult = Microsoft.AspNetCore.Identity.SignInResult; namespace EasyOC.Users.Controllers { diff --git a/src/Modules/EasyOC.Users/Controllers/EocOpenIdAccessController.cs b/src/Modules/EasyOC.Users/Controllers/EocOpenIdAccessController.cs index 34f7e49..c3621d9 100644 --- a/src/Modules/EasyOC.Users/Controllers/EocOpenIdAccessController.cs +++ b/src/Modules/EasyOC.Users/Controllers/EocOpenIdAccessController.cs @@ -46,6 +46,6 @@ public async Task Logout() } return SignOut(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme); - } + } } } diff --git a/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs b/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs index 1559f18..be29052 100644 --- a/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs +++ b/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Logging; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; using OrchardCore.Entities; using OrchardCore.Scripting; @@ -10,7 +9,6 @@ using OrchardCore.Users; using OrchardCore.Users.Handlers; using OrchardCore.Users.Models; -using OrchardCore.Workflows.Helpers; namespace EasyOC.Users.Handlers { diff --git a/src/Modules/EasyOC.Users/Models/UpdateUserContext.cs b/src/Modules/EasyOC.Users/Models/UpdateUserContext.cs index b84bf7f..96f262a 100644 --- a/src/Modules/EasyOC.Users/Models/UpdateUserContext.cs +++ b/src/Modules/EasyOC.Users/Models/UpdateUserContext.cs @@ -1,7 +1,6 @@ using Newtonsoft.Json.Linq; using OrchardCore.Users; using OrchardCore.Users.Handlers; -using System.Security.Claims; namespace EasyOC.Users.Models { diff --git a/src/Modules/EasyOC.Users/Startup.cs b/src/Modules/EasyOC.Users/Startup.cs index 6ecde26..3c60563 100644 --- a/src/Modules/EasyOC.Users/Startup.cs +++ b/src/Modules/EasyOC.Users/Startup.cs @@ -30,7 +30,7 @@ public override void ConfigureServices(IServiceCollection services) nameof(EocAccountController.LinkExternalLogin), nameof(EocAccountController.ExternalLoginCallback), nameof(EocAccountController.RegisterExternalLogin) - ); + ); } } From 9c9c1207e6809a5dcf31d284d1c9a2040af55311 Mon Sep 17 00:00:00 2001 From: hyzx86 Date: Sat, 8 Apr 2023 20:49:44 +0800 Subject: [PATCH 3/7] use full redirect url --- src/Modules/EasyOC.SwaggerUI/Recipes/SwaggerUIAuth.recipe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/EasyOC.SwaggerUI/Recipes/SwaggerUIAuth.recipe.json b/src/Modules/EasyOC.SwaggerUI/Recipes/SwaggerUIAuth.recipe.json index c0101f7..cf0a164 100644 --- a/src/Modules/EasyOC.SwaggerUI/Recipes/SwaggerUIAuth.recipe.json +++ b/src/Modules/EasyOC.SwaggerUI/Recipes/SwaggerUIAuth.recipe.json @@ -41,7 +41,7 @@ "name": "OpenIdApplication", "ClientId": "SwaggerClient", "ConsentType": "implicit", - "RedirectUris": "/Swagger/oauth2-redirect.html", + "RedirectUris": "http://localhost/Swagger/oauth2-redirect.html", "AllowAuthorizationCodeFlow": true, "AllowLogoutEndpoint": false, "AllowPasswordFlow": false, From 8140de391854d505a240ab9c167ffdf11ecf9f75 Mon Sep 17 00:00:00 2001 From: hyzx86 Date: Sun, 16 Apr 2023 22:40:47 +0800 Subject: [PATCH 4/7] Move custom extension methods under the system namespace to the EasyOC namespace --- pack.ps1 | 18 ------------------ .../Items/QueriesDeploymentStep.Summary.cshtml | 1 + .../Items/RolesDeploymentStep.Summary.cshtml | 1 + .../DictionaryExtensions.cs | 2 +- .../EnumerableExtensions.cs | 4 +--- .../ObjectExtensions.cs | 2 +- .../StringExtensions.cs | 2 +- 7 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 pack.ps1 diff --git a/pack.ps1 b/pack.ps1 deleted file mode 100644 index 4b1ebac..0000000 --- a/pack.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -$x = Split-Path -Parent $MyInvocation.MyCommand.Definition -cd $x - -dotnet build --configuration Release --framework net6.0 - -Get-ChildItem ./src/ -recurse *.nupkg | Remove-Item -dotnet pack -c Release --no-restore --no-build --include-symbols --include-source -$pkgs = Get-ChildItem ./src/ -recurse *.nupkg; - -foreach($pkg in $pkgs) -{ - dotnet nuget push $pkg.FullName -n true --skip-duplicate -} -$spkgs = Get-ChildItem ./src/ -recurse *.snupkg; -foreach($spkg in $spkgs) -{ - dotnet nuget push $spkg.FullName -n true --skip-duplicate -} diff --git a/src/Modules/EasyOC.Deployment/Views/Items/QueriesDeploymentStep.Summary.cshtml b/src/Modules/EasyOC.Deployment/Views/Items/QueriesDeploymentStep.Summary.cshtml index 861bf33..a626e36 100644 --- a/src/Modules/EasyOC.Deployment/Views/Items/QueriesDeploymentStep.Summary.cshtml +++ b/src/Modules/EasyOC.Deployment/Views/Items/QueriesDeploymentStep.Summary.cshtml @@ -1,4 +1,5 @@ @using EasyOC.Deployment.Deployment; +@using EasyOC; @using OrchardCore.DisplayManagement.Views; @using OrchardCore.Queries; @model ShapeViewModel diff --git a/src/Modules/EasyOC.Deployment/Views/Items/RolesDeploymentStep.Summary.cshtml b/src/Modules/EasyOC.Deployment/Views/Items/RolesDeploymentStep.Summary.cshtml index 432ee56..6c53bcb 100644 --- a/src/Modules/EasyOC.Deployment/Views/Items/RolesDeploymentStep.Summary.cshtml +++ b/src/Modules/EasyOC.Deployment/Views/Items/RolesDeploymentStep.Summary.cshtml @@ -1,4 +1,5 @@ @using EasyOC.Deployment.Deployment; +@using EasyOC; @using OrchardCore.DisplayManagement.Views; @using OrchardCore.Security.Services; @model ShapeViewModel diff --git a/src/Shared/EasyOC.Shared.Extensions/DictionaryExtensions.cs b/src/Shared/EasyOC.Shared.Extensions/DictionaryExtensions.cs index 17b5a74..21a1028 100644 --- a/src/Shared/EasyOC.Shared.Extensions/DictionaryExtensions.cs +++ b/src/Shared/EasyOC.Shared.Extensions/DictionaryExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -namespace System.Collections.Generic +namespace EasyOC { public static class DictionaryExtensions { diff --git a/src/Shared/EasyOC.Shared.Extensions/EnumerableExtensions.cs b/src/Shared/EasyOC.Shared.Extensions/EnumerableExtensions.cs index 6ceec64..6760fd5 100644 --- a/src/Shared/EasyOC.Shared.Extensions/EnumerableExtensions.cs +++ b/src/Shared/EasyOC.Shared.Extensions/EnumerableExtensions.cs @@ -1,6 +1,4 @@ -using System.Linq; - -namespace System.Collections.Generic +namespace EasyOC { public static class EnumerableExtensions { diff --git a/src/Shared/EasyOC.Shared.Extensions/ObjectExtensions.cs b/src/Shared/EasyOC.Shared.Extensions/ObjectExtensions.cs index 707fc25..4f387e1 100644 --- a/src/Shared/EasyOC.Shared.Extensions/ObjectExtensions.cs +++ b/src/Shared/EasyOC.Shared.Extensions/ObjectExtensions.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Linq; using Newtonsoft.Json.Linq; -namespace System +namespace EasyOC { /// /// Extension methods for all objects. diff --git a/src/Shared/EasyOC.Shared.Extensions/StringExtensions.cs b/src/Shared/EasyOC.Shared.Extensions/StringExtensions.cs index 41db4cd..29012ed 100644 --- a/src/Shared/EasyOC.Shared.Extensions/StringExtensions.cs +++ b/src/Shared/EasyOC.Shared.Extensions/StringExtensions.cs @@ -4,7 +4,7 @@ using System.Text; using System.Text.RegularExpressions; -namespace System +namespace EasyOC { // // 摘要: From c894042a49da5442e088d6cd5ce663209889800d Mon Sep 17 00:00:00 2001 From: hyzx86 Date: Wed, 19 Apr 2023 17:26:36 +0800 Subject: [PATCH 5/7] upgrade To OC1.6 --- EasyOC.build/Commons.props | 2 +- src/Modules/EasyOC.Workflows/EasyOC.Workflows.csproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/EasyOC.build/Commons.props b/EasyOC.build/Commons.props index b5b5eb1..a6f7aa4 100644 --- a/EasyOC.build/Commons.props +++ b/EasyOC.build/Commons.props @@ -3,7 +3,7 @@ 1.0.7 - 1.5.0 + 1.6.0 OrcardCore,EasyOC $(VersionSuffix) diff --git a/src/Modules/EasyOC.Workflows/EasyOC.Workflows.csproj b/src/Modules/EasyOC.Workflows/EasyOC.Workflows.csproj index 38ad44b..d743f8b 100644 --- a/src/Modules/EasyOC.Workflows/EasyOC.Workflows.csproj +++ b/src/Modules/EasyOC.Workflows/EasyOC.Workflows.csproj @@ -12,10 +12,10 @@ - - - - + + + + From 2738125f5b95b357d4d1656c6a6f0920aade9213 Mon Sep 17 00:00:00 2001 From: hyzx86 Date: Wed, 19 Apr 2023 17:34:16 +0800 Subject: [PATCH 6/7] update docments --- EasyOC.build/Commons.props | 2 +- src/EasyOC.CMS.Web/EasyOC.CMS.Web.csproj | 4 ++-- src/Modules/EasyOC.Deployment/Readme.md | 2 +- src/Modules/EasyOC.ReplaceAction/Readme.md | 2 +- src/Modules/EasyOC.Users/Readme.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/EasyOC.build/Commons.props b/EasyOC.build/Commons.props index a6f7aa4..e7c627f 100644 --- a/EasyOC.build/Commons.props +++ b/EasyOC.build/Commons.props @@ -12,7 +12,7 @@ true EasyOC is committed to making OrchardCore development easier. - This repositry is referencing a stable build of Orchard Core (1.5.0). + This repositry is referencing a stable build of Orchard Core (1.6.0). 国内用户 欢迎加入QQ 群：877196442 Tony Han diff --git a/src/EasyOC.CMS.Web/EasyOC.CMS.Web.csproj b/src/EasyOC.CMS.Web/EasyOC.CMS.Web.csproj index 8077cd0..e7a78b6 100644 --- a/src/EasyOC.CMS.Web/EasyOC.CMS.Web.csproj +++ b/src/EasyOC.CMS.Web/EasyOC.CMS.Web.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/src/Modules/EasyOC.Deployment/Readme.md b/src/Modules/EasyOC.Deployment/Readme.md index 342a92f..d27db50 100644 --- a/src/Modules/EasyOC.Deployment/Readme.md +++ b/src/Modules/EasyOC.Deployment/Readme.md @@ -19,7 +19,7 @@ Improve the OC `Deployment` feature, including ## Orchard Core Reference -This module is referencing a stable build of Orchard Core ([`1.5.0`](https://www.nuget.org/packages/OrchardCore.Module.Targets/1.5.0)). +This module is referencing a stable build of Orchard Core ([`1.6.0`](https://www.nuget.org/packages/OrchardCore.Module.Targets/1.6.0)). diff --git a/src/Modules/EasyOC.ReplaceAction/Readme.md b/src/Modules/EasyOC.ReplaceAction/Readme.md index 06e488c..a14ed7b 100644 --- a/src/Modules/EasyOC.ReplaceAction/Readme.md +++ b/src/Modules/EasyOC.ReplaceAction/Readme.md @@ -8,7 +8,7 @@ Replace the implementation of the specified controller action in OrchardCore ## Orchard Core Reference -This module is referencing a stable build of Orchard Core ([`1.5.0`](https://www.nuget.org/packages/OrchardCore.Module.Targets/1.5.0)). +This module is referencing a stable build of Orchard Core ([`1.6.0`](https://www.nuget.org/packages/OrchardCore.Module.Targets/1.6.0)). ## How to use diff --git a/src/Modules/EasyOC.Users/Readme.md b/src/Modules/EasyOC.Users/Readme.md index 993fa78..8b62e47 100644 --- a/src/Modules/EasyOC.Users/Readme.md +++ b/src/Modules/EasyOC.Users/Readme.md @@ -15,7 +15,7 @@ The UserLogin Script in OrchardCore now supports the following features ## Orchard Core Reference -This module is referencing a stable build of Orchard Core ([`1.5.0`](https://www.nuget.org/packages/OrchardCore.Module.Targets/1.5.0)). +This module is referencing a stable build of Orchard Core ([`1.6.0`](https://www.nuget.org/packages/OrchardCore.Module.Targets/1.6.0)). From 2d6c3d4d611658915fbc274b03d05513b201cab0 Mon Sep 17 00:00:00 2001 From: hyzx86 Date: Wed, 3 May 2023 17:25:24 +0800 Subject: [PATCH 7/7] update package description --- EasyOC.build/Commons.props | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/EasyOC.build/Commons.props b/EasyOC.build/Commons.props index e7c627f..9d7bfe8 100644 --- a/EasyOC.build/Commons.props +++ b/EasyOC.build/Commons.props @@ -11,8 +11,9 @@ 612,618 true - EasyOC is committed to making OrchardCore development easier. - This repositry is referencing a stable build of Orchard Core (1.6.0). + This repositry is referencing a stable build of OrchardCore (1.6.0). + Please give me a start if you find the module helpful, thanks. https://github.com/EasyOC/EasyOC.Modules + 如果您认为该模块对你有帮助，请给我一个start ，谢谢 https://github.com/EasyOC/EasyOC.Modules 国内用户 欢迎加入QQ 群：877196442 Tony Han