From 2313bf6ac9e6ce1206ef82601e7e7d3f5ac1208a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Wed, 9 Nov 2022 19:06:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91=E5=8D=87?= =?UTF-8?q?=E7=BA=A7Asp.Net=206.0.11=20=E5=88=B0=20Asp.Net=207.0.0=20?= =?UTF-8?q?=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91=E5=8D=87=E7=BA=A7=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=BB=84=E5=BB=BA=E5=8C=85=EF=BC=8C=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=B8=8D=E7=94=A8=E6=88=96=E8=80=85=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=BC=83=E7=94=A8=E7=9A=84=E7=BB=84=E5=BB=BA=E3=80=82?= =?UTF-8?q?=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8D=87=E7=BA=A7npoi=E6=9C=80=E6=96=B0=E7=89=88=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=87=BA=E7=8E=B0=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E3=80=90NLog.Database=E3=80=91nlog=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=93=BE=E6=8E=A5=E7=BB=84=E4=BB=B6,?= =?UTF-8?q?=E8=A7=A3=E5=86=B3nlog=E5=8D=87=E7=BA=A7=E5=88=B05.x=E4=BB=A5?= =?UTF-8?q?=E5=90=8E=E7=89=88=E6=9C=AC=E8=AE=B0=E5=BD=95=E5=88=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=97=A5=E5=BF=97=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Auth/CoreCms.Net.Auth.csproj | 6 +- .../CoreCms.Net.Caching.csproj | 8 +- .../CoreCms.Net.CodeGenerator.csproj | 4 +- .../CoreCms.Net.Configuration.csproj | 6 +- CoreCms.Net.Core/CoreCms.Net.Core.csproj | 8 +- CoreCms.Net.DTO/CoreCms.Net.DTO.csproj | 4 +- CoreCms.Net.Filter/CoreCms.Net.Filter.csproj | 3 +- .../GlobalExceptionsFilterForAdmin.cs | 1 - .../GlobalExceptionsFilterForClent.cs | 1 - .../CoreCms.Net.IRepository.csproj | 2 +- .../CoreCms.Net.IServices.csproj | 2 +- .../Share/ICoreCmsShareServices.cs | 14 - CoreCms.Net.Loging/CoreCms.Net.Loging.csproj | 6 +- .../CoreCms.Net.Mapping.csproj | 2 +- .../CoreCms.Net.Middlewares.csproj | 2 +- CoreCms.Net.Middlewares/MiddlewareHelpers.cs | 13 - CoreCms.Net.Middlewares/SignalRSendMildd.cs | 57 ---- CoreCms.Net.Model/CoreCms.Net.Model.csproj | 4 +- CoreCms.Net.Model/FromBody/FMGoods.cs | 4 +- CoreCms.Net.Model/FromBody/FmPages.cs | 4 +- .../ViewModels/DTO/BillPaymentsDto.cs | 4 +- .../DTO/Distribution/DistributionDto.cs | 8 +- .../CoreCms.Net.RedisMQ.csproj | 8 +- .../CoreCms.Net.Repository.csproj | 4 +- .../CoreCmsDistributionRepository.cs | 4 +- .../Bill/CoreCmsBillPaymentsServices.cs | 16 +- .../CoreCms.Net.Services.csproj | 15 +- .../CoreCmsDistributionServices.cs | 18 +- .../Promotion/CoreCmsPromotionServices.cs | 1 - .../Share/CoreCmsShareServices.cs | 298 ------------------ ...ansactionComponentAuditCategoryServices.cs | 3 +- .../CoreCms.Net.Swagger.csproj | 2 +- CoreCms.Net.Task/CoreCms.Net.Task.csproj | 4 +- .../CoreCms.Net.Uni-App.csproj | 2 +- CoreCms.Net.Uni-App/CoreShop/App.vue | 2 +- .../CoreCms.Net.Utility.csproj | 5 +- CoreCms.Net.Utility/Hub/ChatHub.cs | 103 ------ CoreCms.Net.Utility/Hub/IChatClient.cs | 38 --- .../CoreCms.Net.WeChat.Service.csproj | 8 +- .../Order/CoreCmsOrderController.cs | 5 +- .../CoreCmsUserServicesOrderController.cs | 12 +- .../CoreCms.Net.Web.Admin.csproj | 26 +- CoreCms.Net.Web.Admin/Program.cs | 31 +- CoreCms.Net.Web.Admin/appsettings.json | 2 +- .../wwwroot/lib/layuiAdmin/config.js | 2 +- .../wwwroot/views/agent/agentOrder/index.html | 60 ---- .../views/financial/billpayments/index.html | 2 +- .../wwwroot/views/index.html | 2 +- .../views/order/billaftersales/index.html | 4 +- .../wwwroot/views/order/billreship/index.html | 4 +- .../views/user/wechatuserinfo/index.html | 7 - .../Controllers/UserController.cs | 2 +- .../CoreCms.Net.Web.WebApi.csproj | 17 +- CoreCms.Net.Web.WebApi/Doc.xml | 77 +---- CoreCms.Net.Web.WebApi/NLog.config | 2 +- CoreCms.Net.Web.WebApi/Program.cs | 31 +- CoreCms.Net.Web.WebApi/appsettings.json | 2 +- CoreCms.Net.Web.WebApi/wwwroot/index.html | 4 +- 58 files changed, 154 insertions(+), 832 deletions(-) delete mode 100644 CoreCms.Net.Middlewares/SignalRSendMildd.cs delete mode 100644 CoreCms.Net.Utility/Hub/ChatHub.cs delete mode 100644 CoreCms.Net.Utility/Hub/IChatClient.cs diff --git a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj index ac47be50..b5de19af 100644 --- a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj +++ b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj @@ -1,12 +1,12 @@ - net6.0 + net7.0 - - + + diff --git a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj index f62ea2ca..01971e0b 100644 --- a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj +++ b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj @@ -1,13 +1,13 @@ - net6.0 + net7.0 - - - + + + diff --git a/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj b/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj index d8916fbe..cf636365 100644 --- a/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj +++ b/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 @@ -19,7 +19,7 @@ - + diff --git a/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj b/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj index 5ade4a2b..f8ef6b4a 100644 --- a/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj +++ b/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj @@ -1,13 +1,13 @@ - net6.0 + net7.0 - - + + diff --git a/CoreCms.Net.Core/CoreCms.Net.Core.csproj b/CoreCms.Net.Core/CoreCms.Net.Core.csproj index 3456e51c..920db07c 100644 --- a/CoreCms.Net.Core/CoreCms.Net.Core.csproj +++ b/CoreCms.Net.Core/CoreCms.Net.Core.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 @@ -22,11 +22,11 @@ - - + + - + diff --git a/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj b/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj index 132c02c5..c36e74d7 100644 --- a/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj +++ b/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj @@ -1,8 +1,8 @@ - net6.0 - enable + net7.0 + disable enable diff --git a/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj b/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj index f9e96bae..e5e9628a 100644 --- a/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj +++ b/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj @@ -1,13 +1,12 @@ - net6.0 + net7.0 - diff --git a/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs b/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs index cd9f9eb4..34446f88 100644 --- a/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs +++ b/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs @@ -21,7 +21,6 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; diff --git a/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs b/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs index c8bbdcb0..2616c633 100644 --- a/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs +++ b/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs @@ -21,7 +21,6 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; diff --git a/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj b/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj index fe8ae3d8..5241667c 100644 --- a/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj +++ b/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj index 44769607..f82821ab 100644 --- a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj +++ b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/CoreCms.Net.IServices/Share/ICoreCmsShareServices.cs b/CoreCms.Net.IServices/Share/ICoreCmsShareServices.cs index 44680ce9..9fa30cf5 100644 --- a/CoreCms.Net.IServices/Share/ICoreCmsShareServices.cs +++ b/CoreCms.Net.IServices/Share/ICoreCmsShareServices.cs @@ -31,7 +31,6 @@ namespace CoreCms.Net.IServices /// Task QrShare(int client, int page, int userShareCode, string url, JObject parameter); - /// /// 页面分享 /// @@ -43,19 +42,6 @@ namespace CoreCms.Net.IServices /// WebApiCallBack UrlShare(int client, int page, int userShareCode, string url, JObject parameter); - - /// - /// 海报分享 - /// - /// - /// - /// - /// - /// - /// - Task PosterShare(int client, int page, int userShareCode, string url, JObject parameter); - - /// /// 小程序二维码，和业务没关系 /// diff --git a/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj b/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj index fac61c52..594ddb9d 100644 --- a/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj +++ b/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj @@ -1,13 +1,13 @@ - net6.0 + net7.0 - + - + diff --git a/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj b/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj index 13f75a3c..b6a6e804 100644 --- a/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj +++ b/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj b/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj index aaa6fef4..f72618fd 100644 --- a/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj +++ b/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/CoreCms.Net.Middlewares/MiddlewareHelpers.cs b/CoreCms.Net.Middlewares/MiddlewareHelpers.cs index 1786f00e..97bd5a0d 100644 --- a/CoreCms.Net.Middlewares/MiddlewareHelpers.cs +++ b/CoreCms.Net.Middlewares/MiddlewareHelpers.cs @@ -51,18 +51,6 @@ namespace CoreCms.Net.Middlewares return app.UseMiddleware(); } - /// - /// SignalR中间件 - /// - /// - /// - public static IApplicationBuilder UseSignalRSendMildd(this IApplicationBuilder app) - { - return app.UseMiddleware(); - } - - - /// /// IP请求中间件 /// @@ -73,7 +61,6 @@ namespace CoreCms.Net.Middlewares return app.UseMiddleware(); } - /// /// 用户访问接口日志中间件 /// diff --git a/CoreCms.Net.Middlewares/SignalRSendMildd.cs b/CoreCms.Net.Middlewares/SignalRSendMildd.cs deleted file mode 100644 index 0c876937..00000000 --- a/CoreCms.Net.Middlewares/SignalRSendMildd.cs +++ /dev/null @@ -1,57 +0,0 @@ -/*********************************************************************** - * Project: CoreCms.Net * - * Web: https://CoreCms.Net * - * ProjectName: 核心内容管理系统 * - * Author: 大灰灰 * - * Email: JianWeie@163.com * - * CreateTime: 2020-09-06 23:37:04 - * Description: 暂无 - ***********************************************************************/ - - -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; -using CoreCms.Net.Utility.Hub; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.SignalR; - -namespace CoreCms.Net.Middlewares -{ - /// - /// 中间件 - /// SignalR发送数据 - /// - public class SignalRSendMildd - { - /// - /// - /// - private readonly RequestDelegate _next; - private readonly IHubContext _hubContext; - - /// - /// - /// - /// - /// - public SignalRSendMildd(RequestDelegate next, IHubContext hubContext) - { - _next = next; - _hubContext = hubContext; - } - - - - public async Task InvokeAsync(HttpContext context) - { - - - - - await _next(context); - } - - } -} diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.csproj b/CoreCms.Net.Model/CoreCms.Net.Model.csproj index 01a98f92..af27a2af 100644 --- a/CoreCms.Net.Model/CoreCms.Net.Model.csproj +++ b/CoreCms.Net.Model/CoreCms.Net.Model.csproj @@ -1,11 +1,11 @@ - net6.0 + net7.0 - + diff --git a/CoreCms.Net.Model/FromBody/FMGoods.cs b/CoreCms.Net.Model/FromBody/FMGoods.cs index 8dcfbbdb..01e81b40 100644 --- a/CoreCms.Net.Model/FromBody/FMGoods.cs +++ b/CoreCms.Net.Model/FromBody/FMGoods.cs @@ -104,10 +104,10 @@ namespace CoreCms.Net.Model.FromBody /// public int[] ids { get; set; } - public List labels { get; set; } + public List labels { get; set; } } - public class labels + public class Labels { public string text { get; set; } public string style { get; set; } diff --git a/CoreCms.Net.Model/FromBody/FmPages.cs b/CoreCms.Net.Model/FromBody/FmPages.cs index 543c726a..8cd848b7 100644 --- a/CoreCms.Net.Model/FromBody/FmPages.cs +++ b/CoreCms.Net.Model/FromBody/FmPages.cs @@ -28,14 +28,14 @@ namespace CoreCms.Net.Model.FromBody [Display(Name = "数据子集")] [Required(ErrorMessage = "请输入{0}")] - public List datalist { get; set; } + public List datalist { get; set; } } /// /// 数据子集类型 /// [Display(Name = "数据子集类型")] - public class items + public class Items { [Display(Name = "数据子集类型")] [Required(ErrorMessage = "请输入{0}")] diff --git a/CoreCms.Net.Model/ViewModels/DTO/BillPaymentsDto.cs b/CoreCms.Net.Model/ViewModels/DTO/BillPaymentsDto.cs index 40283aaf..144a345f 100644 --- a/CoreCms.Net.Model/ViewModels/DTO/BillPaymentsDto.cs +++ b/CoreCms.Net.Model/ViewModels/DTO/BillPaymentsDto.cs @@ -21,10 +21,10 @@ namespace CoreCms.Net.Model.ViewModels.DTO public decimal money { get; set; } = 0; - public List rel { get; set; } = new(); + public List rel { get; set; } = new(); } - public class rel + public class Rel { /// /// 关联资源序列 diff --git a/CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionDto.cs b/CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionDto.cs index 84e0f432..3ef5b7c1 100644 --- a/CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionDto.cs +++ b/CoreCms.Net.Model/ViewModels/DTO/Distribution/DistributionDto.cs @@ -28,20 +28,20 @@ namespace CoreCms.Net.Model.ViewModels.DTO.Distribution /// /// 分销级别一配置 /// - public commission commission_1 { get; set; } + public Commission commission_1 { get; set; } /// /// 分销级别二配置 /// - public commission commission_2 { get; set; } + public Commission commission_2 { get; set; } /// /// 分销级别三配置 /// - public commission commission_3 { get; set; } + public Commission commission_3 { get; set; } } - public class commission + public class Commission { /// /// 类型(百分比/固定金额) diff --git a/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj b/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj index 7d684a19..a46cada0 100644 --- a/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj +++ b/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj @@ -1,14 +1,14 @@ - net6.0 + net7.0 - - + + - + diff --git a/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj b/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj index 34f16d58..2e9d39af 100644 --- a/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj +++ b/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj @@ -1,12 +1,12 @@ - net6.0 + net7.0 - + diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs index 3e7306e1..ca59cf9d 100644 --- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs +++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs @@ -155,7 +155,7 @@ namespace CoreCms.Net.Repository updateTime = p.updateTime, verifyTime = p.verifyTime, isDelete = p.isDelete, - UserGradeId = SqlFunc.Subqueryable().Where(o => o.id == p.userId).Select(p => p.grade) + UserGradeId = SqlFunc.Subqueryable().Where(o => o.id == p.userId).Select(o => o.grade) }) .MergeTable() @@ -184,7 +184,7 @@ namespace CoreCms.Net.Repository updateTime = p.updateTime, verifyTime = p.verifyTime, isDelete = p.isDelete, - UserGradeId = SqlFunc.Subqueryable().Where(o => o.id == p.userId).Select(p => p.grade) + UserGradeId = SqlFunc.Subqueryable().Where(o => o.id == p.userId).Select(o => o.grade) }) .MergeTable() .OrderByIF(orderByExpression != null, orderByExpression, orderByType) diff --git a/CoreCms.Net.Services/Bill/CoreCmsBillPaymentsServices.cs b/CoreCms.Net.Services/Bill/CoreCmsBillPaymentsServices.cs index 40f6da7f..1091e3a1 100644 --- a/CoreCms.Net.Services/Bill/CoreCmsBillPaymentsServices.cs +++ b/CoreCms.Net.Services/Bill/CoreCmsBillPaymentsServices.cs @@ -132,7 +132,7 @@ namespace CoreCms.Net.Services p.status == (int)GlobalEnumVars.OrderStatus.Normal); if (orderModel != null) { - dto.rel.Add(new rel() + dto.rel.Add(new Rel() { sourceId = orderId, money = orderModel.orderAmount @@ -162,7 +162,7 @@ namespace CoreCms.Net.Services jm.msg = "请输入正确的充值金额"; return jm; } - dto.rel.Add(new rel() + dto.rel.Add(new Rel() { sourceId = orderId, money = dto.money @@ -186,7 +186,7 @@ namespace CoreCms.Net.Services var formInfo = await _formSubmitServices.QueryByClauseAsync(p => p.id == intId && p.payStatus == false); if (formInfo != null) { - dto.rel.Add(new rel() + dto.rel.Add(new Rel() { sourceId = intId.ToString(), money = formInfo.money @@ -218,7 +218,7 @@ namespace CoreCms.Net.Services var serviceInfo = await _servicesServices.QueryByClauseAsync(@where); if (serviceInfo != null) { - dto.rel.Add(new rel() + dto.rel.Add(new Rel() { sourceId = orderId, money = serviceInfo.money @@ -290,7 +290,7 @@ namespace CoreCms.Net.Services p.status == (int)GlobalEnumVars.OrderStatus.Normal); if (orderModel != null) { - dto.rel.Add(new rel() + dto.rel.Add(new Rel() { sourceId = item, money = orderModel.orderAmount @@ -322,7 +322,7 @@ namespace CoreCms.Net.Services } foreach (var item in sourceStr) { - dto.rel.Add(new rel() + dto.rel.Add(new Rel() { sourceId = item, money = dto.money @@ -342,7 +342,7 @@ namespace CoreCms.Net.Services var formInfo = await _formSubmitServices.QueryByClauseAsync(p => p.id == item && p.payStatus == false); if (formInfo != null) { - dto.rel.Add(new rel() + dto.rel.Add(new Rel() { sourceId = item.ToString(), money = formInfo.money @@ -379,7 +379,7 @@ namespace CoreCms.Net.Services var serviceInfo = await _servicesServices.QueryByClauseAsync(@where); if (serviceInfo != null) { - dto.rel.Add(new rel() + dto.rel.Add(new Rel() { sourceId = item, money = serviceInfo.money diff --git a/CoreCms.Net.Services/CoreCms.Net.Services.csproj b/CoreCms.Net.Services/CoreCms.Net.Services.csproj index 2469aed7..47c33b67 100644 --- a/CoreCms.Net.Services/CoreCms.Net.Services.csproj +++ b/CoreCms.Net.Services/CoreCms.Net.Services.csproj @@ -1,22 +1,21 @@ - net6.0 + net7.0 - - + + - - + + - - - + + diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs index db4c2106..56e3582a 100644 --- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs +++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs @@ -424,7 +424,7 @@ namespace CoreCms.Net.Services var obj = JObject.Parse(p.parameters); if (p.code == "COMMISSION_1") { - dto.commission_1 = new commission() + dto.commission_1 = new Commission() { type = obj["commissionType"].ObjectToInt(0), discount = obj["discount"].ObjectToDecimal(0) @@ -432,7 +432,7 @@ namespace CoreCms.Net.Services } else if (p.code == "COMMISSION_2") { - dto.commission_2 = new commission() + dto.commission_2 = new Commission() { type = obj["commissionType"].ObjectToInt(0), discount = obj["discount"].ObjectToDecimal(0) @@ -441,7 +441,7 @@ namespace CoreCms.Net.Services } else if (p.code == "COMMISSION_3") { - dto.commission_3 = new commission() + dto.commission_3 = new Commission() { type = obj["commissionType"].ObjectToInt(0), discount = obj["discount"].ObjectToDecimal(0) @@ -453,17 +453,17 @@ namespace CoreCms.Net.Services else { dto.grade_id = 0; - dto.commission_1 = new commission() + dto.commission_1 = new Commission() { type = commissionType, discount = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CommissionFirst).ObjectToDecimal(0) }; - dto.commission_2 = new commission() + dto.commission_2 = new Commission() { type = commissionType, discount = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CommissionSecond).ObjectToDecimal(0) }; - dto.commission_3 = new commission() + dto.commission_3 = new Commission() { type = commissionType, discount = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CommissionThird).ObjectToDecimal(0) @@ -474,17 +474,17 @@ namespace CoreCms.Net.Services else { dto.grade_id = 0; - dto.commission_1 = new commission() + dto.commission_1 = new Commission() { type = commissionType, discount = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CommissionFirst).ObjectToDecimal(0) }; - dto.commission_2 = new commission() + dto.commission_2 = new Commission() { type = commissionType, discount = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CommissionSecond).ObjectToDecimal(0) }; - dto.commission_3 = new commission() + dto.commission_3 = new Commission() { type = commissionType, discount = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CommissionThird).ObjectToDecimal(0) diff --git a/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs b/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs index a34554f6..5dc904b3 100644 --- a/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs +++ b/CoreCms.Net.Services/Promotion/CoreCmsPromotionServices.cs @@ -30,7 +30,6 @@ using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using SqlSugar; -using static SKIT.FlurlHttpClient.Wechat.Api.Models.ScanProductV2AddRequest.Types.Product.Types; namespace CoreCms.Net.Services diff --git a/CoreCms.Net.Services/Share/CoreCmsShareServices.cs b/CoreCms.Net.Services/Share/CoreCmsShareServices.cs index 98c95f18..f8562efe 100644 --- a/CoreCms.Net.Services/Share/CoreCmsShareServices.cs +++ b/CoreCms.Net.Services/Share/CoreCmsShareServices.cs @@ -29,11 +29,6 @@ using CoreCms.Net.WeChat.Service.Options; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Options; using Newtonsoft.Json.Linq; -using SixLabors.Fonts; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.Drawing.Processing; -using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing; using SKIT.FlurlHttpClient.Wechat.Api; using SKIT.FlurlHttpClient.Wechat.Api.Models; @@ -113,44 +108,6 @@ namespace CoreCms.Net.Services #endregion - #region 海报分享 - /// - /// 海报分享 - /// - /// - /// - /// - /// - /// - /// - public async Task PosterShare(int client, int page, int userShareCode, string url, JObject parameter) - { - //获取分享代码 - var res = GetCode(client, page, userShareCode, url, parameter); - if (!res.status) - { - return res; - } - //如果不是商品和拼团 - if (page != (int)GlobalEnumVars.UrlSharePageType.PinTuan && - page != (int)GlobalEnumVars.UrlSharePageType.Goods && - page != (int)GlobalEnumVars.UrlSharePageType.Seckill && - page != (int)GlobalEnumVars.UrlSharePageType.Solitaire && - page != (int)GlobalEnumVars.UrlSharePageType.Group) - { - //走二维码分享 - return await getQr(url, res.otherData.ToString(), client); - } - //生成海报图片 - - var userId = UserHelper.GetUserIdByShareCode(userShareCode); - var user = await _userServices.QueryByClauseAsync(p => p.id == userId); - - var result = await Poster(url, res.otherData.ToString(), client, user); - return result; - } - #endregion - #region 页面分享UrlShare /// /// 页面分享 @@ -790,260 +747,5 @@ namespace CoreCms.Net.Services return jm; } #endregion - - /// - /// 渲染并生成海报图片 - /// - /// - /// - /// - /// - /// - public async Task Poster(string url, string code, int client, CoreCmsUser user) - { - var jm = new WebApiCallBack() { status = false, msg = "海报生成失败0" }; - - - var fileNameStr = CommonHelper.Md5For32(url + code + client) + CommonHelper.Msectime(); - //QrCode 根目录 - var dir = "/static/poster/"; - //文件虚拟目录 - var fileName = dir + fileNameStr + ".jpg"; - //文件硬地址 - var qrCodeDir = _webHostEnvironment.WebRootPath + dir; - //QrCode 根目录 - var pathFileName = qrCodeDir + fileNameStr + ".jpg"; - - //QrCode 根目录 - if (File.Exists(pathFileName)) - { - //有这个二维码了 - jm.status = true; - jm.msg = "海报获取成功"; - jm.data = _appInterFaceUrl + fileName; - } - else - { - //去生成 - var res = de_url(code); - if (!res.status) - { - jm.msg = "海报生成失败1"; - return res; - } - - var qrResult = await getQr(url, code, client); - if (!qrResult.status) - { - jm.msg = "海报生成失败2"; - return qrResult; - } - - var mkResult = await DoMark(res.data, qrResult.otherData.ToString(), fileName, user); - if (mkResult) - { - jm.status = true; - jm.msg = "海报生成成功"; - jm.data = _appInterFaceUrl + fileName; - } - jm.otherData = mkResult; - } - return jm; - } - - /// - /// 绘制图片 - /// - /// - /// 生成的二维码图片地址 - /// 海报文件名称 - /// 用户信息 - /// - public async Task DoMark(object data, string otherData, string fileNameStr, CoreCmsUser user) - { - var fileName = fileNameStr; - - //文件硬地址 - var savePath = _webHostEnvironment.WebRootPath + "/static/poster/"; - var qrCodeDir = _webHostEnvironment.WebRootPath + "/static/qrCode/weChat/" + otherData; - //如果文件夹不存在，则创建文件夹 - if (!Directory.Exists(savePath)) Directory.CreateDirectory(savePath); - - //获取数据来源 - var dataObj = JObject.FromObject(data); - if (!dataObj.ContainsKey("page") || dataObj["page"].ObjectToInt(0) <= 0) - { - return false; - } - //2商品详情页，3拼团详情页 - var page = dataObj["page"].ObjectToInt(0); - if (page is (int)GlobalEnumVars.UrlSharePageType.Goods or (int)GlobalEnumVars.UrlSharePageType.PinTuan or (int)GlobalEnumVars.UrlSharePageType.Seckill) - { - if (dataObj.ContainsKey("params")) - { - var paramsObj = JObject.FromObject(dataObj["params"]); - if (!paramsObj.ContainsKey("goodsId")) - { - return false; - } - var goodId = paramsObj["goodsId"].ObjectToInt(); - var goodModel = await _goodsServices.GetGoodsDetail(goodId); - if (goodModel != null) - { - var images = goodModel.images.Split(","); - if (images.Any()) - { - var image = images[0]; - //创建一个背景宽度为400X600的底图 - using var imageTemple = new SixLabors.ImageSharp.Image(400, 600); - //设置底图的背景色为白色 - imageTemple.Mutate(x => x.BackgroundColor(SixLabors.ImageSharp.Color.White)); - //绘制商品图片（网络下载图片） - HttpClient client = new HttpClient(); - HttpResponseMessage response = await client.GetAsync(image); - response.EnsureSuccessStatusCode(); - var stream = await response.Content.ReadAsStreamAsync(); - //载入下载的图片流2 - var imageThumbnail = await SixLabors.ImageSharp.Image.LoadAsync(stream); - //将下载的图片压缩至400X400 - imageThumbnail.Mutate(x => - { - x.Resize(400, 400); - }); - //将商品大图合并到背景图上 - imageTemple.Mutate(x => x.DrawImage(imageThumbnail, new SixLabors.ImageSharp.Point(0, 0), 1)); - //将用户的分享二维码合并大背景图上 - var imageQrcode = await SixLabors.ImageSharp.Image.LoadAsync(qrCodeDir); - //将二维码缩略至120X120 - imageQrcode.Mutate(x => - { - x.Resize(120, 120); - }); - //将二维码图片合并到背景图上 - imageTemple.Mutate(x => x.DrawImage(imageQrcode, new SixLabors.ImageSharp.Point(275, 420), 1)); - //构建字体//装载字体(ttf)（而且字体一定要支持简体中文的） - var fonts = new FontCollection(); - SixLabors.Fonts.FontFamily fontFamily = fonts.Install(_webHostEnvironment.WebRootPath + "/fonts/SourceHanSansK-Normal.ttf"); - //商品名称可能较长,设置为多行文本输出 - SixLabors.Fonts.Font titleFont = new SixLabors.Fonts.Font(fontFamily, 20, SixLabors.Fonts.FontStyle.Regular); - //多行文本输出 - var textOptions = new TextOptions() - { - ApplyKerning = true, - VerticalAlignment = VerticalAlignment.Top, - HorizontalAlignment = HorizontalAlignment.Left, - WrapTextWidth = 230 - }; - var graphicsOptions = new GraphicsOptions() - { - Antialias = true - }; - //沿着行尾的绕行路径绘制文本 - var options = new SixLabors.ImageSharp.Drawing.Processing.DrawingOptions - { - GraphicsOptions = graphicsOptions, - TextOptions = textOptions - }; - //开始绘制商品名称 - imageTemple.Mutate(ctx => ctx.DrawText(options, goodModel.name, titleFont, SixLabors.ImageSharp.Color.Red, new SixLabors.ImageSharp.PointF(10, 450))); - //绘制商品金额 - SixLabors.Fonts.Font moneyFont = new SixLabors.Fonts.Font(fontFamily, 18); - //获取该文件绘制所需的大小 - imageTemple.Mutate(ctx => ctx.DrawText("￥" + goodModel.price, moneyFont, SixLabors.ImageSharp.Color.Crimson, new SixLabors.ImageSharp.PointF(10, 410))); - //绘制提示语 - SixLabors.Fonts.Font tipsFont = new SixLabors.Fonts.Font(fontFamily, 10); - imageTemple.Mutate(ctx => ctx.DrawText("扫描或长按识别二维码", tipsFont, SixLabors.ImageSharp.Color.Black, new SixLabors.ImageSharp.PointF(283, 555))); - //载入流存储在到文件 - await imageTemple.SaveAsync(_webHostEnvironment.WebRootPath + fileName); - - return true; - } - - } - } - } - else if (page == (int)GlobalEnumVars.UrlSharePageType.Solitaire) - { - if (dataObj.ContainsKey("params")) - { - var paramsObj = JObject.FromObject(dataObj["params"]); - if (!paramsObj.ContainsKey("id")) - { - return false; - } - var id = paramsObj["id"].ObjectToInt(); - var solitaireModel = await _solitaireServices.QueryByClauseAsync(p => p.id == id); - if (solitaireModel != null && !string.IsNullOrEmpty(solitaireModel.thumbnail)) - { - //创建一个背景宽度为400X600的底图 - using var imageTemple = new SixLabors.ImageSharp.Image(400, 600); - //设置底图的背景色为白色 - imageTemple.Mutate(x => x.BackgroundColor(SixLabors.ImageSharp.Color.White)); - //绘制商品图片（网络下载图片） - HttpClient client = new HttpClient(); - HttpResponseMessage response = await client.GetAsync(solitaireModel.thumbnail); - response.EnsureSuccessStatusCode(); - var stream = await response.Content.ReadAsStreamAsync(); - //载入下载的图片流 - var imageThumbnail = await SixLabors.ImageSharp.Image.LoadAsync(stream); - //将下载的图片压缩至400X400 - imageThumbnail.Mutate(x => - { - x.Resize(400, 400); - }); - //将商品大图合并到背景图上 - imageTemple.Mutate(x => x.DrawImage(imageThumbnail, new SixLabors.ImageSharp.Point(0, 0), 1)); - //将用户的分享二维码合并大背景图上 - var imageQrcode = await SixLabors.ImageSharp.Image.LoadAsync(qrCodeDir); - //将二维码缩略至120X120 - imageQrcode.Mutate(x => - { - x.Resize(120, 120); - }); - //将二维码图片合并到背景图上 - imageTemple.Mutate(x => x.DrawImage(imageQrcode, new SixLabors.ImageSharp.Point(275, 420), 1)); - //构建字体//装载字体(ttf)（而且字体一定要支持简体中文的） - var fonts = new FontCollection(); - SixLabors.Fonts.FontFamily fontFamily = fonts.Install(_webHostEnvironment.WebRootPath + "/fonts/SourceHanSansK-Normal.ttf"); - //绘制商品名称 - SixLabors.Fonts.Font titleFont = new SixLabors.Fonts.Font(fontFamily, 20, SixLabors.Fonts.FontStyle.Regular); - //商品名称可能较长,设置为多行文本输出 - var textOptions = new TextOptions() - { - ApplyKerning = true, - VerticalAlignment = VerticalAlignment.Top, - HorizontalAlignment = HorizontalAlignment.Left, - WrapTextWidth = 230 - }; - var graphicsOptions = new GraphicsOptions() - { - Antialias = true - }; - //沿着行尾的绕行路径绘制文本 - var options = new SixLabors.ImageSharp.Drawing.Processing.DrawingOptions - { - GraphicsOptions = graphicsOptions, - TextOptions = textOptions - }; - //开始绘制商品名称 - imageTemple.Mutate(ctx => ctx.DrawText(options, solitaireModel.title, titleFont, SixLabors.ImageSharp.Color.Red, new SixLabors.ImageSharp.PointF(10, 450))); - //绘制商品金额 - SixLabors.Fonts.Font moneyFont = new SixLabors.Fonts.Font(fontFamily, 18); - //获取该文件绘制所需的大小 - //var size = TextMeasurer.Measure(moneyText, new RendererOptions(moneyFont)); - imageTemple.Mutate(ctx => ctx.DrawText("火热接龙中", moneyFont, SixLabors.ImageSharp.Color.Crimson, new SixLabors.ImageSharp.PointF(10, 410))); - //绘制提示语 - SixLabors.Fonts.Font tipsFont = new SixLabors.Fonts.Font(fontFamily, 10); - imageTemple.Mutate(ctx => ctx.DrawText("扫描或长按识别二维码", tipsFont, SixLabors.ImageSharp.Color.Black, new SixLabors.ImageSharp.PointF(283, 555))); - - //载入流存储在到文件 - await imageTemple.SaveAsync(_webHostEnvironment.WebRootPath + fileName); - - return true; - } - } - } - return false; - } } } diff --git a/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs b/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs index c8e0c6f5..b3f7ade1 100644 --- a/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs +++ b/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs @@ -84,7 +84,8 @@ namespace CoreCms.Net.Services request.Audit.Category.FirstCategoryId = entity.level1; request.Audit.Category.SecondCategoryId = entity.level2; request.Audit.Category.ThirdCategoryId = entity.level3; - request.Audit.Category.QualificationUrlList = entity.certificateImage.Split(",").ToList(); + request.Audit.Category.CertificateUrlList = entity.certificateImage.Split(",").ToList(); + //request.Audit.Category.QualificationUrlList = entity.certificateImage.Split(",").ToList(); var response = await client.ExecuteShopAuditAuditCategoryAsync(request); diff --git a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj index 40ec2442..8deb2843 100644 --- a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj +++ b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/CoreCms.Net.Task/CoreCms.Net.Task.csproj b/CoreCms.Net.Task/CoreCms.Net.Task.csproj index 5c0e9592..6509d243 100644 --- a/CoreCms.Net.Task/CoreCms.Net.Task.csproj +++ b/CoreCms.Net.Task/CoreCms.Net.Task.csproj @@ -1,12 +1,12 @@ - net6.0 + net7.0 - + diff --git a/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj b/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj index 50b70f18..e9084626 100644 --- a/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj +++ b/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/CoreCms.Net.Uni-App/CoreShop/App.vue b/CoreCms.Net.Uni-App/CoreShop/App.vue index 7c3b8ab9..b6b3211f 100644 --- a/CoreCms.Net.Uni-App/CoreShop/App.vue +++ b/CoreCms.Net.Uni-App/CoreShop/App.vue @@ -12,7 +12,7 @@ onLaunch() { // 此版本发布于2022-10-23 - const version = '0.6.4' + const version = '0.6.5' // 开发环境才提示，生产环境不会提示 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;'); diff --git a/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj b/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj index 6613a9c3..25c5f9c5 100644 --- a/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj +++ b/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj @@ -1,13 +1,12 @@ - net6.0 + net7.0 - - + diff --git a/CoreCms.Net.Utility/Hub/ChatHub.cs b/CoreCms.Net.Utility/Hub/ChatHub.cs deleted file mode 100644 index 605d19b2..00000000 --- a/CoreCms.Net.Utility/Hub/ChatHub.cs +++ /dev/null @@ -1,103 +0,0 @@ -/*********************************************************************** - * Project: CoreCms.Net * - * Web: https://CoreCms.Net * - * ProjectName: 核心内容管理系统 * - * Author: 大灰灰 * - * Email: JianWeie@163.com * - * CreateTime: 2020-09-06 23:39:37 - * Description: 暂无 - ***********************************************************************/ - - -using Microsoft.AspNetCore.SignalR; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace CoreCms.Net.Utility.Hub -{ - public class ChatHub : Hub - { - /// - /// 向指定群组发送信息 - /// - /// 组名 - /// 信息内容 - /// - public async Task SendMessageToGroupAsync(string groupName, string message) - { - await Clients.Group(groupName).ReceiveMessage(message); - } - - /// - /// 加入指定组 - /// - /// 组名 - /// - public async Task AddToGroup(string groupName) - { - await Groups.AddToGroupAsync(Context.ConnectionId, groupName); - } - - /// - /// 退出指定组 - /// - /// 组名 - /// - public async Task RemoveFromGroup(string groupName) - { - await Groups.RemoveFromGroupAsync(Context.ConnectionId, groupName); - } - - /// - /// 向指定成员发送信息 - /// - /// 成员名 - /// 信息内容 - /// - public async Task SendPrivateMessage(string user, string message) - { - await Clients.User(user).ReceiveMessage(message); - } - - /// - /// 当连接建立时运行 - /// - /// - public override Task OnConnectedAsync() - { - //TODO.. - return base.OnConnectedAsync(); - } - - /// - /// 当链接断开时运行 - /// - /// - /// - public override Task OnDisconnectedAsync(System.Exception ex) - { - //TODO.. - return base.OnDisconnectedAsync(ex); - } - - - public async Task SendMessage(string user, string message) - { - await Clients.All.ReceiveMessage(user, message); - } - - //定于一个通讯管道，用来管理我们和客户端的连接 - //1、客户端调用 GetLatestCount，就像订阅 - public async Task GetLatestCount(string random) - { - //2、服务端主动向客户端发送数据，名字千万不能错 - var dt = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - - await Clients.All.ReceiveUpdate(dt); - //3、客户端再通过 ReceiveUpdate ，来接收 - - } - } -} diff --git a/CoreCms.Net.Utility/Hub/IChatClient.cs b/CoreCms.Net.Utility/Hub/IChatClient.cs deleted file mode 100644 index 48b582ab..00000000 --- a/CoreCms.Net.Utility/Hub/IChatClient.cs +++ /dev/null @@ -1,38 +0,0 @@ -/*********************************************************************** - * Project: CoreCms.Net * - * Web: https://CoreCms.Net * - * ProjectName: 核心内容管理系统 * - * Author: 大灰灰 * - * Email: JianWeie@163.com * - * CreateTime: 2020-09-06 23:39:07 - * Description: 暂无 - ***********************************************************************/ - - -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace CoreCms.Net.Utility.Hub -{ - public interface IChatClient - { - /// - /// SignalR接收信息 - /// - /// 信息内容 - /// - Task ReceiveMessage(object message); - - /// - /// SignalR接收信息 - /// - /// 指定接收客户端 - /// 信息内容 - /// - Task ReceiveMessage(string user, string message); - - Task ReceiveUpdate(object message); - } -} diff --git a/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj b/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj index 9afe8782..023ed219 100644 --- a/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj +++ b/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj @@ -1,17 +1,17 @@ - net6.0 + net7.0 - - + + - + diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs index cc01e6f2..d387c132 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs @@ -1081,12 +1081,13 @@ namespace CoreCms.Net.Web.Admin.Controllers detailsStartNumber++; } //合并单元格（第几行，到第几行，第几列，到第几列） + var marId = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42 }; + if (order.items.Count <= 1) continue; foreach (var id in marId) { sheet1.AddMergedRegion(new CellRangeAddress(nowNumber + 1, detailsStartNumber, id, id)); } - } // 写入到excel @@ -1487,11 +1488,11 @@ namespace CoreCms.Net.Web.Admin.Controllers } //合并单元格（第几行，到第几行，第几列，到第几列） var marId = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42 }; + if (order.items.Count <= 1) continue; foreach (var id in marId) { sheet1.AddMergedRegion(new CellRangeAddress(nowNumber + 1, detailsStartNumber, id, id)); } - } // 写入到excel diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs index 418b9db1..39fb73ba 100644 --- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs @@ -389,7 +389,7 @@ namespace CoreCms.Net.Web.Admin.Controllers rowTemp0.CellStyle = commonCellStyle; var rowTemp1 = rowTemp.CreateCell(1); - rowTemp1.SetCellValue(listModel[i].serviceOrderId.ToString()); + rowTemp1.SetCellValue(listModel[i].serviceOrderId); rowTemp1.CellStyle = commonCellStyle; var rowTemp2 = rowTemp.CreateCell(2); @@ -409,7 +409,7 @@ namespace CoreCms.Net.Web.Admin.Controllers rowTemp5.CellStyle = commonCellStyle; var rowTemp6 = rowTemp.CreateCell(6); - rowTemp6.SetCellValue(listModel[i].paymentId.ToString()); + rowTemp6.SetCellValue(listModel[i].paymentId); rowTemp6.CellStyle = commonCellStyle; var rowTemp7 = rowTemp.CreateCell(7); @@ -607,7 +607,7 @@ namespace CoreCms.Net.Web.Admin.Controllers var rowTemp1 = rowTemp.CreateCell(1); - rowTemp1.SetCellValue(listModel[i].serviceOrderId.ToString()); + rowTemp1.SetCellValue(listModel[i].serviceOrderId); rowTemp1.CellStyle = commonCellStyle; @@ -637,7 +637,7 @@ namespace CoreCms.Net.Web.Admin.Controllers var rowTemp6 = rowTemp.CreateCell(6); - rowTemp6.SetCellValue(listModel[i].paymentId.ToString()); + rowTemp6.SetCellValue(listModel[i].paymentId); rowTemp6.CellStyle = commonCellStyle; @@ -1042,7 +1042,7 @@ namespace CoreCms.Net.Web.Admin.Controllers rowTemp0.CellStyle = commonCellStyle; var rowTemp1 = rowTemp.CreateCell(1); - rowTemp1.SetCellValue(listModel[i].serviceOrderId.ToString()); + rowTemp1.SetCellValue(listModel[i].serviceOrderId); rowTemp1.CellStyle = commonCellStyle; var rowTemp2 = rowTemp.CreateCell(2); @@ -1050,7 +1050,7 @@ namespace CoreCms.Net.Web.Admin.Controllers rowTemp2.CellStyle = commonCellStyle; var rowTemp3 = rowTemp.CreateCell(3); - rowTemp3.SetCellValue(listModel[i].redeemCode.ToString()); + rowTemp3.SetCellValue(listModel[i].redeemCode); rowTemp3.CellStyle = commonCellStyle; var rowTemp4 = rowTemp.CreateCell(4); diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj index 90b0775d..a6a67786 100644 --- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj +++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 zh-Hans false b93911e3-96d4-453b-aa87-357c154804c2 @@ -46,24 +46,24 @@ - - + + - - + + - - - - - - + + + + + + - - + + diff --git a/CoreCms.Net.Web.Admin/Program.cs b/CoreCms.Net.Web.Admin/Program.cs index 8af90917..2021abf3 100644 --- a/CoreCms.Net.Web.Admin/Program.cs +++ b/CoreCms.Net.Web.Admin/Program.cs @@ -54,9 +54,6 @@ builder.Services.AddSession(); // AutoMapper支持 builder.Services.AddAutoMapper(typeof(AutoMapperConfiguration)); -//使用 SignalR -builder.Services.AddSignalR(); - // 引入Payment 依赖注入(支付宝支付/微信支付) builder.Services.AddAlipay(); builder.Services.AddWeChatPay(); @@ -144,14 +141,10 @@ builder.Host.ConfigureContainer(containerBuilder => #endregion #region Nlog注册============================================================================ - -builder.Host.ConfigureLogging(logging => - { - logging.ClearProviders(); //移除已经注册的其他日志处理程序 - logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); //设置最小的日志级别 - }) - .UseNLog(); //NLog: Setup NLog for Dependency injection - +// NLog: Setup NLog for Dependency injection +builder.Logging.ClearProviders();//移除已经注册的其他日志处理程序 +builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); //设置最小的日志级别 +builder.Host.UseNLog(); #endregion @@ -175,8 +168,6 @@ app.UseRequestResponseLog(); app.UseRecordAccessLogsMildd(GlobalEnumVars.CoreShopSystemCategory.Admin.ToString()); // 记录ip请求 (注意开启权限，不然本地无法写入) app.UseIpLogMildd(); -// signalr -app.UseSignalRSendMildd(); #endregion @@ -223,17 +214,9 @@ app.UseAuthentication(); // 然后是授权中间件 app.UseAuthorization(); -app.UseEndpoints(endpoints => -{ - endpoints.MapControllerRoute( - "areas", - "{area:exists}/{controller=Default}/{action=Index}/{id?}" - ); - - endpoints.MapControllerRoute( - "default", - "{controller=Home}/{action=Index}/{id?}"); -}); +app.MapControllerRoute( + name: "default", + pattern: "{controller=Home}/{action=Index}/{id?}"); //设置默认起始页（如default.html） diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json index 9b35aed5..46964560 100644 --- a/CoreCms.Net.Web.Admin/appsettings.json +++ b/CoreCms.Net.Web.Admin/appsettings.json @@ -16,7 +16,7 @@ "AppConfig": { "AppUrl": "https://admin.test.pro.coreshop.cn/", //后端管理地址 "AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址 - "AppVersion": "CoreShopProfessional v0.6.4" + "AppVersion": "CoreShopProfessional v0.6.5" }, //redis为必须启动项，请保持redis为正常可用 "RedisConfig": { diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js index 48306ba0..bf3c8555 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js @@ -12,7 +12,7 @@ layui.define(['laytpl', 'layer', 'element', 'util'], function (exports) { , pageTabs: false //是否开启页面选项卡功能。单页版不推荐开启 , name: '核心商城系统' - , version: '0.6.4' + , version: '0.6.5' , tableName: 'CoreCms' //本地存储表名 , MOD_NAME: 'admin' //模块事件名 diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/agent/agentOrder/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/agent/agentOrder/index.html index beead119..095c2976 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/agent/agentOrder/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/agent/agentOrder/index.html @@ -68,12 +68,6 @@ - @@ -125,8 +119,6 @@ url: layui.setter.apiUrl + 'Api/CoreCmsAgentOrder/GetPageList', method: 'POST', toolbar: '#LAY-app-CoreCmsAgentOrder-toolbar', - pagebar: '#LAY-app-CoreCmsAgentOrder-pagebar', - className: 'pagebarbox', defaultToolbar: ['filter', 'print', 'exports'], height: 'full-127',//面包屑142px,搜索框4行172,3行137,2行102,1行67 page: true, @@ -174,18 +166,6 @@ //查看详情 doDetails(obj); }); - //头工具栏事件 - table.on('pagebar(LAY-app-CoreCmsAgentOrder-tableBox)', function (obj) { - var checkStatus = table.checkStatus(obj.config.id); - switch (obj.event) { - case 'selectExportExcel': - doSelectExportExcel(checkStatus); - break; - case 'queryExportExcel': - doQueryExportexcel(); - break; - }; - }); //监听工具条 table.on('tool(LAY-app-CoreCmsAgentOrder-tableBox)', function (obj) { @@ -228,46 +208,6 @@ layer.msg(e.msg); }); } - - //执行查询条件导出excel - function doQueryExportexcel() { - layer.confirm('确定根据当前的查询条件导出数据吗？', - function (index) { - var field = searchwhere; - coreHelper.PostForm("Api/CoreCmsAgentOrder/QueryExportExcel", field, function (e) { - if (debug) { console.log(e); } //开启调试返回数据 - if (e.code === 0) { - window.open(e.data); - } else { - layer.msg(e.msg); - } - }); - }); - } - //执行选择目录导出数据 - function doSelectExportExcel(checkStatus) { - var checkData = checkStatus.data; - if (checkData.length === 0) { - return layer.msg('请选择您要导出的数据'); - } - layer.confirm('确定导出选择的内容吗？', - function (index) { - var delidsStr = []; - layui.each(checkData, - function (index, item) { - delidsStr.push(item.id); - }); - layer.close(index); - coreHelper.Post("Api/CoreCmsAgentOrder/SelectExportExcel", { id: delidsStr }, function (e) { - if (debug) { console.log(e); } //开启调试返回数据 - if (e.code === 0) { - window.open(e.data); - } else { - layer.msg(e.msg); - } - }); - }); - } //监听 表格复选框操作 }); }; diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/financial/billpayments/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/financial/billpayments/index.html index 559b2d83..a27dde80 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/financial/billpayments/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/financial/billpayments/index.html @@ -254,7 +254,7 @@ var delidsStr = []; layui.each(checkData, function (index, item) { - delidsStr.push(item.id); + delidsStr.push(item.paymentId); }); layer.close(index); coreHelper.Post("Api/CoreCmsBillPayments/SelectExportExcel", { id: delidsStr }, function (e) { diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/index.html index 30c99a7f..8876baf3 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/index.html @@ -129,7 +129,7 @@ 基于框架 diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/index.html index e08a0585..e0418aa8 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/index.html @@ -168,7 +168,8 @@ }); //头工具栏事件 table.on('pagebar(LAY-app-CoreCmsBillAftersales-tableBox)', function (obj) { - var checkStatus = table.checkStatus(obj.config.aftersalesId); + console.log(obj); + var checkStatus = table.checkStatus(obj.config.id); switch (obj.event) { case 'selectExportExcel': doSelectExportExcel(checkStatus); @@ -308,6 +309,7 @@ } //执行选择目录导出数据 function doSelectExportExcel(checkStatus) { + console.log(checkStatus); var checkData = checkStatus.data; if (checkData.length === 0) { return layer.msg('请选择您要导出的数据'); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/billreship/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/billreship/index.html index ac155d98..17372baf 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/order/billreship/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/billreship/index.html @@ -168,7 +168,7 @@ }); //头工具栏事件 table.on('pagebar(LAY-app-CoreCmsBillReship-tableBox)', function (obj) { - var checkStatus = table.checkStatus(obj.config.reshipId); + var checkStatus = table.checkStatus(obj.config.id); switch (obj.event) { case 'selectExportExcel': doSelectExportExcel(checkStatus); @@ -262,7 +262,7 @@ var delidsStr = []; layui.each(checkData, function (index, item) { - delidsStr.push(item.id); + delidsStr.push(item.reshipId); }); layer.close(index); coreHelper.Post("Api/CoreCmsBillReship/SelectExportExcel", { id: delidsStr }, function (e) { diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/user/wechatuserinfo/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/user/wechatuserinfo/index.html index a9d06197..eec165f9 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/user/wechatuserinfo/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/user/wechatuserinfo/index.html @@ -57,12 +57,6 @@ - @@ -109,7 +103,6 @@ url: layui.setter.apiUrl + 'Api/CoreCmsUserWeChatInfo/GetPageList', method: 'POST', toolbar: '#LAY-app-CoreCmsUserWeChatInfo-toolbar', - pagebar: '#LAY-app-CoreCmsUserWeChatInfo-pagebar', css: [ '.layui-table-page{text-align: right;}' ,'.layui-table-pagebar{float: left;}' diff --git a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs index 4eccded4..0d765689 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/UserController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/UserController.cs @@ -727,7 +727,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers } else if (entity.type == (int)GlobalEnumVars.ShareType.Poster) //海报 { - //jm = await _shareServices.PosterShare(entity.client, entity.page, userShareCode, entity.url, entity.@params); + //取消海报后台生成渲染，统一改成生成二维码，前端渲染 jm = await _shareServices.QrShare(entity.client, entity.page, userShareCode, entity.url, entity.@params); } diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj index 848dd207..39a8e7bf 100644 --- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj +++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 zh-Hans false 077906fd-e490-4431-9bae-c3a48ae21992 @@ -50,22 +50,23 @@ - - + + - + - + - - + + + - + diff --git a/CoreCms.Net.Web.WebApi/Doc.xml b/CoreCms.Net.Web.WebApi/Doc.xml index a8f3bdd3..ecbf5fb0 100644 --- a/CoreCms.Net.Web.WebApi/Doc.xml +++ b/CoreCms.Net.Web.WebApi/Doc.xml @@ -181,7 +181,7 @@ 签到控制器 - + 构造函数 @@ -255,13 +255,10 @@ 优惠券接口 - + 构造函数 - - - @@ -481,7 +478,7 @@ 团购调用接口数据 - + 构造函数 @@ -528,7 +525,7 @@ 订单调用接口数据 - + 构造函数 @@ -563,6 +560,12 @@ + + + 订单预览 + + + 获取订单不同状态的数量 @@ -646,7 +649,7 @@ - + 获取用户购买记录 @@ -757,7 +760,7 @@ 构造函数 - + 拼团列表 @@ -1449,61 +1452,5 @@ - - - 启动类 - - - - - 启动配置 - - - - - - 创建启动支撑 - - - - - - - 启动配置 - - - - - 构造函数 - - - - - - - 配置属性 - - - - - web环境 - - - - This method gets called by the runtime. Use this method to add services to the container. - - - - Autofac规则配置 - - - - - - This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - - - - diff --git a/CoreCms.Net.Web.WebApi/NLog.config b/CoreCms.Net.Web.WebApi/NLog.config index 1a2906c7..42eb752b 100644 --- a/CoreCms.Net.Web.WebApi/NLog.config +++ b/CoreCms.Net.Web.WebApi/NLog.config @@ -14,7 +14,7 @@ dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456" --> - + INSERT INTO SysNLogRecords (LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod diff --git a/CoreCms.Net.Web.WebApi/Program.cs b/CoreCms.Net.Web.WebApi/Program.cs index 6908e97f..ed27b477 100644 --- a/CoreCms.Net.Web.WebApi/Program.cs +++ b/CoreCms.Net.Web.WebApi/Program.cs @@ -59,9 +59,6 @@ builder.Services.AddAutoMapper(typeof(AutoMapperConfiguration)); //MediatR（只需要注册一个,同项目或类库下就不需要注册多个） builder.Services.AddMediatR(typeof(TextMessageEventCommand).Assembly); -//使用 SignalR -builder.Services.AddSignalR(); - //Redis消息队列 builder.Services.AddRedisMessageQueueSetup(); @@ -155,14 +152,10 @@ builder.Host.ConfigureContainer(containerBuilder => #endregion #region Nlog注册============================================================================ - -builder.Host.ConfigureLogging(logging => -{ - logging.ClearProviders(); //移除已经注册的其他日志处理程序 - logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); //设置最小的日志级别 -}) - .UseNLog(); //NLog: Setup NLog for Dependency injection - +// NLog: Setup NLog for Dependency injection +builder.Logging.ClearProviders();//移除已经注册的其他日志处理程序 +builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); //设置最小的日志级别 +builder.Host.UseNLog(); #endregion @@ -186,8 +179,6 @@ app.UseRequestResponseLog(); app.UseRecordAccessLogsMildd(GlobalEnumVars.CoreShopSystemCategory.Api.ToString()); // 记录ip请求 (注意开启权限，不然本地无法写入) app.UseIpLogMildd(); -// signalr -app.UseSignalRSendMildd(); #endregion @@ -274,17 +265,9 @@ app.UseAuthentication(); // 然后是授权中间件 app.UseAuthorization(); -app.UseEndpoints(endpoints => -{ - endpoints.MapControllerRoute( - "areas", - "{area:exists}/{controller=Default}/{action=Index}/{id?}" - ); - - endpoints.MapControllerRoute( - "default", - "{controller=Home}/{action=Index}/{id?}"); -}); +app.MapControllerRoute( + name: "default", + pattern: "{controller=Home}/{action=Index}/{id?}"); //设置默认起始页（如default.html） diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json index 9b35aed5..46964560 100644 --- a/CoreCms.Net.Web.WebApi/appsettings.json +++ b/CoreCms.Net.Web.WebApi/appsettings.json @@ -16,7 +16,7 @@ "AppConfig": { "AppUrl": "https://admin.test.pro.coreshop.cn/", //后端管理地址 "AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址 - "AppVersion": "CoreShopProfessional v0.6.4" + "AppVersion": "CoreShopProfessional v0.6.5" }, //redis为必须启动项，请保持redis为正常可用 "RedisConfig": { diff --git a/CoreCms.Net.Web.WebApi/wwwroot/index.html b/CoreCms.Net.Web.WebApi/wwwroot/index.html index b2755e0a..4010ec6d 100644 --- a/CoreCms.Net.Web.WebApi/wwwroot/index.html +++ b/CoreCms.Net.Web.WebApi/wwwroot/index.html @@ -31,8 +31,8 @@
注意事项：

