Merge branch 'master' of github.com:zhontai/Admin.Core

src/hosts/ZhonTai.Host/ZhonTai.Host.csproj

@@ -13,63 +13,6 @@
 		<ProjectReference Include="..\..\platform\ZhonTai.Admin\ZhonTai.Admin.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<Content Update="wwwroot\captcha\jigsaw\backgrounds\1.jpg">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\backgrounds\2.jpg">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\backgrounds\3.jpg">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\backgrounds\4.jpg">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\backgrounds\5.jpg">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\1\dark.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\1\transparent.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\2\dark.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\2\transparent.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\3\dark.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\3\transparent.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\4\dark.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\4\transparent.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\5\dark.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\5\transparent.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\6\dark.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\captcha\jigsaw\templates\6\transparent.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Update="wwwroot\swagger\mini-profiler.js">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-
 	<ItemGroup>
 		<InternalsVisibleTo Include="ZhonTai.Tests" />
 	</ItemGroup>

src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj

@@ -15,14 +15,14 @@
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
 		<PackageReference Include="CSRedisCore" Version="3.8.2" />
 		<PackageReference Include="Caching.CSRedis" Version="3.8.2" />
-		<PackageReference Include="FluentValidation.AspNetCore" Version="11.0.2" />
-		<PackageReference Include="FreeSql" Version="3.2.661" />
-		<PackageReference Include="FreeSql.Provider.MySql" Version="3.2.661" />
-		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.661" />
-		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.661" />
-		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.661" />
-		<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.661" />
-		<PackageReference Include="FreeSql.Repository" Version="3.2.661" />
+		<PackageReference Include="FluentValidation.AspNetCore" Version="11.0.3" />
+		<PackageReference Include="FreeSql" Version="3.2.662" />
+		<PackageReference Include="FreeSql.Provider.MySql" Version="3.2.662" />
+		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.662" />
+		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.662" />
+		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.662" />
+		<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.662" />
+		<PackageReference Include="FreeSql.Repository" Version="3.2.662" />
 		<PackageReference Include="IdleBus" Version="1.5.2" />
 		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 		<PackageReference Include="Mapster" Version="7.3.0" />
@@ -30,11 +30,11 @@
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
-		<PackageReference Include="NLog" Version="5.0.0" />
+		<PackageReference Include="NLog" Version="5.0.1" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.0.0" />
 		<PackageReference Include="SixLabors.ImageSharp" Version="2.1.2" />
 		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.18.0" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.19.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="Yitter.IdGenerator" Version="1.0.12" />