Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into net6.0

Browse Source
This commit is contained in:
不做码农
2022-04-10 10:55:53 +08:00
parent 973c3281b2 75bcc57608
commit 66458d7ce1
24 changed files with 87 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ZR.Service/System/SysFileService.cs
View File

@@ -23,11 +23,11 @@ namespace ZR.Service.System
public class SysFileService : BaseService<SysFile>, ISysFileService
{
private string domainUrl = AppSettings.GetConfig("ALIYUN_OSS:domainUrl");
private readonly SysFileRepository SysFileRepository;
private readonly ISysConfigService SysConfigService;
private OptionsSetting OptionsSetting;
public SysFileService(SysFileRepository repository, IOptions<OptionsSetting> options)
public SysFileService(ISysConfigService sysConfigService, IOptions<OptionsSetting> options)
{
SysFileRepository = repository;
SysConfigService = sysConfigService;
OptionsSetting = options.Value;
}
@@ -53,7 +53,8 @@ namespace ZR.Service.System
{
await formFile.CopyToAsync(stream);//await 不能少
}
string accessPath = string.Concat(OptionsSetting.Upload.UploadUrl, "/", filePath.Replace("\\", "/"), "/", fileName);
string uploadUrl = SysConfigService.GetSysConfigByKey("sys.file.uploadUrl")?.ConfigValue ?? OptionsSetting.Upload.UploadUrl;
string accessPath = string.Concat(uploadUrl, "/", filePath.Replace("\\", "/"), "/", fileName);
SysFile file = new(formFile.FileName, fileName, fileExt, fileSize + "kb", filePath, userName)
{
StoreType = (int)Infrastructure.Enums.StoreType.LOCAL,