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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
不做码农
2022-03-24 21:06:01 +08:00
parent a88fd3a18d 92711679b3
commit ed0404590f
23 changed files with 2105 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ZR.Service/System/IService/ISysFileService.cs
View File

@@ -19,19 +19,21 @@ namespace ZR.Service.System.IService
/// <param name="rootPath"></param>
/// <param name="userName"></param>
/// <returns>文件对象</returns>
Task<SysFile> SaveFileLocal(string rootPath, string fileName, string fileDir, string userName, IFormFile formFile);
(bool, string, string) SaveFile(string picdir, IFormFile formFile, string customFileName, string bucketName);
Task<SysFile> SaveFileToLocal(string rootPath, string fileName, string fileDir, string userName, IFormFile formFile);
Task<SysFile> SaveFileToAliyun(SysFile file, IFormFile formFile);
/// <summary>
/// 按时间来创建文件夹
/// </summary>
/// <param name="path"></param>
/// <param name="byTimeStore"></param>
/// <returns>eg: 2020/11/3</returns>
string GetdirPath(string path = "");
string GetdirPath(string path = "", bool byTimeStore = true);
/// <summary>
/// 取文件名的MD5值(16位)
/// </summary>
/// <param name="name">文件名，不包括扩展名</param>
/// <param name="str">文件名，不包括扩展名</param>
/// <returns></returns>
string HashFileName(string str = null);
}

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

@@ -35,13 +35,12 @@ namespace ZR.Service.System
/// 存储本地
/// </summary>
/// <returns></returns>
public async Task<SysFile> SaveFileLocal(string rootPath, string fileName, string fileDir, string userName, IFormFile formFile)
public async Task<SysFile> SaveFileToLocal(string rootPath, string fileName, string fileDir, string userName, IFormFile formFile)
{
string fileExt = Path.GetExtension(formFile.FileName);
string hashFileName = FileUtil.HashFileName();
fileName = (fileName.IsEmpty() ? hashFileName : fileName) + fileExt;
fileName = (fileName.IsEmpty() ? HashFileName() : fileName) + fileExt;
fileDir = fileDir.IsEmpty() ? "uploads" : fileDir;
string filePath = FileUtil.GetdirPath(fileDir);
string filePath = GetdirPath(fileDir);
string finalFilePath = Path.Combine(rootPath, filePath, fileName);
double fileSize = Math.Round(formFile.Length / 1024.0, 2);
@@ -68,37 +67,39 @@ namespace ZR.Service.System
/// <summary>
/// 上传文件到阿里云
/// </summary>
/// <param name="picdir">文件夹</param>
/// <param name="file"></param>
/// <param name="formFile"></param>
/// <param name="customFileName">自定义文件名</param>
/// <param name="bucketName">存储桶</param>
/// <returns></returns>
public (bool, string, string) SaveFile(string picdir, IFormFile formFile, string customFileName, string bucketName)
public async Task<SysFile> SaveFileToAliyun(SysFile file, IFormFile formFile)
{
// eg: uploads/2020/08/18
//string dir = GetdirPath(picdir.ToString());
file.FileName = (file.FileName.IsEmpty() ? HashFileName() : file.FileName) + file.FileExt;
file.StorePath = GetdirPath(file.StorePath);
string finalPath = Path.Combine(file.StorePath, file.FileName);
HttpStatusCode statusCode = AliyunOssHelper.PutObjectFromFile(formFile.OpenReadStream(), finalPath, "");
if (statusCode != HttpStatusCode.OK) return file;
string tempName = customFileName.IsEmpty() ? HashFileName() : customFileName;
string fileExt = Path.GetExtension(formFile.FileName);
string fileName = tempName + fileExt;
string webUrl = string.Concat(domainUrl, "/", picdir, "/", fileName);
file.StorePath = file.StorePath;
file.FileUrl = finalPath;
file.AccessUrl = string.Concat(domainUrl, "/", file.StorePath.Replace("\\", "/"), "/", file.FileName);
file.Id = await InsertFile(file);
HttpStatusCode statusCode = AliyunOssHelper.PutObjectFromFile(formFile.OpenReadStream(), Path.Combine(picdir, fileName), bucketName);
return (statusCode == HttpStatusCode.OK, webUrl, fileName);
return file;
}
public string GetdirPath(string path = "")
/// <summary>
/// 获取文件存储目录
/// </summary>
/// <param name="storePath"></param>
/// <param name="byTimeStore">是否按年月日存储</param>
/// <returns></returns>
public string GetdirPath(string storePath = "", bool byTimeStore = true)
{
DateTime date = DateTime.Now;
int year = date.Year;
int month = date.Month;
int day = date.Day;
//int hour = date.Hour;
string timeDir = date.ToString("yyyyMMdd");
string timeDir = $"{year}/{month}/{day}";// date.ToString("yyyyMM/dd/HH/");
if (!string.IsNullOrEmpty(path))
if (!string.IsNullOrEmpty(storePath))
{
timeDir = path + "/" + timeDir;
timeDir = Path.Combine(storePath, timeDir);
}
return timeDir;
}