diff --git a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj
index b5de19af..310cfca5 100644
--- a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj
+++ b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj
index 709d49c0..ac65b84d 100644
--- a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj
+++ b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj
@@ -5,10 +5,10 @@
-
+
-
-
+
+
diff --git a/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj b/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj
index cf636365..af88d6c6 100644
--- a/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj
+++ b/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj b/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj
index f8ef6b4a..07fa2969 100644
--- a/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj
+++ b/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/CoreCms.Net.Core/CoreCms.Net.Core.csproj b/CoreCms.Net.Core/CoreCms.Net.Core.csproj
index 920db07c..b3b5c14a 100644
--- a/CoreCms.Net.Core/CoreCms.Net.Core.csproj
+++ b/CoreCms.Net.Core/CoreCms.Net.Core.csproj
@@ -11,23 +11,23 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj b/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj
index 594ddb9d..39a59d0c 100644
--- a/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj
+++ b/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj b/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj
index b6a6e804..3dd0f38e 100644
--- a/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj
+++ b/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj b/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj
index f72618fd..084f0a17 100644
--- a/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj
+++ b/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.csproj b/CoreCms.Net.Model/CoreCms.Net.Model.csproj
index 3df6b0ce..dd98de68 100644
--- a/CoreCms.Net.Model/CoreCms.Net.Model.csproj
+++ b/CoreCms.Net.Model/CoreCms.Net.Model.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj b/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj
index 86538f08..8e840210 100644
--- a/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj
+++ b/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj b/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj
index 7c1f1c29..bef2b547 100644
--- a/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj
+++ b/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs b/CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs
index 66e50109..5822d2ca 100644
--- a/CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs
+++ b/CoreCms.Net.Services/Bill/CoreCmsBillDeliveryServices.cs
@@ -24,7 +24,6 @@ using CoreCms.Net.Model.ViewModels.DTO;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Utility.Helper;
using Flurl.Http;
-using Google.Protobuf.WellKnownTypes;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Newtonsoft.Json;
diff --git a/CoreCms.Net.Services/CoreCms.Net.Services.csproj b/CoreCms.Net.Services/CoreCms.Net.Services.csproj
index 69774345..b8969705 100644
--- a/CoreCms.Net.Services/CoreCms.Net.Services.csproj
+++ b/CoreCms.Net.Services/CoreCms.Net.Services.csproj
@@ -11,13 +11,13 @@
-
-
+
+
-
-
+
+
diff --git a/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs b/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs
index b3f7ade1..873e5ff2 100644
--- a/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs
+++ b/CoreCms.Net.Services/WeChat/WeChatTransactionComponentAuditCategoryServices.cs
@@ -154,7 +154,7 @@ namespace CoreCms.Net.Services
await _dal.UpdateAsync(p => new WeChatTransactionComponentAuditCategory()
{
status = response.Data.Status,
- brandId = response.Data.BrandId,
+ brandId = (int)response.Data.BrandId,
rejectReason = response.Data.RejectReason
}, p => p.id == entity.id);
}
diff --git a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj
index 8deb2843..934a8b2e 100644
--- a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj
+++ b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/CoreCms.Net.Task/CoreCms.Net.Task.csproj b/CoreCms.Net.Task/CoreCms.Net.Task.csproj
index 6509d243..47fb7a14 100644
--- a/CoreCms.Net.Task/CoreCms.Net.Task.csproj
+++ b/CoreCms.Net.Task/CoreCms.Net.Task.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/CoreCms.Net.Uni-App/CoreShop/App.vue b/CoreCms.Net.Uni-App/CoreShop/App.vue
index b0639160..f71ba7cc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/App.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/App.vue
@@ -11,7 +11,7 @@
},
onLaunch() {
//版本设置
- const version = '0.6.7'
+ const version = '0.6.8'
// 开发环境才提示，生产环境不会提示
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 8c3bb097..1560cd37 100644
--- a/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj
+++ b/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj
@@ -5,10 +5,10 @@
-
-
-
-
+
+
+
+
diff --git a/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj b/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj
index 023ed219..512d57db 100644
--- a/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj
+++ b/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj
@@ -5,13 +5,12 @@
-
-
+
-
-
-
+
+
+
diff --git a/CoreCms.Net.WeChat.Service/Mediator/TransactionComponent/OpenProductBrandAuditEventCommandHandler.cs b/CoreCms.Net.WeChat.Service/Mediator/TransactionComponent/OpenProductBrandAuditEventCommandHandler.cs
index 75e79eed..d5197472 100644
--- a/CoreCms.Net.WeChat.Service/Mediator/TransactionComponent/OpenProductBrandAuditEventCommandHandler.cs
+++ b/CoreCms.Net.WeChat.Service/Mediator/TransactionComponent/OpenProductBrandAuditEventCommandHandler.cs
@@ -66,7 +66,7 @@ namespace CoreCms.Net.WeChat.Service.Mediator
{
status = request.EventObj.EventData.Status,
rejectReason = request.EventObj.EventData.RejectReason,
- brandId = request.EventObj.EventData.BrandId,
+ brandId = (int)request.EventObj.EventData.BrandId,
}, p => p.audit_id == request.EventObj.EventData.AuditId);
var log = new WeChatTransactionComponentBrandAuditLog();
@@ -74,7 +74,7 @@ namespace CoreCms.Net.WeChat.Service.Mediator
log.status = request.EventObj.EventData.Status;
log.audit_type = request.EventObj.EventData.AuditType;
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;
var id = await _logServices.InsertAsync(log);
diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
index c500ad90..509ebbef 100644
--- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
+++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj
@@ -49,32 +49,32 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json
index 6d7512ee..a888fbb5 100644
--- a/CoreCms.Net.Web.Admin/appsettings.json
+++ b/CoreCms.Net.Web.Admin/appsettings.json
@@ -18,7 +18,7 @@
"AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址
"AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址
"AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
- "AppVersion": "CoreShopProfessional v0.6.7"
+ "AppVersion": "CoreShopProfessional v0.6.8"
},
//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 b2447b52..7ed27ff3 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js
+++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js
@@ -23,7 +23,7 @@ layui.define(['all'], function (exports) {
pageTabs: false, // 是否开启页面选项卡功能。单页版不推荐开启
name: '核心商城系统',
- version: 'CoreShopProfessional v0.6.7',
+ version: 'CoreShopProfessional v0.6.8',
name: 'layuiAdmin',
tableName: 'CoreShop', // 本地存储表名
MOD_NAME: 'admin', // 模块事件名
diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj
index 765293f1..17ff2e0b 100644
--- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj
+++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj
@@ -53,31 +53,31 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
index 2e25ba61..aa751869 100644
--- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
+++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
@@ -518,6 +518,23 @@
+
+
+ 小程序内置直播功能
+
+
+
+
+ 构造函数
+
+
+
+
+
+ 获取直播间列表和回放
+
+
+
公告控制器
diff --git a/CoreCms.Net.Web.WebApi/Program.cs b/CoreCms.Net.Web.WebApi/Program.cs
index 418639cc..92464028 100644
--- a/CoreCms.Net.Web.WebApi/Program.cs
+++ b/CoreCms.Net.Web.WebApi/Program.cs
@@ -59,7 +59,7 @@ builder.Services.AddSession();
builder.Services.AddAutoMapper(typeof(AutoMapperConfiguration));
//MediatR（只需要注册一个,同项目或类库下就不需要注册多个）
-builder.Services.AddMediatR(typeof(TextMessageEventCommand).Assembly);
+builder.Services.AddMediatR(cfg => cfg.RegisterServicesFromAssembly(typeof(TextMessageEventCommand).Assembly));
//Redis消息队列
builder.Services.AddRedisMessageQueueSetup();
diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json
index 6d7512ee..a888fbb5 100644
--- a/CoreCms.Net.Web.WebApi/appsettings.json
+++ b/CoreCms.Net.Web.WebApi/appsettings.json
@@ -18,7 +18,7 @@
"AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址
"AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址
"AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
- "AppVersion": "CoreShopProfessional v0.6.7"
+ "AppVersion": "CoreShopProfessional v0.6.8"
},
//redis为必须启动项，请保持redis为正常可用
"RedisConfig": {