diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs index 4a9fb0ec..91f434fc 100644 --- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs +++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs @@ -209,7 +209,7 @@ namespace CoreCms.Net.Configuration di.Add(SystemSettingConstVars.FilesStoragePath, new DictionaryKeyValues() { sKey = "存储路径", sValue = "/upload/" }); di.Add(SystemSettingConstVars.FilesStorageFileSuffix, new DictionaryKeyValues() { sKey = "文件后缀类型", sValue = "gif,jpg,jpeg,png,bmp,xls,xlsx,doc,pdf,mp4,WebM,Ogv" }); di.Add(SystemSettingConstVars.FilesStorageFileMaxSize, new DictionaryKeyValues() { sKey = "文件最大大小", sValue = "10" }); - di.Add(SystemSettingConstVars.FilesStorageBucketBindUrl, new DictionaryKeyValues() { sKey = "云存储绑定域名", sValue = "https://www.corecms.net/" }); + di.Add(SystemSettingConstVars.FilesStorageBucketBindUrl, new DictionaryKeyValues() { sKey = "绑定域名", sValue = "https://www.corecms.net/" }); di.Add(SystemSettingConstVars.FilesStorageAccessKeyId, new DictionaryKeyValues() { sKey = "云存储授权账户", sValue = "" }); di.Add(SystemSettingConstVars.FilesStorageAccessKeySecret, new DictionaryKeyValues() { sKey = "云存储授权密钥", sValue = "" }); di.Add(SystemSettingConstVars.FilesStorageTencentAccountId, new DictionaryKeyValues() { sKey = "腾讯云账户标识", sValue = "" }); diff --git a/CoreCms.Net.Services/Com/ToolsServices.cs b/CoreCms.Net.Services/Com/ToolsServices.cs index e938b937..410386ed 100644 --- a/CoreCms.Net.Services/Com/ToolsServices.cs +++ b/CoreCms.Net.Services/Com/ToolsServices.cs @@ -141,7 +141,8 @@ namespace CoreCms.Net.Services string bucketBindDomain = string.Empty; if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.Admin) { - bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + //bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + bucketBindDomain = !string.IsNullOrEmpty(options.BucketBindUrl) ? options.BucketBindUrl : AppSettingsConstVars.AppConfigAppUrl; } else if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.API) { @@ -317,7 +318,9 @@ namespace CoreCms.Net.Services string bucketBindDomain = string.Empty; if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.Admin) { - bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + //bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + bucketBindDomain = !string.IsNullOrEmpty(options.BucketBindUrl) ? options.BucketBindUrl : AppSettingsConstVars.AppConfigAppUrl; + ; } else if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.API) { diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html index a0b69d07..4740f766 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html @@ -40,14 +40,6 @@
- 发货相关 --
佣金通道@@ -667,6 +652,16 @@
+ 关闭后,个人中心将不显示【邀请好友】按钮及【天天分钱】板块通道。 ++
佣金设置(当不开启三级分销时候,推广好友三级统一返现比例)@@ -749,14 +744,15 @@
+ 发货相关 ++