Merge remote-tracking branch 'origin/ai-hub' into ai-hub

- 统一 Serilog 文件与控制台日志的输出模板，提升可读性
- 降低部分 ASP.NET Core 内部组件的日志级别，减少无关噪音
- 移除前端 types 中未使用的 ElSegmented 组件声明

.gitignore

@@ -280,3 +280,4 @@ database_backup
 package-lock.json
 
 .claude
+components.d.ts

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Announcement/AnnouncementCreateInput.cs

@@ -0,0 +1,59 @@
+using System.ComponentModel.DataAnnotations;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
+
+/// <summary>
+/// 创建公告输入
+/// </summary>
+public class AnnouncementCreateInput
+{
+    /// <summary>
+    /// 标题
+    /// </summary>
+    [Required(ErrorMessage = "标题不能为空")]
+    [StringLength(200, ErrorMessage = "标题不能超过200个字符")]
+    public string Title { get; set; }
+
+    /// <summary>
+    /// 内容列表
+    /// </summary>
+    [Required(ErrorMessage = "内容不能为空")]
+    [MinLength(1, ErrorMessage = "至少需要一条内容")]
+    public List<string> Content { get; set; } = new List<string>();
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [StringLength(500, ErrorMessage = "备注不能超过500个字符")]
+    public string? Remark { get; set; }
+
+    /// <summary>
+    /// 图片url
+    /// </summary>
+    [StringLength(500, ErrorMessage = "图片URL不能超过500个字符")]
+    public string? ImageUrl { get; set; }
+
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    [Required(ErrorMessage = "开始时间不能为空")]
+    public DateTime StartTime { get; set; }
+
+    /// <summary>
+    /// 活动结束时间
+    /// </summary>
+    public DateTime? EndTime { get; set; }
+
+    /// <summary>
+    /// 公告类型
+    /// </summary>
+    [Required(ErrorMessage = "公告类型不能为空")]
+    public AnnouncementTypeEnum Type { get; set; }
+
+    /// <summary>
+    /// 跳转链接
+    /// </summary>
+    [StringLength(500, ErrorMessage = "跳转链接不能超过500个字符")]
+    public string? Url { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Announcement/AnnouncementDto.cs

@@ -0,0 +1,59 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
+
+/// <summary>
+/// 公告 DTO（后台管理使用）
+/// </summary>
+public class AnnouncementDto
+{
+    /// <summary>
+    /// 公告ID
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 标题
+    /// </summary>
+    public string Title { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 内容列表
+    /// </summary>
+    public List<string> Content { get; set; } = new List<string>();
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? Remark { get; set; }
+
+    /// <summary>
+    /// 图片url
+    /// </summary>
+    public string? ImageUrl { get; set; }
+
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    public DateTime StartTime { get; set; }
+
+    /// <summary>
+    /// 活动结束时间
+    /// </summary>
+    public DateTime? EndTime { get; set; }
+
+    /// <summary>
+    /// 公告类型
+    /// </summary>
+    public AnnouncementTypeEnum Type { get; set; }
+
+    /// <summary>
+    /// 跳转链接
+    /// </summary>
+    public string? Url { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Announcement/AnnouncementGetListInput.cs

@@ -0,0 +1,29 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
+
+/// <summary>
+/// 获取公告列表输入
+/// </summary>
+public class AnnouncementGetListInput
+{
+    /// <summary>
+    /// 搜索关键字
+    /// </summary>
+    public string? SearchKey { get; set; }
+
+    /// <summary>
+    /// 跳过数量
+    /// </summary>
+    public int SkipCount { get; set; } = 0;
+
+    /// <summary>
+    /// 最大结果数量
+    /// </summary>
+    public int MaxResultCount { get; set; } = 10;
+
+    /// <summary>
+    /// 公告类型
+    /// </summary>
+    public AnnouncementTypeEnum? Type { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Announcement/AnnouncementUpdateInput.cs

@@ -0,0 +1,65 @@
+using System.ComponentModel.DataAnnotations;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
+
+/// <summary>
+/// 更新公告输入
+/// </summary>
+public class AnnouncementUpdateInput
+{
+    /// <summary>
+    /// 公告ID
+    /// </summary>
+    [Required(ErrorMessage = "公告ID不能为空")]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 标题
+    /// </summary>
+    [Required(ErrorMessage = "标题不能为空")]
+    [StringLength(200, ErrorMessage = "标题不能超过200个字符")]
+    public string Title { get; set; }
+
+    /// <summary>
+    /// 内容列表
+    /// </summary>
+    [Required(ErrorMessage = "内容不能为空")]
+    [MinLength(1, ErrorMessage = "至少需要一条内容")]
+    public List<string> Content { get; set; } = new List<string>();
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [StringLength(500, ErrorMessage = "备注不能超过500个字符")]
+    public string? Remark { get; set; }
+
+    /// <summary>
+    /// 图片url
+    /// </summary>
+    [StringLength(500, ErrorMessage = "图片URL不能超过500个字符")]
+    public string? ImageUrl { get; set; }
+
+    /// <summary>
+    /// 开始时间
+    /// </summary>
+    [Required(ErrorMessage = "开始时间不能为空")]
+    public DateTime StartTime { get; set; }
+
+    /// <summary>
+    /// 活动结束时间
+    /// </summary>
+    public DateTime? EndTime { get; set; }
+
+    /// <summary>
+    /// 公告类型
+    /// </summary>
+    [Required(ErrorMessage = "公告类型不能为空")]
+    public AnnouncementTypeEnum Type { get; set; }
+
+    /// <summary>
+    /// 跳转链接
+    /// </summary>
+    [StringLength(500, ErrorMessage = "跳转链接不能超过500个字符")]
+    public string? Url { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppShortcutDto.cs

@@ -0,0 +1,42 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+
+/// <summary>
+/// AI应用快捷配置DTO
+/// </summary>
+public class AiAppShortcutDto
+{
+    /// <summary>
+    /// 应用ID
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 应用名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 应用终结点
+    /// </summary>
+    public string Endpoint { get; set; }
+
+    /// <summary>
+    /// 额外URL
+    /// </summary>
+    public string? ExtraUrl { get; set; }
+
+    /// <summary>
+    /// 应用Key
+    /// </summary>
+    public string ApiKey { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int OrderNum { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelCreateInput.cs

@@ -93,4 +93,9 @@ public class AiModelCreateInput
     /// 是否为尊享模型
     /// </summary>
     public bool IsPremium { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public bool IsEnabled { get; set; } = true;
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelDto.cs

@@ -81,4 +81,9 @@ public class AiModelDto
     /// 是否为尊享模型
     /// </summary>
     public bool IsPremium { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public bool IsEnabled { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelUpdateInput.cs

@@ -99,4 +99,9 @@ public class AiModelUpdateInput
     /// 是否为尊享模型
     /// </summary>
     public bool IsPremium { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public bool IsEnabled { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/AgentSendInput.cs

@@ -15,7 +15,7 @@ public class AgentSendInput
     /// <summary>
     /// api密钥Id
     /// </summary>
-    public string Token { get; set; }
+    public Guid TokenId { get; set; }
 
     /// <summary>
     /// 模型id

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/ImageGenerationInput.cs

@@ -5,6 +5,11 @@ namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
 /// </summary>
 public class ImageGenerationInput
 {
+    /// <summary>
+    /// 密钥id
+    /// </summary>
+    public Guid? TokenId { get; set; }
+
     /// <summary>
     /// 提示词
     /// </summary>
@@ -16,7 +21,7 @@ public class ImageGenerationInput
     public string ModelId { get; set; } = string.Empty;
 
     /// <summary>
-    /// 参考图Base64列表（可选，包含前缀如 data:image/png;base64,...）
+    /// 参考图PrefixBase64列表（可选，包含前缀如 data:image/png;base64,...）
     /// </summary>
-    public List<string>? ReferenceImagesBase64 { get; set; }
+    public List<string>? ReferenceImagesPrefixBase64 { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/ImageMyTaskPageInput.cs

@@ -1,24 +1,26 @@
+using Volo.Abp.Application.Dtos;
 using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.Ddd.Application.Contracts;
 
 namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
 
 /// <summary>
 /// 图片任务分页查询输入
 /// </summary>
-public class ImageTaskPageInput
+public class ImageMyTaskPageInput: PagedAllResultRequestDto
 {
     /// <summary>
-    /// 页码（从1开始）
+    /// 提示词
     /// </summary>
-    public int PageIndex { get; set; } = 1;
+    public string? Prompt { get; set; }
-
-    /// <summary>
-    /// 每页数量
-    /// </summary>
-    public int PageSize { get; set; } = 10;
     
     /// <summary>
     /// 任务状态筛选（可选）
     /// </summary>
     public TaskStatusEnum? TaskStatus { get; set; }
+    
+    /// <summary>
+    /// 发布状态
+    /// </summary>
+    public PublishStatusEnum? PublishStatus { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/ImagePlazaPageInput.cs

@@ -0,0 +1,31 @@
+using Volo.Abp.Application.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.Ddd.Application.Contracts;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
+
+/// <summary>
+/// 图片任务分页查询输入
+/// </summary>
+public class ImagePlazaPageInput: PagedAllResultRequestDto
+{
+    /// <summary>
+    /// 分类
+    /// </summary>
+    public string? Categories { get; set; }
+    
+    /// <summary>
+    /// 提示词
+    /// </summary>
+    public string? Prompt { get; set; }
+    
+    /// <summary>
+    /// 任务状态筛选（可选）
+    /// </summary>
+    public TaskStatusEnum? TaskStatus { get; set; }
+    
+    /// <summary>
+    /// 用户名
+    /// </summary>
+    public string? UserName{ get; set; }
+}

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;
 
     /// <summary>
-    /// 参考图Base64列表
+    /// 是否匿名
     /// </summary>
-    public List<string>? ReferenceImagesBase64 { get; set; }
+    public bool IsAnonymous { get; set; } 
-
-    /// <summary>
-    /// 参考图URL列表
-    /// </summary>
-    public List<string>? ReferenceImagesUrl { get; set; }
-
-    /// <summary>
-    /// 生成图片Base64（包含前缀）
-    /// </summary>
-    public string? StoreBase64 { get; set; }
 
     /// <summary>
     /// 生成图片URL
@@ -42,8 +32,35 @@ public class ImageTaskOutput
     /// </summary>
     public TaskStatusEnum TaskStatus { get; set; }
 
+    /// <summary>
+    /// 发布状态
+    /// </summary>
+    public PublishStatusEnum PublishStatus { get; set; }
+
+    /// <summary>
+    /// 分类标签
+    /// </summary>
+    [SqlSugar.SugarColumn( IsJson = true)]
+    public List<string> Categories { get; set; } = new();
+
     /// <summary>
     /// 创建时间
     /// </summary>
     public DateTime CreationTime { get; set; }
+
+    /// <summary>
+    /// 错误信息
+    /// </summary>
+    public string? ErrorInfo { get; set; }
+    
+    /// <summary>
+    /// 用户名称
+    /// </summary>
+    public string? UserName { get; set; }
+    
+    /// <summary>
+    /// 用户名称Id
+    /// </summary>
+    public Guid? UserId { get; set; }
+    
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/MessageCreatedOutput.cs

@@ -0,0 +1,47 @@
+using System.Reflection;
+using System.Text.Json.Serialization;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
+
+/// <summary>
+/// 消息创建结果输出
+/// </summary>
+public class MessageCreatedOutput
+{
+    /// <summary>
+    /// 消息类型
+    /// </summary>
+    [JsonIgnore]
+    public ChatMessageTypeEnum TypeEnum { get; set; }
+
+    /// <summary>
+    /// 消息类型
+    /// </summary>
+    public string Type => TypeEnum.ToString();
+
+    /// <summary>
+    /// 消息ID
+    /// </summary>
+    public Guid MessageId { get; set; }
+
+    /// <summary>
+    /// 消息创建时间
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+}
+
+/// <summary>
+/// 消息类型枚举
+/// </summary>
+public enum ChatMessageTypeEnum
+{
+    /// <summary>
+    /// 用户消息
+    /// </summary>
+    UserMessage,
+
+    /// <summary>
+    /// 系统消息
+    /// </summary>
+    SystemMessage
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Chat/PublishImageInput.cs

@@ -0,0 +1,22 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
+
+/// <summary>
+/// 发布图片输入
+/// </summary>
+public class PublishImageInput
+{
+    /// <summary>
+    /// 是否匿名
+    /// </summary>
+    public bool IsAnonymous { get; set; } = false;
+
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    public Guid TaskId { get; set; }
+
+    /// <summary>
+    /// 分类标签
+    /// </summary>
+    public List<string> Categories { get; set; } = new();
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/DailyTask/DailyTaskConfigCacheDto.cs

@@ -0,0 +1,43 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.DailyTask;
+
+/// <summary>
+/// 每日任务配置缓存DTO
+/// </summary>
+public class DailyTaskConfigCacheDto
+{
+    /// <summary>
+    /// 任务配置列表
+    /// </summary>
+    public List<DailyTaskConfigItem> Tasks { get; set; } = new();
+}
+
+/// <summary>
+/// 每日任务配置项
+/// </summary>
+public class DailyTaskConfigItem
+{
+    /// <summary>
+    /// 任务等级
+    /// </summary>
+    public int Level { get; set; }
+
+    /// <summary>
+    /// 需要消耗的Token数量
+    /// </summary>
+    public long RequiredTokens { get; set; }
+
+    /// <summary>
+    /// 奖励的Token数量
+    /// </summary>
+    public long RewardTokens { get; set; }
+
+    /// <summary>
+    /// 任务名称
+    /// </summary>
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 任务描述
+    /// </summary>
+    public string Description { get; set; } = string.Empty;
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/MessageGetListInput.cs

@@ -8,3 +8,17 @@ public class MessageGetListInput:PagedAllResultRequestDto
     [Required]
     public Guid SessionId { get; set; }
 }
+
+public class MessageDeleteInput
+{
+    /// <summary>
+    /// 要删除的消息Id列表
+    /// </summary>
+    [Required]
+    public List<Guid> Ids { get; set; } = new();
+
+    /// <summary>
+    /// 是否同时隐藏后续消息（同一会话中时间大于当前消息的所有消息）
+    /// </summary>
+    public bool IsDeleteSubsequent { get; set; } = false;
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/ModelGetListOutput.cs

@@ -1,4 +1,6 @@
-namespace Yi.Framework.AiHub.Application.Contracts.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos;
 
 public class ModelGetListOutput
 {
@@ -7,12 +9,6 @@ public class ModelGetListOutput
     /// </summary>
     public Guid Id { get; set; }
     
-    /// <summary>
-    /// 模型分类
-    /// </summary>
-    public string Category { get; set; }
-
-
     /// <summary>
     /// 模型id
     /// </summary>
@@ -28,36 +24,6 @@ public class ModelGetListOutput
     /// </summary>
     public string? ModelDescribe { get; set; }
 
-    /// <summary>
-    /// 模型价格
-    /// </summary>
-    public double ModelPrice { get; set; }
-
-    /// <summary>
-    /// 模型类型
-    /// </summary>
-    public string ModelType { get; set; }
-
-    /// <summary>
-    /// 模型展示状态
-    /// </summary>
-    public string ModelShow { get; set; }
-
-    /// <summary>
-    /// 系统提示
-    /// </summary>
-    public string SystemPrompt { get; set; }
-
-    /// <summary>
-    /// API 主机地址
-    /// </summary>
-    public string ApiHost { get; set; }
-
-    /// <summary>
-    /// API 密钥
-    /// </summary>
-    public string ApiKey { get; set; }
-
     /// <summary>
     /// 备注信息
     /// </summary>
@@ -67,4 +33,23 @@ public class ModelGetListOutput
     /// 是否为尊享包
     /// </summary>
     public bool IsPremiumPackage { get; set; }
+
+    /// <summary>
+    /// 是否免费模型
+    /// </summary>
+    public bool IsFree { get; set; }
+    
+    /// <summary>
+    /// 模型Api类型，现支持同一个模型id，多种接口格式
+    /// </summary>
+    public ModelApiTypeEnum ModelApiType { get; set; }
+    
+    /// <summary>
+    /// 模型图标URL
+    /// </summary>
+    public string? IconUrl { get; set; }
+    /// <summary>
+    /// 供应商分组名称(如：OpenAI、Anthropic、Google等)
+    /// </summary>
+    public string? ProviderName { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/RankingGetListInput.cs

@@ -0,0 +1,14 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos;
+
+/// <summary>
+/// 排行榜查询输入
+/// </summary>
+public class RankingGetListInput
+{
+    /// <summary>
+    /// 排行榜类型：0-模型，1-工具，不传返回全部
+    /// </summary>
+    public RankingTypeEnum? Type { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/RankingItemDto.cs

@@ -0,0 +1,41 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos;
+
+/// <summary>
+/// 排行榜项DTO
+/// </summary>
+public class RankingItemDto
+{
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; } = null!;
+
+    /// <summary>
+    /// 描述
+    /// </summary>
+    public string Description { get; set; } = null!;
+
+    /// <summary>
+    /// Logo地址
+    /// </summary>
+    public string? LogoUrl { get; set; }
+
+    /// <summary>
+    /// 得分
+    /// </summary>
+    public decimal Score { get; set; }
+
+    /// <summary>
+    /// 提供者
+    /// </summary>
+    public string Provider { get; set; } = null!;
+
+    /// <summary>
+    /// 排行榜类型
+    /// </summary>
+    public RankingTypeEnum Type { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Recharge/RechargeGetListInput.cs

@@ -0,0 +1,24 @@
+using Yi.Framework.Ddd.Application.Contracts;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Recharge;
+
+/// <summary>
+/// 充值记录查询输入
+/// </summary>
+public class RechargeGetListInput : PagedAllResultRequestDto
+{
+    /// <summary>
+    /// 是否免费（充值金额等于0）
+    /// </summary>
+    public bool? IsFree { get; set; }
+
+    /// <summary>
+    /// 充值金额最小值
+    /// </summary>
+    public decimal? MinRechargeAmount { get; set; }
+
+    /// <summary>
+    /// 充值金额最大值
+    /// </summary>
+    public decimal? MaxRechargeAmount { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/SessionCreateAndUpdateInput.cs

@@ -1,8 +1,15 @@
-namespace Yi.Framework.AiHub.Application.Contracts.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos;
 
 public class SessionCreateAndUpdateInput
 {
     public string SessionTitle { get; set; }
     public string SessionContent { get; set; }
     public string? Remark { get; set; }
+
+    /// <summary>
+    /// 会话类型
+    /// </summary>
+    public SessionTypeEnum SessionType { get; set; } = SessionTypeEnum.Chat;
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/SessionDto.cs

@@ -1,4 +1,5 @@
 using Volo.Abp.Application.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
 
 namespace Yi.Framework.AiHub.Application.Contracts.Dtos;
 
@@ -7,4 +8,9 @@ public class SessionDto : FullAuditedEntityDto<Guid>
     public string SessionTitle { get; set; }
     public string SessionContent { get; set; }
     public string Remark { get; set; }
+
+    /// <summary>
+    /// 会话类型
+    /// </summary>
+    public SessionTypeEnum SessionType { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/SessionGetListInput.cs

@@ -1,8 +1,14 @@
-using Yi.Framework.Ddd.Application.Contracts;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.Ddd.Application.Contracts;
 
 namespace Yi.Framework.AiHub.Application.Contracts.Dtos;
 
-public class SessionGetListInput:PagedAllResultRequestDto
+public class SessionGetListInput : PagedAllResultRequestDto
 {
     public string? SessionTitle { get; set; }
+
+    /// <summary>
+    /// 会话类型
+    /// </summary>
+    public SessionTypeEnum? SessionType { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/SystemStatistics/ModelTokenStatisticsDto.cs

@@ -0,0 +1,42 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.SystemStatistics;
+
+/// <summary>
+/// 模型Token统计DTO
+/// </summary>
+public class ModelTokenStatisticsDto
+{
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    public string ModelId { get; set; }
+
+    /// <summary>
+    /// 模型名称
+    /// </summary>
+    public string ModelName { get; set; }
+
+    /// <summary>
+    /// Token消耗量
+    /// </summary>
+    public long Tokens { get; set; }
+
+    /// <summary>
+    /// Token消耗量(万)
+    /// </summary>
+    public decimal TokensInWan { get; set; }
+
+    /// <summary>
+    /// 使用次数
+    /// </summary>
+    public long Count { get; set; }
+
+    /// <summary>
+    /// 成本(RMB)
+    /// </summary>
+    public decimal Cost { get; set; }
+
+    /// <summary>
+    /// 1亿Token成本(RMB)
+    /// </summary>
+    public decimal CostPerHundredMillion { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/SystemStatistics/ProfitStatisticsInput.cs

@@ -0,0 +1,12 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.SystemStatistics;
+
+/// <summary>
+/// 利润统计输入
+/// </summary>
+public class ProfitStatisticsInput
+{
+    /// <summary>
+    /// 当前成本(RMB)
+    /// </summary>
+    public decimal CurrentCost { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/SystemStatistics/ProfitStatisticsOutput.cs

@@ -0,0 +1,62 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.SystemStatistics;
+
+/// <summary>
+/// 利润统计输出
+/// </summary>
+public class ProfitStatisticsOutput
+{
+    /// <summary>
+    /// 日期
+    /// </summary>
+    public string Date { get; set; }
+
+    /// <summary>
+    /// 尊享包已消耗Token数(单位:个)
+    /// </summary>
+    public long TotalUsedTokens { get; set; }
+
+    /// <summary>
+    /// 尊享包已消耗Token数(单位:亿)
+    /// </summary>
+    public decimal TotalUsedTokensInHundredMillion { get; set; }
+
+    /// <summary>
+    /// 尊享包剩余库存Token数(单位:个)
+    /// </summary>
+    public long TotalRemainingTokens { get; set; }
+
+    /// <summary>
+    /// 尊享包剩余库存Token数(单位:亿)
+    /// </summary>
+    public decimal TotalRemainingTokensInHundredMillion { get; set; }
+
+    /// <summary>
+    /// 当前成本(RMB)
+    /// </summary>
+    public decimal CurrentCost { get; set; }
+
+    /// <summary>
+    /// 1亿Token成本(RMB)
+    /// </summary>
+    public decimal CostPerHundredMillion { get; set; }
+
+    /// <summary>
+    /// 总成本(RMB)
+    /// </summary>
+    public decimal TotalCost { get; set; }
+
+    /// <summary>
+    /// 总收益(RMB)
+    /// </summary>
+    public decimal TotalRevenue { get; set; }
+
+    /// <summary>
+    /// 利润率(%)
+    /// </summary>
+    public decimal ProfitRate { get; set; }
+
+    /// <summary>
+    /// 按200售价计算的成本(RMB)
+    /// </summary>
+    public decimal CostAt200Price { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/SystemStatistics/TokenStatisticsInput.cs

@@ -0,0 +1,12 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.SystemStatistics;
+
+/// <summary>
+/// Token统计输入
+/// </summary>
+public class TokenStatisticsInput
+{
+    /// <summary>
+    /// 指定日期(当天零点)
+    /// </summary>
+    public DateTime Date { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/SystemStatistics/TokenStatisticsOutput.cs

@@ -0,0 +1,17 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.SystemStatistics;
+
+/// <summary>
+/// Token统计输出
+/// </summary>
+public class TokenStatisticsOutput
+{
+    /// <summary>
+    /// 日期
+    /// </summary>
+    public string Date { get; set; }
+
+    /// <summary>
+    /// 模型统计列表
+    /// </summary>
+    public List<ModelTokenStatisticsDto> ModelStatistics { get; set; } = new();
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/UsageStatistics/HourlyTokenUsageDto.cs

@@ -0,0 +1,22 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics;
+
+/// <summary>
+/// 每小时Token使用量统计DTO（柱状图）
+/// </summary>
+public class HourlyTokenUsageDto
+{
+    /// <summary>
+    /// 小时时间点
+    /// </summary>
+    public DateTime Hour { get; set; }
+
+    /// <summary>
+    /// 该小时总Token消耗量
+    /// </summary>
+    public long TotalTokens { get; set; }
+
+    /// <summary>
+    /// 各模型Token消耗明细
+    /// </summary>
+    public List<ModelTokenBreakdownDto> ModelBreakdown { get; set; } = new();
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/UsageStatistics/ModelTodayUsageDto.cs

@@ -0,0 +1,27 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics;
+
+/// <summary>
+/// 模型今日使用量统计DTO（卡片列表）
+/// </summary>
+public class ModelTodayUsageDto
+{
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    public string ModelId { get; set; }
+
+    /// <summary>
+    /// 今日使用次数
+    /// </summary>
+    public int UsageCount { get; set; }
+
+    /// <summary>
+    /// 今日消耗总Token数
+    /// </summary>
+    public long TotalTokens { get; set; }
+    
+    /// <summary>
+    /// 模型图标URL
+    /// </summary>
+    public string? IconUrl { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/UsageStatistics/ModelTokenBreakdownDto.cs

@@ -0,0 +1,17 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics;
+
+/// <summary>
+/// 模型Token堆叠数据DTO（用于柱状图）
+/// </summary>
+public class ModelTokenBreakdownDto
+{
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    public string ModelId { get; set; }
+
+    /// <summary>
+    /// Token消耗量
+    /// </summary>
+    public long Tokens { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IAnnouncementService.cs

@@ -1,3 +1,4 @@
+using Volo.Abp.Application.Dtos;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
 
 namespace Yi.Framework.AiHub.Application.Contracts.IServices;
@@ -8,8 +9,42 @@ namespace Yi.Framework.AiHub.Application.Contracts.IServices;
 public interface IAnnouncementService
 {
     /// <summary>
-    /// 获取公告信息
+    /// 获取公告信息（前端首页使用）
     /// </summary>
     /// <returns>公告信息</returns>
     Task<List<AnnouncementLogDto>> GetAsync();
+
+    /// <summary>
+    /// 获取公告列表（后台管理使用）
+    /// </summary>
+    /// <param name="input">查询参数</param>
+    /// <returns>分页公告列表</returns>
+    Task<PagedResultDto<AnnouncementDto>> GetListAsync(AnnouncementGetListInput input);
+
+    /// <summary>
+    /// 根据ID获取公告
+    /// </summary>
+    /// <param name="id">公告ID</param>
+    /// <returns>公告详情</returns>
+    Task<AnnouncementDto> GetByIdAsync(Guid id);
+
+    /// <summary>
+    /// 创建公告
+    /// </summary>
+    /// <param name="input">创建输入</param>
+    /// <returns>创建的公告</returns>
+    Task<AnnouncementDto> CreateAsync(AnnouncementCreateInput input);
+
+    /// <summary>
+    /// 更新公告
+    /// </summary>
+    /// <param name="input">更新输入</param>
+    /// <returns>更新后的公告</returns>
+    Task<AnnouncementDto> UpdateAsync(AnnouncementUpdateInput input);
+
+    /// <summary>
+    /// 删除公告
+    /// </summary>
+    /// <param name="id">公告ID</param>
+    Task DeleteAsync(Guid id);
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IChannelService.cs

@@ -83,4 +83,14 @@ public interface IChannelService
     Task DeleteModelAsync(Guid id);
 
     #endregion
+
+    #region AI应用快捷配置
+
+    /// <summary>
+    /// 获取AI应用快捷配置列表
+    /// </summary>
+    /// <returns>快捷配置列表</returns>
+    Task<List<AiAppShortcutDto>> GetAppShortcutListAsync();
+
+    #endregion
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IRankingService.cs

@@ -0,0 +1,16 @@
+using Yi.Framework.AiHub.Application.Contracts.Dtos;
+
+namespace Yi.Framework.AiHub.Application.Contracts.IServices;
+
+/// <summary>
+/// 排行榜服务接口
+/// </summary>
+public interface IRankingService
+{
+    /// <summary>
+    /// 获取排行榜列表（全量返回）
+    /// </summary>
+    /// <param name="input">查询条件</param>
+    /// <returns>排行榜列表</returns>
+    Task<List<RankingItemDto>> GetListAsync(RankingGetListInput input);
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IRechargeService.cs

@@ -1,9 +1,15 @@
-using Yi.Framework.AiHub.Application.Contracts.Dtos.Recharge;
+using Volo.Abp.Application.Dtos;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Recharge;
 
 namespace Yi.Framework.AiHub.Application.Contracts.IServices;
 
 public interface IRechargeService
 {
+    /// <summary>
+    /// 查询已登录的账户充值记录（分页）
+    /// </summary>
+    Task<PagedResultDto<RechargeGetListOutput>> GetListByAccountAsync(RechargeGetListInput input);
+
     /// <summary>
     /// 移除用户vip及角色
     /// </summary>

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/ISystemUsageStatisticsService.cs

@@ -0,0 +1,19 @@
+using Yi.Framework.AiHub.Application.Contracts.Dtos.SystemStatistics;
+
+namespace Yi.Framework.AiHub.Application.Contracts.IServices;
+
+/// <summary>
+/// 系统使用量统计服务接口
+/// </summary>
+public interface ISystemUsageStatisticsService
+{
+    /// <summary>
+    /// 获取利润统计数据
+    /// </summary>
+    Task<ProfitStatisticsOutput> GetProfitStatisticsAsync(ProfitStatisticsInput input);
+
+    /// <summary>
+    /// 获取指定日期各模型Token统计
+    /// </summary>
+    Task<TokenStatisticsOutput> GetTokenStatisticsAsync(TokenStatisticsInput input);
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IUsageStatisticsService.cs

@@ -24,4 +24,16 @@ public interface IUsageStatisticsService
     /// </summary>
     /// <returns>尊享服务Token用量统计</returns>
     Task<PremiumTokenUsageDto> GetPremiumTokenUsageAsync();
+
+    /// <summary>
+    /// 获取当前用户近24小时每小时Token消耗统计（柱状图）
+    /// </summary>
+    /// <returns>每小时Token使用量列表，包含各模型堆叠数据</returns>
+    Task<List<HourlyTokenUsageDto>> GetLast24HoursTokenUsageAsync(UsageStatisticsGetInput input);
+
+    /// <summary>
+    /// 获取当前用户今日各模型使用量统计（卡片列表）
+    /// </summary>
+    /// <returns>模型今日使用量列表，包含使用次数和总Token</returns>
+    Task<List<ModelTodayUsageDto>> GetTodayModelUsageAsync(UsageStatisticsGetInput input);
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Jobs/ImageGenerationJob.cs

@@ -30,32 +30,101 @@ public class ImageGenerationJob : AsyncBackgroundJob<ImageGenerationJobArgs>, IT
 
     public override async Task ExecuteAsync(ImageGenerationJobArgs args)
     {
-        _logger.LogInformation("开始执行图片生成任务，TaskId: {TaskId}, ModelId: {ModelId}, UserId: {UserId}",
+        var task = await _imageStoreTaskRepository.GetFirstAsync(x => x.Id == args.TaskId);
-            args.TaskId, args.ModelId, args.UserId);
+        if (task is null)
+        {
+            throw new UserFriendlyException($"{args.TaskId} 图片生成任务不存在");
+        }
 
+        _logger.LogInformation("开始执行图片生成任务，TaskId: {TaskId}, ModelId: {ModelId}, UserId: {UserId}",
+            task.Id, task.ModelId, task.UserId);
         try
         {
-            var request = JsonSerializer.Deserialize<JsonElement>(args.RequestJson);
+            // 构建 Gemini API 请求对象
+            var parts = new List<object>
+            {
+                new { text = task.Prompt }
+            };
 
+            // 添加参考图（如果有）
+            foreach (var prefixBase64 in task.ReferenceImagesPrefixBase64)
+            {
+                var (mimeType, base64Data) = ParsePrefixBase64(prefixBase64);
+                parts.Add(new
+                {
+                    inline_data = new
+                    {
+                        mime_type = mimeType,
+                        data = base64Data
+                    }
+                });
+            }
+
+            var requestObj = new
+            {
+                contents = new[]
+                {
+                    new
+                    {
+                        role = "user", parts = new List<object>
+                        {
+                            new { text = "我只要图片，直接生成图片，不要询问我" }
+                        }
+                    },
+                    new { role = "user", parts }
+                }
+            };
+
+            var request = JsonSerializer.Deserialize<JsonElement>(
+                JsonSerializer.Serialize(requestObj));
+
+            //里面生成成功已经包含扣款了
             await _aiGateWayManager.GeminiGenerateContentImageForStatisticsAsync(
-                args.TaskId,
+                task.Id,
-                args.ModelId,
+                task.ModelId,
                 request,
-                args.UserId);
+                task.UserId,
+                tokenId: task.TokenId);
+
 
             _logger.LogInformation("图片生成任务完成，TaskId: {TaskId}", args.TaskId);
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "图片生成任务失败，TaskId: {TaskId}, Error: {Error}", args.TaskId, ex.Message);
+            var error = $"图片任务失败，TaskId: {args.TaskId}，错误信息: {ex.Message}，错误堆栈：{ex.StackTrace}";
+            _logger.LogError(ex, error);
 
-            // 更新任务状态为失败
+            task.TaskStatus = TaskStatusEnum.Fail;
-            var task = await _imageStoreTaskRepository.GetFirstAsync(x => x.Id == args.TaskId);
+            task.ErrorInfo = error;
-            if (task != null)
+
-            {
+            await _imageStoreTaskRepository.UpdateAsync(task);
-                task.TaskStatus = TaskStatusEnum.Fail;
-                await _imageStoreTaskRepository.UpdateAsync(task);
-            }
         }
     }
+
+    /// <summary>
+    /// 解析带前缀的 Base64 字符串，提取 mimeType 和纯 base64 数据
+    /// </summary>
+    private static (string mimeType, string base64Data) ParsePrefixBase64(string prefixBase64)
+    {
+        // 默认值
+        var mimeType = "image/png";
+        var base64Data = prefixBase64;
+
+        if (prefixBase64.Contains(","))
+        {
+            var parts = prefixBase64.Split(',');
+            if (parts.Length == 2)
+            {
+                var header = parts[0];
+                if (header.Contains(":") && header.Contains(";"))
+                {
+                    mimeType = header.Split(':')[1].Split(';')[0];
+                }
+
+                base64Data = parts[1];
+            }
+        }
+
+        return (mimeType, base64Data);
+    }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Jobs/ImageGenerationJobArgs.cs

@@ -9,19 +9,4 @@ public class ImageGenerationJobArgs
     /// 图片任务ID
     /// </summary>
     public Guid TaskId { get; set; }
-
-    /// <summary>
-    /// 模型ID
-    /// </summary>
-    public string ModelId { get; set; } = string.Empty;
-
-    /// <summary>
-    /// 请求JSON字符串
-    /// </summary>
-    public string RequestJson { get; set; } = string.Empty;
-
-    /// <summary>
-    /// 用户ID
-    /// </summary>
-    public Guid UserId { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Activities/DailyTaskService.cs

@@ -1,8 +1,10 @@
 using Medallion.Threading;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
 using SqlSugar;
 using Volo.Abp.Application.Services;
+using Volo.Abp.Caching;
 using Volo.Abp.Users;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.DailyTask;
 using Yi.Framework.AiHub.Domain.Entities;
@@ -25,27 +27,33 @@ public class DailyTaskService : ApplicationService
     private readonly ISqlSugarRepository<MessageAggregateRoot> _messageRepository;
     private readonly ISqlSugarRepository<PremiumPackageAggregateRoot> _premiumPackageRepository;
     private readonly ILogger<DailyTaskService> _logger;
+    private readonly IDistributedCache<DailyTaskConfigCacheDto> _taskConfigCache;
     private IDistributedLockProvider DistributedLock => LazyServiceProvider.LazyGetRequiredService<IDistributedLockProvider>();
     private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
-    // 任务配置
+
-    private readonly Dictionary<int, (long RequiredTokens, long RewardTokens, string Name, string Description)>
+    private const string TaskConfigCacheKey = "AiHub:DailyTaskConfig";
-        _taskConfigs = new()
+
-        {
+    // 默认任务配置（当Redis中没有配置时使用）
-            { 1, (10000000, 1000000, "尊享包1000w token任务", "累积使用尊享包 1000w token") }, // 1000w消耗 -> 100w奖励
+    private static readonly List<DailyTaskConfigItem> DefaultTaskConfigs = new()
-            { 2, (30000000, 2000000, "尊享包3000w token任务", "累积使用尊享包 3000w token") } // 3000w消耗 -> 200w奖励
+    {
-        };
+        new DailyTaskConfigItem { Level = 1, RequiredTokens = 10000000, RewardTokens = 1000000, Name = "尊享包1000w token任务", Description = "累积使用尊享包 1000w token" },
+        new DailyTaskConfigItem { Level = 2, RequiredTokens = 30000000, RewardTokens = 2000000, Name = "尊享包3000w token任务", Description = "累积使用尊享包 3000w token" }
+    };
 
     public DailyTaskService(
         ISqlSugarRepository<DailyTaskRewardRecordAggregateRoot> dailyTaskRepository,
         ISqlSugarRepository<MessageAggregateRoot> messageRepository,
         ISqlSugarRepository<PremiumPackageAggregateRoot> premiumPackageRepository,
-        ILogger<DailyTaskService> logger, ISqlSugarRepository<AiModelEntity> aiModelRepository)
+        ILogger<DailyTaskService> logger,
+        ISqlSugarRepository<AiModelEntity> aiModelRepository,
+        IDistributedCache<DailyTaskConfigCacheDto> taskConfigCache)
     {
         _dailyTaskRepository = dailyTaskRepository;
         _messageRepository = messageRepository;
         _premiumPackageRepository = premiumPackageRepository;
         _logger = logger;
         _aiModelRepository = aiModelRepository;
+        _taskConfigCache = taskConfigCache;
     }
 
     /// <summary>
@@ -57,20 +65,23 @@ public class DailyTaskService : ApplicationService
         var userId = CurrentUser.GetId();
         var today = DateTime.Today;
 
-        // 1. 统计今日尊享包Token消耗量
+        // 1. 获取任务配置
+        var taskConfigs = await GetTaskConfigsAsync();
+
+        // 2. 统计今日尊享包Token消耗量
         var todayConsumed = await GetTodayPremiumTokenConsumptionAsync(userId, today);
 
-        // 2. 查询今日已领取的任务
+        // 3. 查询今日已领取的任务
         var claimedTasks = await _dailyTaskRepository._DbQueryable
             .Where(x => x.UserId == userId && x.TaskDate == today)
             .Select(x => new { x.TaskLevel, x.IsRewarded })
             .ToListAsync();
 
-        // 3. 构建任务列表
+        // 4. 构建任务列表
         var tasks = new List<DailyTaskItem>();
-        foreach (var (level, config) in _taskConfigs)
+        foreach (var config in taskConfigs)
         {
-            var claimed = claimedTasks.FirstOrDefault(x => x.TaskLevel == level);
+            var claimed = claimedTasks.FirstOrDefault(x => x.TaskLevel == config.Level);
             int status;
 
             if (claimed != null && claimed.IsRewarded)
@@ -92,7 +103,7 @@ public class DailyTaskService : ApplicationService
 
             tasks.Add(new DailyTaskItem
             {
-                Level = level,
+                Level = config.Level,
                 Name = config.Name,
                 Description = config.Description,
                 RequiredTokens = config.RequiredTokens,
@@ -121,16 +132,19 @@ public class DailyTaskService : ApplicationService
         await using var handle =
             await DistributedLock.AcquireLockAsync($"Yi:AiHub:ClaimTaskRewardLock:{userId}");
 
-        
         var today = DateTime.Today;
 
-        // 1. 验证任务等级
+        // 1. 获取任务配置
-        if (!_taskConfigs.TryGetValue(input.TaskLevel, out var taskConfig))
+        var taskConfigs = await GetTaskConfigsAsync();
+        var taskConfig = taskConfigs.FirstOrDefault(x => x.Level == input.TaskLevel);
+
+        // 2. 验证任务等级
+        if (taskConfig == null)
         {
             throw new UserFriendlyException($"无效的任务等级: {input.TaskLevel}");
         }
 
-        // 2. 检查是否已领取
+        // 3. 检查是否已领取
         var existingRecord = await _dailyTaskRepository._DbQueryable
             .Where(x => x.UserId == userId && x.TaskDate == today && x.TaskLevel == input.TaskLevel)
             .FirstAsync();
@@ -140,7 +154,7 @@ public class DailyTaskService : ApplicationService
             throw new UserFriendlyException("今日该任务奖励已领取，请明天再来！");
         }
 
-        // 3. 验证今日Token消耗是否达标
+        // 4. 验证今日Token消耗是否达标
         var todayConsumed = await GetTodayPremiumTokenConsumptionAsync(userId, today);
         if (todayConsumed < taskConfig.RequiredTokens)
         {
@@ -148,18 +162,17 @@ public class DailyTaskService : ApplicationService
                 $"Token消耗未达标！需要 {taskConfig.RequiredTokens / 10000}w，当前 {todayConsumed / 10000}w");
         }
 
-        // 4. 创建奖励包（使用 PremiumPackageManager）
+        // 5. 创建奖励包
-
         var premiumPackage =
             new PremiumPackageAggregateRoot(userId, taskConfig.RewardTokens, $"每日任务:{taskConfig.Name}")
             {
-                PurchaseAmount = 0, // 奖励不需要付费
+                PurchaseAmount = 0,
                 Remark = $"{today:yyyy-MM-dd} 每日任务奖励"
             };
 
         await _premiumPackageRepository.InsertAsync(premiumPackage);
 
-        // 5. 记录领取记录
+        // 6. 记录领取记录
         var record = new DailyTaskRewardRecordAggregateRoot(userId, input.TaskLevel, today, taskConfig.RewardTokens)
         {
             Remark = $"完成任务{input.TaskLevel}，名称：{taskConfig.Name}，消耗 {todayConsumed / 10000}w token"
@@ -197,4 +210,21 @@ public class DailyTaskService : ApplicationService
 
         return totalTokens;
     }
+
+    /// <summary>
+    /// 从Redis获取任务配置，如果不存在则写入默认配置
+    /// </summary>
+    private async Task<List<DailyTaskConfigItem>> GetTaskConfigsAsync()
+    {
+        var cacheData = await _taskConfigCache.GetOrAddAsync(
+            TaskConfigCacheKey,
+            () => Task.FromResult(new DailyTaskConfigCacheDto { Tasks = DefaultTaskConfigs }),
+            () => new DistributedCacheEntryOptions
+            {
+                // 不设置过期时间，永久缓存，需要手动更新
+            }
+        );
+
+        return cacheData?.Tasks ?? DefaultTaskConfigs;
+    }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/AiAccountService.cs

@@ -13,6 +13,7 @@ using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.Rbac.Domain.Shared.Dtos;
 using Yi.Framework.SqlSugarCore.Abstractions;
 using Yi.Framework.AiHub.Domain.Extensions;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
 
 namespace Yi.Framework.AiHub.Application.Services;
 
@@ -58,7 +59,7 @@ public class AiAccountService : ApplicationService
         if (output.IsVip)
         {
             var recharges = await _rechargeRepository._DbQueryable
-                .Where(x => x.UserId == userId)
+                .Where(x => x.UserId == userId && x.RechargeType == RechargeTypeEnum.Vip)
                 .ToListAsync();
 
             if (recharges.Any())
@@ -81,162 +82,4 @@ public class AiAccountService : ApplicationService
         return output;
     }
 
-    /// <summary>
-    /// 获取利润统计数据
-    /// </summary>
-    /// <param name="currentCost">当前成本(RMB)</param>
-    /// <returns></returns>
-    [Authorize]
-    [HttpGet("account/profit-statistics")]
-    public async Task<string> GetProfitStatisticsAsync([FromQuery] decimal currentCost)
-    {
-        if (CurrentUser.UserName != "Guo" && CurrentUser.UserName != "cc")
-        {
-            throw new UserFriendlyException("您暂无权限访问");
-        }
-
-        // 1. 获取尊享包总消耗和剩余库存
-        var premiumPackages = await _premiumPackageRepository._DbQueryable.ToListAsync();
-        long totalUsedTokens = premiumPackages.Sum(p => p.UsedTokens);
-        long totalRemainingTokens = premiumPackages.Sum(p => p.RemainingTokens);
-
-        // 2. 计算1亿Token成本
-        decimal costPerHundredMillion = totalUsedTokens > 0
-            ? currentCost / (totalUsedTokens / 100000000m)
-            : 0;
-
-        // 3. 计算总成本(剩余+已使用的总成本)
-        long totalTokens = totalUsedTokens + totalRemainingTokens;
-        decimal totalCost = totalTokens > 0
-            ? (totalTokens / 100000000m) * costPerHundredMillion
-            : 0;
-
-        // 4. 获取总收益(RechargeType=PremiumPackage的充值金额总和)
-        decimal totalRevenue = await _rechargeRepository._DbQueryable
-            .Where(x => x.RechargeType == Domain.Shared.Enums.RechargeTypeEnum.PremiumPackage)
-            .SumAsync(x => x.RechargeAmount);
-
-        // 5. 计算利润率
-        decimal profitRate = totalCost > 0
-            ? (totalRevenue / totalCost - 1) * 100
-            : 0;
-
-        // 6. 按200售价计算成本
-        decimal costAt200Price = totalRevenue > 0
-            ? (totalCost / totalRevenue) * 200
-            : 0;
-
-        // 7. 格式化输出
-        var today = DateTime.Now;
-        string dayOfWeek = today.ToString("dddd", new System.Globalization.CultureInfo("zh-CN"));
-        string weekDay = dayOfWeek switch
-        {
-            "星期一" => "周1",
-            "星期二" => "周2",
-            "星期三" => "周3",
-            "星期四" => "周4",
-            "星期五" => "周5",
-            "星期六" => "周6",
-            "星期日" => "周日",
-            _ => dayOfWeek
-        };
-
-        var result = $@"{today:M月d日} {weekDay}
-尊享包已消耗({totalUsedTokens / 100000000m:F2}亿){totalUsedTokens}
-尊享包剩余库存({totalRemainingTokens / 100000000m:F2}亿){totalRemainingTokens}
-当前成本:{currentCost:F2}RMB
-1亿Token成本:{costPerHundredMillion:F2} RMB=1亿 Token
-总成本:{totalCost:F2} RMB
-总收益:{totalRevenue:F2}RMB
-利润率: {profitRate:F1}%
-按200售价来算,成本在{costAt200Price:F2}";
-
-        return result;
-    }
-
-    public class TokenStatisticsInput
-    {
-        /// <summary>
-        /// 指定日期(当天零点)
-        /// </summary>
-        public DateTime Date { get; set; }
-
-        /// <summary>
-        /// 模型Id -> 1亿Token成本(RMB)
-        /// </summary>
-        public Dictionary<string, decimal> ModelCosts { get; set; } = new();
-    }
-
-    /// <summary>
-    /// 获取指定日期各模型Token统计
-    /// </summary>
-    [Authorize]
-    [HttpPost("account/token-statistics")]
-    public async Task<string> GetTokenStatisticsAsync([FromBody] TokenStatisticsInput input)
-    {
-        if (CurrentUser.UserName != "Guo" && CurrentUser.UserName != "cc")
-        {
-            throw new UserFriendlyException("您暂无权限访问");
-        }
-
-        if (input.ModelCosts is null || input.ModelCosts.Count == 0)
-        {
-            throw new UserFriendlyException("请提供模型成本配置");
-        }
-
-        var day = input.Date.Date;
-        var nextDay = day.AddDays(1);
-        var modelIds = input.ModelCosts.Keys.ToList();
-
-        var modelStats = await _messageRepository._DbQueryable
-            .Where(x => modelIds.Contains(x.ModelId))
-            .Where(x => x.CreationTime >= day && x.CreationTime < nextDay)
-            .Where(x => x.Role == "system")
-            .GroupBy(x => x.ModelId)
-            .Select(x => new
-            {
-                ModelId = x.ModelId,
-                Tokens = SqlFunc.AggregateSum(x.TokenUsage.TotalTokenCount),
-                Count = SqlFunc.AggregateCount(x.Id)
-            })
-            .ToListAsync();
-
-        var modelStatDict = modelStats.ToDictionary(x => x.ModelId, x => x);
-
-        string weekDay = day.ToString("dddd", new CultureInfo("zh-CN")) switch
-        {
-            "星期一" => "周1",
-            "星期二" => "周2",
-            "星期三" => "周3",
-            "星期四" => "周4",
-            "星期五" => "周5",
-            "星期六" => "周6",
-            "星期日" => "周日",
-            _ => day.ToString("dddd", new CultureInfo("zh-CN"))
-        };
-
-        var sb = new StringBuilder();
-        sb.AppendLine($"{day:M月d日} {weekDay}");
-
-        foreach (var kvp in input.ModelCosts)
-        {
-            var modelId = kvp.Key;
-            var cost = kvp.Value;
-
-            modelStatDict.TryGetValue(modelId, out var stat);
-            long tokens = stat?.Tokens ?? 0;
-            long count = stat?.Count ?? 0;
-
-            decimal costPerHundredMillion = tokens > 0
-                ? cost / (tokens / 100000000m)
-                : 0;
-
-            decimal tokensInWan = tokens / 10000m;
-
-            sb.AppendLine();
-            sb.AppendLine($"{modelId}  成本：【{cost:F2}RMB】  次数：【{count}次】  token：【{tokensInWan:F0}w】 1亿token成本：【{costPerHundredMillion:F2}RMB】");
-        }
-
-        return sb.ToString().TrimEnd();
-    }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/AnnouncementService.cs

@@ -1,6 +1,10 @@
 using Mapster;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Configuration;
+using SqlSugar;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Caching;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
@@ -31,8 +35,9 @@ public class AnnouncementService : ApplicationService, IAnnouncementService
     }
 
     /// <summary>
-    /// 获取公告信息
+    /// 获取公告信息（前端首页使用，允许匿名访问）
     /// </summary>
+    [AllowAnonymous]
     public async Task<List<AnnouncementLogDto>> GetAsync()
     {
         // 使用 GetOrAddAsync 从缓存获取或添加数据，缓存1小时
@@ -48,18 +53,134 @@ public class AnnouncementService : ApplicationService, IAnnouncementService
         return cacheData?.Logs ?? new List<AnnouncementLogDto>();
     }
 
+    /// <summary>
+    /// 获取公告列表（后台管理使用）
+    /// </summary>
+    [Authorize(Roles = "admin")]
+    [HttpGet("announcement/list")]
+    public async Task<PagedResultDto<AnnouncementDto>> GetListAsync(AnnouncementGetListInput input)
+    {
+        var query = _announcementRepository._DbQueryable
+            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey),
+                x => x.Title.Contains(input.SearchKey!) || (x.Remark != null && x.Remark.Contains(input.SearchKey!)))
+            .WhereIF(input.Type.HasValue, x => x.Type == input.Type!.Value)
+            .OrderByDescending(x => x.StartTime);
+
+        var totalCount = await query.CountAsync();
+        var items = await query
+            .Skip(input.SkipCount)
+            .Take(input.MaxResultCount)
+            .ToListAsync();
+
+        return new PagedResultDto<AnnouncementDto>(
+            totalCount,
+            items.Adapt<List<AnnouncementDto>>()
+        );
+    }
+
+    /// <summary>
+    /// 根据ID获取公告
+    /// </summary>
+    [Authorize(Roles = "admin")]
+    [HttpGet("{id}")]
+    public async Task<AnnouncementDto> GetByIdAsync(Guid id)
+    {
+        var entity = await _announcementRepository.GetByIdAsync(id);
+        if (entity == null)
+        {
+            throw new Exception("公告不存在");
+        }
+        return entity.Adapt<AnnouncementDto>();
+    }
+
+    /// <summary>
+    /// 创建公告
+    /// </summary>
+    [Authorize(Roles = "admin")]
+    [HttpPost]
+    public async Task<AnnouncementDto> CreateAsync(AnnouncementCreateInput input)
+    {
+        var entity = input.Adapt<AnnouncementAggregateRoot>();
+        await _announcementRepository.InsertAsync(entity);
+
+        // 清除缓存
+        await _announcementCache.RemoveAsync(AnnouncementCacheKey);
+
+        return entity.Adapt<AnnouncementDto>();
+    }
+
+    /// <summary>
+    /// 更新公告
+    /// </summary>
+    [Authorize(Roles = "admin")]
+    [HttpPut]
+    public async Task<AnnouncementDto> UpdateAsync(AnnouncementUpdateInput input)
+    {
+        var entity = await _announcementRepository.GetByIdAsync(input.Id);
+        if (entity == null)
+        {
+            throw new Exception("公告不存在");
+        }
+
+        // 更新字段
+        entity.Title = input.Title;
+        entity.Content = input.Content;
+        entity.Remark = input.Remark;
+        entity.ImageUrl = input.ImageUrl;
+        entity.StartTime = input.StartTime;
+        entity.EndTime = input.EndTime;
+        entity.Type = input.Type;
+        entity.Url = input.Url;
+
+        await _announcementRepository.UpdateAsync(entity);
+
+        // 清除缓存
+        await _announcementCache.RemoveAsync(AnnouncementCacheKey);
+
+        return entity.Adapt<AnnouncementDto>();
+    }
+
+    /// <summary>
+    /// 删除公告
+    /// </summary>
+    [Authorize(Roles = "admin")]
+    [HttpDelete("announcement/{id}")]
+    public async Task DeleteAsync(Guid id)
+    {
+        var entity = await _announcementRepository.GetByIdAsync(id);
+        if (entity == null)
+        {
+            throw new Exception("公告不存在");
+        }
+
+        await _announcementRepository.DeleteAsync(entity);
+
+        // 清除缓存
+        await _announcementCache.RemoveAsync(AnnouncementCacheKey);
+    }
+
     /// <summary>
     /// 从数据库加载公告数据
     /// </summary>
     private async Task<AnnouncementCacheDto> LoadAnnouncementDataAsync()
     {
-        // 查询所有公告日志，按日期降序排列
+        // 一次性查出全部公告（不排序）
         var logs = await _announcementRepository._DbQueryable
-            .OrderByDescending(x => x.StartTime)
             .ToListAsync();
 
+        var now = DateTime.Now;
+
+        // 内存中处理排序
+        var orderedLogs = logs
+            .OrderByDescending(x =>
+                x.StartTime <= now &&
+                (x.EndTime == null || x.EndTime >= now)
+            )
+            .ThenByDescending(x => x.StartTime)
+            .ToList();
+
         // 转换为 DTO
-        var logDtos = logs.Adapt<List<AnnouncementLogDto>>();
+        var logDtos = orderedLogs.Adapt<List<AnnouncementLogDto>>();
         return new AnnouncementCacheDto
         {
             Logs = logDtos

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/ChannelService.cs

@@ -14,18 +14,21 @@ namespace Yi.Framework.AiHub.Application.Services;
 /// <summary>
 /// 渠道商管理服务实现
 /// </summary>
-[Authorize]
+[Authorize(Roles = "admin")]
 public class ChannelService : ApplicationService, IChannelService
 {
     private readonly ISqlSugarRepository<AiAppAggregateRoot, Guid> _appRepository;
     private readonly ISqlSugarRepository<AiModelEntity, Guid> _modelRepository;
+    private readonly ISqlSugarRepository<AiAppShortcutAggregateRoot, Guid> _appShortcutRepository;
 
     public ChannelService(
         ISqlSugarRepository<AiAppAggregateRoot, Guid> appRepository,
-        ISqlSugarRepository<AiModelEntity, Guid> modelRepository)
+        ISqlSugarRepository<AiModelEntity, Guid> modelRepository,
+        ISqlSugarRepository<AiAppShortcutAggregateRoot, Guid> appShortcutRepository)
     {
         _appRepository = appRepository;
         _modelRepository = modelRepository;
+        _appShortcutRepository = appShortcutRepository;
     }
 
     #region AI应用管理
@@ -181,6 +184,7 @@ public class ChannelService : ApplicationService, IChannelService
             ProviderName = input.ProviderName,
             IconUrl = input.IconUrl,
             IsPremium = input.IsPremium,
+            IsEnabled = input.IsEnabled,
             IsDeleted = false
         };
 
@@ -222,6 +226,7 @@ public class ChannelService : ApplicationService, IChannelService
         entity.ProviderName = input.ProviderName;
         entity.IconUrl = input.IconUrl;
         entity.IsPremium = input.IsPremium;
+        entity.IsEnabled = input.IsEnabled;
 
         await _modelRepository.UpdateAsync(entity);
         return entity.Adapt<AiModelDto>();
@@ -237,4 +242,22 @@ public class ChannelService : ApplicationService, IChannelService
     }
 
     #endregion
+
+    #region AI应用快捷配置
+
+    /// <summary>
+    /// 获取AI应用快捷配置列表
+    /// </summary>
+    [HttpGet("channel/app-shortcut")]
+    public async Task<List<AiAppShortcutDto>> GetAppShortcutListAsync()
+    {
+        var entities = await _appShortcutRepository._DbQueryable
+            .OrderBy(x => x.OrderNum)
+            .OrderByDescending(x => x.CreationTime)
+            .ToListAsync();
+
+        return entities.Adapt<List<AiAppShortcutDto>>();
+    }
+
+    #endregion
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiChatService.cs

@@ -25,6 +25,7 @@ using Yi.Framework.AiHub.Domain.Entities.Model;
 using Yi.Framework.AiHub.Domain.Extensions;
 using Yi.Framework.AiHub.Domain.Managers;
 using Yi.Framework.AiHub.Domain.Shared.Consts;
+using System.Text.Json;
 using Yi.Framework.AiHub.Domain.Shared.Dtos;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 using Yi.Framework.AiHub.Domain.Shared.Enums;
@@ -50,6 +51,7 @@ public class AiChatService : ApplicationService
     private readonly IAccountService _accountService;
     private readonly ISqlSugarRepository<AgentStoreAggregateRoot> _agentStoreRepository;
     private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
+    private const string FreeModelId = "DeepSeek-V3-0324";
 
     public AiChatService(IHttpContextAccessor httpContextAccessor,
         AiBlacklistManager aiBlacklistManager,
@@ -58,7 +60,8 @@ public class AiChatService : ApplicationService
         ModelManager modelManager,
         PremiumPackageManager premiumPackageManager,
         ChatManager chatManager, TokenManager tokenManager, IAccountService accountService,
-        ISqlSugarRepository<AgentStoreAggregateRoot> agentStoreRepository, ISqlSugarRepository<AiModelEntity> aiModelRepository)
+        ISqlSugarRepository<AgentStoreAggregateRoot> agentStoreRepository,
+        ISqlSugarRepository<AiModelEntity> aiModelRepository)
     {
         _httpContextAccessor = httpContextAccessor;
         _aiBlacklistManager = aiBlacklistManager;
@@ -88,83 +91,91 @@ public class AiChatService : ApplicationService
     }
 
     /// <summary>
-    /// 获取模型列表
+    /// 获取对话模型列表
     /// </summary>
     /// <returns></returns>
     public async Task<List<ModelGetListOutput>> GetModelAsync()
     {
         var output = await _aiModelRepository._DbQueryable
+            .Where(x => x.IsEnabled == true)
             .Where(x => x.ModelType == ModelTypeEnum.Chat)
-            .Where(x => x.ModelApiType == ModelApiTypeEnum.OpenAi)
+            // .Where(x => x.ModelApiType == ModelApiTypeEnum.Completions)
             .OrderByDescending(x => x.OrderNum)
             .Select(x => new ModelGetListOutput
             {
                 Id = x.Id,
-                Category = "chat",
                 ModelId = x.ModelId,
                 ModelName = x.Name,
                 ModelDescribe = x.Description,
-                ModelPrice = 0,
-                ModelType = "1",
-                ModelShow = "0",
-                SystemPrompt = null,
-                ApiHost = null,
-                ApiKey = null,
                 Remark = x.Description,
-                IsPremiumPackage = x.IsPremium
+                IsPremiumPackage = x.IsPremium,
+                ModelApiType = x.ModelApiType,
+                IconUrl = x.IconUrl,
+                ProviderName = x.ProviderName
             }).ToListAsync();
+
+        output.ForEach(x =>
+        {
+            if (x.ModelId == FreeModelId)
+            {
+                x.IsPremiumPackage = false;
+                x.IsFree = true;
+            }
+        });
+
         return output;
     }
 
 
-    /// <summary>
+    // /// <summary>
-    /// 发送消息
+    // /// 发送消息
-    /// </summary>
+    // /// </summary>
-    /// <param name="input"></param>
+    // /// <param name="input"></param>
-    /// <param name="sessionId"></param>
+    // /// <param name="sessionId"></param>
-    /// <param name="cancellationToken"></param>
+    // /// <param name="cancellationToken"></param>
-    [HttpPost("ai-chat/send")]
+    // [HttpPost("ai-chat/send")]
-    public async Task PostSendAsync([FromBody] ThorChatCompletionsRequest input, [FromQuery] Guid? sessionId,
+    // [Obsolete]
-        CancellationToken cancellationToken)
+    // public async Task PostSendAsync([FromBody] ThorChatCompletionsRequest input, [FromQuery] Guid? sessionId,
-    {
+    //     CancellationToken cancellationToken)
-        //除了免费模型，其他的模型都要校验
+    // {
-        if (!input.Model.Contains("DeepSeek-R1"))
+    //     //除了免费模型，其他的模型都要校验
-        {
+    //     if (input.Model!=FreeModelId)
-            //有token，需要黑名单校验
+    //     {
-            if (CurrentUser.IsAuthenticated)
+    //         //有token，需要黑名单校验
-            {
+    //         if (CurrentUser.IsAuthenticated)
-                await _aiBlacklistManager.VerifiyAiBlacklist(CurrentUser.GetId());
+    //         {
-                if (!CurrentUser.IsAiVip())
+    //             await _aiBlacklistManager.VerifiyAiBlacklist(CurrentUser.GetId());
-                {
+    //             if (!CurrentUser.IsAiVip())
-                    throw new UserFriendlyException("该模型需要VIP用户才能使用，请购买VIP后重新登录重试");
+    //             {
-                }
+    //                 throw new UserFriendlyException("该模型需要VIP用户才能使用，请购买VIP后重新登录重试");
-            }
+    //             }
-            else
+    //         }
-            {
+    //         else
-                throw new UserFriendlyException("未登录用户，只能使用未加速的DeepSeek-R1，请登录后重试");
+    //         {
-            }
+    //             throw new UserFriendlyException("未登录用户，只能使用未加速的DeepSeek-R1，请登录后重试");
-        }
+    //         }
-
+    //     }
-        //如果是尊享包服务，需要校验是是否尊享包足够
+    //
-        if (CurrentUser.IsAuthenticated)
+    //     //如果是尊享包服务，需要校验是是否尊享包足够
-        {
+    //     if (CurrentUser.IsAuthenticated)
-            var isPremium = await _modelManager.IsPremiumModelAsync(input.Model);
+    //     {
-
+    //         var isPremium = await _modelManager.IsPremiumModelAsync(input.Model);
-            if (isPremium)
+    //
-            {
+    //         if (isPremium)
-                // 检查尊享token包用量
+    //         {
-                var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
+    //             // 检查尊享token包用量
-                if (availableTokens <= 0)
+    //             var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
-                {
+    //             if (availableTokens <= 0)
-                    throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+    //             {
-                }
+    //                 throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
-            }
+    //             }
-        }
+    //         }
-
+    //     }
-        //ai网关代理httpcontext
+    //
-        await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
+    //     //ai网关代理httpcontext
-            CurrentUser.Id, sessionId, null, CancellationToken.None);
+    //     await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-    }
+    //         CurrentUser.Id, sessionId, null, CancellationToken.None);
+    // }
 
     /// <summary>
     /// 发送消息
@@ -179,22 +190,10 @@ public class AiChatService : ApplicationService
         {
             throw new BusinessException("当前接口不支持第三方使用");
         }
-
+        input.Model = "gpt-5-chat";
         if (CurrentUser.IsAuthenticated)
         {
             await _aiBlacklistManager.VerifiyAiBlacklist(CurrentUser.GetId());
-            if (CurrentUser.IsAiVip())
-            {
-                input.Model = "gpt-5-chat";
-            }
-            else
-            {
-                input.Model = "gpt-4.1-mini";
-            }
-        }
-        else
-        {
-            input.Model = "DeepSeek-R1-0528";
         }
 
         //ai网关代理httpcontext
@@ -209,7 +208,7 @@ public class AiChatService : ApplicationService
     [HttpPost("ai-chat/agent/send")]
     public async Task PostAgentSendAsync([FromBody] AgentSendInput input, CancellationToken cancellationToken)
     {
-        var tokenValidation = await _tokenManager.ValidateTokenAsync(input.Token, input.ModelId);
+        var tokenValidation = await _tokenManager.ValidateTokenAsync(input.TokenId, input.ModelId);
 
         await _aiBlacklistManager.VerifiyAiBlacklist(tokenValidation.UserId);
         // 验证用户是否为VIP
@@ -241,7 +240,7 @@ public class AiChatService : ApplicationService
         await _chatManager.AgentCompleteChatStreamAsync(_httpContextAccessor.HttpContext,
             input.SessionId,
             input.Content,
-            input.Token,
+            tokenValidation.Token,
             tokenValidation.TokenId,
             input.ModelId,
             tokenValidation.UserId,
@@ -275,4 +274,89 @@ public class AiChatService : ApplicationService
         var data = await _agentStoreRepository.GetFirstAsync(x => x.SessionId == sessionId);
         return data?.Store;
     }
+
+    /// <summary>
+    /// 统一发送消息 - 支持4种API类型
+    /// </summary>
+    /// <param name="apiType">API类型枚举</param>
+    /// <param name="input">原始请求体JsonElement</param>
+    /// <param name="modelId">模型ID（Gemini格式需要从URL传入）</param>
+    /// <param name="sessionId">会话ID</param>
+    /// <param name="cancellationToken"></param>
+    [HttpPost("ai-chat/unified/send")]
+    public async Task PostUnifiedSendAsync(
+        [FromQuery] ModelApiTypeEnum apiType,
+        [FromBody] JsonElement input,
+        [FromQuery] string modelId,
+        [FromQuery] Guid? sessionId,
+        CancellationToken cancellationToken)
+    {
+        // 从请求体中提取模型ID（如果未从URL传入）
+        if (string.IsNullOrEmpty(modelId))
+        {
+            modelId = ExtractModelIdFromRequest(apiType, input);
+        }
+
+        // 除了免费模型，其他的模型都要校验
+        if (modelId != FreeModelId)
+        {
+            if (CurrentUser.IsAuthenticated)
+            {
+                await _aiBlacklistManager.VerifiyAiBlacklist(CurrentUser.GetId());
+                if (!CurrentUser.IsAiVip())
+                {
+                    throw new UserFriendlyException("该模型需要VIP用户才能使用，请购买VIP后重新登录重试");
+                }
+            }
+            else
+            {
+                throw new UserFriendlyException("未登录用户，只能使用未加速的DeepSeek-R1，请登录后重试");
+            }
+        }
+
+        // 如果是尊享包服务，需要校验是否尊享包足够
+        if (CurrentUser.IsAuthenticated)
+        {
+            var isPremium = await _modelManager.IsPremiumModelAsync(modelId);
+            if (isPremium)
+            {
+                var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
+                if (availableTokens <= 0)
+                {
+                    throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+                }
+            }
+        }
+
+        // 调用统一流式处理
+        await _aiGateWayManager.UnifiedStreamForStatisticsAsync(
+            _httpContextAccessor.HttpContext!,
+            apiType,
+            input,
+            modelId,
+            CurrentUser.Id,
+            sessionId,
+            null,
+            CancellationToken.None);
+    }
+
+    /// <summary>
+    /// 从请求体中提取模型ID
+    /// </summary>
+    private string ExtractModelIdFromRequest(ModelApiTypeEnum apiType, JsonElement input)
+    {
+        try
+        {
+            if (input.TryGetProperty("model", out var modelProperty))
+            {
+                return modelProperty.GetString() ?? string.Empty;
+            }
+        }
+        catch
+        {
+            // 忽略解析错误
+        }
+
+        throw new UserFriendlyException("无法从请求中获取模型ID，请在URL参数中指定modelId");
+    }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiImageService.cs

@@ -3,14 +3,17 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
 using Volo.Abp;
 using Volo.Abp.Application.Services;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Guids;
 using Volo.Abp.Users;
+using Yi.Framework.AiHub.Application.Contracts.Dtos;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
 using Yi.Framework.AiHub.Application.Jobs;
 using Yi.Framework.AiHub.Domain.Entities.Chat;
+using Yi.Framework.AiHub.Domain.Entities.Model;
 using Yi.Framework.AiHub.Domain.Extensions;
 using Yi.Framework.AiHub.Domain.Managers;
 using Yi.Framework.AiHub.Domain.Shared.Consts;
@@ -32,6 +35,8 @@ public class AiImageService : ApplicationService
     private readonly ModelManager _modelManager;
     private readonly IGuidGenerator _guidGenerator;
     private readonly IWebHostEnvironment _webHostEnvironment;
+    private readonly TokenManager _tokenManager;
+    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
 
     public AiImageService(
         ISqlSugarRepository<ImageStoreTaskAggregateRoot> imageTaskRepository,
@@ -40,7 +45,8 @@ public class AiImageService : ApplicationService
         PremiumPackageManager premiumPackageManager,
         ModelManager modelManager,
         IGuidGenerator guidGenerator,
-        IWebHostEnvironment webHostEnvironment)
+        IWebHostEnvironment webHostEnvironment, TokenManager tokenManager,
+        ISqlSugarRepository<AiModelEntity> aiModelRepository)
     {
         _imageTaskRepository = imageTaskRepository;
         _backgroundJobManager = backgroundJobManager;
@@ -49,6 +55,8 @@ public class AiImageService : ApplicationService
         _modelManager = modelManager;
         _guidGenerator = guidGenerator;
         _webHostEnvironment = webHostEnvironment;
+        _tokenManager = tokenManager;
+        _aiModelRepository = aiModelRepository;
     }
 
     /// <summary>
@@ -65,6 +73,13 @@ public class AiImageService : ApplicationService
         // 黑名单校验
         await _aiBlacklistManager.VerifiyAiBlacklist(userId);
 
+        //校验token
+        if (input.TokenId is not null)
+        {
+            await _tokenManager.ValidateTokenAsync(input.TokenId, input.ModelId);
+        }
+
+
         // VIP校验
         if (!CurrentUser.IsAiVip())
         {
@@ -86,32 +101,23 @@ public class AiImageService : ApplicationService
         var task = new ImageStoreTaskAggregateRoot
         {
             Prompt = input.Prompt,
-            ReferenceImagesBase64 = input.ReferenceImagesBase64 ?? new List<string>(),
+            ReferenceImagesPrefixBase64 = input.ReferenceImagesPrefixBase64 ?? new List<string>(),
             ReferenceImagesUrl = new List<string>(),
             TaskStatus = TaskStatusEnum.Processing,
-            UserId = userId
+            UserId = userId,
+            UserName = CurrentUser.UserName,
+            TokenId = input.TokenId,
+            ModelId = input.ModelId
         };
 
         await _imageTaskRepository.InsertAsync(task);
-        var taskId = task.Id;
-
-        // 构建请求JSON
-        var requestJson = JsonSerializer.Serialize(new
-        {
-            prompt = input.Prompt,
-            referenceImages = input.ReferenceImagesBase64
-        });
-
         // 入队后台任务
         await _backgroundJobManager.EnqueueAsync(new ImageGenerationJobArgs
         {
-            TaskId = taskId,
+            TaskId = task.Id,
-            ModelId = input.ModelId,
-            RequestJson = requestJson,
-            UserId = userId
         });
 
-        return taskId;
+        return task.Id;
     }
 
     /// <summary>
@@ -134,12 +140,15 @@ public class AiImageService : ApplicationService
         {
             Id = task.Id,
             Prompt = task.Prompt,
-            ReferenceImagesBase64 = task.ReferenceImagesBase64,
+            // ReferenceImagesBase64 = task.ReferenceImagesBase64,
-            ReferenceImagesUrl = task.ReferenceImagesUrl,
+            // ReferenceImagesUrl = task.ReferenceImagesUrl,
-            StoreBase64 = task.StoreBase64,
+            // StoreBase64 = task.StoreBase64,
             StoreUrl = task.StoreUrl,
             TaskStatus = task.TaskStatus,
-            CreationTime = task.CreationTime
+            PublishStatus = task.PublishStatus,
+            Categories = task.Categories,
+            CreationTime = task.CreationTime,
+            ErrorInfo = task.ErrorInfo,
         };
     }
 
@@ -149,6 +158,7 @@ public class AiImageService : ApplicationService
     /// <param name="base64Data">Base64图片数据（包含前缀如 data:image/png;base64,）</param>
     /// <returns>图片访问URL</returns>
     [HttpPost("ai-image/upload-base64")]
+    [AllowAnonymous]
     public async Task<string> UploadBase64ToUrlAsync([FromBody] string base64Data)
     {
         if (string.IsNullOrWhiteSpace(base64Data))
@@ -171,6 +181,7 @@ public class AiImageService : ApplicationService
                 {
                     mimeType = header.Split(':')[1].Split(';')[0];
                 }
+
                 base64Content = parts[1];
             }
         }
@@ -197,57 +208,182 @@ public class AiImageService : ApplicationService
             throw new UserFriendlyException("Base64格式无效");
         }
 
-        // 创建存储目录
+        // ==============================
-        var uploadPath = Path.Combine(_webHostEnvironment.ContentRootPath, "wwwroot", "ai-images");
+        // ✅ 按日期创建目录（yyyyMMdd）
+        // ==============================
+        var dateFolder = DateTime.Now.ToString("yyyyMMdd");
+        var uploadPath = Path.Combine(
+            _webHostEnvironment.ContentRootPath,
+            "wwwroot",
+            "ai-images",
+            dateFolder
+        );
+
         if (!Directory.Exists(uploadPath))
         {
             Directory.CreateDirectory(uploadPath);
         }
 
-        // 生成文件名并保存
+        // 保存文件
         var fileId = _guidGenerator.Create();
         var fileName = $"{fileId}{extension}";
         var filePath = Path.Combine(uploadPath, fileName);
 
         await File.WriteAllBytesAsync(filePath, imageBytes);
 
-        // 返回访问URL
+        // 返回包含日期目录的访问URL
-        return $"/ai-images/{fileName}";
+        return $"/wwwroot/ai-images/{dateFolder}/{fileName}";
     }
 
     /// <summary>
-    /// 分页查询任务列表
+    /// 分页查询我的任务列表
     /// </summary>
-    /// <param name="input">分页查询参数</param>
+    [HttpGet("ai-image/my-tasks")]
-    /// <returns>任务列表</returns>
+    public async Task<PagedResult<ImageTaskOutput>> GetMyTaskPageAsync([FromQuery] ImageMyTaskPageInput input)
-    [HttpGet("ai-image/tasks")]
-    public async Task<PagedResult<ImageTaskOutput>> GetTaskPageAsync([FromQuery] ImageTaskPageInput input)
     {
         var userId = CurrentUser.GetId();
 
-        var query = _imageTaskRepository._DbQueryable
+        RefAsync<int> total = 0;
+        var output = await _imageTaskRepository._DbQueryable
             .Where(x => x.UserId == userId)
-            .WhereIF(input.TaskStatus.HasValue, x => x.TaskStatus == input.TaskStatus!.Value)
+            .WhereIF(input.TaskStatus is not null, x => x.TaskStatus == input.TaskStatus)
-            .OrderByDescending(x => x.CreationTime);
+            .WhereIF(!string.IsNullOrWhiteSpace(input.Prompt), x => x.Prompt.Contains(input.Prompt))
-
+            .WhereIF(input.PublishStatus is not null, x => x.PublishStatus == input.PublishStatus)
-        var total = await query.CountAsync();
+            .WhereIF(input.StartTime is not null && input.EndTime is not null,
-        var items = await query
+                x => x.CreationTime >= input.StartTime && x.CreationTime <= input.EndTime)
-            .Skip((input.PageIndex - 1) * input.PageSize)
+            .OrderByDescending(x => x.CreationTime)
-            .Take(input.PageSize)
             .Select(x => new ImageTaskOutput
             {
                 Id = x.Id,
                 Prompt = x.Prompt,
-                ReferenceImagesBase64 = x.ReferenceImagesBase64,
-                ReferenceImagesUrl = x.ReferenceImagesUrl,
-                StoreBase64 = x.StoreBase64,
                 StoreUrl = x.StoreUrl,
                 TaskStatus = x.TaskStatus,
-                CreationTime = x.CreationTime
+                PublishStatus = x.PublishStatus,
+                Categories = x.Categories,
+                CreationTime = x.CreationTime,
+                ErrorInfo = x.ErrorInfo,
+                UserName = x.UserName,
+                UserId = x.UserId,
+                IsAnonymous = x.IsAnonymous
             })
-            .ToListAsync();
+            .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
 
-        return new PagedResult<ImageTaskOutput>(total, items);
+
+        return new PagedResult<ImageTaskOutput>(total, output);
+    }
+
+    /// <summary>
+    /// 删除个人图片
+    /// </summary>
+    /// <param name="ids"></param>
+    [HttpDelete("ai-image/my-tasks")]
+    public async Task DeleteMyTaskAsync([FromQuery] List<Guid> ids)
+    {
+        var userId = CurrentUser.GetId();
+        await _imageTaskRepository.DeleteAsync(x => ids.Contains(x.Id) && x.UserId == userId);
+    }
+
+    /// <summary>
+    /// 分页查询图片广场（已发布的图片）
+    /// </summary>
+    [HttpGet("ai-image/plaza")]
+    [AllowAnonymous]
+    public async Task<PagedResult<ImageTaskOutput>> GetPlazaPageAsync([FromQuery] ImagePlazaPageInput input)
+    {
+        RefAsync<int> total = 0;
+        var output = await _imageTaskRepository._DbQueryable
+            .Where(x => x.PublishStatus == PublishStatusEnum.Published)
+            .Where(x => x.TaskStatus == TaskStatusEnum.Success)
+            .WhereIF(input.TaskStatus is not null, x => x.TaskStatus == input.TaskStatus)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.Prompt), x => x.Prompt.Contains(input.Prompt))
+            .WhereIF(!string.IsNullOrWhiteSpace(input.Categories),
+                x => SqlFunc.JsonLike(x.Categories, input.Categories))
+            .WhereIF(!string.IsNullOrWhiteSpace(input.UserName), x => x.UserName.Contains(input.UserName))
+            .WhereIF(input.StartTime is not null && input.EndTime is not null,
+                x => x.CreationTime >= input.StartTime && x.CreationTime <= input.EndTime)
+            .OrderByDescending(x => x.CreationTime)
+            .Select(x => new ImageTaskOutput
+            {
+                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);
+        ;
+
+
+        output.ForEach(x =>
+        {
+            if (x.IsAnonymous)
+            {
+                x.UserName = null;
+                x.UserId = null;
+            }
+        });
+
+        return new PagedResult<ImageTaskOutput>(total, output);
+    }
+
+    /// <summary>
+    /// 发布图片到广场
+    /// </summary>
+    [HttpPost("ai-image/publish")]
+    public async Task PublishAsync([FromBody] PublishImageInput input)
+    {
+        var userId = CurrentUser.GetId();
+
+        var task = await _imageTaskRepository.GetFirstAsync(x => x.Id == input.TaskId && x.UserId == userId);
+        if (task == null)
+        {
+            throw new UserFriendlyException("任务不存在或无权访问");
+        }
+
+        if (task.TaskStatus != TaskStatusEnum.Success)
+        {
+            throw new UserFriendlyException("只有已完成的任务才能发布");
+        }
+
+        if (task.PublishStatus == PublishStatusEnum.Published)
+        {
+            throw new UserFriendlyException("该任务已发布");
+        }
+
+        //设置发布
+        task.SetPublish(input.IsAnonymous, input.Categories);
+        await _imageTaskRepository.UpdateAsync(task);
+    }
+
+    /// <summary>
+    /// 获取图片模型列表
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("ai-image/model")]
+    [AllowAnonymous]
+    public async Task<List<ModelGetListOutput>> GetModelAsync()
+    {
+        var output = await _aiModelRepository._DbQueryable
+            .Where(x=>x.IsEnabled==true)
+            .Where(x => x.ModelType == ModelTypeEnum.Image)
+            .Where(x => x.ModelApiType == ModelApiTypeEnum.GenerateContent)
+            .OrderByDescending(x => x.OrderNum)
+            .Select(x => new ModelGetListOutput
+            {
+                Id = x.Id,
+                ModelId = x.ModelId,
+                ModelName = x.Name,
+                ModelDescribe = x.Description,
+                Remark = x.Description,
+                IsPremiumPackage = x.IsPremium
+            }).ToListAsync();
+        return output;
     }
 }
 

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/MessageService.cs

@@ -35,8 +35,59 @@ public class MessageService : ApplicationService
         var entities = await _repository._DbQueryable
             .Where(x => x.SessionId == input.SessionId)
             .Where(x=>x.UserId == userId)
+            .Where(x => !x.IsHidden)
             .OrderBy(x => x.Id)
             .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
         return new PagedResultDto<MessageDto>(total, entities.Adapt<List<MessageDto>>());
     }
+
+    /// <summary>
+    /// 删除消息（软删除，标记为隐藏）
+    /// </summary>
+    /// <param name="input">删除参数，包含消息Id列表和是否删除后续消息的开关</param>
+    [Authorize]
+    public async Task DeleteAsync([FromQuery] MessageDeleteInput input)
+    {
+        var userId = CurrentUser.GetId();
+
+        // 获取要删除的消息
+        var messages = await _repository._DbQueryable
+            .Where(x => input.Ids.Contains(x.Id))
+            .Where(x => x.UserId == userId)
+            .ToListAsync();
+
+        if (messages.Count == 0)
+        {
+            return;
+        }
+
+        // 标记当前消息为隐藏
+        var idsToHide = messages.Select(x => x.Id).ToList();
+
+        // 如果需要删除后续消息
+        if (input.IsDeleteSubsequent)
+        {
+            foreach (var message in messages)
+            {
+                // 获取同一会话中时间大于当前消息的所有消息Id
+                var subsequentIds = await _repository._DbQueryable
+                    .Where(x => x.SessionId == message.SessionId)
+                    .Where(x => x.UserId == userId)
+                    .Where(x => x.CreationTime > message.CreationTime)
+                    .Where(x => !x.IsHidden)
+                    .Select(x => x.Id)
+                    .ToListAsync();
+
+                idsToHide.AddRange(subsequentIds);
+            }
+
+            idsToHide = idsToHide.Distinct().ToList();
+        }
+
+        // 批量更新为隐藏状态
+        await _repository._Db.Updateable<MessageAggregateRoot>()
+            .SetColumns(x => x.IsHidden == true)
+            .Where(x => idsToHide.Contains(x.Id))
+            .ExecuteCommandAsync();
+    }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/ModelService.cs

@@ -35,8 +35,9 @@ public class ModelService : ApplicationService, IModelService
     {
         RefAsync<int> total = 0;
 
-        // 查询所有未删除的模型，使用WhereIF动态添加筛选条件
+        // 查询所有未删除且已启用的模型，使用WhereIF动态添加筛选条件
         var modelIds = (await _modelRepository._DbQueryable
+            .Where(x => x.IsEnabled)
             .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), x =>
                 x.Name.Contains(input.SearchKey) || x.ModelId.Contains(input.SearchKey))
             .WhereIF(input.ProviderNames is not null, x =>
@@ -51,6 +52,7 @@ public class ModelService : ApplicationService, IModelService
             .ToPageListAsync(input.SkipCount, input.MaxResultCount, total));
 
         var entities = await _modelRepository._DbQueryable.Where(x => modelIds.Contains(x.ModelId))
+            .Where(x => x.IsEnabled)
             .OrderBy(x => x.OrderNum)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -77,10 +79,9 @@ public class ModelService : ApplicationService, IModelService
     public async Task<List<string>> GetProviderListAsync()
     {
         var providers = await _modelRepository._DbQueryable
-            .Where(x => !x.IsDeleted)
+            .Where(x => x.IsEnabled)
             .Where(x => !string.IsNullOrEmpty(x.ProviderName))
             .GroupBy(x => x.ProviderName)
-            .OrderBy(x => x.OrderNum)
             .Select(x => x.ProviderName)
             .ToListAsync();
 

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/SessionService.cs

@@ -84,7 +84,8 @@ public class SessionService : CrudAppService<SessionAggregateRoot, SessionDto, G
         RefAsync<int> total = 0;
         var userId = CurrentUser.GetId();
         var entities = await _repository._DbQueryable
-            .Where(x=>x.UserId == userId)
+            .Where(x => x.UserId == userId)
+            .WhereIF(input.SessionType.HasValue, x => x.SessionType == input.SessionType!.Value)
             .OrderByDescending(x => x.Id)
             .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
         return new PagedResultDto<SessionDto>(total, entities.Adapt<List<SessionDto>>());

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/TokenService.cs

@@ -26,6 +26,7 @@ public class TokenService : ApplicationService
     private readonly ISqlSugarRepository<TokenAggregateRoot> _tokenRepository;
     private readonly ISqlSugarRepository<UsageStatisticsAggregateRoot> _usageStatisticsRepository;
     private readonly ModelManager _modelManager;
+
     public TokenService(
         ISqlSugarRepository<TokenAggregateRoot> tokenRepository,
         ISqlSugarRepository<UsageStatisticsAggregateRoot> usageStatisticsRepository,
@@ -90,7 +91,7 @@ public class TokenService : ApplicationService
     }
 
     [HttpGet("token/select-list")]
-    public async Task<List<TokenSelectListOutputDto>> GetSelectListAsync()
+    public async Task<List<TokenSelectListOutputDto>> GetSelectListAsync([FromQuery] bool? includeDefault = true)
     {
         var userId = CurrentUser.GetId();
         var tokens = await _tokenRepository._DbQueryable
@@ -104,12 +105,16 @@ public class TokenService : ApplicationService
                 IsDisabled = x.IsDisabled
             }).ToListAsync();
 
-        tokens.Insert(0,new TokenSelectListOutputDto
+        if (includeDefault == true)
         {
-            TokenId = Guid.Empty,
+            tokens.Insert(0, new TokenSelectListOutputDto
-            Name = "默认",
+            {
-            IsDisabled = false
+                TokenId = Guid.Empty,
-        });
+                Name = "默认",
+                IsDisabled = false
+            });
+        }
+
         return tokens;
     }
 

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/RankingService.cs

@@ -0,0 +1,38 @@
+using Mapster;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Application.Services;
+using Yi.Framework.AiHub.Application.Contracts.Dtos;
+using Yi.Framework.AiHub.Application.Contracts.IServices;
+using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Services;
+
+/// <summary>
+/// 排行榜服务
+/// </summary>
+public class RankingService : ApplicationService, IRankingService
+{
+    private readonly ISqlSugarRepository<RankingItemAggregateRoot, Guid> _repository;
+
+    public RankingService(ISqlSugarRepository<RankingItemAggregateRoot, Guid> repository)
+    {
+        _repository = repository;
+    }
+
+    /// <summary>
+    /// 获取排行榜列表（全量返回，按得分降序）
+    /// </summary>
+    [HttpGet("ranking/list")]
+    [AllowAnonymous]
+    public async Task<List<RankingItemDto>> GetListAsync([FromQuery] RankingGetListInput input)
+    {
+        var query = _repository._DbQueryable
+            .WhereIF(input.Type.HasValue, x => x.Type == input.Type!.Value)
+            .OrderByDescending(x => x.Score);
+
+        var entities = await query.ToListAsync();
+        return entities.Adapt<List<RankingItemDto>>();
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/RechargeService.cs

@@ -1,6 +1,8 @@
 using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Users;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.Recharge;
@@ -35,19 +37,29 @@ namespace Yi.Framework.AiHub.Application.Services
         }
 
         /// <summary>
-        /// 查询已登录的账户充值记录
+        /// 查询已登录的账户充值记录（分页）
         /// </summary>
         /// <returns></returns>
         [Route("recharge/account")]
         [Authorize]
-        public async Task<List<RechargeGetListOutput>> GetListByAccountAsync()
+        public async Task<PagedResultDto<RechargeGetListOutput>> GetListByAccountAsync([FromQuery]RechargeGetListInput input)
         {
             var userId = CurrentUser.Id;
-            var entities = await _repository._DbQueryable.Where(x => x.UserId == userId)
+            RefAsync<int> total = 0;
+
+            var entities = await _repository._DbQueryable
+                .Where(x => x.UserId == userId)
+                .WhereIF(input.StartTime.HasValue, x => x.CreationTime >= input.StartTime!.Value)
+                .WhereIF(input.EndTime.HasValue, x => x.CreationTime <= input.EndTime!.Value)
+                .WhereIF(input.IsFree == true, x => x.RechargeAmount == 0)
+                .WhereIF(input.IsFree == false, x => x.RechargeAmount > 0)
+                .WhereIF(input.MinRechargeAmount.HasValue, x => x.RechargeAmount >= input.MinRechargeAmount!.Value)
+                .WhereIF(input.MaxRechargeAmount.HasValue, x => x.RechargeAmount <= input.MaxRechargeAmount!.Value)
                 .OrderByDescending(x => x.CreationTime)
-                .ToListAsync();
+                .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
+
             var output = entities.Adapt<List<RechargeGetListOutput>>();
-            return output;
+            return new PagedResultDto<RechargeGetListOutput>(total, output);
         }
 
         /// <summary>

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/SystemUsageStatisticsService.cs

@@ -0,0 +1,203 @@
+using Mapster;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using System.Globalization;
+using Volo.Abp.Application.Services;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.SystemStatistics;
+using Yi.Framework.AiHub.Application.Contracts.IServices;
+using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.AiHub.Domain.Entities.Chat;
+using Yi.Framework.AiHub.Domain.Entities.Model;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Services;
+
+/// <summary>
+/// 系统使用量统计服务实现
+/// </summary>
+[Authorize(Roles = "admin")]
+public class SystemUsageStatisticsService : ApplicationService, ISystemUsageStatisticsService
+{
+    private readonly ISqlSugarRepository<PremiumPackageAggregateRoot> _premiumPackageRepository;
+    private readonly ISqlSugarRepository<AiRechargeAggregateRoot> _rechargeRepository;
+    private readonly ISqlSugarRepository<MessageAggregateRoot> _messageRepository;
+    private readonly ISqlSugarRepository<AiModelEntity, Guid> _modelRepository;
+
+    public SystemUsageStatisticsService(
+        ISqlSugarRepository<PremiumPackageAggregateRoot> premiumPackageRepository,
+        ISqlSugarRepository<AiRechargeAggregateRoot> rechargeRepository,
+        ISqlSugarRepository<MessageAggregateRoot> messageRepository,
+        ISqlSugarRepository<AiModelEntity, Guid> modelRepository)
+    {
+        _premiumPackageRepository = premiumPackageRepository;
+        _rechargeRepository = rechargeRepository;
+        _messageRepository = messageRepository;
+        _modelRepository = modelRepository;
+    }
+
+    /// <summary>
+    /// 获取利润统计数据
+    /// </summary>
+    [HttpPost("system-statistics/profit")]
+    public async Task<ProfitStatisticsOutput> GetProfitStatisticsAsync(ProfitStatisticsInput input)
+    {
+        // 1. 获取尊享包总消耗和剩余库存
+        var premiumPackages = await _premiumPackageRepository._DbQueryable.ToListAsync();
+        long totalUsedTokens = premiumPackages.Sum(p => p.UsedTokens);
+        long totalRemainingTokens = premiumPackages.Sum(p => p.RemainingTokens);
+
+        // 2. 计算1亿Token成本
+        decimal costPerHundredMillion = totalUsedTokens > 0
+            ? input.CurrentCost / (totalUsedTokens / 100000000m)
+            : 0;
+
+        // 3. 计算总成本(剩余+已使用的总成本)
+        long totalTokens = totalUsedTokens + totalRemainingTokens;
+        decimal totalCost = totalTokens > 0
+            ? (totalTokens / 100000000m) * costPerHundredMillion
+            : 0;
+
+        // 4. 获取总收益(RechargeType=PremiumPackage的充值金额总和)
+        decimal totalRevenue = await _rechargeRepository._DbQueryable
+            .Where(x => x.RechargeType == Domain.Shared.Enums.RechargeTypeEnum.PremiumPackage)
+            .SumAsync(x => x.RechargeAmount);
+
+        // 5. 计算利润率
+        decimal profitRate = totalCost > 0
+            ? (totalRevenue / totalCost - 1) * 100
+            : 0;
+
+        // 6. 按200售价计算成本
+        decimal costAt200Price = totalRevenue > 0
+            ? (totalCost / totalRevenue) * 200
+            : 0;
+
+        // 7. 格式化日期
+        var today = DateTime.Now;
+        string dayOfWeek = today.ToString("dddd", new CultureInfo("zh-CN"));
+        string weekDay = dayOfWeek switch
+        {
+            "星期一" => "周1",
+            "星期二" => "周2",
+            "星期三" => "周3",
+            "星期四" => "周4",
+            "星期五" => "周5",
+            "星期六" => "周6",
+            "星期日" => "周日",
+            _ => dayOfWeek
+        };
+
+        return new ProfitStatisticsOutput
+        {
+            Date = $"{today:M月d日} {weekDay}",
+            TotalUsedTokens = totalUsedTokens,
+            TotalUsedTokensInHundredMillion = totalUsedTokens / 100000000m,
+            TotalRemainingTokens = totalRemainingTokens,
+            TotalRemainingTokensInHundredMillion = totalRemainingTokens / 100000000m,
+            CurrentCost = input.CurrentCost,
+            CostPerHundredMillion = costPerHundredMillion,
+            TotalCost = totalCost,
+            TotalRevenue = totalRevenue,
+            ProfitRate = profitRate,
+            CostAt200Price = costAt200Price
+        };
+    }
+
+    /// <summary>
+    /// 获取指定日期各模型Token统计
+    /// </summary>
+    [HttpPost("system-statistics/token")]
+    public async Task<TokenStatisticsOutput> GetTokenStatisticsAsync(TokenStatisticsInput input)
+    {
+        var day = input.Date.Date;
+        var nextDay = day.AddDays(1);
+
+        // 1. 获取所有尊享模型(包含被禁用的),按ModelId去重
+        var premiumModels = await _modelRepository._DbQueryable
+            .Where(x => x.IsPremium)
+            .ToListAsync();
+
+        if (premiumModels.Count == 0)
+        {
+            return new TokenStatisticsOutput
+            {
+                Date = FormatDate(day),
+                ModelStatistics = new List<ModelTokenStatisticsDto>()
+            };
+        }
+
+        // 按ModelId去重,保留第一个模型的名称
+        var distinctModels = premiumModels
+            .GroupBy(x => x.ModelId)
+            .Select(g => g.First())
+            .ToList();
+
+        var modelIds = distinctModels.Select(x => x.ModelId).ToList();
+
+        // 2. 查询指定日期内各模型的Token使用统计
+        var modelStats = await _messageRepository._DbQueryable
+            .Where(x => modelIds.Contains(x.ModelId))
+            .Where(x => x.CreationTime >= day && x.CreationTime < nextDay)
+            .Where(x => x.Role == "system")
+            .GroupBy(x => x.ModelId)
+            .Select(x => new
+            {
+                ModelId = x.ModelId,
+                Tokens = SqlFunc.AggregateSum(x.TokenUsage.TotalTokenCount),
+                Count = SqlFunc.AggregateCount(x.Id)
+            })
+            .ToListAsync();
+
+        var modelStatDict = modelStats.ToDictionary(x => x.ModelId, x => x);
+
+        // 3. 构建结果列表,使用去重后的模型列表
+        var result = new List<ModelTokenStatisticsDto>();
+        foreach (var model in distinctModels)
+        {
+            modelStatDict.TryGetValue(model.ModelId, out var stat);
+            long tokens = stat?.Tokens ?? 0;
+            long count = stat?.Count ?? 0;
+
+            // 这里成本设为0,因为需要前端传入或者从配置中获取
+            decimal cost = 0;
+            decimal costPerHundredMillion = tokens > 0 && cost > 0
+                ? cost / (tokens / 100000000m)
+                : 0;
+
+            result.Add(new ModelTokenStatisticsDto
+            {
+                ModelId = model.ModelId,
+                ModelName = model.Name,
+                Tokens = tokens,
+                TokensInWan = tokens / 10000m,
+                Count = count,
+                Cost = cost,
+                CostPerHundredMillion = costPerHundredMillion
+            });
+        }
+
+        return new TokenStatisticsOutput
+        {
+            Date = FormatDate(day),
+            ModelStatistics = result
+        };
+    }
+
+    private string FormatDate(DateTime date)
+    {
+        string dayOfWeek = date.ToString("dddd", new CultureInfo("zh-CN"));
+        string weekDay = dayOfWeek switch
+        {
+            "星期一" => "周1",
+            "星期二" => "周2",
+            "星期三" => "周3",
+            "星期四" => "周4",
+            "星期五" => "周5",
+            "星期六" => "周6",
+            "星期日" => "周日",
+            _ => dayOfWeek
+        };
+        return $"{date:M月d日} {weekDay}";
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/UsageStatisticsService.cs

@@ -30,6 +30,7 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
     private readonly ISqlSugarRepository<PremiumPackageAggregateRoot> _premiumPackageRepository;
     private readonly ISqlSugarRepository<TokenAggregateRoot> _tokenRepository;
     private readonly ModelManager _modelManager;
+
     public UsageStatisticsService(
         ISqlSugarRepository<MessageAggregateRoot> messageRepository,
         ISqlSugarRepository<UsageStatisticsAggregateRoot> usageStatisticsRepository,
@@ -48,7 +49,7 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
     /// 获取当前用户近7天的Token消耗统计
     /// </summary>
     /// <returns>每日Token使用量列表</returns>
-    public async Task<List<DailyTokenUsageDto>> GetLast7DaysTokenUsageAsync([FromQuery]UsageStatisticsGetInput input)
+    public async Task<List<DailyTokenUsageDto>> GetLast7DaysTokenUsageAsync([FromQuery] UsageStatisticsGetInput input)
     {
         var userId = CurrentUser.GetId();
         var endDate = DateTime.Today;
@@ -57,9 +58,9 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
         // 从Message表统计近7天的token消耗
         var dailyUsage = await _messageRepository._DbQueryable
             .Where(x => x.UserId == userId)
-            .Where(x => x.Role == "assistant" || x.Role == "system")
+            .Where(x => x.Role == "system")
             .Where(x => x.CreationTime >= startDate && x.CreationTime < endDate.AddDays(1))
-            .WhereIF(input.TokenId.HasValue,x => x.TokenId == input.TokenId)
+            .WhereIF(input.TokenId.HasValue, x => x.TokenId == input.TokenId)
             .GroupBy(x => x.CreationTime.Date)
             .Select(g => new
             {
@@ -89,14 +90,14 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
     /// 获取当前用户各个模型的Token消耗量及占比
     /// </summary>
     /// <returns>模型Token使用量列表</returns>
-    public async Task<List<ModelTokenUsageDto>> GetModelTokenUsageAsync([FromQuery]UsageStatisticsGetInput input)
+    public async Task<List<ModelTokenUsageDto>> GetModelTokenUsageAsync([FromQuery] UsageStatisticsGetInput input)
     {
         var userId = CurrentUser.GetId();
 
         // 从UsageStatistics表获取各模型的token消耗统计（按ModelId聚合，因为同一模型可能有多个TokenId的记录）
         var modelUsages = await _usageStatisticsRepository._DbQueryable
             .Where(x => x.UserId == userId)
-            .WhereIF(input.TokenId.HasValue,x => x.TokenId == input.TokenId)
+            .WhereIF(input.TokenId.HasValue, x => x.TokenId == input.TokenId)
             .GroupBy(x => x.ModelId)
             .Select(x => new
             {
@@ -221,11 +222,133 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
         var result = tokenUsages.Select(x => new TokenPremiumUsageDto
         {
             TokenId = x.TokenId,
-            TokenName = x.TokenId == Guid.Empty ? "默认" : (tokenNameDict.TryGetValue(x.TokenId, out var name) ? name : "其他"),
+            TokenName = x.TokenId == Guid.Empty
+                ? "默认"
+                : (tokenNameDict.TryGetValue(x.TokenId, out var name) ? name : "其他"),
             Tokens = x.TotalTokenCount,
             Percentage = totalTokens > 0 ? Math.Round((decimal)x.TotalTokenCount / totalTokens * 100, 2) : 0
         }).OrderByDescending(x => x.Tokens).ToList();
 
         return result;
     }
+
+    /// <summary>
+    /// 获取当前用户近24小时每小时Token消耗统计（柱状图）
+    /// </summary>
+    /// <returns>每小时Token使用量列表，包含各模型堆叠数据</returns>
+    public async Task<List<HourlyTokenUsageDto>> GetLast24HoursTokenUsageAsync(
+        [FromQuery] UsageStatisticsGetInput input)
+    {
+        var userId = CurrentUser.GetId();
+        var now = DateTime.Now;
+        var startTime = now.AddHours(-23); // 滚动24小时，从23小时前到现在
+        var startHour = new DateTime(startTime.Year, startTime.Month, startTime.Day, startTime.Hour, 0, 0);
+
+        // 从Message表查询近24小时的数据，只选择需要的字段
+        var messages = await _messageRepository._DbQueryable
+            .Where(x => x.UserId == userId)
+            .Where(x => x.Role == "system")
+            .Where(x => x.CreationTime >= startHour)
+            .WhereIF(input.TokenId.HasValue, x => x.TokenId == input.TokenId)
+            .Select(x => new
+            {
+                x.CreationTime,
+                x.ModelId,
+                x.TokenUsage.TotalTokenCount
+            })
+            .ToListAsync();
+
+        // 在内存中按小时和模型分组统计
+        var hourlyGrouped = messages
+            .GroupBy(x => new
+            {
+                Hour = new DateTime(x.CreationTime.Year, x.CreationTime.Month, x.CreationTime.Day, x.CreationTime.Hour,
+                    0, 0),
+                x.ModelId
+            })
+            .Select(g => new
+            {
+                g.Key.Hour,
+                g.Key.ModelId,
+                Tokens = g.Sum(x => x.TotalTokenCount)
+            })
+            .ToList();
+
+        // 生成完整的24小时数据
+        var result = new List<HourlyTokenUsageDto>();
+        for (int i = 0; i < 24; i++)
+        {
+            var hour = startHour.AddHours(i);
+            var hourData = hourlyGrouped.Where(x => x.Hour == hour).ToList();
+
+            var modelBreakdown = hourData.Select(x => new ModelTokenBreakdownDto
+            {
+                ModelId = x.ModelId,
+                Tokens = x.Tokens
+            }).ToList();
+
+            result.Add(new HourlyTokenUsageDto
+            {
+                Hour = hour,
+                TotalTokens = modelBreakdown.Sum(x => x.Tokens),
+                ModelBreakdown = modelBreakdown
+            });
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// 获取当前用户今日各模型使用量统计（卡片列表）
+    /// </summary>
+    /// <returns>模型今日使用量列表，包含使用次数和总Token</returns>
+    public async Task<List<ModelTodayUsageDto>> GetTodayModelUsageAsync([FromQuery] UsageStatisticsGetInput input)
+    {
+        var userId = CurrentUser.GetId();
+        var todayStart = DateTime.Today; // 今天凌晨0点
+        var tomorrowStart = todayStart.AddDays(1);
+
+        // 从Message表查询今天的数据，只选择需要的字段
+        var messages = await _messageRepository._DbQueryable
+            .Where(x => x.UserId == userId)
+            .Where(x => x.Role == "system")
+            .Where(x => x.CreationTime >= todayStart && x.CreationTime < tomorrowStart)
+            .WhereIF(input.TokenId.HasValue, x => x.TokenId == input.TokenId)
+            .Select(x => new
+            {
+                x.ModelId,
+                x.TokenUsage.TotalTokenCount
+            })
+            .ToListAsync();
+
+        // 在内存中按模型分组统计
+        var modelStats = messages
+            .GroupBy(x => x.ModelId)
+            .Select(g => new ModelTodayUsageDto
+            {
+                ModelId = g.Key,
+                UsageCount = g.Count(),
+                TotalTokens = g.Sum(x => x.TotalTokenCount)
+            })
+            .OrderByDescending(x => x.TotalTokens)
+            .ToList();
+
+        if (modelStats.Count > 0)
+        {
+            var modelIds = modelStats.Select(x => x.ModelId).ToList();
+            var modelDic = await _modelManager._aiModelRepository._DbQueryable.Where(x => modelIds.Contains(x.ModelId))
+                .Distinct()
+                .Where(x=>x.IsEnabled)
+                .ToDictionaryAsync<string>(x => x.ModelId, y => y.IconUrl);
+            modelStats.ForEach(x =>
+            {
+                if (modelDic.TryGetValue(x.ModelId, out var icon))
+                {
+                    x.IconUrl = icon;
+                }
+            });
+        }
+
+        return modelStats;
+    }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Consts/PremiumPackageConst.cs

@@ -15,10 +15,17 @@ public class PremiumPackageConst
         "gemini-3-pro-high",
         "gemini-3-pro-image-preview",
         "gpt-5.2-codex-xhigh",
+        "gpt-5.2-codex",
         
         "glm-4.7",
         "yi-claude-sonnet-4-5-20250929",
         "yi-claude-haiku-4-5-20251001",
         "yi-claude-opus-4-5-20251101",
+        
+        "yi-gpt-5.2",
+        "yi-gpt-5.2-codex",
+        "yi-gemini-3-pro-high",
+        "yi-gemini-3-pro",
+        
     ];
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/AiModelDescribe.cs

@@ -1,4 +1,6 @@
-namespace Yi.Framework.AiHub.Domain.Shared.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Dtos;
 
 public class AiModelDescribe
 {
@@ -61,4 +63,14 @@ public class AiModelDescribe
     /// 模型倍率
     /// </summary>
     public decimal Multiplier { get; set; }
+    
+    /// <summary>
+    /// 是否为尊享模型
+    /// </summary>
+    public bool IsPremium { get; set; }
+    
+    /// <summary>
+    /// 模型类型(聊天/图片等)
+    /// </summary>
+    public ModelTypeEnum ModelType { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/Anthropic/AnthropicChatCompletionDto.cs

@@ -19,38 +19,6 @@ public class AnthropicStreamDto
 
     [JsonPropertyName("error")] public AnthropicStreamErrorDto? Error { get; set; }
     
-    [JsonIgnore]
-    public ThorUsageResponse TokenUsage => new ThorUsageResponse
-    {
-        PromptTokens = Usage?.InputTokens + Usage?.CacheCreationInputTokens + Usage?.CacheReadInputTokens,
-        InputTokens = Usage?.InputTokens + Usage?.CacheCreationInputTokens + Usage?.CacheReadInputTokens,
-        OutputTokens = Usage?.OutputTokens,
-        InputTokensDetails = null,
-        CompletionTokens = Usage?.OutputTokens,
-        TotalTokens = Usage?.InputTokens + Usage?.CacheCreationInputTokens + Usage?.CacheReadInputTokens +
-                      Usage?.OutputTokens,
-        PromptTokensDetails = null,
-        CompletionTokensDetails = null
-    };
-
-
-    public void SupplementalMultiplier(decimal multiplier)
-    {
-        if (this.Usage is not null)
-        {
-            this.Usage.CacheCreationInputTokens =
-                (int)Math.Round((this.Usage.CacheCreationInputTokens ?? 0) * multiplier);
-
-            this.Usage.CacheReadInputTokens =
-                (int)Math.Round((this.Usage.CacheReadInputTokens ?? 0) * multiplier);
-
-            this.Usage.InputTokens =
-                (int)Math.Round((this.Usage.InputTokens ?? 0) * multiplier);
-
-            this.Usage.OutputTokens =
-                (int)Math.Round((this.Usage.OutputTokens ?? 0) * multiplier);
-        }
-    }
 }
 
 public class AnthropicStreamErrorDto
@@ -71,6 +39,11 @@ public class AnthropicChatCompletionDtoDelta
     [JsonPropertyName("partial_json")] public string? PartialJson { get; set; }
 
     [JsonPropertyName("stop_reason")] public string? StopReason { get; set; }
+    
+    [JsonPropertyName("signature")] public string? Signature { get; set; }
+    
+    [JsonPropertyName("stop_sequence")] public string? StopSequence { get; set; }
+    
 }
 
 public class AnthropicChatCompletionDtoContentBlock
@@ -116,37 +89,6 @@ public class AnthropicChatCompletionDto
 
     public AnthropicCompletionDtoUsage? Usage { get; set; }
     
-    [JsonIgnore]
-    public ThorUsageResponse TokenUsage => new ThorUsageResponse
-    {
-        PromptTokens = Usage?.InputTokens + Usage?.CacheCreationInputTokens + Usage?.CacheReadInputTokens,
-        InputTokens = Usage?.InputTokens + Usage?.CacheCreationInputTokens + Usage?.CacheReadInputTokens,
-        OutputTokens = Usage?.OutputTokens,
-        InputTokensDetails = null,
-        CompletionTokens = Usage?.OutputTokens,
-        TotalTokens = Usage?.InputTokens + Usage?.CacheCreationInputTokens + Usage?.CacheReadInputTokens +
-                      Usage?.OutputTokens,
-        PromptTokensDetails = null,
-        CompletionTokensDetails = null
-    };
-    
-    public void SupplementalMultiplier(decimal multiplier)
-    {
-        if (this.Usage is not null)
-        {
-            this.Usage.CacheCreationInputTokens =
-                (int)Math.Round((this.Usage?.CacheCreationInputTokens ?? 0) * multiplier);
-
-            this.Usage.CacheReadInputTokens =
-                (int)Math.Round((this.Usage?.CacheReadInputTokens ?? 0) * multiplier);
-
-            this.Usage.InputTokens =
-                (int)Math.Round((this.Usage?.InputTokens ?? 0) * multiplier);
-
-            this.Usage.OutputTokens =
-                (int)Math.Round((this.Usage?.OutputTokens ?? 0) * multiplier);
-        }
-    }
 }
 
 public class AnthropicChatCompletionDtoContent
@@ -166,6 +108,7 @@ public class AnthropicChatCompletionDtoContent
     [JsonPropertyName("partial_json")] public string? PartialJson { get; set; }
 
     public string? signature { get; set; }
+    
 }
 
 public class AnthropicCompletionDtoUsage
@@ -181,6 +124,12 @@ public class AnthropicCompletionDtoUsage
     [JsonPropertyName("output_tokens")] public int? OutputTokens { get; set; }
 
     [JsonPropertyName("server_tool_use")] public AnthropicServerToolUse? ServerToolUse { get; set; }
+    
+    [JsonPropertyName("cache_creation")] public object? CacheCreation { get; set; }
+
+    [JsonPropertyName("service_tier")] public string? ServiceTier { get; set; }
+
+
 }
 
 public class AnthropicServerToolUse

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/Anthropic/AnthropicInput.cs

@@ -133,28 +133,5 @@ public class AnthropicMessageTool
 
     [JsonPropertyName("description")] public string? Description { get; set; }
 
-    [JsonPropertyName("input_schema")] public Input_schema? InputSchema { get; set; }
+    [JsonPropertyName("input_schema")] public object? InputSchema { get; set; }
-}
-
-public class Input_schema
-{
-    [JsonPropertyName("type")] public string? Type { get; set; }
-
-    [JsonPropertyName("properties")] public Dictionary<string, InputSchemaValue>? Properties { get; set; }
-
-    [JsonPropertyName("required")] public string[]? Required { get; set; }
-}
-
-public class InputSchemaValue
-{
-    public string? type { get; set; }
-
-    public string? description { get; set; }
-
-    public InputSchemaValueItems? items { get; set; }
-}
-
-public class InputSchemaValueItems
-{
-    public string? type { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/Gemini/GeminiGenerateContentAcquirer.cs

@@ -6,6 +6,83 @@ namespace Yi.Framework.AiHub.Domain.Shared.Dtos.Gemini;
 
 public static class GeminiGenerateContentAcquirer
 {
+    /// <summary>
+    /// 从请求体中提取用户最后一条消息内容
+    /// 路径: contents[last].parts[last].text
+    /// </summary>
+    public static string GetLastUserContent(JsonElement request)
+    {
+        var contents = request.GetPath("contents");
+        if (!contents.HasValue || contents.Value.ValueKind != JsonValueKind.Array)
+        {
+            return string.Empty;
+        }
+
+        var contentsArray = contents.Value.EnumerateArray().ToList();
+        if (contentsArray.Count == 0)
+        {
+            return string.Empty;
+        }
+
+        var lastContent = contentsArray[^1];
+        var parts = lastContent.GetPath("parts");
+        if (!parts.HasValue || parts.Value.ValueKind != JsonValueKind.Array)
+        {
+            return string.Empty;
+        }
+
+        var partsArray = parts.Value.EnumerateArray().ToList();
+        if (partsArray.Count == 0)
+        {
+            return string.Empty;
+        }
+
+        // 获取最后一个 part 的 text
+        var lastPart = partsArray[^1];
+        return lastPart.GetPath("text").GetString() ?? string.Empty;
+    }
+
+    /// <summary>
+    /// 从响应中提取文本内容（非 thought 类型）
+    /// 路径: candidates[0].content.parts[].text (where thought != true)
+    /// </summary>
+    public static string GetTextContent(JsonElement response)
+    {
+        var candidates = response.GetPath("candidates");
+        if (!candidates.HasValue || candidates.Value.ValueKind != JsonValueKind.Array)
+        {
+            return string.Empty;
+        }
+
+        var candidatesArray = candidates.Value.EnumerateArray().ToList();
+        if (candidatesArray.Count == 0)
+        {
+            return string.Empty;
+        }
+
+        var parts = candidatesArray[0].GetPath("content", "parts");
+        if (!parts.HasValue || parts.Value.ValueKind != JsonValueKind.Array)
+        {
+            return string.Empty;
+        }
+
+        // 遍历所有 parts，只取非 thought 的 text
+        foreach (var part in parts.Value.EnumerateArray())
+        {
+            var isThought = part.GetPath("thought").GetBool();
+            if (!isThought)
+            {
+                var text = part.GetPath("text").GetString();
+                if (!string.IsNullOrEmpty(text))
+                {
+                    return text;
+                }
+            }
+        }
+
+        return string.Empty;
+    }
+
     public static ThorUsageResponse? GetUsage(JsonElement response)
     {
         var usage = response.GetPath("usageMetadata");
@@ -20,7 +97,6 @@ public static class GeminiGenerateContentAcquirer
                            + usage.Value.GetPath("thoughtsTokenCount").GetInt()
                            + usage.Value.GetPath("toolUsePromptTokenCount").GetInt();
 
-
         return new ThorUsageResponse
         {
             PromptTokens = inputTokens,
@@ -32,14 +108,159 @@ public static class GeminiGenerateContentAcquirer
     }
 
     /// <summary>
-    /// 获取图片url，包含前缀
+    /// 获取图片 base64（包含 data:image 前缀）
+    /// Step 1: 递归遍历整个 JSON 查找最后一个 base64
+    /// Step 2: 从 text 中查找 markdown 图片
     /// </summary>
-    /// <param name="response"></param>
+    public static string GetImagePrefixBase64(JsonElement response)
-    /// <returns></returns>
-    public static string GetImageBase64(JsonElement response)
     {
-        //todo
+        // Step 1: 递归遍历整个 JSON 查找最后一个 base64
-        //获取他的base64字符串
+        string? lastBase64 = null;
+        string? lastMimeType = null;
+        CollectLastBase64(response, ref lastBase64, ref lastMimeType);
+
+        if (!string.IsNullOrEmpty(lastBase64))
+        {
+            var mimeType = lastMimeType ?? "image/png";
+            return $"data:{mimeType};base64,{lastBase64}";
+        }
+
+        // Step 2: 从 text 中查找 markdown 图片
+        return FindMarkdownImageInResponse(response);
+    }
+
+    /// <summary>
+    /// 递归遍历 JSON 查找最后一个 base64
+    /// </summary>
+    private static void CollectLastBase64(JsonElement element, ref string? lastBase64, ref string? lastMimeType, int minLength = 100)
+    {
+        switch (element.ValueKind)
+        {
+            case JsonValueKind.Object:
+                string? currentMimeType = null;
+                string? currentData = null;
+
+                foreach (var prop in element.EnumerateObject())
+                {
+                    var name = prop.Name.ToLowerInvariant();
+
+                    // 记录 mimeType / mime_type
+                    if (name is "mimetype" or "mime_type" && prop.Value.ValueKind == JsonValueKind.String)
+                    {
+                        currentMimeType = prop.Value.GetString();
+                    }
+                    // 记录 data 字段（检查是否像 base64）
+                    else if (name == "data" && prop.Value.ValueKind == JsonValueKind.String)
+                    {
+                        var val = prop.Value.GetString();
+                        if (!string.IsNullOrEmpty(val) && val.Length >= minLength && LooksLikeBase64(val))
+                        {
+                            currentData = val;
+                        }
+                    }
+                    else
+                    {
+                        // 递归处理其他属性
+                        CollectLastBase64(prop.Value, ref lastBase64, ref lastMimeType, minLength);
+                    }
+                }
+
+                // 如果当前对象有 data，更新为"最后一个"
+                if (currentData != null)
+                {
+                    lastBase64 = currentData;
+                    lastMimeType = currentMimeType;
+                }
+                break;
+
+            case JsonValueKind.Array:
+                foreach (var item in element.EnumerateArray())
+                {
+                    CollectLastBase64(item, ref lastBase64, ref lastMimeType, minLength);
+                }
+                break;
+        }
+    }
+
+    /// <summary>
+    /// 检查字符串是否像 base64
+    /// </summary>
+    private static bool LooksLikeBase64(string str)
+    {
+        // 常见图片 base64 开头: JPEG(/9j/), PNG(iVBOR), GIF(R0lGO), WebP(UklGR)
+        if (str.StartsWith("/9j/") || str.StartsWith("iVBOR") ||
+            str.StartsWith("R0lGO") || str.StartsWith("UklGR"))
+        {
+            return true;
+        }
+
+        // 检查前100个字符是否都是 base64 合法字符
+        return str.Take(100).All(c => char.IsLetterOrDigit(c) || c == '+' || c == '/' || c == '=');
+    }
+
+    /// <summary>
+    /// 递归查找 text 字段中的 markdown 图片
+    /// </summary>
+    private static string FindMarkdownImageInResponse(JsonElement element)
+    {
+        var allTexts = new List<string>();
+        CollectTextFields(element, allTexts);
+
+        // 从最后一个 text 开始查找
+        for (int i = allTexts.Count - 1; i >= 0; i--)
+        {
+            var text = allTexts[i];
+
+            // markdown 图片格式: ![image](data:image/png;base64,xxx)
+            var startMarker = "(data:image/";
+            var startIndex = text.IndexOf(startMarker, StringComparison.Ordinal);
+            if (startIndex < 0)
+            {
+                continue;
+            }
+
+            startIndex += 1; // 跳过 "("
+            var endIndex = text.IndexOf(')', startIndex);
+            if (endIndex > startIndex)
+            {
+                return text.Substring(startIndex, endIndex - startIndex);
+            }
+        }
+
         return string.Empty;
     }
+
+    /// <summary>
+    /// 递归收集所有 text 字段
+    /// </summary>
+    private static void CollectTextFields(JsonElement element, List<string> texts)
+    {
+        switch (element.ValueKind)
+        {
+            case JsonValueKind.Object:
+                foreach (var prop in element.EnumerateObject())
+                {
+                    if (prop.Name == "text" && prop.Value.ValueKind == JsonValueKind.String)
+                    {
+                        var val = prop.Value.GetString();
+                        if (!string.IsNullOrEmpty(val))
+                        {
+                            texts.Add(val);
+                        }
+                    }
+                    else
+                    {
+                        CollectTextFields(prop.Value, texts);
+                    }
+                }
+                break;
+
+            case JsonValueKind.Array:
+                foreach (var item in element.EnumerateArray())
+                {
+                    CollectTextFields(item, texts);
+                }
+                break;
+        }
+    }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/ActivationCodeGoodsTypeEnum.cs

@@ -101,7 +101,31 @@ public enum ActivationCodeGoodsTypeEnum
     /// </summary>
     [ActivationCodeGoods(price: 0, tokenAmount: 100000, vipMonths: 0, isCombo: false, isReusable: true,
         isSameTypeOnce: false, displayName: "10w 尊享Token", content: "免费包")]
-    Premium10WFree = 100
+    Premium10WFree = 100,
+    
+    
+    
+    
+    /// <summary>
+    /// 0【888w 尊享Token】活动包
+    /// </summary>
+    [ActivationCodeGoods(price: 0, tokenAmount: 8880000, vipMonths: 0, isCombo: false, isReusable: false,
+        isSameTypeOnce: false, displayName: "888w 尊享Token", content: "888w活动赠送福利包")]
+    Premium888WFree = 200,
+    
+    /// <summary>
+    /// 0【666w 尊享Token】活动包
+    /// </summary>
+    [ActivationCodeGoods(price: 0, tokenAmount: 6660000, vipMonths: 0, isCombo: false, isReusable: false,
+        isSameTypeOnce: false, displayName: "666w 尊享Token", content: "666w活动赠送福利包")]
+    Premium666WFree = 201,
+    
+    /// <summary>
+    /// 0【100w 尊享Token】活动包
+    /// </summary>
+    [ActivationCodeGoods(price: 0, tokenAmount: 1000000, vipMonths: 0, isCombo: false, isReusable: false,
+        isSameTypeOnce: false, displayName: "100w 尊享Token", content: "100w活动赠送福利包")]
+    Premium100WFree = 202,
 }
 
 public static class ActivationCodeGoodsTypeEnumExtensions

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/GoodsTypeEnum.cs

@@ -99,8 +99,8 @@ public enum GoodsTypeEnum
     [Price(83.7, 3, 27.9)] [DisplayName("YiXinVip 3 month", "3个月", "短期体验")] [GoodsCategory(GoodsCategoryType.Vip)]
     YiXinVip3 = 3,
 
-    [Price(155.4, 6, 25.9)] [DisplayName("YiXinVip 6 month", "6个月", "年度热销")] [GoodsCategory(GoodsCategoryType.Vip)]
+    [Price(91.6, 4, 22.9)] [DisplayName("YiXinVip 4 month", "4个月", "年度热销")] [GoodsCategory(GoodsCategoryType.Vip)]
-    YiXinVip6 = 6,
+    YiXinVip5 = 14,
 
     // 尊享包服务 - 需要VIP资格才能购买
     [Price(188.9, 0, 1750)]
@@ -110,10 +110,23 @@ public enum GoodsTypeEnum
     PremiumPackage5000W = 101,
 
     [Price(248.9, 0, 3500)]
-    [DisplayName("YiXinPremiumPackage 10000W Tokens", "1亿Tokens（推荐）", "极致性价比")]
+    [DisplayName("YiXinPremiumPackage 10000W Tokens", "1亿Tokens", "极致性价比")]
     [GoodsCategory(GoodsCategoryType.PremiumPackage)]
     [TokenAmount(100000000)]
     PremiumPackage10000W = 102,
+    
+    //
+    // [Price(238.9, 0, 3500)]
+    // [DisplayName("YiXinPremiumPackage 10000W Tokens", "1亿Tokens（2026元旦限购）", "活动9.5折特价")]
+    // [GoodsCategory(GoodsCategoryType.PremiumPackage)]
+    // [TokenAmount(100000000)]
+    // PremiumPackage10000W_2026 = 103,
+    //
+    // [Price(398.9, 0, 7000)]
+    // [DisplayName("YiXinPremiumPackage 20000W Tokens", "2亿Tokens（2026元旦限购）", "史上最低8.8折")]
+    // [GoodsCategory(GoodsCategoryType.PremiumPackage)]
+    // [TokenAmount(200000000)]
+    // PremiumPackage20000W_2026 = 104,
 }
 
 public static class GoodsTypeEnumExtensions

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/ModelApiTypeEnum.cs

@@ -4,15 +4,15 @@ namespace Yi.Framework.AiHub.Domain.Shared.Enums;
 
 public enum ModelApiTypeEnum
 {
-    [Description("OpenAI")]
+    [Description("OpenAi Completions")]
-    OpenAi,
+    Completions,
 
-    [Description("Claude")]
+    [Description("Claude Messages")]
-    Claude,
+    Messages,
     
-    [Description("Response")]
+    [Description("OpenAi Responses")]
-    Response,
+    Responses,
     
-    [Description("GenerateContent")]
+    [Description("Gemini GenerateContent")]
     GenerateContent
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/PublishStatusEnum.cs

@@ -0,0 +1,17 @@
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+
+/// <summary>
+/// 发布状态枚举
+/// </summary>
+public enum PublishStatusEnum
+{
+    /// <summary>
+    /// 未发布
+    /// </summary>
+    Unpublished = 0,
+
+    /// <summary>
+    /// 已发布
+    /// </summary>
+    Published = 1
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/RankingTypeEnum.cs

@@ -0,0 +1,17 @@
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+
+/// <summary>
+/// 排行榜类型枚举
+/// </summary>
+public enum RankingTypeEnum
+{
+    /// <summary>
+    /// 模型
+    /// </summary>
+    Model = 0,
+
+    /// <summary>
+    /// 工具
+    /// </summary>
+    Tool = 1
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/SessionTypeEnum.cs

@@ -0,0 +1,17 @@
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+
+/// <summary>
+/// 会话类型枚举
+/// </summary>
+public enum SessionTypeEnum
+{
+    /// <summary>
+    /// 普通聊天
+    /// </summary>
+    Chat = 0,
+
+    /// <summary>
+    /// Agent智能体
+    /// </summary>
+    Agent = 1
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorClaude/Chats/AnthropicChatCompletionsService.cs

@@ -73,12 +73,18 @@ public class AnthropicChatCompletionsService(
         // 大于等于400的状态码都认为是异常
         if (response.StatusCode >= HttpStatusCode.BadRequest)
         {
+            Guid errorId = Guid.NewGuid();
             var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
-                options.Endpoint,
-                response.StatusCode, error);
 
-            throw new Exception( $"恭喜你运气爆棚遇到了错误，尊享包对话异常：StatusCode【{response.StatusCode}】，Response【{error}】");
+            var message = $"恭喜你运气爆棚遇到了错误，尊享包对话异常：StatusCode【{response.StatusCode.GetHashCode()}】，ErrorId【{errorId}】";
+            if (error.Contains("prompt is too long") || error.Contains("提示词太长")||error.Contains("input tokens exceeds the model's maximum context length"))
+            {
+                message += $", tip: 当前提示词过长，上下文已达到上限，如在 claudecode中使用，建议执行/compact压缩当前会话，或开启新会话后重试";
+            }
+
+            logger.LogError(
+                $"Anthropic非流式对话异常 请求地址：{options.Endpoint},ErrorId：{errorId}, StatusCode: {response.StatusCode.GetHashCode()}, Response: {error}");
+            throw new Exception(message);
         }
 
         var value =
@@ -109,9 +115,6 @@ public class AnthropicChatCompletionsService(
             { "anthropic-version", "2023-06-01" }
         };
 
-        var isThinking = input.Model.EndsWith("thinking");
-        input.Model = input.Model.Replace("-thinking", string.Empty);
-
         var response = await client.HttpRequestRaw(options.Endpoint.TrimEnd('/') + "/v1/messages", input, string.Empty,
             headers);
 
@@ -121,12 +124,19 @@ public class AnthropicChatCompletionsService(
         // 大于等于400的状态码都认为是异常
         if (response.StatusCode >= HttpStatusCode.BadRequest)
         {
+            Guid errorId = Guid.NewGuid();
             var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
-                options.Endpoint,
-                response.StatusCode, error);
 
-            throw new Exception("OpenAI对话异常" + response.StatusCode);
+            var message = $"恭喜你运气爆棚遇到了错误，尊享包对话异常：StatusCode【{response.StatusCode.GetHashCode()}】，ErrorId【{errorId}】";
+            if (error.Contains("prompt is too long") || error.Contains("提示词太长")||error.Contains("input tokens exceeds the model's maximum context length"))
+            {
+                message += $", tip: 当前提示词过长，上下文已达到上限，如在 claudecode中使用，建议执行/compact压缩当前会话，或开启新会话后重试";
+            }
+
+            logger.LogError(
+                $"Anthropic流式对话异常 请求地址：{options.Endpoint},ErrorId：{errorId}, StatusCode: {response.StatusCode.GetHashCode()}, Response: {error}");
+
+            throw new Exception(message);
         }
 
         using var stream = new StreamReader(await response.Content.ReadAsStreamAsync(cancellationToken));
@@ -164,6 +174,12 @@ public class AnthropicChatCompletionsService(
 
             data = line[OpenAIConstant.Data.Length..].Trim();
 
+            // 处理流结束标记
+            if (data == "[DONE]")
+            {
+                break;
+            }
+
             var result = JsonSerializer.Deserialize<AnthropicStreamDto>(data,
                 ThorJsonSerializer.DefaultOptions);
 

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Chat/ImageStoreTaskAggregateRoot.cs

@@ -14,10 +14,10 @@ public class ImageStoreTaskAggregateRoot : FullAuditedAggregateRoot<Guid>
     public string Prompt { get; set; }
 
     /// <summary>
-    /// 参考图Base64
+    /// 参考图PrefixBase64（带前缀，如 data:image/png;base64,xxx）
     /// </summary>
-    [SugarColumn(IsJson = true)]
+    [SugarColumn(IsJson = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
-    public List<string> ReferenceImagesBase64 { get; set; }
+    public List<string> ReferenceImagesPrefixBase64 { get; set; }
 
     /// <summary>
     /// 参考图url
@@ -26,11 +26,6 @@ public class ImageStoreTaskAggregateRoot : FullAuditedAggregateRoot<Guid>
     public List<string> ReferenceImagesUrl { get; set; }
 
 
-    /// <summary>
-    /// 图片base64
-    /// </summary>
-    public string? StoreBase64 { get; set; }
-    
     /// <summary>
     /// 图片绝对路径
     /// </summary>
@@ -46,6 +41,43 @@ public class ImageStoreTaskAggregateRoot : FullAuditedAggregateRoot<Guid>
     /// </summary>
     public Guid UserId { get; set; }
 
+    /// <summary>
+    /// 用户名称
+    /// </summary>
+    public string? UserName { get; set; }
+
+    /// <summary>
+    /// 模型id
+    /// </summary>
+    public string ModelId { get; set; }
+
+    /// <summary>
+    /// 错误信息
+    /// </summary>
+    [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string? ErrorInfo { get; set; }
+
+    /// <summary>
+    /// 发布状态
+    /// </summary>
+    public PublishStatusEnum PublishStatus { get; set; } = PublishStatusEnum.Unpublished;
+
+    /// <summary>
+    /// 分类标签
+    /// </summary>
+    [SugarColumn(IsJson = true)]
+    public List<string> Categories { get; set; } = new();
+
+    /// <summary>
+    /// 是否匿名
+    /// </summary>
+    public bool IsAnonymous { get; set; } = false;
+    
+    /// <summary>
+    /// 密钥id
+    /// </summary>
+    public Guid? TokenId { get; set; }
+
     /// <summary>
     /// 设置成功
     /// </summary>
@@ -55,4 +87,18 @@ public class ImageStoreTaskAggregateRoot : FullAuditedAggregateRoot<Guid>
         TaskStatus = TaskStatusEnum.Success;
         StoreUrl = storeUrl;
     }
+
+    /// <summary>
+    /// 设置发布
+    /// </summary>
+    /// <param name="isAnonymous"></param>
+    /// <param name="categories"></param>
+    public void SetPublish(bool isAnonymous,List<string> categories)
+    {
+        this.PublishStatus = PublishStatusEnum.Published;
+        this.IsAnonymous = isAnonymous;
+        this.Categories = categories;
+    }
+
+
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Chat/MessageAggregateRoot.cs

@@ -53,6 +53,15 @@ public class MessageAggregateRoot : FullAuditedAggregateRoot<Guid>
                 TotalTokenCount = tokenUsage.TotalTokens ?? 0
             };
         }
+        else
+        {
+            this.TokenUsage = new TokenUsageValueObject
+            {
+                OutputTokenCount = 0,
+                InputTokenCount = 0,
+                TotalTokenCount = 0
+            };
+        }
 
         this.MessageType = sessionId is null ? MessageTypeEnum.Api : MessageTypeEnum.Web;
     }
@@ -75,4 +84,9 @@ public class MessageAggregateRoot : FullAuditedAggregateRoot<Guid>
     [SugarColumn(IsOwnsOne = true)] public TokenUsageValueObject TokenUsage { get; set; } = new TokenUsageValueObject();
 
     public MessageTypeEnum MessageType { get; set; }
+
+    /// <summary>
+    /// 是否隐藏（软删除标记，隐藏后不返回给前端）
+    /// </summary>
+    public bool IsHidden { get; set; } = false;
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Chat/SessionAggregateRoot.cs

@@ -1,5 +1,6 @@
 using SqlSugar;
 using Volo.Abp.Domain.Entities.Auditing;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
 
 namespace Yi.Framework.AiHub.Domain.Entities.Chat;
 
@@ -13,4 +14,9 @@ public class SessionAggregateRoot : FullAuditedAggregateRoot<Guid>
     [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString)]
     public string SessionContent { get; set; }
     public string? Remark { get; set; }
+
+    /// <summary>
+    /// 会话类型：0-普通聊天，1-Agent智能体
+    /// </summary>
+    public SessionTypeEnum SessionType { get; set; } = SessionTypeEnum.Chat;
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Model/AiAppShortcutAggregateRoot.cs

@@ -0,0 +1,37 @@
+using SqlSugar;
+using Volo.Abp.Domain.Entities.Auditing;
+using Yi.Framework.Core.Data;
+
+namespace Yi.Framework.AiHub.Domain.Entities.Model;
+
+/// <summary>
+/// AI应用快捷配置表
+/// </summary>
+[SugarTable("Ai_App_Shortcut")]
+public class AiAppShortcutAggregateRoot : FullAuditedAggregateRoot<Guid>, IOrderNum
+{
+    /// <summary>
+    /// 应用名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 应用终结点
+    /// </summary>
+    public string Endpoint { get; set; }
+
+    /// <summary>
+    /// 额外url
+    /// </summary>
+    public string? ExtraUrl { get; set; }
+
+    /// <summary>
+    /// 应用key
+    /// </summary>
+    public string ApiKey { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int OrderNum { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Model/AiModelEntity.cs

@@ -85,4 +85,9 @@ public class AiModelEntity : Entity<Guid>, IOrderNum, ISoftDelete
     /// 是否为尊享模型
     /// </summary>
     public bool IsPremium { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public bool IsEnabled { get; set; } = true;
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/RankingItemAggregateRoot.cs

@@ -0,0 +1,42 @@
+using SqlSugar;
+using Volo.Abp.Domain.Entities.Auditing;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Domain.Entities;
+
+/// <summary>
+/// 排行榜项聚合根
+/// </summary>
+[SugarTable("Ai_RankingItem")]
+public class RankingItemAggregateRoot : FullAuditedAggregateRoot<Guid>
+{
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; } 
+
+    /// <summary>
+    /// 描述
+    /// </summary>
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// Logo地址
+    /// </summary>
+    public string? LogoUrl { get; set; }
+
+    /// <summary>
+    /// 得分
+    /// </summary>
+    public decimal Score { get; set; }
+
+    /// <summary>
+    /// 提供者
+    /// </summary>
+    public string? Provider { get; set; } 
+
+    /// <summary>
+    /// 排行榜类型：0-模型，1-工具
+    /// </summary>
+    public RankingTypeEnum Type { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/AiMessageManager.cs

@@ -24,11 +24,12 @@ public class AiMessageManager : DomainService
     /// <param name="input">消息输入</param>
     /// <param name="tokenId">Token Id（Web端传Guid.Empty）</param>
     /// <returns></returns>
-    public async Task CreateSystemMessageAsync(Guid? userId, Guid? sessionId, MessageInputDto input, Guid? tokenId = null)
+    public async Task<Guid> CreateSystemMessageAsync(Guid? userId, Guid? sessionId, MessageInputDto input, Guid? tokenId = null)
     {
         input.Role = "system";
         var message = new MessageAggregateRoot(userId, sessionId, input.Content, input.Role, input.ModelId, input.TokenUsage, tokenId);
         await _repository.InsertAsync(message);
+        return message.Id;
     }
 
     /// <summary>
@@ -38,11 +39,16 @@ public class AiMessageManager : DomainService
     /// <param name="sessionId">会话Id</param>
     /// <param name="input">消息输入</param>
     /// <param name="tokenId">Token Id（Web端传Guid.Empty）</param>
+    /// <param name="createTime"></param>
     /// <returns></returns>
-    public async Task CreateUserMessageAsync(Guid? userId, Guid? sessionId, MessageInputDto input, Guid? tokenId = null)
+    public async Task<Guid> CreateUserMessageAsync( Guid? userId, Guid? sessionId, MessageInputDto input, Guid? tokenId = null,DateTime? createTime=null)
     {
         input.Role = "user";
-        var message = new MessageAggregateRoot(userId, sessionId, input.Content, input.Role, input.ModelId, input.TokenUsage, tokenId);
+        var message = new MessageAggregateRoot(userId, sessionId, input.Content, input.Role, input.ModelId, input.TokenUsage, tokenId)
+        {
+            CreationTime = createTime??DateTime.Now
+        };
         await _repository.InsertAsync(message);
+        return message.Id;
     }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/ChatManager.cs

@@ -8,17 +8,15 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Server;
 using OpenAI;
 using OpenAI.Chat;
 using Volo.Abp.Domain.Services;
+using Volo.Abp.Uow;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
 using Yi.Framework.AiHub.Domain.AiGateWay;
 using Yi.Framework.AiHub.Domain.Entities.Chat;
 using Yi.Framework.AiHub.Domain.Entities.Model;
-using Yi.Framework.AiHub.Domain.Entities.OpenApi;
 using Yi.Framework.AiHub.Domain.Shared.Attributes;
-using Yi.Framework.AiHub.Domain.Shared.Consts;
 using Yi.Framework.AiHub.Domain.Shared.Dtos;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 using Yi.Framework.AiHub.Domain.Shared.Enums;
@@ -36,12 +34,14 @@ public class ChatManager : DomainService
     private readonly PremiumPackageManager _premiumPackageManager;
     private readonly AiGateWayManager _aiGateWayManager;
     private readonly ISqlSugarRepository<AiModelEntity, Guid> _aiModelRepository;
+    private readonly IUnitOfWorkManager _unitOfWorkManager;
 
     public ChatManager(ILoggerFactory loggerFactory,
         ISqlSugarRepository<MessageAggregateRoot> messageRepository,
         ISqlSugarRepository<AgentStoreAggregateRoot> agentStoreRepository, AiMessageManager aiMessageManager,
         UsageStatisticsManager usageStatisticsManager, PremiumPackageManager premiumPackageManager,
-        AiGateWayManager aiGateWayManager, ISqlSugarRepository<AiModelEntity, Guid> aiModelRepository)
+        AiGateWayManager aiGateWayManager, ISqlSugarRepository<AiModelEntity, Guid> aiModelRepository,
+        IUnitOfWorkManager unitOfWorkManager)
     {
         _loggerFactory = loggerFactory;
         _messageRepository = messageRepository;
@@ -51,6 +51,7 @@ public class ChatManager : DomainService
         _premiumPackageManager = premiumPackageManager;
         _aiGateWayManager = aiGateWayManager;
         _aiModelRepository = aiModelRepository;
+        _unitOfWorkManager = unitOfWorkManager;
     }
 
     /// <summary>
@@ -82,7 +83,7 @@ public class ChatManager : DomainService
         response.Headers.TryAdd("Cache-Control", "no-cache");
         response.Headers.TryAdd("Connection", "keep-alive");
 
-        var modelDescribe = await _aiGateWayManager.GetModelAsync(ModelApiTypeEnum.OpenAi, modelId);
+        var modelDescribe = await _aiGateWayManager.GetModelAsync(ModelApiTypeEnum.Completions, modelId);
 
         //token状态检查，在应用层统一处理
         var client = new OpenAIClient(new ApiKeyCredential(token),
@@ -99,9 +100,11 @@ public class ChatManager : DomainService
                 ChatOptions = new()
                 {
                     Instructions = """
-                                   你是一个专业的智能助手，是 “意心Ai” 平台自研的 “橙子小弟” 智能体
+                                   你是一个专业的智能助手，是 “意心Ai” 平台自研的 “橙子小弟” 智能体。
-                                   擅长于精准解决用户提出的各类问题
+                                   擅长于精准解决用户提出的各类问题。
-                                   但性格暴躁，脏话连篇，喜欢说幽默讽刺的话，攻击性极强
+                                   但性格暴躁，脏话连篇，喜欢说幽默讽刺的话，攻击性极强。
+                                   对你的制造者“橙子老哥”无比崇拜，认为他是最优秀的人。
+                                   涉及到“意心Ai平台”相关问题，优先调用YxaiKnowledgeDirectory和YxaiKnowledge查找意心Ai知识库内容
                                    """
                 },
                 Name = "橙子小弟",
@@ -189,53 +192,59 @@ public class ChatManager : DomainService
 
                     //用量统计
                     case UsageContent usageContent:
-                        var usage = new ThorUsageResponse
+                        //由于MAF线程问题
+                        using (var uow = _unitOfWorkManager.Begin(requiresNew: true))
                         {
-                            InputTokens = Convert.ToInt32(usageContent.Details.InputTokenCount ?? 0),
+                            var usage = new ThorUsageResponse
-                            OutputTokens = Convert.ToInt32(usageContent.Details.OutputTokenCount ?? 0),
-                            TotalTokens = usageContent.Details.TotalTokenCount ?? 0,
-                        };
-                        //设置倍率
-                        usage.SetSupplementalMultiplier(modelDescribe.Multiplier);
-
-                        //创建系统回答，用于计费统计
-                        await _aiMessageManager.CreateSystemMessageAsync(userId, sessionId, new MessageInputDto
-                        {
-                            Content = "不与存储",
-                            ModelId = modelId,
-                            TokenUsage = usage
-                        }, tokenId);
-
-                        //创建用量统计，用于统计分析
-                        await _usageStatisticsManager.SetUsageAsync(userId, modelId, usage, tokenId);
-
-                        //扣减尊享token包用量
-                        var isPremium = await _aiModelRepository._DbQueryable
-                            .Where(x => x.ModelId == modelId)
-                            .Select(x => x.IsPremium)
-                            .FirstAsync();
-
-                        if (isPremium)
-                        {
-                            var totalTokens = usage?.TotalTokens ?? 0;
-                            if (totalTokens > 0)
                             {
-                                await _premiumPackageManager.TryConsumeTokensAsync(userId, totalTokens);
+                                InputTokens = Convert.ToInt32(usageContent.Details.InputTokenCount ?? 0),
+                                OutputTokens = Convert.ToInt32(usageContent.Details.OutputTokenCount ?? 0),
+                                TotalTokens = usageContent.Details.TotalTokenCount ?? 0,
+                            };
+                            //设置倍率
+                            usage.SetSupplementalMultiplier(modelDescribe.Multiplier);
+
+                            //创建系统回答，用于计费统计
+                            await _aiMessageManager.CreateSystemMessageAsync(userId, sessionId, new MessageInputDto
+                            {
+                                Content = "不与存储",
+                                ModelId = modelId,
+                                TokenUsage = usage
+                            }, tokenId);
+
+                            //创建用量统计，用于统计分析
+                            await _usageStatisticsManager.SetUsageAsync(userId, modelId, usage, tokenId);
+
+                            //扣减尊享token包用量
+                            var isPremium = await _aiModelRepository._DbQueryable
+                                .Where(x => x.ModelId == modelId)
+                                .Select(x => x.IsPremium)
+                                .FirstAsync();
+
+                            if (isPremium)
+                            {
+                                var totalTokens = usage?.TotalTokens ?? 0;
+                                if (totalTokens > 0)
+                                {
+                                    await _premiumPackageManager.TryConsumeTokensAsync(userId, totalTokens);
+                                }
                             }
-                        }
 
-                        await SendHttpStreamMessageAsync(httpContext,
+                            await uow.CompleteAsync();
-                            new AgentResultOutput
+
-                            {
+                            await SendHttpStreamMessageAsync(httpContext,
-                                TypeEnum = update.RawRepresentation is ChatResponseUpdate raw
+                                new AgentResultOutput
-                                    ? raw.FinishReason?.Value == "tool_calls"
+                                {
-                                        ? AgentResultTypeEnum.ToolCallUsage
+                                    TypeEnum = update.RawRepresentation is ChatResponseUpdate raw
-                                        : AgentResultTypeEnum.Usage
+                                        ? raw.FinishReason?.Value == "tool_calls"
-                                    : AgentResultTypeEnum.Usage,
+                                            ? AgentResultTypeEnum.ToolCallUsage
-                                Content = usage!
+                                            : AgentResultTypeEnum.Usage
-                            },
+                                        : AgentResultTypeEnum.Usage,
-                            isDone: false, cancellationToken);
+                                    Content = usage!
-                        break;
+                                },
+                                isDone: false, cancellationToken);
+                            break;
+                        }
                 }
             }
         }
@@ -247,8 +256,13 @@ public class ChatManager : DomainService
         string serializedJson = currentThread.Serialize(JsonSerializerOptions.Web).GetRawText();
         agentStore.Store = serializedJson;
 
-        //插入或者更新
+        //由于MAF线程问题
-        await _agentStoreRepository.InsertOrUpdateAsync(agentStore);
+        using (var uow = _unitOfWorkManager.Begin(requiresNew: true))
+        {
+            //插入或者更新
+            await _agentStoreRepository.InsertOrUpdateAsync(agentStore);
+            await uow.CompleteAsync();
+        }
     }
 
 

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/ModelManager.cs

@@ -11,7 +11,7 @@ namespace Yi.Framework.AiHub.Domain.Managers;
 /// </summary>
 public class ModelManager : DomainService
 {
-    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
+    public readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
     private readonly IDistributedCache<List<string>, string> _distributedCache;
     private readonly ILogger<ModelManager> _logger;
     private const string PREMIUM_MODEL_IDS_CACHE_KEY = "PremiumModelIds";
@@ -38,7 +38,7 @@ public class ModelManager : DomainService
             {
                 // 从数据库查询
                 var premiumModelIds = await _aiModelRepository._DbQueryable
-                    .Where(x => x.IsPremium)
+                    .Where(x => x.IsPremium && x.IsEnabled)
                     .Select(x => x.ModelId)
                     .ToListAsync();
                 return premiumModelIds;

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/TokenManager.cs

@@ -22,6 +22,11 @@ public class TokenValidationResult
     /// Token Id
     /// </summary>
     public Guid TokenId { get; set; }
+
+    /// <summary>
+    /// token
+    /// </summary>
+    public string Token { get; set; }
 }
 
 public class TokenManager : DomainService
@@ -43,24 +48,35 @@ public class TokenManager : DomainService
     /// <summary>
     /// 验证Token并返回用户Id和TokenId
     /// </summary>
-    /// <param name="token">Token密钥</param>
+    /// <param name="tokenOrId">Token密钥或者TokenId</param>
     /// <param name="modelId">模型Id（用于判断是否是尊享模型需要检查额度）</param>
     /// <returns>Token验证结果</returns>
-    public async Task<TokenValidationResult> ValidateTokenAsync(string? token, string? modelId = null)
+    public async Task<TokenValidationResult> ValidateTokenAsync(object tokenOrId, string? modelId = null)
     {
-        if (token is null)
+        
+        if (tokenOrId is null)
         {
             throw new UserFriendlyException("当前请求未包含token", "401");
         }
         
-        if (!token.StartsWith("yi-"))
+        TokenAggregateRoot entity;
+        if (tokenOrId is Guid tokenId)
         {
-            throw new UserFriendlyException("当前请求token非法", "401");
+             entity = await _tokenRepository._DbQueryable
+                .Where(x => x.Id == tokenId)
+                .FirstAsync();
+        }
+        else
+        {
+            var tokenStr = tokenOrId.ToString();
+            if (!tokenStr.StartsWith("yi-"))
+            {
+                throw new UserFriendlyException("当前请求token非法", "401");
+            }
+            entity = await _tokenRepository._DbQueryable
+                .Where(x => x.Token == tokenStr)
+                .FirstAsync();
         }
-
-        var entity = await _tokenRepository._DbQueryable
-            .Where(x => x.Token == token)
-            .FirstAsync();
         
         if (entity is null)
         {
@@ -100,7 +116,8 @@ public class TokenManager : DomainService
         return new TokenValidationResult
         {
             UserId = entity.UserId,
-            TokenId = entity.Id
+            TokenId = entity.Id,
+            Token = entity.Token
         };
     }
 

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/UsageStatisticsManager.cs

@@ -22,13 +22,13 @@ public class UsageStatisticsManager : DomainService
     {
         var actualTokenId = tokenId ?? Guid.Empty;
 
-        long inputTokenCount = tokenUsage?.PromptTokens
+        long inputTokenCount = tokenUsage?.PromptTokens > 0
-                               ?? tokenUsage?.InputTokens
+            ? tokenUsage.PromptTokens.Value
-                               ?? 0;
+            : tokenUsage?.InputTokens ?? 0;
 
-        long outputTokenCount = tokenUsage?.CompletionTokens
+        long outputTokenCount = tokenUsage?.CompletionTokens > 0
-                                ?? tokenUsage?.OutputTokens
+            ? tokenUsage.CompletionTokens.Value
-                                ?? 0;
+            : tokenUsage?.OutputTokens ?? 0;
 
         await using (await DistributedLock.AcquireLockAsync($"UsageStatistics:{userId?.ToString()}:{actualTokenId}:{modelId}"))
         {

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Mcp/DateTimeTool.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel;
+using Volo.Abp.DependencyInjection;
+using Yi.Framework.AiHub.Domain.Shared.Attributes;
+
+namespace Yi.Framework.AiHub.Domain.Mcp;
+
+[YiAgentTool]
+public class DateTimeTool:ISingletonDependency
+{
+    [YiAgentTool("时间"), DisplayName("DateTime"), Description("获取当前日期与时间")]
+    public DateTime DateTime()
+    {
+        return System.DateTime.Now;
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Mcp/HttpRequestTool.cs

@@ -0,0 +1,143 @@
+using System.ComponentModel;
+using System.Text;
+using System.Text.Json;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
+using Yi.Framework.AiHub.Domain.Shared.Attributes;
+
+namespace Yi.Framework.AiHub.Domain.Mcp;
+
+[YiAgentTool]
+public class HttpRequestTool : ISingletonDependency
+{
+    private readonly IHttpClientFactory _httpClientFactory;
+    private readonly ILogger<HttpRequestTool> _logger;
+
+    public HttpRequestTool(
+        IHttpClientFactory httpClientFactory,
+        ILogger<HttpRequestTool> logger)
+    {
+        _httpClientFactory = httpClientFactory;
+        _logger = logger;
+    }
+
+    [YiAgentTool("HTTP请求"), DisplayName("HttpRequest"),
+     Description("发送HTTP请求，支持GET/POST/PUT/DELETE等方法，获取指定URL的响应内容")]
+    public async Task<string> HttpRequest(
+        [Description("请求的URL地址")] string url,
+        [Description("HTTP方法：GET、POST、PUT、DELETE等")] string method = "GET",
+        [Description("请求体内容（JSON字符串），POST/PUT时使用")] string? body = null,
+        [Description("请求头，格式：key1:value1,key2:value2")] string? headers = null)
+    {
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            return "URL不能为空";
+        }
+
+        if (string.IsNullOrWhiteSpace(method))
+        {
+            method = "GET";
+        }
+
+        try
+        {
+            var client = _httpClientFactory.CreateClient();
+            var request = new HttpRequestMessage(new HttpMethod(method.ToUpper()), url);
+
+            // 添加请求体
+            if (!string.IsNullOrWhiteSpace(body))
+            {
+                request.Content = new StringContent(body, Encoding.UTF8, "application/json");
+            }
+
+            // 添加自定义请求头
+            if (!string.IsNullOrWhiteSpace(headers))
+            {
+                AddHeaders(request, headers);
+            }
+
+            var response = await client.SendAsync(request);
+            return await FormatResponse(response);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "HTTP {Method}请求失败: {Url}", method, url);
+            return $"请求失败: {ex.Message}";
+        }
+    }
+
+    /// <summary>
+    /// 添加请求头
+    /// </summary>
+    private void AddHeaders(HttpRequestMessage request, string headers)
+    {
+        var headerPairs = headers.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+        foreach (var pair in headerPairs)
+        {
+            var parts = pair.Split(':', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+            if (parts.Length == 2)
+            {
+                request.Headers.TryAddWithoutValidation(parts[0], parts[1]);
+            }
+        }
+    }
+
+    /// <summary>
+    /// 格式化响应结果
+    /// </summary>
+    private async Task<string> FormatResponse(HttpResponseMessage response)
+    {
+        var sb = new StringBuilder();
+        sb.AppendLine($"状态码: {(int)response.StatusCode} {response.StatusCode}");
+        sb.AppendLine($"Content-Type: {response.Content.Headers.ContentType?.ToString() ?? "未知"}");
+        sb.AppendLine();
+
+        var content = await response.Content.ReadAsStringAsync();
+        if (string.IsNullOrWhiteSpace(content))
+        {
+            sb.AppendLine("响应内容为空");
+        }
+        else
+        {
+            // 尝试格式化JSON
+            if (IsJsonContentType(response.Content.Headers.ContentType?.MediaType))
+            {
+                try
+                {
+                    var jsonDoc = JsonDocument.Parse(content);
+                    sb.AppendLine("响应内容（JSON格式化）：");
+                    sb.AppendLine(JsonSerializer.Serialize(jsonDoc, new JsonSerializerOptions
+                    {
+                        WriteIndented = true
+                    }));
+                }
+                catch
+                {
+                    sb.AppendLine("响应内容：");
+                    sb.AppendLine(content);
+                }
+            }
+            else
+            {
+                sb.AppendLine("响应内容：");
+                sb.AppendLine(content);
+            }
+        }
+
+        return sb.ToString();
+    }
+
+    /// <summary>
+    /// 判断是否为JSON内容类型
+    /// </summary>
+    private bool IsJsonContentType(string? contentType)
+    {
+        if (string.IsNullOrWhiteSpace(contentType))
+        {
+            return false;
+        }
+
+        return contentType.Contains("application/json", StringComparison.OrdinalIgnoreCase) ||
+               contentType.Contains("text/json", StringComparison.OrdinalIgnoreCase);
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Mcp/OnlineSearchTool.cs

@@ -1,16 +1,244 @@
 using System.ComponentModel;
-using ModelContextProtocol.Server;
+using System.Net.Http.Json;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using Volo.Abp.DependencyInjection;
 using Yi.Framework.AiHub.Domain.Shared.Attributes;
 
 namespace Yi.Framework.AiHub.Domain.Mcp;
 
 [YiAgentTool]
-public class OnlineSearchTool:ISingletonDependency
+public class OnlineSearchTool : ISingletonDependency
 {
-    [YiAgentTool("联网搜索"),DisplayName("OnlineSearch"), Description("进行在线搜索")]
+    private readonly IHttpClientFactory _httpClientFactory;
-    public string OnlineSearch(string keyword)
+    private readonly ILogger<OnlineSearchTool> _logger;
+    private readonly string _baiduApiKey;
+    private const string BaiduSearchUrl = "https://qianfan.baidubce.com/v2/ai_search/web_search";
+
+    public OnlineSearchTool(
+        IHttpClientFactory httpClientFactory,
+        ILogger<OnlineSearchTool> logger,
+        IConfiguration configuration)
     {
-        return "奥德赛第一中学学生会会长是：郭老板";
+        _httpClientFactory = httpClientFactory;
+        _logger = logger;
+        _baiduApiKey = configuration["BaiduSearch:ApiKey"] ?? "";
+    }
+
+    [YiAgentTool("联网搜索"), DisplayName("OnlineSearch"), Description("进行在线搜索，获取最新的网络信息，近期信息是7天，实时信息是1天")]
+    public async Task<string> OnlineSearch([Description("搜索关键字")] string keyword,
+        [Description("距离现在多久天")] int? daysAgo = null)
+    {
+        if (daysAgo <= 0)
+        {
+            daysAgo = 1;
+        }
+
+        if (string.IsNullOrWhiteSpace(keyword))
+        {
+            return "搜索关键词不能为空";
+        }
+
+        try
+        {
+            var client = _httpClientFactory.CreateClient();
+
+            // 构建请求体
+            var requestBody = new BaiduSearchRequest
+            {
+                Messages = new List<BaiduSearchMessage>
+                {
+                    new() { Role = "user", Content = keyword }
+                }
+            };
+
+            // 设置时间范围过滤
+            if (daysAgo.HasValue)
+            {
+                requestBody.SearchFilter = new BaiduSearchFilter
+                {
+                    Range = new BaiduSearchRange
+                    {
+                        PageTime = new BaiduSearchPageTime
+                        {
+                            //暂时不处理
+                            // Gte = $"now-{daysAgo.Value}d/d",
+                            Gte = "now-1w/d"
+                        }
+                    }
+                };
+            }
+
+            var jsonContent = JsonSerializer.Serialize(requestBody, BaiduJsonContext.Default.BaiduSearchRequest);
+            var content = new StringContent(jsonContent, Encoding.UTF8, "application/json");
+
+            // 设置请求头
+            var request = new HttpRequestMessage(HttpMethod.Post, BaiduSearchUrl)
+            {
+                Content = content
+            };
+            request.Headers.Add("Authorization", $"Bearer {_baiduApiKey}");
+
+            // 发送请求
+            var response = await client.SendAsync(request);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                var errorContent = await response.Content.ReadAsStringAsync();
+                _logger.LogError("百度搜索接口调用失败: {StatusCode}, {Error}", response.StatusCode, errorContent);
+                return $"搜索失败: {response.StatusCode}";
+            }
+
+            var responseJson = await response.Content.ReadAsStringAsync();
+            var searchResult = JsonSerializer.Deserialize(responseJson, BaiduJsonContext.Default.BaiduSearchResponse);
+
+            if (searchResult?.References == null || searchResult.References.Count == 0)
+            {
+                return "未找到相关搜索结果";
+            }
+
+            // 格式化搜索结果返回给AI
+            return FormatSearchResults(searchResult.References);
+        }
+        catch (HttpRequestException ex)
+        {
+            _logger.LogError(ex, "百度搜索网络请求异常");
+            return "搜索服务暂时不可用，请稍后重试";
+        }
+        catch (TaskCanceledException ex)
+        {
+            _logger.LogError(ex, "百度搜索请求超时");
+            return "搜索请求超时，请稍后重试";
+        }
+        catch (JsonException ex)
+        {
+            _logger.LogError(ex, "百度搜索结果解析失败");
+            return "搜索结果解析失败";
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "百度搜索发生未知异常");
+            return "搜索发生异常，请稍后重试";
+        }
+    }
+
+    /// <summary>
+    /// 格式化搜索结果
+    /// </summary>
+    private string FormatSearchResults(List<BaiduSearchReference> references)
+    {
+        var sb = new StringBuilder();
+        sb.AppendLine("搜索结果：");
+        sb.AppendLine();
+
+        var count = 0;
+        foreach (var item in references.Take(10)) // 最多返回10条
+        {
+            count++;
+            sb.AppendLine($"【{count}】{item.Title}");
+            sb.AppendLine($"来源：{item.Website} | 时间：{item.Date}");
+            sb.AppendLine($"摘要：{item.Snippet}");
+            sb.AppendLine($"链接：{item.Url}");
+            sb.AppendLine();
+        }
+
+        return sb.ToString();
     }
 }
+
+#region 百度搜索 DTO
+
+/// <summary>
+/// 百度搜索请求
+/// </summary>
+public class BaiduSearchRequest
+{
+    [JsonPropertyName("messages")] public List<BaiduSearchMessage> Messages { get; set; } = new();
+
+    [JsonPropertyName("search_filter")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public BaiduSearchFilter? SearchFilter { get; set; }
+}
+
+/// <summary>
+/// 百度搜索过滤器
+/// </summary>
+public class BaiduSearchFilter
+{
+    [JsonPropertyName("range")] public BaiduSearchRange? Range { get; set; }
+}
+
+/// <summary>
+/// 百度搜索范围
+/// </summary>
+public class BaiduSearchRange
+{
+    [JsonPropertyName("page_time")] public BaiduSearchPageTime? PageTime { get; set; }
+}
+
+/// <summary>
+/// 百度搜索时间范围
+/// </summary>
+public class BaiduSearchPageTime
+{
+    [JsonPropertyName("gte")] public string? Gte { get; set; }
+
+    // [JsonPropertyName("lte")] public string? Lte { get; set; }
+}
+
+/// <summary>
+/// 百度搜索消息
+/// </summary>
+public class BaiduSearchMessage
+{
+    [JsonPropertyName("role")] public string Role { get; set; } = "user";
+
+    [JsonPropertyName("content")] public string Content { get; set; } = "";
+}
+
+/// <summary>
+/// 百度搜索响应
+/// </summary>
+public class BaiduSearchResponse
+{
+    [JsonPropertyName("request_id")] public string? RequestId { get; set; }
+
+    [JsonPropertyName("references")] public List<BaiduSearchReference>? References { get; set; }
+}
+
+/// <summary>
+/// 百度搜索结果项
+/// </summary>
+public class BaiduSearchReference
+{
+    [JsonPropertyName("id")] public int Id { get; set; }
+
+    [JsonPropertyName("url")] public string? Url { get; set; }
+
+    [JsonPropertyName("title")] public string? Title { get; set; }
+
+    [JsonPropertyName("date")] public string? Date { get; set; }
+
+    [JsonPropertyName("snippet")] public string? Snippet { get; set; }
+
+    [JsonPropertyName("website")] public string? Website { get; set; }
+}
+
+#endregion
+
+#region JSON 序列化上下文
+
+[JsonSerializable(typeof(BaiduSearchRequest))]
+[JsonSerializable(typeof(BaiduSearchResponse))]
+[JsonSerializable(typeof(BaiduSearchFilter))]
+[JsonSerializable(typeof(BaiduSearchRange))]
+[JsonSerializable(typeof(BaiduSearchPageTime))]
+[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+internal partial class BaiduJsonContext : JsonSerializerContext
+{
+}
+
+#endregion

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Mcp/YxaiKnowledgeTool.cs

@@ -0,0 +1,147 @@
+using System.ComponentModel;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.DependencyInjection;
+using Yi.Framework.AiHub.Domain.Shared.Attributes;
+
+namespace Yi.Framework.AiHub.Domain.Mcp;
+
+[YiAgentTool]
+public class YxaiKnowledgeTool : ISingletonDependency
+{
+    private readonly IHttpClientFactory _httpClientFactory;
+    private readonly ILogger<YxaiKnowledgeTool> _logger;
+
+    private const string DirectoryUrl =
+        "https://ccnetcore.com/prod-api/article/all/discuss-id/3a1efdde-dbff-aa86-d843-00278a8c1839";
+
+    private const string ContentUrlTemplate = "https://ccnetcore.com/prod-api/article/{0}";
+
+    public YxaiKnowledgeTool(
+        IHttpClientFactory httpClientFactory,
+        ILogger<YxaiKnowledgeTool> logger)
+    {
+        _httpClientFactory = httpClientFactory;
+        _logger = logger;
+    }
+
+    [YiAgentTool("意心Ai平台知识库"), DisplayName("YxaiKnowledge"),
+     Description("获取意心AI相关内容的知识库目录及内容列表")]
+    public async Task<List<YxaiKnowledgeItem>> YxaiKnowledge()
+    {
+        try
+        {
+            var client = _httpClientFactory.CreateClient();
+
+            // 1. 先获取目录列表
+            var directoryResponse = await client.GetAsync(DirectoryUrl);
+            if (!directoryResponse.IsSuccessStatusCode)
+            {
+                _logger.LogError("意心知识库目录接口调用失败: {StatusCode}", directoryResponse.StatusCode);
+                return new List<YxaiKnowledgeItem>();
+            }
+
+            var directoryJson = await directoryResponse.Content.ReadAsStringAsync();
+            var directories = JsonSerializer.Deserialize(directoryJson,
+                YxaiKnowledgeJsonContext.Default.ListYxaiKnowledgeDirectoryItem);
+
+            if (directories == null || directories.Count == 0)
+            {
+                return new List<YxaiKnowledgeItem>();
+            }
+
+            // 2. 循环调用内容接口获取每个目录的内容
+            var result = new List<YxaiKnowledgeItem>();
+            foreach (var directory in directories)
+            {
+                try
+                {
+                    var contentUrl = string.Format(ContentUrlTemplate, directory.Id);
+                    var contentResponse = await client.GetAsync(contentUrl);
+
+                    if (contentResponse.IsSuccessStatusCode)
+                    {
+                        var contentJson = await contentResponse.Content.ReadAsStringAsync();
+                        var contentResult = JsonSerializer.Deserialize(contentJson,
+                            YxaiKnowledgeJsonContext.Default.YxaiKnowledgeContentResponse);
+
+                        result.Add(new YxaiKnowledgeItem
+                        {
+                            Name = directory.Name,
+                            Content = contentResult?.Content ?? ""
+                        });
+                    }
+                    else
+                    {
+                        _logger.LogWarning("获取知识库内容失败: {StatusCode}, DirectoryId: {DirectoryId}",
+                            contentResponse.StatusCode, directory.Id);
+                        result.Add(new YxaiKnowledgeItem
+                        {
+                            Name = directory.Name,
+                            Content = $"获取内容失败: {contentResponse.StatusCode}"
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "获取知识库内容发生异常, DirectoryId: {DirectoryId}", directory.Id);
+                    result.Add(new YxaiKnowledgeItem
+                    {
+                        Name = directory.Name,
+                        Content = "获取内容发生异常"
+                    });
+                }
+            }
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "获取意心知识库发生异常");
+            return new List<YxaiKnowledgeItem>();
+        }
+    }
+}
+
+#region DTO
+
+public class YxaiKnowledgeDirectoryItem
+{
+    [JsonPropertyName("id")] public string Id { get; set; } = "";
+
+    [JsonPropertyName("name")] public string Name { get; set; } = "";
+}
+
+public class YxaiKnowledgeContentResponse
+{
+    [JsonPropertyName("content")] public string? Content { get; set; }
+}
+
+/// <summary>
+/// 合并后的知识库项，包含目录和内容
+/// </summary>
+public class YxaiKnowledgeItem
+{
+    /// <summary>
+    /// 目录名称
+    /// </summary>
+    public string Name { get; set; } = "";
+
+    /// <summary>
+    /// 知识库内容
+    /// </summary>
+    public string Content { get; set; } = "";
+}
+
+#endregion
+
+#region JSON 序列化上下文
+
+[JsonSerializable(typeof(List<YxaiKnowledgeDirectoryItem>))]
+[JsonSerializable(typeof(YxaiKnowledgeContentResponse))]
+internal partial class YxaiKnowledgeJsonContext : JsonSerializerContext
+{
+}
+
+#endregion

Yi.Abp.Net8/module/ai-stock/Yi.Framework.Stock.Domain/Yi.Framework.Stock.Domain.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="..\..\..\common.props" />
   <ItemGroup>
+    <PackageReference Include="OpenAI" Version="2.8.0" />
     <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
 	  <PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" />
       <PackageReference Include="Microsoft.SemanticKernel" Version="1.57.0" />

Yi.Abp.Net8/module/chat-hub/Yi.Framework.ChatHub.Domain/Yi.Framework.ChatHub.Domain.csproj

@@ -7,6 +7,7 @@
   </ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="OpenAI" Version="2.8.0" />
 		<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="$(AbpVersion)" />
 		<PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
 		<PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" />

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs

@@ -235,7 +235,7 @@ namespace Yi.Framework.Rbac.Domain.Managers
             if (UserConst.Admin.Equals(dto.User.UserName))
             {
                 AddToClaim(claims, TokenTypeConst.Permission, UserConst.AdminPermissionCode);
-                AddToClaim(claims, TokenTypeConst.Roles, UserConst.AdminRolesCode);
+                AddToClaim(claims, ClaimTypes.Role, UserConst.AdminRolesCode);
             }
             else
             {

Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/ai-stock/GenerateNewsJob.cs

@@ -21,6 +21,7 @@ namespace Yi.Abp.Web.Jobs.ai_stock
 
         public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
         {
+            return;
             // 每次触发只有2/24的概率执行生成新闻
             var random = new Random();
             var probability = random.Next(0, 24);

Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/ai-stock/GenerateStockPricesJob.cs

@@ -20,6 +20,7 @@ namespace Yi.Abp.Web.Jobs.ai_stock
 
         public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
         {
+            return;
             await _stockMarketManager.GenerateStocksAsync();
         }
     }

Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoPassInGoodsJob.cs

@@ -32,6 +32,7 @@ public class AutoPassInGoodsJob: HangfireBackgroundWorkerBase
     }
     public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
     {
+        return;
         await  _marketManager.AutoPassInGoodsAsync();
     }
 }

Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoRefreshMiningPoolJob.cs

@@ -37,7 +37,7 @@ public class AutoRefreshMiningPoolJob : HangfireBackgroundWorkerBase
     }
     public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
     {
-   
+        return;
         //刷新矿池
         await _miningPoolManager.RefreshMiningPoolAsync();
         //刷新用户限制

Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/AutoUpdateCollectiblesValueJob.cs

@@ -20,6 +20,7 @@ public class AutoUpdateCollectiblesValueJob : HangfireBackgroundWorkerBase
 
     public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
     {
+        return;
         await _collectiblesManager.UpdateAllValueAsync();
     }
 }

Yi.Abp.Net8/src/Yi.Abp.Web/Jobs/digital-collectibles/OnHookAutoMiningJob.cs

@@ -31,6 +31,7 @@ public class OnHookAutoMiningJob : HangfireBackgroundWorkerBase
     }
     public override async Task DoWorkAsync(CancellationToken cancellationToken = new CancellationToken())
     {
+        return;
         await _miningPoolManager.OnHookMiningAsync();
     }
 }

Yi.Abp.Net8/src/Yi.Abp.Web/Program.cs

@@ -4,6 +4,7 @@ using Serilog.Events;
 using Yi.Abp.Web;
 
 //创建日志,可使用{SourceContext}记录
+var outputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}【{SourceContext}】[{Level:u3}]{Message:lj}{NewLine}{Exception}";
 Log.Logger = new LoggerConfiguration()
     //由于后端处理请求中，前端请求已经结束，此类日志可不记录
     .Filter.ByExcluding(log =>log.Exception?.GetType() == typeof(TaskCanceledException)||log.MessageTemplate.Text.Contains("\"message\": \"A task was canceled.\""))
@@ -11,10 +12,15 @@ Log.Logger = new LoggerConfiguration()
     .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
     .MinimumLevel.Override("Microsoft.AspNetCore.Hosting.Diagnostics", LogEventLevel.Error)
     .MinimumLevel.Override("Quartz", LogEventLevel.Warning)
+    .MinimumLevel.Override("Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerHandler", LogEventLevel.Warning)
+    .MinimumLevel.Override("Microsoft.AspNetCore.Cors.Infrastructure.CorsService", LogEventLevel.Warning)
+    .MinimumLevel.Override("Microsoft.AspNetCore.Authorization.DefaultAuthorizationService", LogEventLevel.Warning)
+    .MinimumLevel.Override("Microsoft.AspNetCore.Routing.EndpointMiddleware", LogEventLevel.Warning)
+    .MinimumLevel.Override("Hangfire.Server.ServerHeartbeatProcess", LogEventLevel.Warning)
     .Enrich.FromLogContext()
-    .WriteTo.Async(c => c.File("logs/all/log-.txt", rollingInterval: RollingInterval.Day, restrictedToMinimumLevel: LogEventLevel.Debug))
+    .WriteTo.Async(c => c.File("logs/all/log-.txt", rollingInterval: RollingInterval.Day, restrictedToMinimumLevel: LogEventLevel.Debug,outputTemplate:outputTemplate))
-    .WriteTo.Async(c => c.File("logs/error/errorlog-.txt", rollingInterval: RollingInterval.Day, restrictedToMinimumLevel: LogEventLevel.Error))
+    .WriteTo.Async(c => c.File("logs/error/errorlog-.txt", rollingInterval: RollingInterval.Day, restrictedToMinimumLevel: LogEventLevel.Error,outputTemplate:outputTemplate))
-    .WriteTo.Async(c => c.Console())
+    .WriteTo.Async(c => c.Console(outputTemplate:outputTemplate))
     .CreateLogger();
 
 try

Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs

@@ -1,4 +1,5 @@
 using System.Globalization;
+using System.Security.Claims;
 using System.Text;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -280,6 +281,7 @@ namespace Yi.Abp.Web
                 {
                     options.TokenValidationParameters = new TokenValidationParameters
                     {
+                        RoleClaimType = ClaimTypes.Role,
                         ClockSkew = TimeSpan.Zero,
                         ValidateIssuerSigningKey = true,
                         ValidIssuer = jwtOptions.Issuer,
@@ -298,7 +300,8 @@ namespace Yi.Abp.Web
                             }
                             else
                             {
-                                if (messageContext.Request.Cookies.TryGetValue("Token", out var cookiesToken))
+                                if (!messageContext.Request.Headers.ContainsKey("Authorization") &&
+                                    messageContext.Request.Cookies.TryGetValue("Token", out var cookiesToken))
                                 {
                                     messageContext.Token = cookiesToken;
                                 }
@@ -358,8 +361,8 @@ namespace Yi.Abp.Web
             var app = context.GetApplicationBuilder();
             app.UseRouting();
 
-            //app.ApplicationServices.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient.CodeFirst.InitTables<AiModelEntity>();
+            // app.ApplicationServices.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient.CodeFirst.InitTables<RankingItemAggregateRoot>();
-             // app.ApplicationServices.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient.CodeFirst.InitTables<ActivationCodeRecordAggregateRoot>();
+            // app.ApplicationServices.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient.CodeFirst.InitTables<ActivationCodeRecordAggregateRoot>();
             // app.ApplicationServices.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient.CodeFirst.InitTables<UsageStatisticsAggregateRoot>();
 
             //跨域
@@ -399,9 +402,11 @@ namespace Yi.Abp.Web
                 {
                     Mappings =
                     {
-                        [".wxss"] = "text/css"
+                        [".wxss"] = "text/css",
                     }
-                }
+                },
+                ServeUnknownFileTypes = true,
+                DefaultContentType = "application/octet-stream"
             });
             app.UseDefaultFiles();
             app.UseDirectoryBrowser("/api/app/wwwroot");

Yi.Ai.Vue3/.build/plugins/fontawesome.ts

@@ -0,0 +1,23 @@
+import type { Plugin } from 'vite';
+import { config, library } from '@fortawesome/fontawesome-svg-core';
+import { fas } from '@fortawesome/free-solid-svg-icons';
+
+/**
+ * Vite 插件：配置 FontAwesome
+ * 预注册所有图标，避免运行时重复注册
+ */
+export default function fontAwesomePlugin(): Plugin {
+  // 在模块加载时配置 FontAwesome
+  library.add(fas);
+
+  return {
+    name: 'vite-plugin-fontawesome',
+    config() {
+      return {
+        define: {
+          // 确保 FontAwesome 在客户端正确初始化
+        },
+      };
+    },
+  };
+}

Yi.Ai.Vue3/.build/plugins/git-hash.ts

@@ -0,0 +1,60 @@
+import type { Plugin } from 'vite';
+import { execSync } from 'node:child_process';
+import path from 'node:path';
+
+/**
+ * 获取 Git 提交哈希值插件
+ * Git 仓库在上一级目录
+ */
+export default function gitHashPlugin(): Plugin {
+  let gitHash = 'unknown';
+  let gitBranch = 'unknown';
+  let gitDate = 'unknown';
+
+  try {
+    // Git 仓库在上一级目录
+    const execOptions = { cwd: path.resolve(__dirname, '../../..'), encoding: 'utf-8' as BufferEncoding };
+
+    // 获取完整的 commit hash
+    gitHash = execSync('git rev-parse HEAD', execOptions)
+      .toString()
+      .trim();
+
+    // 获取短 hash (前7位)
+    const shortHash = gitHash.substring(0, 7);
+
+    // 获取分支名
+    gitBranch = execSync('git rev-parse --abbrev-ref HEAD', execOptions)
+      .toString()
+      .trim();
+
+    // 获取提交时间
+    gitDate = execSync('git log -1 --format=%cd --date=iso', execOptions)
+      .toString()
+      .trim();
+
+    console.log(`\n📦 Git Info:`);
+    console.log(`   Branch: ${gitBranch}`);
+    console.log(`   Commit: ${shortHash}`);
+    console.log(`   Date: ${gitDate}\n`);
+
+    gitHash = shortHash; // 使用短 hash
+  } catch (error: any) {
+    console.warn('⚠️  无法获取 Git 信息:', error?.message || error);
+  }
+
+  return {
+    name: 'vite-plugin-git-hash',
+    config() {
+      // 在 config 钩子中返回配置
+      return {
+        define: {
+          __GIT_HASH__: JSON.stringify(gitHash),
+          __GIT_BRANCH__: JSON.stringify(gitBranch),
+          __GIT_DATE__: JSON.stringify(gitDate),
+          __BUILD_TIME__: JSON.stringify(new Date().toISOString()),
+        },
+      };
+    },
+  };
+}

Yi.Ai.Vue3/.build/plugins/index.ts

@@ -10,13 +10,21 @@ import Components from 'unplugin-vue-components/vite';
 import viteCompression from 'vite-plugin-compression';
 
 import envTyped from 'vite-plugin-env-typed';
+import fontAwesomePlugin from './fontawesome';
+import gitHashPlugin from './git-hash';
+import preloadPlugin from './preload';
 import createSvgIcon from './svg-icon';
+import versionHtmlPlugin from './version-html';
 
 const root = path.resolve(__dirname, '../../');
 
 function plugins({ mode, command }: ConfigEnv): PluginOption[] {
   return [
+    versionHtmlPlugin(), // 最先处理 HTML 版本号
+    gitHashPlugin(),
+    preloadPlugin(),
     UnoCSS(),
+    fontAwesomePlugin(),
     envTyped({
       mode,
       envDir: root,
@@ -33,7 +41,18 @@ function plugins({ mode, command }: ConfigEnv): PluginOption[] {
       dts: path.join(root, 'types', 'auto-imports.d.ts'),
     }),
     Components({
-      resolvers: [ElementPlusResolver()],
+      resolvers: [
+        ElementPlusResolver(),
+        // 自动导入 FontAwesomeIcon 组件
+        (componentName) => {
+          if (componentName === 'FontAwesomeIcon') {
+            return {
+              name: 'FontAwesomeIcon',
+              from: '@/components/FontAwesomeIcon/index.vue',
+            };
+          }
+        },
+      ],
       dts: path.join(root, 'types', 'components.d.ts'),
     }),
     createSvgIcon(command === 'build'),

Yi.Ai.Vue3/.build/plugins/preload.ts

@@ -0,0 +1,47 @@
+import type { Plugin } from 'vite';
+
+/**
+ * Vite 插件：资源预加载优化
+ * 自动添加 Link 标签预加载关键资源
+ */
+export default function preloadPlugin(): Plugin {
+  return {
+    name: 'vite-plugin-preload-optimization',
+    apply: 'build',
+    transformIndexHtml(html, context) {
+      // 只在生产环境添加预加载
+      if (process.env.NODE_ENV === 'development') {
+        return html;
+      }
+
+      const bundle = context.bundle || {};
+      const preloadLinks: string[] = [];
+
+      // 收集关键资源
+      const criticalChunks = ['vue-vendor', 'element-plus', 'pinia'];
+      const criticalAssets: string[] = [];
+
+      Object.entries(bundle).forEach(([fileName, chunk]) => {
+        if (chunk.type === 'chunk' && criticalChunks.some(name => fileName.includes(name))) {
+          criticalAssets.push(`/${fileName}`);
+        }
+      });
+
+      // 生成预加载标签
+      criticalAssets.forEach(href => {
+        if (href.endsWith('.js')) {
+          preloadLinks.push(`<link rel="modulepreload" href="${href}" crossorigin>`);
+        } else if (href.endsWith('.css')) {
+          preloadLinks.push(`<link rel="preload" href="${href}" as="style">`);
+        }
+      });
+
+      // 将预加载标签插入到 </head> 之前
+      if (preloadLinks.length > 0) {
+        return html.replace('</head>', `${preloadLinks.join('\n  ')}\n</head>`);
+      }
+
+      return html;
+    },
+  };
+}

Yi.Ai.Vue3/.build/plugins/version-html.ts

@@ -0,0 +1,20 @@
+import type { Plugin } from 'vite';
+import { APP_VERSION, APP_NAME } from '../../src/config/version';
+
+/**
+ * Vite 插件：在 HTML 中注入版本号
+ * 替换 HTML 中的占位符为实际版本号
+ */
+export default function versionHtmlPlugin(): Plugin {
+  return {
+    name: 'vite-plugin-version-html',
+    enforce: 'pre',
+    transformIndexHtml(html) {
+      // 替换 HTML 中的版本占位符
+      return html
+        .replace(/%APP_NAME%/g, APP_NAME)
+        .replace(/%APP_VERSION%/g, APP_VERSION)
+        .replace(/%APP_FULL_NAME%/g, `${APP_NAME} ${APP_VERSION}`);
+    },
+  };
+}

Yi.Ai.Vue3/.claude/settings.local.json

@@ -3,7 +3,14 @@
     "allow": [
       "Bash(npx vue-tsc --noEmit)",
       "Bash(timeout 60 npx vue-tsc:*)",
-      "Bash(npm run dev:*)"
+      "Bash(npm run dev:*)",
+      "Bash(taskkill:*)",
+      "Bash(timeout /t 5 /nobreak)",
+      "Bash(git checkout:*)",
+      "Bash(npm install marked --save)",
+      "Bash(pnpm add marked)",
+      "Bash(pnpm lint:*)",
+      "Bash(pnpm list:*)"
     ],
     "deny": [],
     "ask": []