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

【升级】nuget升级项目组件到最新版本。发布v0.6.8版本

Browse Source
This commit is contained in:
JIANWEIE-WORKPC\Administrator
2023-03-01 16:40:42 +08:00
parent 3c9a8478e8
commit 4d3309c379
27 changed files with 99 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
</ItemGroup> </ItemGroup>

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

@@ -5,10 +5,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EasyCaching.Core" Version="1.7.0" /> <PackageReference Include="EasyCaching.Core" Version="1.9.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.20.1" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.24.0" />
<PackageReference Include="StackExchange.Redis" Version="2.6.70" /> <PackageReference Include="StackExchange.Redis" Version="2.6.96" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@@ -18,8 +18,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DotLiquid" Version="2.2.656" /> <PackageReference Include="DotLiquid" Version="2.2.682" />
<PackageReference Include="sqlSugarCore" Version="5.1.3.32" /> <PackageReference Include="sqlSugarCore" Version="5.1.3.52" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.0" /> <PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
</ItemGroup> </ItemGroup>

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

@@ -11,23 +11,23 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" /> <PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="Castle.Core" Version="5.1.0" /> <PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Hangfire" Version="1.7.31" /> <PackageReference Include="Hangfire" Version="1.7.33" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.31" /> <PackageReference Include="Hangfire.AspNetCore" Version="1.7.33" />
<PackageReference Include="Hangfire.Core" Version="1.7.31" /> <PackageReference Include="Hangfire.Core" Version="1.7.33" />
<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.8.6" /> <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.8.6" />
<PackageReference Include="InitQ" Version="1.0.0.14" /> <PackageReference Include="InitQ" Version="1.0.0.14" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.OpenApi" Version="1.4.3" /> <PackageReference Include="Microsoft.OpenApi" Version="1.6.2" />
<PackageReference Include="SqlSugar.IOC" Version="1.9.0" /> <PackageReference Include="SqlSugar.IOC" Version="2.0.0" />
<PackageReference Include="sqlSugarCore" Version="5.1.3.32" /> <PackageReference Include="sqlSugarCore" Version="5.1.3.52" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.5" /> <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@@ -6,8 +6,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NLog" Version="5.0.5" /> <PackageReference Include="NLog" Version="5.1.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@@ -5,8 +5,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.0" /> <PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@@ -7,8 +7,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.20.1" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.24.0" />
<PackageReference Include="sqlSugarCore" Version="5.1.3.32" /> <PackageReference Include="sqlSugarCore" Version="5.1.3.52" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@@ -8,7 +8,7 @@
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.0" /> <PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.0" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.0" /> <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.0" />
<PackageReference Include="InitQ" Version="1.0.0.14" /> <PackageReference Include="InitQ" Version="1.0.0.14" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.20.1" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.24.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DotLiquid" Version="2.2.656" /> <PackageReference Include="DotLiquid" Version="2.2.682" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.0" /> <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.0" />
</ItemGroup> </ItemGroup>

1
CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs
View File

@@ -24,7 +24,6 @@ using CoreCms.Net.Model.ViewModels.DTO;
using CoreCms.Net.Model.ViewModels.UI; using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Utility.Helper; using CoreCms.Net.Utility.Helper;
using Flurl.Http; using Flurl.Http;
using Google.Protobuf.WellKnownTypes;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Newtonsoft.Json; using Newtonsoft.Json;

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

@@ -11,13 +11,13 @@
<PackageReference Include="Flurl.Http" Version="3.2.4" /> <PackageReference Include="Flurl.Http" Version="3.2.4" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="Qiniu" Version="8.2.0" /> <PackageReference Include="Qiniu" Version="8.3.0" />
<PackageReference Include="QRCoder" Version="1.4.3" /> <PackageReference Include="QRCoder" Version="1.4.3" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="2.0.2" /> <PackageReference Include="SixLabors.ImageSharp.Web" Version="2.0.2" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" /> <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.32" /> <PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.34" />
<PackageReference Include="ToolGood.Words" Version="3.0.3.1" /> <PackageReference Include="ToolGood.Words" Version="3.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs
View File

@@ -154,7 +154,7 @@ namespace CoreCms.Net.Services
await _dal.UpdateAsync(p => new WeChatTransactionComponentAuditCategory() await _dal.UpdateAsync(p => new WeChatTransactionComponentAuditCategory()
{ {
status = response.Data.Status, status = response.Data.Status,
brandId = response.Data.BrandId, brandId = (int)response.Data.BrandId,
rejectReason = response.Data.RejectReason rejectReason = response.Data.RejectReason
}, p => p.id == entity.id); }, p => p.id == entity.id);
} }

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

