Merge branch 'main' of https://github.com/EasyOC/EasyOC.Modules

EasyOC · May 5, 2023 · fe59f96 · fe59f96
2 parents 7557f92 + 598f6fb
commit fe59f96
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 52 deletions.
diff --git a/EasyOC.build/Commons.props b/EasyOC.build/Commons.props
@@ -3,16 +3,17 @@
 	<PropertyGroup>
 		<!-- after 1.0.3 version depend by tags v*   -->
 		<VersionPrefix>1.0.7</VersionPrefix>
-		<OrchardCoreVersion>1.5.0</OrchardCoreVersion>
+		<OrchardCoreVersion>1.6.0</OrchardCoreVersion>
 		<!--<VersionSuffix>preview</VersionSuffix>-->
 		<PackageTags>OrcardCore,EasyOC</PackageTags>
 		<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)</VersionSuffix>
 		<!--<Version>$(VersionPrefix)-$(VersionSuffix)</Version>-->
 		<WarningsNotAsErrors>612,618</WarningsNotAsErrors>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<Description>
-			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 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
 		</Description>
 		<Copyright>Tony Han</Copyright>

diff --git a/pack.ps1 b/pack.ps1
diff --git a/src/EasyOC.CMS.Web/EasyOC.CMS.Web.csproj b/src/EasyOC.CMS.Web/EasyOC.CMS.Web.csproj
@@ -19,8 +19,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="OrchardCore.Logging.NLog" Version="1.5.0" />
-		<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.5.0" />
+		<PackageReference Include="OrchardCore.Logging.NLog" Version="$(OrchardCoreVersion)" />
+		<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="$(OrchardCoreVersion)" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git 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.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<QueriesDeploymentStep>

diff --git 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<RolesDeploymentStep>

diff --git 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/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.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.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,

diff --git 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
@@ -46,6 +46,6 @@ public async Task<IActionResult> Logout()
             }
 
             return SignOut(OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
-        } 
+        }
     }
 }
diff --git a/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs b/src/Modules/EasyOC.Users/Handlers/EocScriptExternalLoginEventHandler.cs
@@ -2,15 +2,13 @@
 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;
 using OrchardCore.Settings;
 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
@@ -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/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)).
 
 
 

diff --git 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)
-                ); 
+                );
         }
 
     }

diff --git a/src/Modules/EasyOC.Workflows/EasyOC.Workflows.csproj b/src/Modules/EasyOC.Workflows/EasyOC.Workflows.csproj
@@ -12,10 +12,10 @@
 
 	<ItemGroup>
 
-		<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
-		<PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
-		<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.5.0" />
-		<PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
+		<PackageReference Include="OrchardCore.Module.Targets" Version="$(OrchardCoreVersion)" />
+		<PackageReference Include="OrchardCore.ContentManagement" Version="$(OrchardCoreVersion)" />
+		<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="$(OrchardCoreVersion)" />
+		<PackageReference Include="OrchardCore.DisplayManagement" Version="$(OrchardCoreVersion)" />
 		<PackageReference Include="OrchardCore.Workflows" Version="$(OrchardCoreVersion)" />
 	</ItemGroup>
 

diff --git 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
@@ -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
@@ -3,7 +3,7 @@
 using System.Globalization;
 using System.Linq;
 using Newtonsoft.Json.Linq;
-namespace System
+namespace EasyOC
 {
     /// <summary>
     /// Extension methods for all objects.

diff --git 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
 {
     //
     // 摘要: