wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 14:53:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

升级框架到asp.net 9版本，打包项目v0.75版本，更新版本号。.net8版本切入到分支。

Browse Source
This commit is contained in:
jianweie code
2024-11-28 22:54:41 +08:00
parent a416bb4048
commit 648592ab0e
27 changed files with 98 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CoreCms.Net.Auth/CoreCms.Net.Auth.csproj
View File

@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageReference Include="NETCore.Encrypt" Version="2.1.1" /> <PackageReference Include="NETCore.Encrypt" Version="2.1.1" />
</ItemGroup> </ItemGroup>

8
CoreCms.Net.Caching/CoreCms.Net.Caching.csproj
View File

@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CSRedisCore" Version="3.8.803" /> <PackageReference Include="CSRedisCore" Version="3.8.803" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.5.0" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.6.0" />
<PackageReference Include="StackExchange.Redis" Version="2.8.16" /> <PackageReference Include="StackExchange.Redis" Version="2.8.22" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@@ -47,7 +47,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DotLiquid" Version="2.2.692" /> <PackageReference Include="DotLiquid" Version="2.2.717" />
<PackageReference Include="sqlSugarCore" Version="5.1.4.170" /> <PackageReference Include="sqlSugarCore" Version="5.1.4.170" />
</ItemGroup> </ItemGroup>

6
CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj
View File

@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="13.0.1" /> <PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

15
CoreCms.Net.Core/CoreCms.Net.Core.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@@ -14,19 +14,20 @@
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" /> <PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
<PackageReference Include="Castle.Core" Version="5.1.1" /> <PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Hangfire" Version="1.8.15" /> <PackageReference Include="Hangfire" Version="1.8.16" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.15" /> <PackageReference Include="Hangfire.AspNetCore" Version="1.8.16" />
<PackageReference Include="Hangfire.Core" Version="1.8.15" /> <PackageReference Include="Hangfire.Core" Version="1.8.16" />
<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" /> <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" /> <PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.3" /> <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />
<PackageReference Include="InitQ" Version="1.0.0.19" /> <PackageReference Include="InitQ" Version="1.0.0.19" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.22" /> <PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
<PackageReference Include="SqlSugar.IOC" Version="2.0.0" /> <PackageReference Include="SqlSugar.IOC" Version="2.0.0" />
<PackageReference Include="sqlSugarCore" Version="5.1.4.170" /> <PackageReference Include="sqlSugarCore" Version="5.1.4.170" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" /> <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
CoreCms.Net.DTO/CoreCms.Net.DTO.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings> <ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>

2
CoreCms.Net.Filter/CoreCms.Net.Filter.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

6
CoreCms.Net.IServices/CoreCms.Net.IServices.csproj
View File

@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.296" /> <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.320" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" /> <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.8" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
CoreCms.Net.Loging/CoreCms.Net.Loging.csproj
View File

@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.3.4" /> <PackageReference Include="NLog" Version="5.3.4" />
</ItemGroup> </ItemGroup>

2
CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

6
CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj
View File

@@ -1,9 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\CoreCms.Net.Auth\CoreCms.Net.Auth.csproj" /> <ProjectReference Include="..\CoreCms.Net.Auth\CoreCms.Net.Auth.csproj" />
<ProjectReference Include="..\CoreCms.Net.Configuration\CoreCms.Net.Configuration.csproj" /> <ProjectReference Include="..\CoreCms.Net.Configuration\CoreCms.Net.Configuration.csproj" />

6
CoreCms.Net.Model/CoreCms.Net.Model.csproj
View File

@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<GenerateDocumentationFile>True</GenerateDocumentationFile> <GenerateDocumentationFile>True</GenerateDocumentationFile>
<DocumentationFile>CoreCms.Net.Model.xml</DocumentationFile> <DocumentationFile>CoreCms.Net.Model.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" /> <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.5.0" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.6.0" />
<PackageReference Include="sqlSugarCore" Version="5.1.4.170" /> <PackageReference Include="sqlSugarCore" Version="5.1.4.170" />
</ItemGroup> </ItemGroup>

8
CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj
View File

@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.4" /> <PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.8" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" /> <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.8" />
<PackageReference Include="InitQ" Version="1.0.0.19" /> <PackageReference Include="InitQ" Version="1.0.0.19" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.5.0" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.6.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

7
CoreCms.Net.Repository/CoreCms.Net.Repository.csproj
View File

@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DotLiquid" Version="2.2.692" /> <PackageReference Include="DotLiquid" Version="2.2.717" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" /> <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.8" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

