diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/ImageTaskOutput.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/ImageTaskOutput.cs index ffd3fdbd..4e06b189 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/ImageTaskOutput.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/ImageTaskOutput.cs @@ -18,19 +18,9 @@ public class ImageTaskOutput public string Prompt { get; set; } = string.Empty; /// - /// 参考图PrefixBase64列表(带前缀) + /// 是否匿名 /// - // public List? ReferenceImagesPrefixBase64 { get; set; } - - /// - /// 参考图URL列表 - /// - // public List? ReferenceImagesUrl { get; set; } - - /// - /// 生成图片PrefixBase64(包含前缀) - /// - // public string? StorePrefixBase64 { get; set; } + public bool IsAnonymous { get; set; } /// /// 生成图片URL @@ -70,5 +60,5 @@ public class ImageTaskOutput /// /// 用户名称Id /// - public Guid UserId { get; set; } + public Guid? UserId { get; set; } } diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/PublishImageInput.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/PublishImageInput.cs index 9300d7df..bb33ad01 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/PublishImageInput.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/PublishImageInput.cs @@ -5,6 +5,11 @@ /// public class PublishImageInput { + /// + /// 是否匿名 + /// + public bool IsAnonymous { get; set; } = false; + /// /// 任务ID /// diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiImageService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiImageService.cs index b4bb6155..fad3ecc7 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiImageService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiImageService.cs @@ -291,18 +291,29 @@ public class AiImageService : ApplicationService { Id = x.Id, Prompt = x.Prompt, + IsAnonymous = x.IsAnonymous, StoreUrl = x.StoreUrl, TaskStatus = x.TaskStatus, PublishStatus = x.PublishStatus, Categories = x.Categories, CreationTime = x.CreationTime, + ErrorInfo = null, UserName = x.UserName, UserId = x.UserId, + }) - .ToPageListAsync(input.SkipCount, input.MaxResultCount, total); - ; + .ToPageListAsync(input.SkipCount, input.MaxResultCount, total); ; + output.ForEach(x => + { + if (x.IsAnonymous) + { + x.UserName = null; + x.UserId = null; + } + }); + return new PagedResult(total, output); } @@ -330,9 +341,8 @@ public class AiImageService : ApplicationService throw new UserFriendlyException("该任务已发布"); } - task.PublishStatus = PublishStatusEnum.Published; - task.Categories = input.Categories ?? new List(); - + //设置发布 + task.SetPublish(input.IsAnonymous,input.Categories); await _imageTaskRepository.UpdateAsync(task); } diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Chat/ImageStoreTaskAggregateRoot.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Chat/ImageStoreTaskAggregateRoot.cs index 76fdde14..c2593409 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Chat/ImageStoreTaskAggregateRoot.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Chat/ImageStoreTaskAggregateRoot.cs @@ -68,7 +68,11 @@ public class ImageStoreTaskAggregateRoot : FullAuditedAggregateRoot [SugarColumn(IsJson = true)] public List Categories { get; set; } = new(); - + /// + /// 是否匿名 + /// + public bool IsAnonymous { get; set; } = false; + /// /// 密钥id /// @@ -83,4 +87,18 @@ public class ImageStoreTaskAggregateRoot : FullAuditedAggregateRoot TaskStatus = TaskStatusEnum.Success; StoreUrl = storeUrl; } + + /// + /// 设置发布 + /// + /// + /// + public void SetPublish(bool isAnonymous,List categories) + { + this.PublishStatus = PublishStatusEnum.Published; + this.IsAnonymous = isAnonymous; + this.Categories = categories; + } + + } \ No newline at end of file