@@ -6,8 +6,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
<PackageReference Include="Microsoft.OpenApi" Version="1.4.3" /> <PackageReference Include="Microsoft.OpenApi" Version="1.6.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Hangfire" Version="1.7.31" /> <PackageReference Include="Hangfire" Version="1.7.33" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
</ItemGroup> </ItemGroup>

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

@@ -11,7 +11,7 @@
}, },
onLaunch() { onLaunch() {
//版本设置 //版本设置
const version = '0.6.7' const version = '0.6.8'
// 开发环境才提示，生产环境不会提示 // 开发环境才提示，生产环境不会提示
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;');

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

@@ -5,10 +5,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac" Version="6.4.0" /> <PackageReference Include="Autofac" Version="6.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NPOI" Version="2.5.6" /> <PackageReference Include="NPOI" Version="2.6.0" />
<PackageReference Include="ToolGood.Words" Version="3.0.3.1" /> <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>

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

@@ -5,13 +5,12 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MediatR" Version="11.0.0" /> <PackageReference Include="MediatR" Version="12.0.1" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.20.1" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.24.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
CoreCms.Net.WeChat.Service/Mediator/TransactionComponent/OpenProductBrandAuditEventCommandHandler.cs
View File

@@ -66,7 +66,7 @@ namespace CoreCms.Net.WeChat.Service.Mediator
{ {
status = request.EventObj.EventData.Status, status = request.EventObj.EventData.Status,
rejectReason = request.EventObj.EventData.RejectReason, rejectReason = request.EventObj.EventData.RejectReason,
brandId = request.EventObj.EventData.BrandId, brandId = (int)request.EventObj.EventData.BrandId,
}, p => p.audit_id == request.EventObj.EventData.AuditId); }, p => p.audit_id == request.EventObj.EventData.AuditId);
var log = new WeChatTransactionComponentBrandAuditLog(); var log = new WeChatTransactionComponentBrandAuditLog();
@@ -74,7 +74,7 @@ namespace CoreCms.Net.WeChat.Service.Mediator
log.status = request.EventObj.EventData.Status; log.status = request.EventObj.EventData.Status;
log.audit_type = request.EventObj.EventData.AuditType; log.audit_type = request.EventObj.EventData.AuditType;
log.reject_reason = request.EventObj.EventData.RejectReason; log.reject_reason = request.EventObj.EventData.RejectReason;
log.brand_id = request.EventObj.EventData.BrandId; log.brand_id = (int)request.EventObj.EventData.BrandId;
log.createTime = DateTime.Now; log.createTime = DateTime.Now;
var id = await _logServices.InsertAsync(log); var id = await _logServices.InsertAsync(log);

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

@@ -49,32 +49,32 @@
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" /> <PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" /> <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
<PackageReference Include="EasyCaching.CSRedis" Version="1.7.0" /> <PackageReference Include="EasyCaching.CSRedis" Version="1.9.0" />
<PackageReference Include="EasyCaching.InMemory" Version="1.7.0" /> <PackageReference Include="EasyCaching.InMemory" Version="1.9.0" />
<PackageReference Include="EasyCaching.Serialization.Json" Version="1.7.0" /> <PackageReference Include="EasyCaching.Serialization.Json" Version="1.9.0" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.0" /> <PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.0" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.0" /> <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.0" />
<PackageReference Include="IdentityModel" Version="6.0.0" /> <PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="7.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.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="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.2" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.0" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
<PackageReference Include="MySql.Data" Version="8.0.31" /> <PackageReference Include="MySql.Data" Version="8.0.32" />
<PackageReference Include="NLog" Version="5.0.5" /> <PackageReference Include="NLog" Version="5.1.2" />
<PackageReference Include="NLog.Database" Version="5.0.5" /> <PackageReference Include="NLog.Database" Version="5.1.2" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.5" /> <PackageReference Include="NLog.Web.AspNetCore" Version="5.2.2" />
<PackageReference Include="NPOI" Version="2.5.6" /> <PackageReference Include="NPOI" Version="2.6.0" />
<PackageReference Include="Snowflake.Core" Version="2.0.0" /> <PackageReference Include="Snowflake.Core" Version="2.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.6.70" /> <PackageReference Include="StackExchange.Redis" Version="2.6.96" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.27.0" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.32" /> <PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.34" />
<PackageReference Include="ToolGood.Words" Version="3.0.3.1" /> <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>

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

