From 9c8afbec521f010e7904e8fd2b3458b379acdf9c Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Mon, 12 Aug 2024 19:38:49 +0800
Subject: [PATCH] fix(templates): Update module dependency version

---
 ...PackageName.CompanyName.ProjectName.csproj |  2 +-
 .../content/Directory.Packages.props          |  6 +--
 .../appsettings.Development.json              |  4 +-
 ...ProjectNamePermissionDefinitionProvider.cs | 44 +++++++++----------
 .../ProjectNamePermissions.cs                 | 16 +++----
 .../ProjectNameSettingAppService.cs           |  2 +-
 .../ProjectNameSettingController.cs           |  2 +-
 7 files changed, 39 insertions(+), 37 deletions(-)
 rename aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/{Authorization => Permissions}/ProjectNamePermissionDefinitionProvider.cs (88%)
 rename aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/{Authorization => Permissions}/ProjectNamePermissions.cs (70%)

diff --git a/aspnet-core/templates/PackageName.CompanyName.ProjectName.csproj b/aspnet-core/templates/PackageName.CompanyName.ProjectName.csproj
index 850295401..ae82c9869 100644
--- a/aspnet-core/templates/PackageName.CompanyName.ProjectName.csproj
+++ b/aspnet-core/templates/PackageName.CompanyName.ProjectName.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net8.0</TargetFramework> <!-- 或其他适合的框架 -->
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>LINGYUN.Abp.MicroService.Templates</PackageId>
-    <Version>8.1.3</Version>
+    <Version>8.2.1</Version>
     <Authors>colin.in@foxmail.com</Authors>
     <Description>Abp framework micro-service template</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/aspnet-core/templates/content/Directory.Packages.props b/aspnet-core/templates/content/Directory.Packages.props
index dce5e2882..f3dc78297 100644
--- a/aspnet-core/templates/content/Directory.Packages.props
+++ b/aspnet-core/templates/content/Directory.Packages.props
@@ -70,7 +70,7 @@
 
 	<!-- Abp Framework -->
 	<ItemGroup>
-		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.0.5" />
+		<PackageVersion Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.2.0" />
 		<PackageVersion Include="Volo.Abp.Core" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.Account.Application" Version="$(VoloAbpPackageVersion)" />
 		<PackageVersion Include="Volo.Abp.Account.Application.Contracts" Version="$(VoloAbpPackageVersion)" />
@@ -195,7 +195,7 @@
 
 	<!-- .NET -->
 	<ItemGroup>
-		<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCorePackageVersion)" />
+		<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
 		<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCorePackageVersion)" />
 		<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="$(MicrosoftAspNetCorePackageVersion)" />
 		<PackageVersion Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="$(MicrosoftAspNetCorePackageVersion)" />
@@ -211,7 +211,7 @@
 		<PackageVersion Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsPackageVersion)" />
 		<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="$(MicrosoftExtensionsPackageVersion)" />
 		<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsPackageVersion)" />
-		<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsPackageVersion)" />
+		<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
 	</ItemGroup>
 
 	<!-- Elsa -->
diff --git a/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.DbMigrator/appsettings.Development.json b/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.DbMigrator/appsettings.Development.json
index 93f33118f..17a01bb6a 100644
--- a/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.DbMigrator/appsettings.Development.json
+++ b/aspnet-core/templates/content/host/PackageName.CompanyName.ProjectName.DbMigrator/appsettings.Development.json
@@ -95,7 +95,9 @@
   },
   "AuthServer": {
     "Authority": "http://127.0.0.1:44385/",
-    "ApiName": "lingyun-abp-application",
+    "Audience": "lingyun-abp-application",
+    "MapInboundClaims": false,
+    "RequireHttpsMetadata": false,
     "SwaggerClientId": "InternalServiceClient",
     "SwaggerClientSecret": "1q2w3E*"
   },
