From e95f3785eff7bc0a2158b7a84d13a7d1756810f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Mon, 26 Jul 2021 05:15:12 +0000 Subject: [PATCH] =?UTF-8?q?!86=20=E4=BF=AE=E5=A4=8D=E8=85=BE=E8=AE=AF?= =?UTF-8?q?=E4=BA=91cos=E5=AD=98=E5=82=A8=E6=9C=AA=E8=B0=83=E7=94=A8bucket?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=20*=20=E3=80=90=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E8=85=BE=E8=AE=AF=E4=BA=91cos?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=9C=AA=E8=B0=83=E7=94=A8bucket=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82#I42DF0=20*=20Merge=20branch=20'develop'=20in?= =?UTF-8?q?to=20dahuihui/develop=20*=20=E5=90=AF=E7=94=A8=E6=96=B0?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E5=8F=8A=E6=BC=94=E7=A4=BA=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=20*=20Merge=20branch=20'develop'=20into=20dahuihui/develop=20*?= =?UTF-8?q?=20Merge=20branch=20'develop'=20into=20dahuihui/develop=20*=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=B4=E6=98=8E=20*=20Merge=20branch=20'de?= =?UTF-8?q?velop'=20into=20dahuihui/develop=20*=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E8=8F=9C=E5=8D=95=20*=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9F=9F=E5=90=8D=E8=BD=AC=E5=8F=91=E8=8E=B7?= =?UTF-8?q?=E5=8F=96ip=E5=9C=B0=E5=9D=80=E9=95=BF=E5=BA=A6=E8=BF=87?= =?UTF-8?q?=E9=95=BF=E9=97=AE=E9=A2=98=E3=80=82=20*=201=E3=80=81=E3=80=90?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E3=80=91=E8=B0=83=E6=95=B4=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E3=80=822=E3=80=81=E3=80=90=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D20=E6=97=A5=E5=88=A0=E9=99=A43?= =?UTF-8?q?=E4=B8=AA=E8=A1=A8=E5=90=8E=EF=BC=8C=E6=9C=AA=E6=B8=85=E7=90=86?= =?UTF-8?q?=E5=B9=B2=E5=87=80=E9=97=AE=E9=A2=98=E3=80=82=20*=20Merge=20bra?= =?UTF-8?q?nch=20'develop'=20into=20dahuihui/develop=20*=20Merge=20branch?= =?UTF-8?q?=20'develop'=20into=20dahuihui/develop=20*=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=20*=20=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B9=B6=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E3=80=82#I3X8PP=20*=20Merge=20branch=20'deve?= =?UTF-8?q?lop'=20into=20dahuihui/develop=20*=20Merge=20branch=20'develop'?= =?UTF-8?q?=20into=20dahuihui/develop=20*=20=E5=A2=9E=E5=8A=A0=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=95=8F=E6=84=9F=E8=AF=8D=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=82#I3W6CM=20*=20=E5=A2=9E=E5=8A=A0Issue=20=E5=92=8C=20Pu?= =?UTF-8?q?ll=20Request=20=E6=A8=A1=E6=9D=BF=20*=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=87=B3=E7=AB=99=E7=82=B9=E6=A0=B9=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E8=80=8C=E9=9D=9Ewwwroot=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20#I41TD1=20*=20Merge=20branch=20'develop'=20into=20d?= =?UTF-8?q?ahuihui/develop=20*=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=91=BD=E5=90=8D=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20*=20=E4=BD=BF=E7=94=A8=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=20*=20=E3=80=90=E6=95=B0=E6=8D=AE=E5=BA=93=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dmysql=E6=95=B0=E6=8D=AE=E5=BA=93decimal=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9C=AA=E5=B8=A6=E5=B0=8F=E6=95=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82#I3WAUY=20*=20=E6=9B=B4=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=8F=8A=E8=84=9A=E6=9C=AC=20*=202021-07-20?= =?UTF-8?q?=20*=20Merge=20branch=20'develop'=20into=20dahuihui/develop=20*?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dwebapi=E4=B8=8D=E8=BF=9B=E5=85=A5=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E6=96=AD=E7=82=B9=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=20*=20Merge=20branch=20'develop'=20into=20dahuihui/develop=20*?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E5=89=8D=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E5=88=86=E7=A6=BBtable=E9=9D=A2=E6=9D=BF=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=9F=E5=90=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82=20*=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E5=88=86=E7=A6=BB=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E6=9C=AA=E5=A2=9E=E5=8A=A0=E5=88=B0html=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82=20*=20Merge=20branch=20'develop'=20into=20dahuihui/de?= =?UTF-8?q?velop=20*=20=E3=80=90=E5=90=8E=E7=AB=AF=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E9=95=BF=E5=BA=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82=20*=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=85=8D=E9=80=81=E6=96=B9=E5=BC=8F=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=20*=201=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E4=BA=8B=E6=83=85=E3=80=82=E4=B8=8D=E7=84=B6=E7=9B=9B=E6=B4=BE?= =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6=E6=9C=89bug=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E4=B8=8D=E6=B3=A8=E5=86=8C=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E5=8F=AA=E6=B3=A8=E5=86=8C=E5=BE=AE=E4=BF=A1=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B6=88=E6=81=AF=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=98=E6=98=AF=E8=B5=B0?= =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=BE=AE=E2=80=A6=20*=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E6=9D=BF=E4=B8=8D=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20*=20Merge=20branch=20'develop'=20?= =?UTF-8?q?into=20dahuihui/develop=20*=20Merge=20branch=20'develop'=20into?= =?UTF-8?q?=20dahuihui/develop=20*=20=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E6=96=87=E6=A1=A3=20*=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BA=8B=E5=8A=A1=20*=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3=E7=AB=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=20*=20=E4=BF=AE=E5=A4=8D=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E4=B8=8D=E5=B1=85=E4=B8=AD=E9=97=AE=E9=A2=98=20*=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=80=E4=BA=9B=E5=91=BD=E5=90=8D=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=20*=20=E4=BF=AE=E5=A4=8Duni-app=E5=89=8D=E7=AB=AF=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=90?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E3=80=91=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=20*=201=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dmysql=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=8B,=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E7=BB=9F=E8=AE=A1sql=E7=9A=84=E8=AF=AD=E6=B3=95?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=822=E3=80=81=E4=B8=BA=E6=96=B9?= =?UTF-8?q?=E4=BE=BF=E5=89=8D=E7=AB=AF=E5=9C=A8=E4=B8=8D=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=8A=E5=90=8E=E7=AB=AF=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E6=B5=8B=E8=AF=95uni-app=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=E2=80=A6=20*=20Me?= =?UTF-8?q?rge=20branch=20'develop'=20into=20dahuihui/develop=20*=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=91=BD=E5=90=8D=20*=20=E5=A2=9E=E5=8A=A0do?= =?UTF-8?q?cker-compose=E9=83=A8=E7=BD=B2=20*=20Merge=20branch=20'develop'?= =?UTF-8?q?=20into=20dahuihui/develop=20*=20=E4=BF=AE=E5=A4=8D=E5=9B=A0lin?= =?UTF-8?q?ux=E4=B8=8B=E5=AD=98=E5=9C=A8=E6=95=B0=E6=8D=AE=E4=B8=8E?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=A4=A7=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E5=BA=94=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E7=89=B9=E9=87=8D=E6=96=B0=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=B8=80=E4=BB=BD=E8=A1=A8=E5=90=8D=E4=B8=8E=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E5=90=8D=E7=A7=B0=E4=B8=80=E4=B8=80=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E3=80=82=20*=20=E6=96=B0mysql=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E5=AD=98=E5=9C=A8=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Configuration/GlobalEnumVars.cs | 2 +- .../SystemSettingConstVars.cs | 4 ++++ .../SystemSettingDictionary.cs | 3 ++- .../ViewModels/Options/FilesStorageOptions.cs | 6 ++++++ .../Shop/CoreCmsSettingServices.cs | 1 + .../Controllers/Com/ToolsController.cs | 16 ++++++++-------- .../wwwroot/views/shop/setting/index.html | 6 ++++++ .../Controllers/CommonController.cs | 4 ++-- 8 files changed, 30 insertions(+), 12 deletions(-) diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs index fbf4dec..3aa035e 100644 --- a/CoreCms.Net.Configuration/GlobalEnumVars.cs +++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs @@ -103,7 +103,7 @@ namespace CoreCms.Net.Configuration LocalStorage = 0, [Description("阿里云OSS")] AliYunOSS = 1, - [Description("腾讯云OSS")] + [Description("腾讯云COS")] QCloudOSS = 2, } diff --git a/CoreCms.Net.Configuration/SystemSettingConstVars.cs b/CoreCms.Net.Configuration/SystemSettingConstVars.cs index 6dc2b5b..3d8bf81 100644 --- a/CoreCms.Net.Configuration/SystemSettingConstVars.cs +++ b/CoreCms.Net.Configuration/SystemSettingConstVars.cs @@ -631,6 +631,10 @@ namespace CoreCms.Net.Configuration /// 腾讯云存储桶地域 /// public static readonly string FilesStorageTencentCosRegion = "filesStorageTencentCosRegion"; + /// + /// 腾讯云存储桶名称 + /// + public static readonly string FilesStorageTencentBucketName = "filesStorageTencentBucketName"; /// /// 阿里云节点 diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs index c925976..479bd50 100644 --- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs +++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs @@ -182,7 +182,8 @@ namespace CoreCms.Net.Configuration di.Add(SystemSettingConstVars.FilesStorageAccessKeyId, new DictionaryKeyValues() { sKey = "云存储授权账户", sValue = "" }); di.Add(SystemSettingConstVars.FilesStorageAccessKeySecret, new DictionaryKeyValues() { sKey = "云存储授权密钥", sValue = "" }); di.Add(SystemSettingConstVars.FilesStorageTencentAccountId, new DictionaryKeyValues() { sKey = "腾讯云账户标识", sValue = "" }); - di.Add(SystemSettingConstVars.FilesStorageTencentCosRegion, new DictionaryKeyValues() { sKey = "腾讯云存储桶地域", sValue = "" }); + di.Add(SystemSettingConstVars.FilesStorageTencentCosRegion, new DictionaryKeyValues() { sKey = "腾讯云桶地域", sValue = "" }); + di.Add(SystemSettingConstVars.FilesStorageTencentBucketName, new DictionaryKeyValues() { sKey = "腾讯云桶名称", sValue = "" }); di.Add(SystemSettingConstVars.FilesStorageAliYunEndpoint, new DictionaryKeyValues() { sKey = "阿里云节点", sValue = "https://oss-cn-shenzhen.aliyuncs.com" }); di.Add(SystemSettingConstVars.FilesStorageAliYunBucketName, new DictionaryKeyValues() { sKey = "阿里云桶名称", sValue = "CoreShop" }); diff --git a/CoreCms.Net.Model/ViewModels/Options/FilesStorageOptions.cs b/CoreCms.Net.Model/ViewModels/Options/FilesStorageOptions.cs index 067c866..6f72956 100644 --- a/CoreCms.Net.Model/ViewModels/Options/FilesStorageOptions.cs +++ b/CoreCms.Net.Model/ViewModels/Options/FilesStorageOptions.cs @@ -36,6 +36,12 @@ namespace CoreCms.Net.Model.ViewModels.Options /// public string CosRegion { get; set; } + /// + /// 存储桶名称（腾讯云） + /// + public string TencentBucketName { get; set; } + + /// /// 授权账户 /// diff --git a/CoreCms.Net.Services/Shop/CoreCmsSettingServices.cs b/CoreCms.Net.Services/Shop/CoreCmsSettingServices.cs index ed7aedb..5dcd21c 100644 --- a/CoreCms.Net.Services/Shop/CoreCmsSettingServices.cs +++ b/CoreCms.Net.Services/Shop/CoreCmsSettingServices.cs @@ -186,6 +186,7 @@ namespace CoreCms.Net.Services //腾讯云 filesStorageOptions.AccountId = GetValue(SystemSettingConstVars.FilesStorageTencentAccountId, configs, settings); filesStorageOptions.CosRegion = GetValue(SystemSettingConstVars.FilesStorageTencentCosRegion, configs, settings); + filesStorageOptions.TencentBucketName = GetValue(SystemSettingConstVars.FilesStorageTencentBucketName, configs, settings); //阿里云 filesStorageOptions.BucketName = GetValue(SystemSettingConstVars.FilesStorageAliYunBucketName, configs, settings); filesStorageOptions.Endpoint = GetValue(SystemSettingConstVars.FilesStorageAliYunEndpoint, configs, settings); diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs index 80e7e62..91c5019 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs @@ -452,7 +452,7 @@ namespace CoreCms.Net.Web.Admin.Controllers string appid = _filesStorageOptions.AccountId;//设置腾讯云账户的账户标识 APPID string region = _filesStorageOptions.CosRegion; //设置一个默认的存储桶地域 CosXmlConfig config = new CosXmlConfig.Builder() - .SetAppid(appid) + //.SetAppid(appid) .IsHttps(true) //设置默认 HTTPS 请求 .SetRegion(region) //设置一个默认的存储桶地域 .SetDebugLog(true) //显示日志 @@ -470,7 +470,7 @@ namespace CoreCms.Net.Web.Admin.Controllers } var cosXml = new CosXmlServer(config, qCloudCredentialProvider); - COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(_filesStorageOptions.BucketName, filePath, bytes); + COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(_filesStorageOptions.TencentBucketName, filePath, bytes); cosXml.PutObject(putObjectRequest); jm.code = 0; @@ -582,7 +582,7 @@ namespace CoreCms.Net.Web.Admin.Controllers string appid = _filesStorageOptions.AccountId;//设置腾讯云账户的账户标识 APPID string region = _filesStorageOptions.CosRegion; //设置一个默认的存储桶地域 CosXmlConfig config = new CosXmlConfig.Builder() - .SetAppid(appid) + //.SetAppid(appid) .IsHttps(true) //设置默认 HTTPS 请求 .SetRegion(region) //设置一个默认的存储桶地域 .SetDebugLog(true) //显示日志 @@ -596,7 +596,7 @@ namespace CoreCms.Net.Web.Admin.Controllers var cosXml = new CosXmlServer(config, qCloudCredentialProvider); var filePath = _filesStorageOptions.Path + today + "/" + newFileName; //云文件保存路径 - COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(_filesStorageOptions.BucketName, filePath, bytes); + COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(_filesStorageOptions.TencentBucketName, filePath, bytes); cosXml.PutObject(putObjectRequest); @@ -715,7 +715,7 @@ namespace CoreCms.Net.Web.Admin.Controllers string appid = _filesStorageOptions.AccountId;//设置腾讯云账户的账户标识 APPID string region = _filesStorageOptions.CosRegion; //设置一个默认的存储桶地域 CosXmlConfig config = new CosXmlConfig.Builder() - .SetAppid(appid) + //.SetAppid(appid) .IsHttps(true) //设置默认 HTTPS 请求 .SetRegion(region) //设置一个默认的存储桶地域 .SetDebugLog(true) //显示日志 @@ -733,7 +733,7 @@ namespace CoreCms.Net.Web.Admin.Controllers } var cosXml = new CosXmlServer(config, qCloudCredentialProvider); - COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(_filesStorageOptions.BucketName, filePath, bytes); + COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(_filesStorageOptions.TencentBucketName, filePath, bytes); cosXml.PutObject(putObjectRequest); jm.uploaded = 1; @@ -867,7 +867,7 @@ namespace CoreCms.Net.Web.Admin.Controllers string appid = _filesStorageOptions.AccountId;//设置腾讯云账户的账户标识 APPID string region = _filesStorageOptions.CosRegion; //设置一个默认的存储桶地域 CosXmlConfig config = new CosXmlConfig.Builder() - .SetAppid(appid) + //.SetAppid(appid) .IsHttps(true) //设置默认 HTTPS 请求 .SetRegion(region) //设置一个默认的存储桶地域 .SetDebugLog(true) //显示日志 @@ -883,7 +883,7 @@ namespace CoreCms.Net.Web.Admin.Controllers byte[] bytes = memStream.ToArray(); var filePath = "Upload/QrCode/" + today + "/" + newFileName; //云文件保存路径 - COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(_filesStorageOptions.BucketName, filePath, bytes); + COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(_filesStorageOptions.TencentBucketName, filePath, bytes); cosXml.PutObject(putObjectRequest); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html index 90dbc9d..aebf040 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html @@ -591,6 +591,12 @@ +
+ +
+ +
+
diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs index 75c1fb0..8c929ba 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs @@ -363,7 +363,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers string appid = filesStorageOptions.AccountId;//设置腾讯云账户的账户标识 APPID string region = filesStorageOptions.CosRegion; //设置一个默认的存储桶地域 CosXmlConfig config = new CosXmlConfig.Builder() - .SetAppid(appid) + //.SetAppid(appid) .IsHttps(true) //设置默认 HTTPS 请求 .SetRegion(region) //设置一个默认的存储桶地域 .SetDebugLog(true) //显示日志 @@ -381,7 +381,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers } var cosXml = new CosXmlServer(config, qCloudCredentialProvider); - COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(filesStorageOptions.BucketName, filePath, bytes); + COSXML.Model.Object.PutObjectRequest putObjectRequest = new COSXML.Model.Object.PutObjectRequest(filesStorageOptions.TencentBucketName, filePath, bytes); cosXml.PutObject(putObjectRequest); jm.code = 0;