17
CoreCms.Net.Services/CoreCms.Net.Services.csproj
View File

@@ -1,22 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="3.1.0" /> <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="3.1.0" />
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.296" /> <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.320" />
<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" /> <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.4" /> <PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.8" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" /> <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.8" />
<PackageReference Include="Flurl.Http" Version="4.0.2" /> <PackageReference Include="Flurl.Http" Version="4.0.2" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" /> <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageReference Include="Qiniu" Version="8.6.0" /> <PackageReference Include="Qiniu" Version="8.7.0" />
<PackageReference Include="QRCoder" Version="1.6.0" /> <PackageReference Include="QRCoder" Version="1.6.0" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" /> <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
<PackageReference Include="System.Drawing.Common" Version="8.0.10" /> <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.40" /> <PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.40" />
<PackageReference Include="ToolGood.Words" Version="3.1.0" /> <PackageReference Include="ToolGood.Words" Version="3.1.0" />
</ItemGroup> </ItemGroup>

4
CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj
View File

@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.OpenApi" Version="1.6.22" /> <PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

7
CoreCms.Net.Task/CoreCms.Net.Task.csproj
View File

@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Hangfire" Version="1.8.15" /> <PackageReference Include="Hangfire" Version="1.8.16" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
CoreCms.Net.Uni-App/CoreShop/App.vue
View File

