Merge branch 'master' into net6.0

This commit is contained in:
不做码农
2022-03-24 12:42:13 +08:00
25 changed files with 2284 additions and 192 deletions

View File

@@ -10,15 +10,72 @@ namespace ZR.Model.System.Dto
public class SysFileDto
{
public long Id { get; set; }
/// <summary>
/// 文件原名
/// </summary>
public string RealName { get; set; }
/// <summary>
/// 文件类型
/// </summary>
public string FileType { get; set; }
/// <summary>
/// 描述 : 存储文件名
/// 空值 : true
/// </summary>
public string FileName { get; set; }
/// <summary>
/// 描述 : 文件存储地址 eg/uploads/20220202
/// 空值 : true
/// </summary>
public string FileUrl { get; set; }
/// <summary>
/// 描述 : 仓库位置 eg/uploads
/// 空值 : true
/// </summary>
public string StorePath { get; set; }
/// <summary>
/// 描述 : 文件大小
/// 空值 : true
/// </summary>
public string FileSize { get; set; }
/// <summary>
/// 描述 : 文件扩展名
/// 空值 : true
/// </summary>
public string FileExt { get; set; }
/// <summary>
/// 描述 : 创建人
/// 空值 : true
/// </summary>
public string Create_by { get; set; }
/// <summary>
/// 描述 : 上传时间
/// 空值 : true
/// </summary>
public DateTime? Create_time { get; set; }
/// <summary>
/// 描述 : 存储类型
/// 空值 : true
/// </summary>
public int? StoreType { get; set; }
/// <summary>
/// 描述 : 访问路径
/// 空值 : true
/// </summary>
public string AccessUrl { get; set; }
public SysFileDto() { }
public SysFileDto(string originFileName, string fileName, string ext, string fileSize, string storePath, string accessUrl, string create_by)
{
StorePath = storePath;
RealName = originFileName;
FileName = fileName;
FileExt = ext;
FileSize = fileSize;
AccessUrl = accessUrl;
Create_by = create_by;
Create_time = DateTime.Now;
}
}
public class SysFileQueryDto : PagerInfo
{

View File

@@ -18,7 +18,7 @@ namespace ZR.Model.System
[SugarColumn(IsPrimaryKey = true)]
public long Id { get; set; }
/// <summary>
/// 文件真实
/// 文件
/// </summary>
public string RealName { get; set; }
/// <summary>
@@ -26,17 +26,17 @@ namespace ZR.Model.System
/// </summary>
public string FileType { get; set; }
/// <summary>
/// 描述 : 文件名
/// 描述 : 存储文件名
/// 空值 : true
/// </summary>
public string FileName { get; set; }
/// <summary>
/// 描述 : 文件存储地址
/// 描述 : 文件存储地址 eg/uploads/20220202
/// 空值 : true
/// </summary>
public string FileUrl { get; set; }
/// <summary>
/// 描述 : 仓库位置
/// 描述 : 仓库位置 eg/uploads
/// 空值 : true
/// </summary>
public string StorePath { get; set; }
@@ -70,5 +70,18 @@ namespace ZR.Model.System
/// 空值 : true
/// </summary>
public string AccessUrl { get; set; }
public SysFile() { }
public SysFile(string originFileName, string fileName, string ext, string fileSize, string storePath, string accessUrl,string create_by)
{
StorePath = storePath;
RealName = originFileName;
FileName = fileName;
FileExt = ext;
FileSize = fileSize;
AccessUrl = accessUrl;
Create_by = create_by;
Create_time = DateTime.Now;
}
}
}