@@ -18,7 +18,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.6.7" "AppVersion": "CoreShopProfessional v0.6.8"
}, },
//redis为必须启动项，请保持redis为正常可用 //redis为必须启动项，请保持redis为正常可用
"RedisConfig": { "RedisConfig": {

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

@@ -23,7 +23,7 @@ layui.define(['all'], function (exports) {
pageTabs: false, // 是否开启页面选项卡功能。单页版不推荐开启 pageTabs: false, // 是否开启页面选项卡功能。单页版不推荐开启
name: '核心商城系统', name: '核心商城系统',
version: 'CoreShopProfessional v0.6.7', version: 'CoreShopProfessional v0.6.8',
name: 'layuiAdmin', name: 'layuiAdmin',
tableName: 'CoreShop', // 本地存储表名 tableName: 'CoreShop', // 本地存储表名
MOD_NAME: 'admin', // 模块事件名 MOD_NAME: 'admin', // 模块事件名

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

@@ -53,31 +53,31 @@
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" /> <PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" /> <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
<PackageReference Include="EasyCaching.CSRedis" Version="1.7.0" /> <PackageReference Include="EasyCaching.CSRedis" Version="1.9.0" />
<PackageReference Include="EasyCaching.InMemory" Version="1.7.0" /> <PackageReference Include="EasyCaching.InMemory" Version="1.9.0" />
<PackageReference Include="EasyCaching.Serialization.Json" Version="1.7.0" /> <PackageReference Include="EasyCaching.Serialization.Json" Version="1.9.0" />
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.0" /> <PackageReference Include="Essensoft.Paylink.Alipay" Version="4.1.0" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.0" /> <PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.1.0" />
<PackageReference Include="Hangfire" Version="1.7.31" /> <PackageReference Include="Hangfire" Version="1.7.33" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.31" /> <PackageReference Include="Hangfire.AspNetCore" Version="1.7.33" />
<PackageReference Include="Hangfire.Core" Version="1.7.31" /> <PackageReference Include="Hangfire.Core" Version="1.7.33" />
<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.8.6" /> <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.8.6" />
<PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="7.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.3" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.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.17.2" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.0" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
<PackageReference Include="MySql.Data" Version="8.0.31" /> <PackageReference Include="MySql.Data" Version="8.0.32" />
<PackageReference Include="Nito.AsyncEx" Version="5.1.2" /> <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
<PackageReference Include="NLog" Version="5.0.5" /> <PackageReference Include="NLog" Version="5.1.2" />
<PackageReference Include="NLog.Database" Version="5.0.5" /> <PackageReference Include="NLog.Database" Version="5.1.2" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.5" /> <PackageReference Include="NLog.Web.AspNetCore" Version="5.2.2" />
<PackageReference Include="Snowflake.Core" Version="2.0.0" /> <PackageReference Include="Snowflake.Core" Version="2.0.0" />
<PackageReference Include="StackExchange.Redis" Version="2.6.70" /> <PackageReference Include="StackExchange.Redis" Version="2.6.96" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.32" /> <PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.34" />
<PackageReference Include="ToolGood.Words" Version="3.0.3.1" /> <PackageReference Include="ToolGood.Words" Version="3.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

17
CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
View File

@@ -518,6 +518,23 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:CoreCms.Net.Web.WebApi.Controllers.LiveBroadCastController">
<summary>
小程序内置直播功能
</summary>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.LiveBroadCastController.#ctor(CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory)">
<summary>
构造函数
</summary>
<param name="weChatApiHttpClientFactory"></param>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.LiveBroadCastController.GetLiveInfo(CoreCms.Net.Model.FromBody.FMPageByIntId)">
<summary>
获取直播间列表和回放
</summary>
<returns></returns>
</member>
<member name="T:CoreCms.Net.Web.WebApi.Controllers.NoticeController"> <member name="T:CoreCms.Net.Web.WebApi.Controllers.NoticeController">
<summary> <summary>
公告控制器 公告控制器

2
CoreCms.Net.Web.WebApi/Program.cs
View File

@@ -59,7 +59,7 @@ builder.Services.AddSession();
builder.Services.AddAutoMapper(typeof(AutoMapperConfiguration)); builder.Services.AddAutoMapper(typeof(AutoMapperConfiguration));
//MediatR（只需要注册一个,同项目或类库下就不需要注册多个） //MediatR（只需要注册一个,同项目或类库下就不需要注册多个）
builder.Services.AddMediatR(typeof(TextMessageEventCommand).Assembly); builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssembly(typeof(TextMessageEventCommand).Assembly));
//Redis消息队列 //Redis消息队列
builder.Services.AddRedisMessageQueueSetup(); builder.Services.AddRedisMessageQueueSetup();

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

@@ -18,7 +18,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.6.7" "AppVersion": "CoreShopProfessional v0.6.8"
}, },
//redis为必须启动项，请保持redis为正常可用 //redis为必须启动项，请保持redis为正常可用
"RedisConfig": { "RedisConfig": {