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;