From 648592ab0ef27f950a417ea84030b31feb658dc2 Mon Sep 17 00:00:00 2001 From: jianweie code Date: Thu, 28 Nov 2024 22:54:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=A1=86=E6=9E=B6=E5=88=B0as?= =?UTF-8?q?p.net=209=E7=89=88=E6=9C=AC=EF=BC=8C=E6=89=93=E5=8C=85=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEv0.75=E7=89=88=E6=9C=AC=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E3=80=82.net8=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=88=87=E5=85=A5=E5=88=B0=E5=88=86=E6=94=AF=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 | 15 ++++++----- CoreCms.Net.DTO/CoreCms.Net.DTO.csproj | 2 +- CoreCms.Net.Filter/CoreCms.Net.Filter.csproj | 2 +- .../CoreCms.Net.IRepository.csproj | 2 +- .../CoreCms.Net.IServices.csproj | 6 ++--- CoreCms.Net.Loging/CoreCms.Net.Loging.csproj | 4 +-- .../CoreCms.Net.Mapping.csproj | 2 +- .../CoreCms.Net.Middlewares.csproj | 6 ++++- CoreCms.Net.Model/CoreCms.Net.Model.csproj | 6 ++--- .../CoreCms.Net.RedisMQ.csproj | 8 +++--- .../CoreCms.Net.Repository.csproj | 7 ++--- .../CoreCms.Net.Services.csproj | 17 ++++++------ .../CoreCms.Net.Swagger.csproj | 4 +-- CoreCms.Net.Task/CoreCms.Net.Task.csproj | 7 ++--- .../CoreCms.Net.Uni-App.csproj | 2 +- CoreCms.Net.Uni-App/CoreShop/App.vue | 2 +- .../CoreCms.Net.Utility.csproj | 4 +-- .../CoreCms.Net.WeChat.Service.csproj | 8 +++--- .../CoreCms.Net.Web.Admin.csproj | 25 ++++++++--------- CoreCms.Net.Web.Admin/appsettings.json | 2 +- .../wwwroot/lib/layuiAdmin/config.js | 2 +- .../CoreCms.Net.Web.WebApi.csproj | 27 ++++++++++--------- CoreCms.Net.Web.WebApi/appsettings.json | 2 +- 27 files changed, 98 insertions(+), 88 deletions(-) diff --git a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj index cb447269..953cb24a 100644 --- a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj +++ b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj @@ -1,12 +1,12 @@ - net8.0 + net9.0 - - + + diff --git a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj index 62851c91..7c7a8004 100644 --- a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj +++ b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj @@ -1,14 +1,14 @@ - net8.0 + net9.0 - - - + + + diff --git a/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj b/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj index 5768355a..ee8e871a 100644 --- a/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj +++ b/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 @@ -47,7 +47,7 @@ - + diff --git a/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj b/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj index 540f6422..16b42467 100644 --- a/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj +++ b/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj @@ -1,13 +1,13 @@ - net8.0 + net9.0 - - + + diff --git a/CoreCms.Net.Core/CoreCms.Net.Core.csproj b/CoreCms.Net.Core/CoreCms.Net.Core.csproj index 26135df7..a7f5d930 100644 --- a/CoreCms.Net.Core/CoreCms.Net.Core.csproj +++ b/CoreCms.Net.Core/CoreCms.Net.Core.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 @@ -14,19 +14,20 @@ - - - + + + - + - - + + + diff --git a/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj b/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj index 938d50a9..9c8aa1e7 100644 --- a/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj +++ b/CoreCms.Net.DTO/CoreCms.Net.DTO.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 disable enable diff --git a/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj b/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj index 89b57695..9dfeecad 100644 --- a/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj +++ b/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 diff --git a/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj b/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj index c9dcb387..b12e7a57 100644 --- a/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj +++ b/CoreCms.Net.IRepository/CoreCms.Net.IRepository.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 diff --git a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj index 8b6fa923..da400090 100644 --- a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj +++ b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj @@ -1,12 +1,12 @@ - net8.0 + net9.0 - - + + diff --git a/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj b/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj index 6cce29b4..70cad9e0 100644 --- a/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj +++ b/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj @@ -1,11 +1,11 @@ - net8.0 + net9.0 - + diff --git a/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj b/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj index 8da34540..223d34df 100644 --- a/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj +++ b/CoreCms.Net.Mapping/CoreCms.Net.Mapping.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 diff --git a/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj b/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj index bce39ae7..2aa07d32 100644 --- a/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj +++ b/CoreCms.Net.Middlewares/CoreCms.Net.Middlewares.csproj @@ -1,9 +1,13 @@ - net8.0 + net9.0 + + + + diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.csproj b/CoreCms.Net.Model/CoreCms.Net.Model.csproj index f4de9f2a..63d914dd 100644 --- a/CoreCms.Net.Model/CoreCms.Net.Model.csproj +++ b/CoreCms.Net.Model/CoreCms.Net.Model.csproj @@ -1,14 +1,14 @@ - net8.0 + net9.0 True CoreCms.Net.Model.xml - - + + diff --git a/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj b/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj index 8dd72dd9..65532511 100644 --- a/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj +++ b/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj @@ -1,14 +1,14 @@ - net8.0 + net9.0 - - + + - + diff --git a/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj b/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj index 17a3e7dd..7868e8f6 100644 --- a/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj +++ b/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj @@ -1,12 +1,13 @@ - net8.0 + net9.0 - - + + + diff --git a/CoreCms.Net.Services/CoreCms.Net.Services.csproj b/CoreCms.Net.Services/CoreCms.Net.Services.csproj index 12e26b59..e61f4f1e 100644 --- a/CoreCms.Net.Services/CoreCms.Net.Services.csproj +++ b/CoreCms.Net.Services/CoreCms.Net.Services.csproj @@ -1,22 +1,23 @@ - net8.0 + net9.0 - + - - + + - - - + + + - + + diff --git a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj index 856f2e1f..6fec1f01 100644 --- a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj +++ b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj @@ -1,12 +1,12 @@ - net8.0 + net9.0 - + diff --git a/CoreCms.Net.Task/CoreCms.Net.Task.csproj b/CoreCms.Net.Task/CoreCms.Net.Task.csproj index 996582f1..09132afd 100644 --- a/CoreCms.Net.Task/CoreCms.Net.Task.csproj +++ b/CoreCms.Net.Task/CoreCms.Net.Task.csproj @@ -1,12 +1,13 @@ - net8.0 + net9.0 - - + + + diff --git a/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj b/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj index e5e16272..403e7cd9 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 @@ - net8.0 + net9.0 diff --git a/CoreCms.Net.Uni-App/CoreShop/App.vue b/CoreCms.Net.Uni-App/CoreShop/App.vue index 47c757ed..b3453d61 100644 --- a/CoreCms.Net.Uni-App/CoreShop/App.vue +++ b/CoreCms.Net.Uni-App/CoreShop/App.vue @@ -12,7 +12,7 @@ onLaunch(() => { getShopConfigV2(); /** 版本设置 */ - const version = '0.7.4' + const version = '0.7.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 1e6de4e2..728a7e35 100644 --- a/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj +++ b/CoreCms.Net.Utility/CoreCms.Net.Utility.csproj @@ -1,13 +1,13 @@ - net8.0 + net9.0 - + diff --git a/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj b/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj index c985fca2..3fae826b 100644 --- a/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj +++ b/CoreCms.Net.WeChat.Service/CoreCms.Net.WeChat.Service.csproj @@ -1,15 +1,15 @@ - net8.0 + net9.0 - - + + - + diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj index 18a85554..7b83f4f3 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 @@ - net8.0 + net9.0 zh-Hans false b93911e3-96d4-453b-aa87-357c154804c2 @@ -46,28 +46,29 @@ - + - - + + - - - + + + - + - + - - + + - + + diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json index 710538f4..021ce525 100644 --- a/CoreCms.Net.Web.Admin/appsettings.json +++ b/CoreCms.Net.Web.Admin/appsettings.json @@ -22,7 +22,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.7.4" + "AppVersion": "CoreShopProfessional v0.7.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 78296d9d..e330f339 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js @@ -24,7 +24,7 @@ layui.define(['all'], function (exports) { refreshCurrPage: true, // 当跳转页面 url 与当前页 url 相同时，是否自动执行刷新 name: '核心商城系统', - version: 'CoreShopProfessional v0.7.4', + version: 'CoreShopProfessional v0.7.5', 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 3f02097c..52619bd0 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 @@ - net8.0 + net9.0 zh-Hans false 077906fd-e490-4431-9bae-c3a48ae21992 @@ -50,30 +50,31 @@ - + - - - - - + + + + + - - - + + + - + - + - + + diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json index a7aefcac..012b0ae9 100644 --- a/CoreCms.Net.Web.WebApi/appsettings.json +++ b/CoreCms.Net.Web.WebApi/appsettings.json @@ -26,7 +26,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.7.4" + "AppVersion": "CoreShopProfessional v0.7.5" }, //redis为必须启动项，请保持redis为正常可用 "RedisConfig": {