GithubStar/CoreShop
1
0
Fork 0
mirror of https://github.com/CoreUnion/CoreShop.git synced 2026-10-17 05:12:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

!86 修复腾讯云cos存储未调用bucket问题。

Browse Source 
* 【后端】修复腾讯云cos存储未调用bucket问题。#I42DF0
* Merge branch 'develop' into dahuihui/develop
* 启用新域名及演示平台
* Merge branch 'develop' into dahuihui/develop
* Merge branch 'develop' into dahuihui/develop
* 调整说明
* Merge branch 'develop' into dahuihui/develop
* 删除不需要的菜单
* 修复域名转发获取ip地址长度过长问题。
* 1、【后端】调整全局错误返回提示语。2、【数据库】修复20日删除3个表后，未清理干净问题。
* Merge branch 'develop' into dahuihui/develop
* Merge branch 'develop' into dahuihui/develop
* 调整全局错误返回提示语
* 修复商品批量处理报错的问题并优化展示界面。#I3X8PP
* Merge branch 'develop' into dahuihui/develop
* Merge branch 'develop' into dahuihui/develop
* 增加过滤敏感词的功能。#I3W6CM
* 增加Issue 和 Pull Request 模板
* 修复自定义上传路径上传至站点根目录，而非wwwroot的问题 #I41TD1
* Merge branch 'develop' into dahuihui/develop
* 修复自定义上传路径的表单命名异常问题
* 使用新数据库
* 【数据库】修复mysql数据库decimal类型未带小数的问题。#I3WAUY
* 更新数据库及脚本
* 2021-07-20
* Merge branch 'develop' into dahuihui/develop
* 修复webapi不进入调试断点的问题。
* Merge branch 'develop' into dahuihui/develop
* 修复后台前后端分离table面板启用自定义域名问题。
* 修复后台前后端分离域名未增加到html问题。
* Merge branch 'develop' into dahuihui/develop
* 【后端】修复修改登录用户真实姓名长度问题。
* 修复后台管理配送方式维护错误问题
* 1、修复小程序注册问题，导致交互事情。不然盛派的组件有bug，在不注册微信公众号只注册微信小程序的时候，进行小程序消息操作，默认还是走的是微…
* 修复消息模板不推送的问题
* Merge branch 'develop' into dahuihui/develop
* Merge branch 'develop' into dahuihui/develop
* 修复过期失效文档
* 调整代码生成器，增加初始化事务
* 调整接口端提示界面
* 修复弹窗不居中问题
* 调整一些命名方式
* 修复uni-app前端，用户订单列表【确认收货】按钮失效问题
* 1、修复mysql数据库下,报表统计sql的语法错误。2、为方便前端在不部署接口及后端的情况下测试uni-app前端，默认增加了测试接口地址…
* Merge branch 'develop' into dahuihui/develop
* 调整命名
* 增加docker-compose部署
* Merge branch 'develop' into dahuihui/develop
* 修复因linux下存在数据与文件名称大小写不对应，导致找不到数据库表的问题，特重新发布一份表名与实体名称一一对应脚本。
* 新mysql表名存在大小写问题
This commit is contained in:
大灰灰
2021-07-26 05:15:12 +00:00
parent 994b658d92
commit e95f3785ef
8 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CoreCms.Net.Configuration/GlobalEnumVars.cs
+1 -1
View File
@@ -103,7 +103,7 @@ namespace CoreCms.Net.Configuration
LocalStorage = 0,
[Description("阿里云OSS")]
AliYunOSS = 1,
[Description("腾讯云OSS")]
[Description("腾讯云COS")]
QCloudOSS = 2,
}
CoreCms.Net.Configuration/SystemSettingConstVars.cs
+4
View File
@@ -631,6 +631,10 @@ namespace CoreCms.Net.Configuration
/// 腾讯云存储桶地域
/// </summary>
public static readonly string FilesStorageTencentCosRegion = "filesStorageTencentCosRegion";
/// <summary>
/// 腾讯云存储桶名称
/// </summary>
public static readonly string FilesStorageTencentBucketName = "filesStorageTencentBucketName";
/// <summary>
/// 阿里云节点
CoreCms.Net.Configuration/SystemSettingDictionary.cs
+2 -1
View File
@@ -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" });
CoreCms.Net.Model/ViewModels/Options/FilesStorageOptions.cs
+6
View File
@@ -36,6 +36,12 @@ namespace CoreCms.Net.Model.ViewModels.Options
/// </summary>
public string CosRegion { get; set; }
/// <summary>
/// 存储桶名称（腾讯云）
/// </summary>
public string TencentBucketName { get; set; }
/// <summary>
/// 授权账户
/// </summary>
CoreCms.Net.Services/Shop/CoreCmsSettingServices.cs
+1
View File
@@ -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);
CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs
+8 -8
View File
@@ -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);
CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
+6
View File
@@ -591,6 +591,12 @@
<input type="text" name="filesStorageTencentCosRegion" value="{{d.data.configs['filesStorageTencentCosRegion']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">{{d.data.configs['filesStorageTencentBucketName']['sKey']}}：</label>
<div class="layui-input-inline layui-inline-10">
<input type="text" name="filesStorageTencentBucketName" value="{{d.data.configs['filesStorageTencentBucketName']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">
</div>
</div>
</div>
<div id="aliyun">
<div class="layui-form-item">
CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
+2 -2
View File
@@ -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;