xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修复线上bug

Browse Source
This commit is contained in:
陈淳
2023-03-30 18:06:57 +08:00
parent ba220e9d55
commit 8329728b81
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileService.cs
View File

@@ -130,17 +130,15 @@ namespace Yi.Framework.FileManager
try try
{ {
result = _thumbnailSharpManager.CreateThumbnailBytes(thumbnailSize: 300, imageStream: stream, imageFormat: Format.Jpeg); result = _thumbnailSharpManager.CreateThumbnailBytes(thumbnailSize: 300, imageStream: stream, imageFormat: Format.Jpeg);
if(result is null) throw new ArgumentNullException(nameof(result));
} }
catch catch
{ {
result = new byte[stream.Length]; result = new byte[stream.Length];
stream.Read(result, 0, result.Length); stream.Read(result, 0, result.Length);
// 设置当前流的位置为流的开始
stream.Seek(0, SeekOrigin.Begin);
} }
finally finally
{ {
await System.IO.File.WriteAllBytesAsync(Path.Combine(thumbnailPath, filename), result); await System.IO.File.WriteAllBytesAsync(Path.Combine(thumbnailPath, filename), result);
} }
} }

7
Yi.Framework.Net6/src/project/bbs/Yi.BBS.Application/Forum/DiscussService.cs
View File

@@ -84,10 +84,11 @@ namespace Yi.BBS.Application.Forum
.WhereIF(!string.IsNullOrEmpty(input.Title), x => x.Title.Contains(input.Title)) .WhereIF(!string.IsNullOrEmpty(input.Title), x => x.Title.Contains(input.Title))
.WhereIF(input.PlateId is not null, x => x.PlateId == input.PlateId) .WhereIF(input.PlateId is not null, x => x.PlateId == input.PlateId)
.Where(x => x.IsTop == input.IsTop) .Where(x => x.IsTop == input.IsTop)
.OrderByIF(input.Type == QueryDiscussTypeEnum.New, x => x.CreationTime, OrderByType.Desc)
.OrderByIF(input.Type == QueryDiscussTypeEnum.Host, x => x.SeeNum, OrderByType.Desc)
.OrderByIF(input.Type == QueryDiscussTypeEnum.Suggest, x => x.AgreeNum, OrderByType.Desc)
.LeftJoin<UserEntity>((discuss, user) => discuss.CreatorId == user.Id) .LeftJoin<UserEntity>((discuss, user) => discuss.CreatorId == user.Id)
.OrderByIF(input.Type == QueryDiscussTypeEnum.New, discuss => discuss.CreationTime, OrderByType.Desc)
.OrderByIF(input.Type == QueryDiscussTypeEnum.Host, discuss => discuss.SeeNum, OrderByType.Desc)
.OrderByIF(input.Type == QueryDiscussTypeEnum.Suggest, discuss => discuss.AgreeNum, OrderByType.Desc)
.Select((discuss, user) => new DiscussGetListOutputDto .Select((discuss, user) => new DiscussGetListOutputDto
{ {
Id=discuss.Id, Id=discuss.Id,