1、以上组件地址支持自定义调整，投产环境下请及时修改或屏蔽；投产环境下可删除此展示页面。

-

2、『Swagger接口文档』访问路径修改位置为：【Startup.cs】文件第206行左右【代码：c.RoutePrefix = "doc"】，请将doc修改为其他虚拟路径。

-

3、『HangFire定时任务』面板路径修改位置为：【Startup.cs】文件第256行左右【代码：app.UseHangfireDashboard("/job", options);】，请将job修改为其他虚拟路径。

+

2、『Swagger接口文档』访问路径修改位置为：【Program.cs】文件第205行左右【代码：c.RoutePrefix = "doc"】，请将doc修改为其他虚拟路径。

+

3、『HangFire定时任务』面板路径修改位置为：【Program.cs】文件第240行左右【代码：app.UseHangfireDashboard("/job", hangfireOptions);】，请将job修改为其他虚拟路径。

4、『HangFire定时任务』初始登录账号密码均为：【CoreShop】，修改位置为：【appsettings.json】文件，代码中【HangFire】节点。

5、如果无法访问接口，请检查【1、数据库配置是否正常】【2、Redis是否配置正常并可正常链接使用】【3、Mysql数据库请保持5.7+版本】【4、站点日志文件夹写入权限】。

6、如果第三方请求接口服务获取不到数据，Debug提示【Access-Control-Allow-Origin】的错误，表示为跨域问题，请打开【appsettings.json】文件在【Cors】节点设置请求白名单。