@@ -12,7 +12,7 @@
onLaunch(() => { onLaunch(() => {
getShopConfigV2(); getShopConfigV2();
/** 版本设置 */ /** 版本设置 */
const version = '0.7.4' const version = '0.7.5'
/** 开发环境才提示，生产环境不会提示 */ /** 开发环境才提示，生产环境不会提示 */
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
console.log(`\n %c \u6838\u5fc3\u5546\u57ce\u7cfb\u7edf\u0020\u0043\u006f\u0072\u0065\u0053\u0068\u006f\u0070 V${version} %c \u0068\u0074\u0074\u0070\u0073\u003a\u002f\u002f\u0077\u0077\u0077\u002e\u0063\u006f\u0072\u0065\u0073\u0068\u006f\u0070\u002e\u0063\u006e\u002f \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #f1f1f1; padding:5px 0;'); console.log(`\n %c \u6838\u5fc3\u5546\u57ce\u7cfb\u7edf\u0020\u0043\u006f\u0072\u0065\u0053\u0068\u006f\u0070 V${version} %c \u0068\u0074\u0074\u0070\u0073\u003a\u002f\u002f\u0077\u0077\u0077\u002e\u0063\u006f\u0072\u0065\u0073\u0068\u006f\u0070\u002e\u0063\u006e\u002f \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #f1f1f1; padding:5px 0;');

4
CoreCms.Net.Utility/CoreCms.Net.Utility.csproj
View File

@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac" Version="8.1.1" /> <PackageReference Include="Autofac" Version="8.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NPOI" Version="2.7.1" /> <PackageReference Include="NPOI" Version="2.7.2" />
<PackageReference Include="ToolGood.Words" Version="3.1.0" /> <PackageReference Include="ToolGood.Words" Version="3.1.0" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

8
CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj
View File

@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MediatR" Version="12.4.1" /> <PackageReference Include="MediatR" Version="12.4.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" /> <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.5.0" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.6.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

25
CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages> <SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish> <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
<UserSecretsId>b93911e3-96d4-453b-aa87-357c154804c2</UserSecretsId> <UserSecretsId>b93911e3-96d4-453b-aa87-357c154804c2</UserSecretsId>
@@ -46,28 +46,29 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.296" /> <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.320" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" /> <PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
<PackageReference Include="CSRedisCore" Version="3.8.803" /> <PackageReference Include="CSRedisCore" Version="3.8.803" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.4" /> <PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.8" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" /> <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.8" />
<PackageReference Include="IdentityModel" Version="7.0.0" /> <PackageReference Include="IdentityModel" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="8.0.10" /> <PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.10" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" /> <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.6" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
<PackageReference Include="MySql.Data" Version="9.1.0" /> <PackageReference Include="MySql.Data" Version="9.1.0" />
<PackageReference Include="NETCore.Encrypt" Version="2.1.1" /> <PackageReference Include="NETCore.Encrypt" Version="2.1.1" />
<PackageReference Include="NLog" Version="5.3.4" /> <PackageReference Include="NLog" Version="5.3.4" />
<PackageReference Include="NLog.Database" Version="5.3.4" /> <PackageReference Include="NLog.Database" Version="5.3.4" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" /> <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
<PackageReference Include="NPOI" Version="2.7.1" /> <PackageReference Include="NPOI" Version="2.7.2" />
<PackageReference Include="Snowflake.Core" Version="2.0.0" /> <PackageReference Include="Snowflake.Core" Version="2.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.8.16" /> <PackageReference Include="StackExchange.Redis" Version="2.8.22" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.40" /> <PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.40" />
<PackageReference Include="ToolGood.Words" Version="3.1.0" /> <PackageReference Include="ToolGood.Words" Version="3.1.0" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

2
CoreCms.Net.Web.Admin/appsettings.json
View File

@@ -22,7 +22,7 @@
"AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址 "AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址
"AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址 "AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址
"AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址 "AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
"AppVersion": "CoreShopProfessional v0.7.4" "AppVersion": "CoreShopProfessional v0.7.5"
}, },
//redis为必须启动项，请保持redis为正常可用 //redis为必须启动项，请保持redis为正常可用
"RedisConfig": { "RedisConfig": {

2
CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js
View File

@@ -24,7 +24,7 @@ layui.define(['all'], function (exports) {
refreshCurrPage: true, // 当跳转页面 url 与当前页 url 相同时，是否自动执行刷新 refreshCurrPage: true, // 当跳转页面 url 与当前页 url 相同时，是否自动执行刷新
name: '核心商城系统', name: '核心商城系统',
version: 'CoreShopProfessional v0.7.4', version: 'CoreShopProfessional v0.7.5',
name: 'layuiAdmin', name: 'layuiAdmin',
tableName: 'CoreShop', // 本地存储表名 tableName: 'CoreShop', // 本地存储表名
MOD_NAME: 'admin', // 模块事件名 MOD_NAME: 'admin', // 模块事件名

27
CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages> <SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish> <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
<UserSecretsId>077906fd-e490-4431-9bae-c3a48ae21992</UserSecretsId> <UserSecretsId>077906fd-e490-4431-9bae-c3a48ae21992</UserSecretsId>
@@ -50,30 +50,31 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AlipaySDKNet.Standard" Version="4.9.296" /> <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.320" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" /> <PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
<PackageReference Include="CSRedisCore" Version="3.8.803" /> <PackageReference Include="CSRedisCore" Version="3.8.803" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.4" /> <PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.8" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.4" /> <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.8" />
<PackageReference Include="Hangfire" Version="1.8.15" /> <PackageReference Include="Hangfire" Version="1.8.16" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.15" /> <PackageReference Include="Hangfire.AspNetCore" Version="1.8.16" />
<PackageReference Include="Hangfire.Core" Version="1.8.15" /> <PackageReference Include="Hangfire.Core" Version="1.8.16" />
<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" /> <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.3" /> <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />
<PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="8.0.10" /> <PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" /> <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.6" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
<PackageReference Include="MySql.Data" Version="9.1.0" /> <PackageReference Include="MySql.Data" Version="9.1.0" />
<PackageReference Include="NETCore.Encrypt" Version="2.1.1" /> <PackageReference Include="NETCore.Encrypt" Version="2.1.1" />
<PackageReference Include="Nito.AsyncEx" Version="5.1.2" /> <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
<PackageReference Include="NLog" Version="5.3.4" /> <PackageReference Include="NLog" Version="5.3.4" />
<PackageReference Include="NLog.Database" Version="5.3.4" /> <PackageReference Include="NLog.Database" Version="5.3.4" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" /> <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
<PackageReference Include="Snowflake.Core" Version="2.0.0" /> <PackageReference Include="Snowflake.Core" Version="2.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.8.16" /> <PackageReference Include="StackExchange.Redis" Version="2.8.22" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.40" /> <PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.40" />
<PackageReference Include="ToolGood.Words" Version="3.1.0" /> <PackageReference Include="ToolGood.Words" Version="3.1.0" />
</ItemGroup> </ItemGroup>

2
CoreCms.Net.Web.WebApi/appsettings.json
View File

@@ -26,7 +26,7 @@
"AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址 "AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址
"AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址 "AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址
"AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址 "AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
"AppVersion": "CoreShopProfessional v0.7.4" "AppVersion": "CoreShopProfessional v0.7.5"
}, },
//redis为必须启动项，请保持redis为正常可用 //redis为必须启动项，请保持redis为正常可用
"RedisConfig": { "RedisConfig": {