mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-05-09 12:07:21 +08:00
【升级】升级Asp.Net 6.0.11 到 Asp.Net 7.0.0
【升级】升级所有组建包，移除一些不用或者版本弃用的组建。 【优化】优化升级npoi最新版后，出现导出数据兼容性的问题。 【优化】使用新的【NLog.Database】nlog数据库链接组件,解决nlog升级到5.x以后版本记录到数据库日志失败的问题。
This commit is contained in:
大灰灰
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
|
||||
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
|
||||
<UserSecretsId>077906fd-e490-4431-9bae-c3a48ae21992</UserSecretsId>
|
||||
@@ -50,22 +50,23 @@
|
||||
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
|
||||
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
|
||||
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.0.12" />
|
||||
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.0.12" />
|
||||
<PackageReference Include="Essensoft.Paylink.Alipay" Version="4.0.14" />
|
||||
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.0.14" />
|
||||
<PackageReference Include="Hangfire" Version="1.7.31" />
|
||||
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.31" />
|
||||
<PackageReference Include="Hangfire.Core" Version="1.7.31" />
|
||||
<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
|
||||
<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.8.6" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" />
|
||||
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.0" />
|
||||
<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
|
||||
<PackageReference Include="NLog" Version="4.7.15" />
|
||||
<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
|
||||
<PackageReference Include="NLog" Version="5.0.5" />
|
||||
<PackageReference Include="NLog.Database" Version="5.0.5" />
|
||||
<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.5" />
|
||||
<PackageReference Include="Snowflake.Core" Version="2.0.0" />
|
||||
<PackageReference Include="StackExchange.Redis" Version="2.6.66" />
|
||||
<PackageReference Include="StackExchange.Redis" Version="2.6.70" />
|
||||
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.32" />
|
||||
<PackageReference Include="ToolGood.Words" Version="3.0.3.1" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -181,7 +181,7 @@
|
||||
签到控制器
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.CheckInController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsUserCheckInDetailsServices)">
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.CheckInController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsUserCheckInDetailsServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository)">
|
||||
<summary>
|
||||
构造函数
|
||||
</summary>
|
||||
@@ -255,13 +255,10 @@
|
||||
优惠券接口
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.CouponController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsCouponServices,CoreCms.Net.IServices.ICoreCmsPromotionServices)">
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.CouponController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsCouponServices,CoreCms.Net.IServices.ICoreCmsPromotionServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository)">
|
||||
<summary>
|
||||
构造函数
|
||||
</summary>
|
||||
<param name="user"></param>
|
||||
<param name="couponServices"></param>
|
||||
<param name="promotionServices"></param>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.CouponController.CouponList(CoreCms.Net.Model.FromBody.FMCouponForUserCouponPost)">
|
||||
<summary>
|
||||
@@ -481,7 +478,7 @@
|
||||
团购调用接口数据
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.GroupController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsPromotionServices,CoreCms.Net.IServices.ICoreCmsGoodsServices)">
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.GroupController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsPromotionServices)">
|
||||
<summary>
|
||||
构造函数
|
||||
</summary>
|
||||
@@ -528,7 +525,7 @@
|
||||
订单调用接口数据
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillReshipServices,CoreCms.Net.IServices.ICoreCmsShipServices,CoreCms.Net.IServices.ICoreCmsBillDeliveryServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsGoodsServices,CoreCms.Net.IServices.ICoreCmsStoreServices,CoreCms.Net.IServices.ICoreCmsOrderDistributionModelServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository)">
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillReshipServices,CoreCms.Net.IServices.ICoreCmsShipServices,CoreCms.Net.IServices.ICoreCmsBillDeliveryServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsGoodsServices,CoreCms.Net.IServices.ICoreCmsStoreServices,CoreCms.Net.IServices.ICoreCmsOrderDistributionModelServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices)">
|
||||
<summary>
|
||||
构造函数
|
||||
</summary>
|
||||
@@ -563,6 +560,12 @@
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.CheckOrderIsPaid(CoreCms.Net.Model.FromBody.FMStringId)">
|
||||
<summary>
|
||||
订单预览
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.GetOrderStatusNum(CoreCms.Net.Model.ViewModels.DTO.GetOrderStatusNumPost)">
|
||||
<summary>
|
||||
获取订单不同状态的数量
|
||||
@@ -646,7 +649,7 @@
|
||||
<param name="entity"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.PageController.GetRecod(CoreCms.Net.Model.FromBody.FMGetRecodPost)">
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.PageController.GetRecord(CoreCms.Net.Model.FromBody.FMGetRecodPost)">
|
||||
<summary>
|
||||
获取用户购买记录
|
||||
</summary>
|
||||
@@ -757,7 +760,7 @@
|
||||
构造函数
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.PinTuanController.GetList">
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Controllers.PinTuanController.GetList(CoreCms.Net.Model.FromBody.FMPageByIntId)">
|
||||
<summary>
|
||||
拼团列表
|
||||
</summary>
|
||||
@@ -1449,61 +1452,5 @@
|
||||
</summary>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:CoreCms.Net.Web.WebApi.Program">
|
||||
<summary>
|
||||
启动类
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Program.Main(System.String[])">
|
||||
<summary>
|
||||
启动配置
|
||||
</summary>
|
||||
<param name="args"></param>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Program.CreateHostBuilder(System.String[])">
|
||||
<summary>
|
||||
创建启动支撑
|
||||
</summary>
|
||||
<param name="args"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:CoreCms.Net.Web.WebApi.Startup">
|
||||
<summary>
|
||||
启动配置
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Startup.#ctor(Microsoft.Extensions.Configuration.IConfiguration,Microsoft.AspNetCore.Hosting.IWebHostEnvironment)">
|
||||
<summary>
|
||||
构造函数
|
||||
</summary>
|
||||
<param name="configuration"></param>
|
||||
<param name="env"></param>
|
||||
</member>
|
||||
<member name="P:CoreCms.Net.Web.WebApi.Startup.Configuration">
|
||||
<summary>
|
||||
配置属性
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:CoreCms.Net.Web.WebApi.Startup.Env">
|
||||
<summary>
|
||||
web环境
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Startup.ConfigureServices(Microsoft.Extensions.DependencyInjection.IServiceCollection)">
|
||||
This method gets called by the runtime. Use this method to add services to the container.
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Startup.ConfigureContainer(Autofac.ContainerBuilder)">
|
||||
<summary>
|
||||
Autofac规则配置
|
||||
</summary>
|
||||
<param name="builder"></param>
|
||||
</member>
|
||||
<member name="M:CoreCms.Net.Web.WebApi.Startup.Configure(Microsoft.AspNetCore.Builder.IApplicationBuilder,Microsoft.AspNetCore.Hosting.IWebHostEnvironment)">
|
||||
<summary>
|
||||
This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
|
||||
</summary>
|
||||
<param name="app"></param>
|
||||
<param name="env"></param>
|
||||
</member>
|
||||
</members>
|
||||
</doc>
|
||||
|
||||
@@ -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"
|
||||
-->
|
||||
<target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;uid=CoreShop;pwd=CoreShop;Database=CoreShop;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;">
|
||||
<target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;uid=CoreShopProfessional;pwd=CoreShopProfessional;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;">
|
||||
<commandText>
|
||||
INSERT INTO SysNLogRecords
|
||||
(LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod
|
||||
|
||||
@@ -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>(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）
|
||||
|
||||
@@ -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": {
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
<br />
|
||||
<span class="zhuyi">注意事项：</span><br />
|
||||
<p>1、以上组件地址支持自定义调整，投产环境下请及时修改或屏蔽；投产环境下可删除此展示页面。</p>
|
||||
<p>2、『Swagger接口文档』访问路径修改位置为：【Startup.cs】文件第206行左右【代码：c.RoutePrefix = "doc"】，请将doc修改为其他虚拟路径。</p>
|
||||
<p>3、『HangFire定时任务』面板路径修改位置为：【Startup.cs】文件第256行左右【代码：app.UseHangfireDashboard("/job", options);】，请将job修改为其他虚拟路径。</p>
|
||||
<p>2、『Swagger接口文档』访问路径修改位置为：【Program.cs】文件第205行左右【代码：c.RoutePrefix = "doc"】，请将doc修改为其他虚拟路径。</p>
|
||||
<p>3、『HangFire定时任务』面板路径修改位置为：【Program.cs】文件第240行左右【代码：app.UseHangfireDashboard("/job", hangfireOptions);】，请将job修改为其他虚拟路径。</p>
|
||||
<p>4、『HangFire定时任务』初始登录账号密码均为：【CoreShop】，修改位置为：【appsettings.json】文件，代码中【HangFire】节点。</p>
|
||||
<p>5、如果无法访问接口，请检查【1、数据库配置是否正常】【2、Redis是否配置正常并可正常链接使用】【3、Mysql数据库请保持5.7+版本】【4、站点日志文件夹写入权限】。</p>
|
||||
<p>6、如果第三方请求接口服务获取不到数据，Debug提示【Access-Control-Allow-Origin】的错误，表示为跨域问题，请打开【appsettings.json】文件在【Cors】节点设置请求白名单。</p>
|
||||
|
||||
Reference in New Issue
Block a user