blahba.com/flower-story
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to .net 8

Browse Source
This commit is contained in:
Tsanie
2024-10-12 14:34:11 +08:00
parent 7a44b7fd9c
commit c914f13828
15 changed files with 384 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Server/Controller/FlowerApiController.cs
View File

@@ -12,12 +12,8 @@ namespace Blahblah.FlowerStory.Server.Controller;
[ApiController]
[Produces("application/json")]
[Route("api/flower")]
public class FlowerApiController : BaseController
public class FlowerApiController(FlowerDatabase database, ILogger<FlowerApiController>? logger = null) : BaseController<FlowerApiController>(database, logger)
{
/// <inheritdoc/>
public FlowerApiController(FlowerDatabase database, ILogger<BaseController>? logger = null) : base(database, logger)
{
}
/// <summary>
/// 获取用户名下所有符合条件的花草
@@ -184,9 +180,9 @@ public class FlowerApiController : BaseController
if (key != null)
{
flowers = flowers.Where(f =>
f.Name.ToLower().Contains(key.ToLower()) ||
f.Name.Contains(key, StringComparison.CurrentCultureIgnoreCase) ||
f.Purchase != null &&
f.Purchase.ToLower().Contains(key.ToLower()));
f.Purchase.Contains(key, StringComparison.CurrentCultureIgnoreCase));
}
if (buyFrom != null)
{
@@ -325,7 +321,7 @@ public class FlowerApiController : BaseController
if (includePhoto == true)
{
item.Photos = database.Photos.Where(p => p.FlowerId == item.Id && p.RecordId == null).ToList();
item.Photos = [.. database.Photos.Where(p => p.FlowerId == item.Id && p.RecordId == null)];
foreach (var photo in item.Photos)
{
photo.Url = $"photo/flower/{item.Id}/{photo.Path}";
@@ -388,7 +384,7 @@ public class FlowerApiController : BaseController
/// <remarks>
/// 请求示例：
///
/// POST /api/flower/remove
/// POST /api/flower/removeany
/// Authorization: authorization id
/// [
/// 2, 4, 5, 11