diff --git a/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Authorization/ProjectNamePermissionDefinitionProvider.cs b/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Permissions/ProjectNamePermissionDefinitionProvider.cs
similarity index 88%
rename from aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Authorization/ProjectNamePermissionDefinitionProvider.cs
rename to aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Permissions/ProjectNamePermissionDefinitionProvider.cs
index 487837400..4a170551b 100644
--- a/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Authorization/ProjectNamePermissionDefinitionProvider.cs
+++ b/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Permissions/ProjectNamePermissionDefinitionProvider.cs
@@ -1,22 +1,22 @@
-using PackageName.CompanyName.ProjectName.Localization;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Localization;
-
-namespace PackageName.CompanyName.ProjectName.Authorization;
-
-public class ProjectNamePermissionDefinitionProvider : PermissionDefinitionProvider
-{
-    public override void Define(IPermissionDefinitionContext context)
-    {
-        var group = context.AddGroup(ProjectNamePermissions.GroupName, L("Permission:ProjectName"));
-
-        group.AddPermission(
-            ProjectNamePermissions.ManageSettings,
-            L("Permission:ManageSettings"));
-    }
-
-    private static LocalizableString L(string name)
-    {
-        return LocalizableString.Create<ProjectNameResource>(name);
-    }
-}
+using PackageName.CompanyName.ProjectName.Localization;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Localization;
+
+namespace PackageName.CompanyName.ProjectName.Permissions;
+
+public class ProjectNamePermissionDefinitionProvider : PermissionDefinitionProvider
+{
+    public override void Define(IPermissionDefinitionContext context)
+    {
+        var group = context.AddGroup(ProjectNamePermissions.GroupName, L("Permission:ProjectName"));
+
+        group.AddPermission(
+            ProjectNamePermissions.ManageSettings,
+            L("Permission:ManageSettings"));
+    }
+
+    private static LocalizableString L(string name)
+    {
+        return LocalizableString.Create<ProjectNameResource>(name);
+    }
+}
diff --git a/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Authorization/ProjectNamePermissions.cs b/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Permissions/ProjectNamePermissions.cs
similarity index 70%
rename from aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Authorization/ProjectNamePermissions.cs
rename to aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Permissions/ProjectNamePermissions.cs
index 257d11988..98a957ff9 100644
--- a/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Authorization/ProjectNamePermissions.cs
+++ b/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.Application.Contracts/PackageName/CompanyName/ProjectName/Permissions/ProjectNamePermissions.cs
@@ -1,8 +1,8 @@
-namespace PackageName.CompanyName.ProjectName.Authorization;
-
-public static class ProjectNamePermissions
-{
-    public const string GroupName = "ProjectName";
-
-    public const string ManageSettings = GroupName + ".ManageSettings";
-}
+namespace PackageName.CompanyName.ProjectName.Permissions;
+
+public static class ProjectNamePermissions
+{
+    public const string GroupName = "ProjectName";
+
+    public const string ManageSettings = GroupName + ".ManageSettings";
+}
diff --git a/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.SettingManagement/PackageName/CompanyName/ProjectName/SettingManagement/ProjectNameSettingAppService.cs b/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.SettingManagement/PackageName/CompanyName/ProjectName/SettingManagement/ProjectNameSettingAppService.cs
index 52641171c..619fdd3ab 100644
--- a/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.SettingManagement/PackageName/CompanyName/ProjectName/SettingManagement/ProjectNameSettingAppService.cs
+++ b/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.SettingManagement/PackageName/CompanyName/ProjectName/SettingManagement/ProjectNameSettingAppService.cs
@@ -1,6 +1,6 @@
 using LINGYUN.Abp.SettingManagement;
 using Microsoft.AspNetCore.Authorization;
-using PackageName.CompanyName.ProjectName.Authorization;
+using PackageName.CompanyName.ProjectName.Permissions;
 using PackageName.CompanyName.ProjectName.Localization;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
diff --git a/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.SettingManagement/PackageName/CompanyName/ProjectName/SettingManagement/ProjectNameSettingController.cs b/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.SettingManagement/PackageName/CompanyName/ProjectName/SettingManagement/ProjectNameSettingController.cs
index 8e2a69ca3..58df5fe31 100644
--- a/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.SettingManagement/PackageName/CompanyName/ProjectName/SettingManagement/ProjectNameSettingController.cs
+++ b/aspnet-core/templates/content/src/PackageName.CompanyName.ProjectName.SettingManagement/PackageName/CompanyName/ProjectName/SettingManagement/ProjectNameSettingController.cs
@@ -2,7 +2,7 @@
 using LINGYUN.Abp.SettingManagement;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using PackageName.CompanyName.ProjectName.Authorization;
+using PackageName.CompanyName.ProjectName.Permissions;
 using System.Threading.Tasks;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Mvc;