feature: 优化排序

This reverts commit 70ae2fab44.

.gitignore

@@ -278,3 +278,5 @@ database_backup
 /Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db
 
 package-lock.json
+
+.claude

Yi.Abp.Net8/.claude/settings.local.json

@@ -2,7 +2,8 @@
   "permissions": {
     "allow": [
       "Bash(dotnet build \"E:\\code\\github\\Yi\\Yi.Abp.Net8\\module\\ai-hub\\Yi.Framework.AiHub.Application\\Yi.Framework.AiHub.Application.csproj\" --no-restore)",
-      "Read(//e/code/github/Yi/Yi.Ai.Vue3/**)"
+      "Read(//e/code/github/Yi/Yi.Ai.Vue3/**)",
+      "Bash(dotnet build:*)"
     ],
     "deny": [],
     "ask": []

Yi.Abp.Net8/CLAUDE.md

@@ -0,0 +1,129 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Overview
+
+Yi.Abp.Net8 is a modular, multi-tenant SaaS platform built on ABP Framework 8.3.4 with .NET 8.0. It uses **SqlSugar** (not EF Core) as the ORM and follows Domain-Driven Design (DDD) principles. The platform includes AI/ML features (chat, models, agents, token tracking), RBAC, forum, messaging, and digital collectibles modules.
+
+## Architecture
+
+### Solution Structure
+
+```
+Yi.Abp.Net8/
+├── src/                    # Main application host
+│   └── Yi.Abp.Web/         # ASP.NET Core 8.0 Web Host (port 19001)
+├── framework/              # Framework layer (shared infrastructure)
+│   ├── Yi.Framework.Core                    # Core utilities, JSON handling
+│   ├── Yi.Framework.SqlSugarCore            # SqlSugar ORM abstraction (v5.1.4.197-preview22)
+│   ├── Yi.Framework.SqlSugarCore.Abstractions # Repository interfaces
+│   ├── Yi.Framework.AspNetCore              # ASP.NET Core extensions
+│   ├── Yi.Framework.AspNetCore.Authentication.OAuth # QQ, Gitee OAuth
+│   ├── Yi.Framework.Ddd.Application          # DDD application base classes
+│   ├── Yi.Framework.BackgroundWorkers.Hangfire # Job scheduling
+│   ├── Yi.Framework.Caching.FreeRedis        # Redis caching
+│   └── Yi.Framework.SemanticKernel          # AI/ML integration
+├── module/                 # Business modules (each follows 5-layer DDD pattern)
+│   ├── ai-hub/            # AI services (chat, models, sessions, agents)
+│   ├── rbac/              # Role-Based Access Control (core auth/authz)
+│   ├── bbs/               # Forum/community
+│   ├── chat-hub/          # Real-time messaging
+│   ├── audit-logging/     # Audit trail tracking
+│   ├── code-gen/          # Code generation
+│   ├── tenant-management/ # Multi-tenancy support
+│   ├── digital-collectibles/ # NFT/digital assets
+│   └── ai-stock/          # AI-powered stock analysis
+├── test/                  # Unit tests (xUnit + NSubstitute + Shouldly)
+├── client/                # HTTP API clients
+└── tool/                  # Development utilities
+```
+
+### Module Structure (DDD Layers)
+
+Each module follows this pattern:
+
+```
+module/[feature]/
+├── [Feature].Domain.Shared/     # Constants, enums, shared DTOs
+├── [Feature].Domain/            # Entities, aggregates, domain services
+├── [Feature].Application.Contracts/ # Service interfaces, DTOs
+├── [Feature].Application/       # Application services (implementations)
+└── [Feature].SqlSugarCore/      # Repository implementations, DbContext
+```
+
+**Dependency Flow:** Application → Domain + Application.Contracts → Domain.Shared → Framework
+
+### Module Registration
+
+All modules are registered in `src/Yi.Abp.Web/YiAbpWebModule.cs`. When adding a new module:
+
+1. Add `DependsOn` attribute in `YiAbpWebModule`
+2. Add conventional controller in `PreConfigureServices`:
+```csharp
+options.ConventionalControllers.Create(typeof(YiFramework[Feature]ApplicationModule).Assembly,
+    option => option.RemoteServiceName = "[service-name]");
+```
+
+### API Routing
+
+All API routes use the unified prefix: `/api/app/{service-name}/{controller}/{action}`
+
+Registered service names:
+- `default` - Main application services
+- `rbac` - Authentication, authorization, user/role management
+- `ai-hub` - AI chat, models, sessions, agents
+- `bbs` - Forum posts and comments
+- `chat-hub` - Real-time messaging
+- `tenant-management` - Multi-tenant configuration
+- `code-gen` - Code generation utilities
+- `digital-collectibles` - NFT/digital assets
+- `ai-stock` - Stock analysis
+
+## Database
+
+**ORM:** SqlSugar (NOT Entity Framework Core)
+
+**Configuration** (`appsettings.json`):
+```json
+"DbConnOptions": {
+  "Url": "DataSource=yi-abp-dev.db",
+  "DbType": "Sqlite",  // Sqlite, Mysql, Sqlserver, Oracle, PostgreSQL
+  "EnabledCodeFirst": true,    // Auto-create tables
+  "EnabledDbSeed": true,        // Auto-seed data
+  "EnabledSaasMultiTenancy": true
+}
+```
+
+**Multi-tenancy:** Tenant isolation via `HeaderTenantResolveContributor` (NOT cookie-based). Tenant is resolved from `__tenant` header.
+
+## Key Technologies
+
+| Component | Technology |
+|-----------|-----------|
+| Framework | ABP 8.3.4 |
+| .NET Version | .NET 8.0 |
+| ORM | SqlSugar 5.1.4.197-preview22 |
+| Authentication | JWT Bearer + Refresh Tokens |
+| OAuth | QQ, Gitee |
+| Caching | FreeRedis (optional) |
+| Background Jobs | Hangfire (in-memory or Redis) |
+| Logging | Serilog (daily rolling files) |
+| Testing | xUnit + NSubstitute + Shouldly |
+| Container | Autofac |
+
+## Important Notes
+
+- **JSON Serialization:** Uses Microsoft's `System.Text.Json`, NOT Newtonsoft.Json. Date format handled via `DatetimeJsonConverter`.
+- **Multi-tenancy:** Tenant resolved from `__tenant` header, NOT cookies.
+- **Rate Limiting:** Disabled in development, enabled in production (1000 req/60s sliding window).
+- **Swagger:** Available at `/swagger` in development.
+- **Hangfire Dashboard:** Available at `/hangfire` (requires JWT authorization).
+- **Background Workers:** Disabled in development (`AbpBackgroundWorkerOptions.IsEnabled = false`).
+
+## Development Workflow
+
+1. **Branch:** Main branch is `abp`, current development branch is `ai-hub`.
+2. **Commit Convention:** Chinese descriptive messages with prefixes (`feat:`, `fix:`, `style:`).
+3. **Testing:** Run `dotnet test` before committing.
+4. **Building:** Use `dotnet build --no-restore` for faster builds after initial restore.

Yi.Abp.Net8/common.props

@@ -12,6 +12,7 @@
 	</PropertyGroup>
 	
   <PropertyGroup>
+      <SatelliteResourceLanguages>en;zh-CN</SatelliteResourceLanguages>
     <LangVersion>latest</LangVersion>
     <Version>1.0.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS8618;CS1998;CS8604;CS8620;CS8600;CS8602</NoWarn>

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

@@ -0,0 +1,30 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.ActivationCode;
+
+/// <summary>
+/// 批量生成激活码输入
+/// </summary>
+public class ActivationCodeCreateInput
+{
+    /// <summary>
+    /// 商品类型
+    /// </summary>
+    public ActivationCodeGoodsTypeEnum GoodsType { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    public int Count { get; set; } = 1;
+}
+
+/// <summary>
+/// 批量生成激活码列表输入
+/// </summary>
+public class ActivationCodeCreateListInput
+{
+    /// <summary>
+    /// 生成项列表
+    /// </summary>
+    public List<ActivationCodeCreateInput> Items { get; set; } = new();
+}

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

@@ -0,0 +1,35 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.ActivationCode;
+
+/// <summary>
+/// 批量生成激活码输出
+/// </summary>
+public class ActivationCodeCreateOutput
+{
+    /// <summary>
+    /// 商品类型
+    /// </summary>
+    public ActivationCodeGoodsTypeEnum GoodsType { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    public int Count { get; set; }
+
+    /// <summary>
+    /// 激活码列表
+    /// </summary>
+    public List<string> Codes { get; set; } = new();
+}
+
+/// <summary>
+/// 批量生成激活码列表输出
+/// </summary>
+public class ActivationCodeCreateListOutput
+{
+    /// <summary>
+    /// 分组输出
+    /// </summary>
+    public List<ActivationCodeCreateOutput> Items { get; set; } = new();
+}

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

@@ -0,0 +1,12 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.ActivationCode;
+
+/// <summary>
+/// 激活码兑换输入
+/// </summary>
+public class ActivationCodeRedeemInput
+{
+    /// <summary>
+    /// 激活码
+    /// </summary>
+    public string Code { get; set; } = string.Empty;
+}

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

@@ -0,0 +1,24 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.ActivationCode;
+
+/// <summary>
+/// 激活码兑换输出
+/// </summary>
+public class ActivationCodeRedeemOutput
+{
+    /// <summary>
+    /// 商品类型
+    /// </summary>
+    public ActivationCodeGoodsTypeEnum GoodsType { get; set; }
+
+    /// <summary>
+    /// 商品名称
+    /// </summary>
+    public string PackageName { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 内容描述
+    /// </summary>
+    public string Content { get; set; } = string.Empty;
+}

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

@@ -0,0 +1,42 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+
+/// <summary>
+/// 创建AI应用输入
+/// </summary>
+public class AiAppCreateInput
+{
+    /// <summary>
+    /// 应用名称
+    /// </summary>
+    [Required(ErrorMessage = "应用名称不能为空")]
+    [StringLength(100, ErrorMessage = "应用名称不能超过100个字符")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 应用终结点
+    /// </summary>
+    [Required(ErrorMessage = "应用终结点不能为空")]
+    [StringLength(500, ErrorMessage = "应用终结点不能超过500个字符")]
+    public string Endpoint { get; set; }
+
+    /// <summary>
+    /// 额外URL
+    /// </summary>
+    [StringLength(500, ErrorMessage = "额外URL不能超过500个字符")]
+    public string? ExtraUrl { get; set; }
+
+    /// <summary>
+    /// 应用Key
+    /// </summary>
+    [Required(ErrorMessage = "应用Key不能为空")]
+    [StringLength(500, ErrorMessage = "应用Key不能超过500个字符")]
+    public string ApiKey { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [Range(0, int.MaxValue, ErrorMessage = "排序必须大于等于0")]
+    public int OrderNum { get; set; }
+}

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

@@ -0,0 +1,42 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+
+/// <summary>
+/// AI应用DTO
+/// </summary>
+public class AiAppDto
+{
+    /// <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/AiAppGetListInput.cs

@@ -0,0 +1,14 @@
+using Yi.Framework.Ddd.Application.Contracts;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+
+/// <summary>
+/// 获取AI应用列表输入
+/// </summary>
+public class AiAppGetListInput : PagedAllResultRequestDto
+{
+    /// <summary>
+    /// 搜索关键词（搜索应用名称）
+    /// </summary>
+    public string? SearchKey { get; set; }
+}

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

@@ -0,0 +1,48 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+
+/// <summary>
+/// 更新AI应用输入
+/// </summary>
+public class AiAppUpdateInput
+{
+    /// <summary>
+    /// 应用ID
+    /// </summary>
+    [Required(ErrorMessage = "应用ID不能为空")]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 应用名称
+    /// </summary>
+    [Required(ErrorMessage = "应用名称不能为空")]
+    [StringLength(100, ErrorMessage = "应用名称不能超过100个字符")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 应用终结点
+    /// </summary>
+    [Required(ErrorMessage = "应用终结点不能为空")]
+    [StringLength(500, ErrorMessage = "应用终结点不能超过500个字符")]
+    public string Endpoint { get; set; }
+
+    /// <summary>
+    /// 额外URL
+    /// </summary>
+    [StringLength(500, ErrorMessage = "额外URL不能超过500个字符")]
+    public string? ExtraUrl { get; set; }
+
+    /// <summary>
+    /// 应用Key
+    /// </summary>
+    [Required(ErrorMessage = "应用Key不能为空")]
+    [StringLength(500, ErrorMessage = "应用Key不能超过500个字符")]
+    public string ApiKey { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [Range(0, int.MaxValue, ErrorMessage = "排序必须大于等于0")]
+    public int OrderNum { get; set; }
+}

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

@@ -0,0 +1,96 @@
+using System.ComponentModel.DataAnnotations;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+
+/// <summary>
+/// 创建AI模型输入
+/// </summary>
+public class AiModelCreateInput
+{
+    /// <summary>
+    /// 处理名
+    /// </summary>
+    [Required(ErrorMessage = "处理名不能为空")]
+    [StringLength(100, ErrorMessage = "处理名不能超过100个字符")]
+    public string HandlerName { get; set; }
+
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    [Required(ErrorMessage = "模型ID不能为空")]
+    [StringLength(200, ErrorMessage = "模型ID不能超过200个字符")]
+    public string ModelId { get; set; }
+
+    /// <summary>
+    /// 模型名称
+    /// </summary>
+    [Required(ErrorMessage = "模型名称不能为空")]
+    [StringLength(200, ErrorMessage = "模型名称不能超过200个字符")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 模型描述
+    /// </summary>
+    [StringLength(1000, ErrorMessage = "模型描述不能超过1000个字符")]
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [Range(0, int.MaxValue, ErrorMessage = "排序必须大于等于0")]
+    public int OrderNum { get; set; }
+
+    /// <summary>
+    /// AI应用ID
+    /// </summary>
+    [Required(ErrorMessage = "AI应用ID不能为空")]
+    public Guid AiAppId { get; set; }
+
+    /// <summary>
+    /// 额外信息
+    /// </summary>
+    [StringLength(2000, ErrorMessage = "额外信息不能超过2000个字符")]
+    public string? ExtraInfo { get; set; }
+
+    /// <summary>
+    /// 模型类型
+    /// </summary>
+    [Required(ErrorMessage = "模型类型不能为空")]
+    public ModelTypeEnum ModelType { get; set; }
+
+    /// <summary>
+    /// 模型API类型
+    /// </summary>
+    [Required(ErrorMessage = "模型API类型不能为空")]
+    public ModelApiTypeEnum ModelApiType { get; set; }
+
+    /// <summary>
+    /// 模型倍率
+    /// </summary>
+    [Range(0.01, double.MaxValue, ErrorMessage = "模型倍率必须大于0")]
+    public decimal Multiplier { get; set; } = 1;
+
+    /// <summary>
+    /// 模型显示倍率
+    /// </summary>
+    [Range(0.01, double.MaxValue, ErrorMessage = "模型显示倍率必须大于0")]
+    public decimal MultiplierShow { get; set; } = 1;
+
+    /// <summary>
+    /// 供应商分组名称
+    /// </summary>
+    [StringLength(100, ErrorMessage = "供应商分组名称不能超过100个字符")]
+    public string? ProviderName { get; set; }
+
+    /// <summary>
+    /// 模型图标URL
+    /// </summary>
+    [StringLength(500, ErrorMessage = "模型图标URL不能超过500个字符")]
+    public string? IconUrl { get; set; }
+
+    /// <summary>
+    /// 是否为尊享模型
+    /// </summary>
+    public bool IsPremium { get; set; }
+}

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

@@ -0,0 +1,84 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+
+/// <summary>
+/// AI模型DTO
+/// </summary>
+public class AiModelDto
+{
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 处理名
+    /// </summary>
+    public string HandlerName { get; set; }
+
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    public string ModelId { get; set; }
+
+    /// <summary>
+    /// 模型名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 模型描述
+    /// </summary>
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int OrderNum { get; set; }
+
+    /// <summary>
+    /// AI应用ID
+    /// </summary>
+    public Guid AiAppId { get; set; }
+
+    /// <summary>
+    /// 额外信息
+    /// </summary>
+    public string? ExtraInfo { get; set; }
+
+    /// <summary>
+    /// 模型类型
+    /// </summary>
+    public ModelTypeEnum ModelType { get; set; }
+
+    /// <summary>
+    /// 模型API类型
+    /// </summary>
+    public ModelApiTypeEnum ModelApiType { get; set; }
+
+    /// <summary>
+    /// 模型倍率
+    /// </summary>
+    public decimal Multiplier { get; set; }
+
+    /// <summary>
+    /// 模型显示倍率
+    /// </summary>
+    public decimal MultiplierShow { get; set; }
+
+    /// <summary>
+    /// 供应商分组名称
+    /// </summary>
+    public string? ProviderName { get; set; }
+
+    /// <summary>
+    /// 模型图标URL
+    /// </summary>
+    public string? IconUrl { get; set; }
+
+    /// <summary>
+    /// 是否为尊享模型
+    /// </summary>
+    public bool IsPremium { get; set; }
+}

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

@@ -0,0 +1,24 @@
+using Yi.Framework.Ddd.Application.Contracts;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+
+/// <summary>
+/// 获取AI模型列表输入
+/// </summary>
+public class AiModelGetListInput : PagedAllResultRequestDto
+{
+    /// <summary>
+    /// 搜索关键词(搜索模型名称、模型ID)
+    /// </summary>
+    public string? SearchKey { get; set; }
+
+    /// <summary>
+    /// AI应用ID筛选
+    /// </summary>
+    public Guid? AiAppId { get; set; }
+
+    /// <summary>
+    /// 是否只显示尊享模型
+    /// </summary>
+    public bool? IsPremiumOnly { get; set; }
+}

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

@@ -0,0 +1,102 @@
+using System.ComponentModel.DataAnnotations;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+
+/// <summary>
+/// 更新AI模型输入
+/// </summary>
+public class AiModelUpdateInput
+{
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    [Required(ErrorMessage = "模型ID不能为空")]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 处理名
+    /// </summary>
+    [Required(ErrorMessage = "处理名不能为空")]
+    [StringLength(100, ErrorMessage = "处理名不能超过100个字符")]
+    public string HandlerName { get; set; }
+
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    [Required(ErrorMessage = "模型ID不能为空")]
+    [StringLength(200, ErrorMessage = "模型ID不能超过200个字符")]
+    public string ModelId { get; set; }
+
+    /// <summary>
+    /// 模型名称
+    /// </summary>
+    [Required(ErrorMessage = "模型名称不能为空")]
+    [StringLength(200, ErrorMessage = "模型名称不能超过200个字符")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 模型描述
+    /// </summary>
+    [StringLength(1000, ErrorMessage = "模型描述不能超过1000个字符")]
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    [Range(0, int.MaxValue, ErrorMessage = "排序必须大于等于0")]
+    public int OrderNum { get; set; }
+
+    /// <summary>
+    /// AI应用ID
+    /// </summary>
+    [Required(ErrorMessage = "AI应用ID不能为空")]
+    public Guid AiAppId { get; set; }
+
+    /// <summary>
+    /// 额外信息
+    /// </summary>
+    [StringLength(2000, ErrorMessage = "额外信息不能超过2000个字符")]
+    public string? ExtraInfo { get; set; }
+
+    /// <summary>
+    /// 模型类型
+    /// </summary>
+    [Required(ErrorMessage = "模型类型不能为空")]
+    public ModelTypeEnum ModelType { get; set; }
+
+    /// <summary>
+    /// 模型API类型
+    /// </summary>
+    [Required(ErrorMessage = "模型API类型不能为空")]
+    public ModelApiTypeEnum ModelApiType { get; set; }
+
+    /// <summary>
+    /// 模型倍率
+    /// </summary>
+    [Range(0.01, double.MaxValue, ErrorMessage = "模型倍率必须大于0")]
+    public decimal Multiplier { get; set; }
+
+    /// <summary>
+    /// 模型显示倍率
+    /// </summary>
+    [Range(0.01, double.MaxValue, ErrorMessage = "模型显示倍率必须大于0")]
+    public decimal MultiplierShow { get; set; }
+
+    /// <summary>
+    /// 供应商分组名称
+    /// </summary>
+    [StringLength(100, ErrorMessage = "供应商分组名称不能超过100个字符")]
+    public string? ProviderName { get; set; }
+
+    /// <summary>
+    /// 模型图标URL
+    /// </summary>
+    [StringLength(500, ErrorMessage = "模型图标URL不能超过500个字符")]
+    public string? IconUrl { get; set; }
+
+    /// <summary>
+    /// 是否为尊享模型
+    /// </summary>
+    public bool IsPremium { get; set; }
+}

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

@@ -0,0 +1,65 @@
+using System.Reflection;
+using System.Text.Json.Serialization;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
+
+public class AgentResultOutput
+{
+    /// <summary>
+    /// 类型
+    /// </summary>
+    [JsonIgnore]
+    public AgentResultTypeEnum TypeEnum { get; set; }
+
+    /// <summary>
+    /// 类型
+    /// </summary>
+    public string Type => TypeEnum.GetJsonName();
+    
+    /// <summary>
+    /// 内容载体
+    /// </summary>
+    public object Content { get; set; }
+}
+
+public enum AgentResultTypeEnum
+{
+    /// <summary>
+    /// 文本内容
+    /// </summary>
+    [JsonPropertyName("text")]
+    Text,
+    /// <summary>
+    /// 工具调用中
+    /// </summary>
+    [JsonPropertyName("toolCalling")]
+    ToolCalling,
+    
+    /// <summary>
+    /// 工具调用完成
+    /// </summary>
+    [JsonPropertyName("toolCalled")]
+    ToolCalled,
+    
+    /// <summary>
+    /// 用量
+    /// </summary>
+    [JsonPropertyName("usage")]
+    Usage,
+    
+    /// <summary>
+    /// 工具调用用量
+    /// </summary>
+    [JsonPropertyName("toolCallUsage")]
+    ToolCallUsage
+}
+
+public static class AgentResultTypeEnumExtensions
+{
+    public static string GetJsonName(this AgentResultTypeEnum value)
+    {
+        var member = typeof(AgentResultTypeEnum).GetMember(value.ToString()).FirstOrDefault();
+        var attr = member?.GetCustomAttribute<JsonPropertyNameAttribute>();
+        return attr?.Name ?? value.ToString();
+    }
+}

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

@@ -0,0 +1,29 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
+
+public class AgentSendInput
+{
+    /// <summary>
+    /// 会话id
+    /// </summary>
+    public Guid SessionId { get; set; }
+    
+    /// <summary>
+    /// 用户内容
+    /// </summary>
+    public string Content { get; set; }
+    
+    /// <summary>
+    /// api密钥Id
+    /// </summary>
+    public string Token { get; set; }
+
+    /// <summary>
+    /// 模型id
+    /// </summary>
+    public string ModelId { get; set; }
+
+    /// <summary>
+    /// 已选择工具
+    /// </summary>
+    public List<string> Tools { get; set; }
+}

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

@@ -0,0 +1,8 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
+
+public class AgentToolOutput
+{
+    public string Code { get; set; }
+
+    public string Name { get; set; }
+}

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

@@ -0,0 +1,22 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
+
+/// <summary>
+/// 图片生成输入
+/// </summary>
+public class ImageGenerationInput
+{
+    /// <summary>
+    /// 提示词
+    /// </summary>
+    public string Prompt { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    public string ModelId { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 参考图Base64列表（可选，包含前缀如 data:image/png;base64,...）
+    /// </summary>
+    public List<string>? ReferenceImagesBase64 { get; set; }
+}

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

@@ -0,0 +1,49 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
+
+/// <summary>
+/// 图片任务输出
+/// </summary>
+public class ImageTaskOutput
+{
+    /// <summary>
+    /// 任务ID
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 提示词
+    /// </summary>
+    public string Prompt { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 参考图Base64列表
+    /// </summary>
+    public List<string>? ReferenceImagesBase64 { get; set; }
+
+    /// <summary>
+    /// 参考图URL列表
+    /// </summary>
+    public List<string>? ReferenceImagesUrl { get; set; }
+
+    /// <summary>
+    /// 生成图片Base64（包含前缀）
+    /// </summary>
+    public string? StoreBase64 { get; set; }
+
+    /// <summary>
+    /// 生成图片URL
+    /// </summary>
+    public string? StoreUrl { get; set; }
+
+    /// <summary>
+    /// 任务状态
+    /// </summary>
+    public TaskStatusEnum TaskStatus { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+}

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

@@ -0,0 +1,24 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
+
+/// <summary>
+/// 图片任务分页查询输入
+/// </summary>
+public class ImageTaskPageInput
+{
+    /// <summary>
+    /// 页码（从1开始）
+    /// </summary>
+    public int PageIndex { get; set; } = 1;
+
+    /// <summary>
+    /// 每页数量
+    /// </summary>
+    public int PageSize { get; set; } = 10;
+
+    /// <summary>
+    /// 任务状态筛选（可选）
+    /// </summary>
+    public TaskStatusEnum? TaskStatus { get; set; }
+}

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

@@ -0,0 +1,17 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+
+/// <summary>
+/// API类型选项
+/// </summary>
+public class ModelApiTypeOption
+{
+    /// <summary>
+    /// 显示名称
+    /// </summary>
+    public string Label { get; set; }
+
+    /// <summary>
+    /// 枚举值
+    /// </summary>
+    public int Value { get; set; }
+}

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

@@ -0,0 +1,79 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.AiHub.Domain.Shared.Extensions;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+
+/// <summary>
+/// 模型库展示数据
+/// </summary>
+public class ModelLibraryDto
+{
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    public string ModelId { get; set; }
+
+    /// <summary>
+    /// 模型名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 模型描述
+    /// </summary>
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// 模型类型
+    /// </summary>
+    public ModelTypeEnum ModelType { get; set; }
+
+    /// <summary>
+    /// 模型类型名称
+    /// </summary>
+    public string ModelTypeName => ModelType.GetDescription();
+
+    /// <summary>
+    /// 模型支持的API类型
+    /// </summary>
+    public List<ModelApiTypeOutput> ModelApiTypes { get; set; }
+
+    
+    /// <summary>
+    /// 模型显示倍率
+    /// </summary>
+    public decimal MultiplierShow { get; set; }
+
+    /// <summary>
+    /// 供应商分组名称
+    /// </summary>
+    public string? ProviderName { get; set; }
+
+    /// <summary>
+    /// 模型图标URL
+    /// </summary>
+    public string? IconUrl { get; set; }
+
+    /// <summary>
+    /// 是否为尊享模型（PremiumChat类型）
+    /// </summary>
+    public bool IsPremium { get; set; }
+    
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int OrderNum { get; set; }
+}
+
+public class ModelApiTypeOutput
+{
+    /// <summary>
+    /// 模型类型
+    /// </summary>
+    public ModelApiTypeEnum ModelApiType { get; set; }
+
+    /// <summary>
+    /// 模型类型名称
+    /// </summary>
+    public string ModelApiTypeName => ModelApiType.GetDescription();
+}

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

@@ -0,0 +1,35 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.Ddd.Application.Contracts;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+
+/// <summary>
+/// 获取模型库列表查询参数
+/// </summary>
+public class ModelLibraryGetListInput : PagedAllResultRequestDto
+{
+    /// <summary>
+    /// 搜索关键词（搜索模型名称、模型ID）
+    /// </summary>
+    public string? SearchKey { get; set; }
+
+    /// <summary>
+    /// 供应商名称筛选
+    /// </summary>
+    public List<string>? ProviderNames { get; set; }
+
+    /// <summary>
+    /// 模型类型筛选
+    /// </summary>
+    public List<ModelTypeEnum>? ModelTypes { get; set; }
+
+    /// <summary>
+    /// API类型筛选
+    /// </summary>
+    public List<ModelApiTypeEnum>? ModelApiTypes { get; set; }
+
+    /// <summary>
+    /// 是否只显示尊享模型
+    /// </summary>
+    public bool? IsPremiumOnly { get; set; }
+}

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

@@ -0,0 +1,17 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+
+/// <summary>
+/// 模型类型选项
+/// </summary>
+public class ModelTypeOption
+{
+    /// <summary>
+    /// 显示名称
+    /// </summary>
+    public string Label { get; set; }
+
+    /// <summary>
+    /// 枚举值
+    /// </summary>
+    public int Value { get; set; }
+}

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

@@ -25,11 +25,17 @@ public class RechargeCreateInput
     public string Content { get; set; } = string.Empty;
 
     /// <summary>
-    /// VIP月数（为空或0表示永久VIP）
+    /// VIP月数（为空或0表示永久VIP，1个月按31天计算）
     /// </summary>
     [Range(0, int.MaxValue, ErrorMessage = "月数必须大于等于0")]
     public int? Months { get; set; }
 
+    /// <summary>
+    /// VIP天数（为空或0表示不使用天数充值）
+    /// </summary>
+    [Range(0, int.MaxValue, ErrorMessage = "天数必须大于等于0")]
+    public int? Days { get; set; }
+
     /// <summary>
     /// 备注
     /// </summary>

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

@@ -0,0 +1,20 @@
+using Volo.Abp.Application.Services;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.ActivationCode;
+
+namespace Yi.Framework.AiHub.Application.Contracts.IServices;
+
+/// <summary>
+/// 激活码服务接口
+/// </summary>
+public interface IActivationCodeService : IApplicationService
+{
+    /// <summary>
+    /// 批量生成激活码
+    /// </summary>
+    Task<ActivationCodeCreateListOutput> CreateBatchAsync(ActivationCodeCreateListInput input);
+
+    /// <summary>
+    /// 兑换激活码
+    /// </summary>
+    Task<ActivationCodeRedeemOutput> RedeemAsync(ActivationCodeRedeemInput input);
+}

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

@@ -0,0 +1,86 @@
+using Volo.Abp.Application.Dtos;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+
+namespace Yi.Framework.AiHub.Application.Contracts.IServices;
+
+/// <summary>
+/// 渠道商管理服务接口
+/// </summary>
+public interface IChannelService
+{
+    #region AI应用管理
+
+    /// <summary>
+    /// 获取AI应用列表
+    /// </summary>
+    /// <param name="input">查询参数</param>
+    /// <returns>分页应用列表</returns>
+    Task<PagedResultDto<AiAppDto>> GetAppListAsync(AiAppGetListInput input);
+
+    /// <summary>
+    /// 根据ID获取AI应用
+    /// </summary>
+    /// <param name="id">应用ID</param>
+    /// <returns>应用详情</returns>
+    Task<AiAppDto> GetAppByIdAsync(Guid id);
+
+    /// <summary>
+    /// 创建AI应用
+    /// </summary>
+    /// <param name="input">创建输入</param>
+    /// <returns>创建的应用</returns>
+    Task<AiAppDto> CreateAppAsync(AiAppCreateInput input);
+
+    /// <summary>
+    /// 更新AI应用
+    /// </summary>
+    /// <param name="input">更新输入</param>
+    /// <returns>更新后的应用</returns>
+    Task<AiAppDto> UpdateAppAsync(AiAppUpdateInput input);
+
+    /// <summary>
+    /// 删除AI应用
+    /// </summary>
+    /// <param name="id">应用ID</param>
+    Task DeleteAppAsync(Guid id);
+
+    #endregion
+
+    #region AI模型管理
+
+    /// <summary>
+    /// 获取AI模型列表
+    /// </summary>
+    /// <param name="input">查询参数</param>
+    /// <returns>分页模型列表</returns>
+    Task<PagedResultDto<AiModelDto>> GetModelListAsync(AiModelGetListInput input);
+
+    /// <summary>
+    /// 根据ID获取AI模型
+    /// </summary>
+    /// <param name="id">模型ID</param>
+    /// <returns>模型详情</returns>
+    Task<AiModelDto> GetModelByIdAsync(Guid id);
+
+    /// <summary>
+    /// 创建AI模型
+    /// </summary>
+    /// <param name="input">创建输入</param>
+    /// <returns>创建的模型</returns>
+    Task<AiModelDto> CreateModelAsync(AiModelCreateInput input);
+
+    /// <summary>
+    /// 更新AI模型
+    /// </summary>
+    /// <param name="input">更新输入</param>
+    /// <returns>更新后的模型</returns>
+    Task<AiModelDto> UpdateModelAsync(AiModelUpdateInput input);
+
+    /// <summary>
+    /// 删除AI模型(软删除)
+    /// </summary>
+    /// <param name="id">模型ID</param>
+    Task DeleteModelAsync(Guid id);
+
+    #endregion
+}

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

@@ -0,0 +1,35 @@
+using Volo.Abp.Application.Dtos;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+
+namespace Yi.Framework.AiHub.Application.Contracts.IServices;
+
+/// <summary>
+/// 模型服务接口
+/// </summary>
+public interface IModelService
+{
+    /// <summary>
+    /// 获取模型库列表（公开接口，无需登录）
+    /// </summary>
+    /// <param name="input">查询参数</param>
+    /// <returns>分页模型列表</returns>
+    Task<PagedResultDto<ModelLibraryDto>> GetListAsync(ModelLibraryGetListInput input);
+
+    /// <summary>
+    /// 获取供应商列表（公开接口，无需登录）
+    /// </summary>
+    /// <returns>供应商列表</returns>
+    Task<List<string>> GetProviderListAsync();
+
+    /// <summary>
+    /// 获取模型类型选项列表（公开接口，无需登录）
+    /// </summary>
+    /// <returns>模型类型选项</returns>
+    Task<List<ModelTypeOption>> GetModelTypeOptionsAsync();
+
+    /// <summary>
+    /// 获取API类型选项列表（公开接口，无需登录）
+    /// </summary>
+    /// <returns>API类型选项</returns>
+    Task<List<ModelApiTypeOption>> GetApiTypeOptionsAsync();
+}

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

@@ -0,0 +1,61 @@
+using System.Text.Json;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.BackgroundJobs;
+using Volo.Abp.DependencyInjection;
+using Yi.Framework.AiHub.Domain.Entities.Chat;
+using Yi.Framework.AiHub.Domain.Managers;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Jobs;
+
+/// <summary>
+/// 图片生成后台任务
+/// </summary>
+public class ImageGenerationJob : AsyncBackgroundJob<ImageGenerationJobArgs>, ITransientDependency
+{
+    private readonly ILogger<ImageGenerationJob> _logger;
+    private readonly AiGateWayManager _aiGateWayManager;
+    private readonly ISqlSugarRepository<ImageStoreTaskAggregateRoot> _imageStoreTaskRepository;
+
+    public ImageGenerationJob(
+        ILogger<ImageGenerationJob> logger,
+        AiGateWayManager aiGateWayManager,
+        ISqlSugarRepository<ImageStoreTaskAggregateRoot> imageStoreTaskRepository)
+    {
+        _logger = logger;
+        _aiGateWayManager = aiGateWayManager;
+        _imageStoreTaskRepository = imageStoreTaskRepository;
+    }
+
+    public override async Task ExecuteAsync(ImageGenerationJobArgs args)
+    {
+        _logger.LogInformation("开始执行图片生成任务，TaskId: {TaskId}, ModelId: {ModelId}, UserId: {UserId}",
+            args.TaskId, args.ModelId, args.UserId);
+
+        try
+        {
+            var request = JsonSerializer.Deserialize<JsonElement>(args.RequestJson);
+
+            await _aiGateWayManager.GeminiGenerateContentImageForStatisticsAsync(
+                args.TaskId,
+                args.ModelId,
+                request,
+                args.UserId);
+
+            _logger.LogInformation("图片生成任务完成，TaskId: {TaskId}", args.TaskId);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "图片生成任务失败，TaskId: {TaskId}, Error: {Error}", args.TaskId, ex.Message);
+
+            // 更新任务状态为失败
+            var task = await _imageStoreTaskRepository.GetFirstAsync(x => x.Id == args.TaskId);
+            if (task != null)
+            {
+                task.TaskStatus = TaskStatusEnum.Fail;
+                await _imageStoreTaskRepository.UpdateAsync(task);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,27 @@
+namespace Yi.Framework.AiHub.Application.Jobs;
+
+/// <summary>
+/// 图片生成后台任务参数
+/// </summary>
+public class ImageGenerationJobArgs
+{
+    /// <summary>
+    /// 图片任务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/ActivationCodeService.cs

@@ -0,0 +1,116 @@
+using Medallion.Threading;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Users;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.ActivationCode;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Recharge;
+using Yi.Framework.AiHub.Application.Contracts.IServices;
+using Yi.Framework.AiHub.Domain.Managers;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Services;
+
+/// <summary>
+/// 激活码服务
+/// </summary>
+public class ActivationCodeService : ApplicationService, IActivationCodeService
+{
+    private readonly ActivationCodeManager _activationCodeManager;
+    private readonly IRechargeService _rechargeService;
+    private readonly PremiumPackageManager _premiumPackageManager;
+    private IDistributedLockProvider DistributedLock => LazyServiceProvider.LazyGetRequiredService<IDistributedLockProvider>();
+    public ActivationCodeService(
+        ActivationCodeManager activationCodeManager,
+        IRechargeService rechargeService,
+        PremiumPackageManager premiumPackageManager)
+    {
+        _activationCodeManager = activationCodeManager;
+        _rechargeService = rechargeService;
+        _premiumPackageManager = premiumPackageManager;
+    }
+
+    /// <summary>
+    /// 批量生成激活码
+    /// </summary>
+    [Authorize]
+    [HttpPost("activationCode/Batch")]
+    public async Task<ActivationCodeCreateListOutput> CreateBatchAsync(ActivationCodeCreateListInput input)
+    {
+        if (input.Items == null || input.Items.Count == 0)
+        {
+            throw new UserFriendlyException("生成列表不能为空");
+        }
+
+        var entities = await _activationCodeManager.CreateBatchAsync(
+            input.Items.Select(x => (x.GoodsType, x.Count)).ToList());
+
+        var outputs = entities
+            .GroupBy(x => x.GoodsType)
+            .Select(group => new ActivationCodeCreateOutput
+            {
+                GoodsType = group.Key,
+                Count = group.Count(),
+                Codes = group.Select(x => x.Code).ToList()
+            })
+            .ToList();
+
+        return new ActivationCodeCreateListOutput
+        {
+            Items = outputs
+        };
+    }
+
+    /// <summary>
+    /// 兑换激活码
+    /// </summary>
+    [Authorize]
+    [HttpPost("activationCode/Redeem")]
+    public async Task<ActivationCodeRedeemOutput> RedeemAsync(ActivationCodeRedeemInput input)
+    {
+        //自旋等待，防抖
+        await using var handle =
+            await DistributedLock.AcquireLockAsync($"Yi:AiHub:ActivationCodeLock:{input.Code}");
+        
+        var userId = CurrentUser.GetId();
+        var redeemContext = await _activationCodeManager.RedeemAsync(userId, input.Code);
+        var goodsType = redeemContext.ActivationCode.GoodsType;
+        var goods = redeemContext.Goods;
+        var packageName = redeemContext.PackageName;
+        var totalAmount = goods.Price;
+
+        if (goods.TokenAmount > 0)
+        {
+            await _premiumPackageManager.CreatePremiumPackageAsync(
+                userId,
+                goods.TokenAmount,
+                packageName,
+                totalAmount,
+                "激活码兑换",
+                expireMonths: null,
+                isCreateRechargeRecord: !goods.IsCombo);
+        }
+
+        if (goods.VipMonths > 0 || goods.VipDays > 0)
+        {
+            await _rechargeService.RechargeVipAsync(new RechargeCreateInput
+            {
+                UserId = userId,
+                RechargeAmount = totalAmount,
+                Content = packageName,
+                Months = goods.VipMonths,
+                Days = goods.VipDays,
+                Remark = "激活码兑换",
+                ContactInfo = null
+            });
+        }
+
+        return new ActivationCodeRedeemOutput
+        {
+            GoodsType = goodsType,
+            PackageName = packageName,
+            Content = packageName
+        };
+    }
+}

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

@@ -1,3 +1,4 @@
+using Medallion.Threading;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Logging;
 using SqlSugar;
@@ -6,6 +7,7 @@ using Volo.Abp.Users;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.DailyTask;
 using Yi.Framework.AiHub.Domain.Entities;
 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;
@@ -23,7 +25,8 @@ public class DailyTaskService : ApplicationService
     private readonly ISqlSugarRepository<MessageAggregateRoot> _messageRepository;
     private readonly ISqlSugarRepository<PremiumPackageAggregateRoot> _premiumPackageRepository;
     private readonly ILogger<DailyTaskService> _logger;
-
+    private IDistributedLockProvider DistributedLock => LazyServiceProvider.LazyGetRequiredService<IDistributedLockProvider>();
+    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
     // 任务配置
     private readonly Dictionary<int, (long RequiredTokens, long RewardTokens, string Name, string Description)>
         _taskConfigs = new()
@@ -36,12 +39,13 @@ public class DailyTaskService : ApplicationService
         ISqlSugarRepository<DailyTaskRewardRecordAggregateRoot> dailyTaskRepository,
         ISqlSugarRepository<MessageAggregateRoot> messageRepository,
         ISqlSugarRepository<PremiumPackageAggregateRoot> premiumPackageRepository,
-        ILogger<DailyTaskService> logger)
+        ILogger<DailyTaskService> logger, ISqlSugarRepository<AiModelEntity> aiModelRepository)
     {
         _dailyTaskRepository = dailyTaskRepository;
         _messageRepository = messageRepository;
         _premiumPackageRepository = premiumPackageRepository;
         _logger = logger;
+        _aiModelRepository = aiModelRepository;
     }
 
     /// <summary>
@@ -113,6 +117,11 @@ public class DailyTaskService : ApplicationService
     public async Task ClaimTaskRewardAsync(ClaimTaskRewardInput input)
     {
         var userId = CurrentUser.GetId();
+        //自旋等待，防抖
+        await using var handle =
+            await DistributedLock.AcquireLockAsync($"Yi:AiHub:ClaimTaskRewardLock:{userId}");
+        
+        
         var today = DateTime.Today;
 
         // 1. 验证任务等级
@@ -173,10 +182,16 @@ public class DailyTaskService : ApplicationService
         var tomorrow = today.AddDays(1);
 
         // 查询今日所有使用尊享包模型的消息（role=system 表示消耗）
+        // 先获取所有尊享模型的ModelId列表
+        var premiumModelIds = await _aiModelRepository._DbQueryable
+            .Where(x => x.IsPremium)
+            .Select(x => x.ModelId)
+            .ToListAsync();
+
         var totalTokens = await _messageRepository._DbQueryable
             .Where(x => x.UserId == userId)
             .Where(x => x.Role == "system") // system角色表示实际消耗
-            .Where(x => PremiumPackageConst.ModeIds.Contains(x.ModelId)) // 尊享包模型
+            .Where(x => premiumModelIds.Contains(x.ModelId)) // 尊享包模型
             .Where(x => x.CreationTime >= today && x.CreationTime < tomorrow)
             .SumAsync(x => x.TokenUsage.TotalTokenCount);
 

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

@@ -1,10 +1,14 @@
 using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using System.Globalization;
+using System.Text;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Users;
 using Yi.Framework.AiHub.Application.Contracts.Dtos;
 using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.AiHub.Domain.Entities.Chat;
 using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.Rbac.Domain.Shared.Dtos;
 using Yi.Framework.SqlSugarCore.Abstractions;
@@ -18,17 +22,18 @@ public class AiAccountService : ApplicationService
     private ISqlSugarRepository<AiUserExtraInfoEntity> _userRepository;
     private ISqlSugarRepository<AiRechargeAggregateRoot> _rechargeRepository;
     private ISqlSugarRepository<PremiumPackageAggregateRoot> _premiumPackageRepository;
-
+    private ISqlSugarRepository<MessageAggregateRoot> _messageRepository;
     public AiAccountService(
         IAccountService accountService,
         ISqlSugarRepository<AiUserExtraInfoEntity> userRepository,
         ISqlSugarRepository<AiRechargeAggregateRoot> rechargeRepository,
-        ISqlSugarRepository<PremiumPackageAggregateRoot> premiumPackageRepository)
+        ISqlSugarRepository<PremiumPackageAggregateRoot> premiumPackageRepository, ISqlSugarRepository<MessageAggregateRoot> messageRepository)
     {
         _accountService = accountService;
         _userRepository = userRepository;
         _rechargeRepository = rechargeRepository;
         _premiumPackageRepository = premiumPackageRepository;
+        _messageRepository = messageRepository;
     }
 
     /// <summary>
@@ -148,4 +153,90 @@ public class AiAccountService : ApplicationService
 
         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/ChannelService.cs

@@ -0,0 +1,240 @@
+using Mapster;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Channel;
+using Yi.Framework.AiHub.Application.Contracts.IServices;
+using Yi.Framework.AiHub.Domain.Entities.Model;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Services;
+
+/// <summary>
+/// 渠道商管理服务实现
+/// </summary>
+[Authorize]
+public class ChannelService : ApplicationService, IChannelService
+{
+    private readonly ISqlSugarRepository<AiAppAggregateRoot, Guid> _appRepository;
+    private readonly ISqlSugarRepository<AiModelEntity, Guid> _modelRepository;
+
+    public ChannelService(
+        ISqlSugarRepository<AiAppAggregateRoot, Guid> appRepository,
+        ISqlSugarRepository<AiModelEntity, Guid> modelRepository)
+    {
+        _appRepository = appRepository;
+        _modelRepository = modelRepository;
+    }
+
+    #region AI应用管理
+
+    /// <summary>
+    /// 获取AI应用列表
+    /// </summary>
+    [HttpGet("channel/app")]
+    public async Task<PagedResultDto<AiAppDto>> GetAppListAsync(AiAppGetListInput input)
+    {
+        RefAsync<int> total = 0;
+
+        var entities = await _appRepository._DbQueryable
+            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), x => x.Name.Contains(input.SearchKey))
+            .OrderByDescending(x => x.OrderNum)
+            .OrderByDescending(x => x.CreationTime)
+            .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
+
+        var output = entities.Adapt<List<AiAppDto>>();
+        return new PagedResultDto<AiAppDto>(total, output);
+    }
+
+    /// <summary>
+    /// 根据ID获取AI应用
+    /// </summary>
+    [HttpGet("channel/app/{id}")]
+    public async Task<AiAppDto> GetAppByIdAsync([FromRoute]Guid id)
+    {
+        var entity = await _appRepository.GetByIdAsync(id);
+        return entity.Adapt<AiAppDto>();
+    }
+
+    /// <summary>
+    /// 创建AI应用
+    /// </summary>
+    public async Task<AiAppDto> CreateAppAsync(AiAppCreateInput input)
+    {
+        var entity = new AiAppAggregateRoot
+        {
+            Name = input.Name,
+            Endpoint = input.Endpoint,
+            ExtraUrl = input.ExtraUrl,
+            ApiKey = input.ApiKey,
+            OrderNum = input.OrderNum
+        };
+
+        await _appRepository.InsertAsync(entity);
+        return entity.Adapt<AiAppDto>();
+    }
+
+    /// <summary>
+    /// 更新AI应用
+    /// </summary>
+    public async Task<AiAppDto> UpdateAppAsync(AiAppUpdateInput input)
+    {
+        var entity = await _appRepository.GetByIdAsync(input.Id);
+
+        entity.Name = input.Name;
+        entity.Endpoint = input.Endpoint;
+        entity.ExtraUrl = input.ExtraUrl;
+        entity.ApiKey = input.ApiKey;
+        entity.OrderNum = input.OrderNum;
+
+        await _appRepository.UpdateAsync(entity);
+        return entity.Adapt<AiAppDto>();
+    }
+
+    /// <summary>
+    /// 删除AI应用
+    /// </summary>
+    [HttpDelete("channel/app/{id}")]
+    public async Task DeleteAppAsync([FromRoute]Guid id)
+    {
+        // 检查是否有关联的模型
+        var hasModels = await _modelRepository._DbQueryable
+            .Where(x => x.AiAppId == id && !x.IsDeleted)
+            .AnyAsync();
+
+        if (hasModels)
+        {
+            throw new Volo.Abp.UserFriendlyException("该应用下存在模型,无法删除");
+        }
+
+        await _appRepository.DeleteAsync(id);
+    }
+
+    #endregion
+
+    #region AI模型管理
+
+    /// <summary>
+    /// 获取AI模型列表
+    /// </summary>
+    [HttpGet("channel/model")]
+    public async Task<PagedResultDto<AiModelDto>> GetModelListAsync(AiModelGetListInput input)
+    {
+        RefAsync<int> total = 0;
+
+        var query = _modelRepository._DbQueryable
+            .Where(x => !x.IsDeleted)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), x =>
+                x.Name.Contains(input.SearchKey) || x.ModelId.Contains(input.SearchKey))
+            .WhereIF(input.AiAppId.HasValue, x => x.AiAppId == input.AiAppId.Value)
+            .WhereIF(input.IsPremiumOnly == true, x => x.IsPremium);
+
+        var entities = await query
+            .OrderBy(x => x.OrderNum)
+            .OrderByDescending(x => x.Id)
+            .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
+
+        var output = entities.Adapt<List<AiModelDto>>();
+        return new PagedResultDto<AiModelDto>(total, output);
+    }
+
+    /// <summary>
+    /// 根据ID获取AI模型
+    /// </summary>
+    [HttpGet("channel/model/{id}")]
+    public async Task<AiModelDto> GetModelByIdAsync([FromRoute]Guid id)
+    {
+        var entity = await _modelRepository.GetByIdAsync(id);
+        return entity.Adapt<AiModelDto>();
+    }
+
+    /// <summary>
+    /// 创建AI模型
+    /// </summary>
+    public async Task<AiModelDto> CreateModelAsync(AiModelCreateInput input)
+    {
+        // 验证应用是否存在
+        var appExists = await _appRepository._DbQueryable
+            .Where(x => x.Id == input.AiAppId)
+            .AnyAsync();
+
+        if (!appExists)
+        {
+            throw new Volo.Abp.UserFriendlyException("指定的AI应用不存在");
+        }
+
+        var entity = new AiModelEntity
+        {
+            HandlerName = input.HandlerName,
+            ModelId = input.ModelId,
+            Name = input.Name,
+            Description = input.Description,
+            OrderNum = input.OrderNum,
+            AiAppId = input.AiAppId,
+            ExtraInfo = input.ExtraInfo,
+            ModelType = input.ModelType,
+            ModelApiType = input.ModelApiType,
+            Multiplier = input.Multiplier,
+            MultiplierShow = input.MultiplierShow,
+            ProviderName = input.ProviderName,
+            IconUrl = input.IconUrl,
+            IsPremium = input.IsPremium,
+            IsDeleted = false
+        };
+
+        await _modelRepository.InsertAsync(entity);
+        return entity.Adapt<AiModelDto>();
+    }
+
+    /// <summary>
+    /// 更新AI模型
+    /// </summary>
+    public async Task<AiModelDto> UpdateModelAsync(AiModelUpdateInput input)
+    {
+        var entity = await _modelRepository.GetByIdAsync(input.Id);
+
+        // 验证应用是否存在
+        if (entity.AiAppId != input.AiAppId)
+        {
+            var appExists = await _appRepository._DbQueryable
+                .Where(x => x.Id == input.AiAppId)
+                .AnyAsync();
+
+            if (!appExists)
+            {
+                throw new Volo.Abp.UserFriendlyException("指定的AI应用不存在");
+            }
+        }
+
+        entity.HandlerName = input.HandlerName;
+        entity.ModelId = input.ModelId;
+        entity.Name = input.Name;
+        entity.Description = input.Description;
+        entity.OrderNum = input.OrderNum;
+        entity.AiAppId = input.AiAppId;
+        entity.ExtraInfo = input.ExtraInfo;
+        entity.ModelType = input.ModelType;
+        entity.ModelApiType = input.ModelApiType;
+        entity.Multiplier = input.Multiplier;
+        entity.MultiplierShow = input.MultiplierShow;
+        entity.ProviderName = input.ProviderName;
+        entity.IconUrl = input.IconUrl;
+        entity.IsPremium = input.IsPremium;
+
+        await _modelRepository.UpdateAsync(entity);
+        return entity.Adapt<AiModelDto>();
+    }
+
+    /// <summary>
+    /// 删除AI模型(软删除)
+    /// </summary>
+    [HttpDelete("channel/model/{id}")]
+    public async Task DeleteModelAsync(Guid id)
+    {
+        await _modelRepository.DeleteByIdAsync(id);
+    }
+
+    #endregion
+}

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

@@ -1,18 +1,26 @@
 using System.Collections.Concurrent;
+using System.Reflection;
 using System.Text;
+using System.Text.Encodings.Web;
+using Dm.util;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using ModelContextProtocol;
+using ModelContextProtocol.Server;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using OpenAI.Chat;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Users;
 using Yi.Framework.AiHub.Application.Contracts.Dtos;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
+using Yi.Framework.AiHub.Domain;
 using Yi.Framework.AiHub.Domain.Entities;
+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;
@@ -32,23 +40,37 @@ namespace Yi.Framework.AiHub.Application.Services;
 public class AiChatService : ApplicationService
 {
     private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
     private readonly AiBlacklistManager _aiBlacklistManager;
     private readonly ILogger<AiChatService> _logger;
     private readonly AiGateWayManager _aiGateWayManager;
+    private readonly ModelManager _modelManager;
     private readonly PremiumPackageManager _premiumPackageManager;
+    private readonly ChatManager _chatManager;
+    private readonly TokenManager _tokenManager;
+    private readonly IAccountService _accountService;
+    private readonly ISqlSugarRepository<AgentStoreAggregateRoot> _agentStoreRepository;
+    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
 
     public AiChatService(IHttpContextAccessor httpContextAccessor,
         AiBlacklistManager aiBlacklistManager,
-        ISqlSugarRepository<AiModelEntity> aiModelRepository,
-        ILogger<AiChatService> logger, AiGateWayManager aiGateWayManager, PremiumPackageManager premiumPackageManager)
+        ILogger<AiChatService> logger,
+        AiGateWayManager aiGateWayManager,
+        ModelManager modelManager,
+        PremiumPackageManager premiumPackageManager,
+        ChatManager chatManager, TokenManager tokenManager, IAccountService accountService,
+        ISqlSugarRepository<AgentStoreAggregateRoot> agentStoreRepository, ISqlSugarRepository<AiModelEntity> aiModelRepository)
     {
         _httpContextAccessor = httpContextAccessor;
         _aiBlacklistManager = aiBlacklistManager;
-        _aiModelRepository = aiModelRepository;
         _logger = logger;
         _aiGateWayManager = aiGateWayManager;
+        _modelManager = modelManager;
         _premiumPackageManager = premiumPackageManager;
+        _chatManager = chatManager;
+        _tokenManager = tokenManager;
+        _accountService = accountService;
+        _agentStoreRepository = agentStoreRepository;
+        _aiModelRepository = aiModelRepository;
     }
 
 
@@ -73,6 +95,7 @@ public class AiChatService : ApplicationService
     {
         var output = await _aiModelRepository._DbQueryable
             .Where(x => x.ModelType == ModelTypeEnum.Chat)
+            .Where(x => x.ModelApiType == ModelApiTypeEnum.OpenAi)
             .OrderByDescending(x => x.OrderNum)
             .Select(x => new ModelGetListOutput
             {
@@ -88,7 +111,7 @@ public class AiChatService : ApplicationService
                 ApiHost = null,
                 ApiKey = null,
                 Remark = x.Description,
-                IsPremiumPackage = PremiumPackageConst.ModeIds.Contains(x.ModelId)
+                IsPremiumPackage = x.IsPremium
             }).ToListAsync();
         return output;
     }
@@ -123,22 +146,26 @@ public class AiChatService : ApplicationService
         }
 
         //如果是尊享包服务，需要校验是是否尊享包足够
-        if (CurrentUser.IsAuthenticated && PremiumPackageConst.ModeIds.Contains(input.Model))
+        if (CurrentUser.IsAuthenticated)
         {
-            // 检查尊享token包用量
-            var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
-            if (availableTokens <= 0)
+            var isPremium = await _modelManager.IsPremiumModelAsync(input.Model);
+
+            if (isPremium)
             {
-                throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+                // 检查尊享token包用量
+                var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
+                if (availableTokens <= 0)
+                {
+                    throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+                }
             }
         }
 
         //ai网关代理httpcontext
         await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-            CurrentUser.Id, sessionId, null, cancellationToken);
+            CurrentUser.Id, sessionId, null, CancellationToken.None);
     }
 
-
     /// <summary>
     /// 发送消息
     /// </summary>
@@ -172,6 +199,80 @@ public class AiChatService : ApplicationService
 
         //ai网关代理httpcontext
         await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-            CurrentUser.Id, null, null, cancellationToken);
+            CurrentUser.Id, null, null, CancellationToken.None);
+    }
+
+
+    /// <summary>
+    /// Agent 发送消息
+    /// </summary>
+    [HttpPost("ai-chat/agent/send")]
+    public async Task PostAgentSendAsync([FromBody] AgentSendInput input, CancellationToken cancellationToken)
+    {
+        var tokenValidation = await _tokenManager.ValidateTokenAsync(input.Token, input.ModelId);
+
+        await _aiBlacklistManager.VerifiyAiBlacklist(tokenValidation.UserId);
+        // 验证用户是否为VIP
+        var userInfo = await _accountService.GetAsync(null, null, tokenValidation.UserId);
+        if (userInfo == null)
+        {
+            throw new UserFriendlyException("用户信息不存在");
+        }
+
+        // 检查是否为VIP（使用RoleCodes判断）
+        if (!userInfo.RoleCodes.Contains(AiHubConst.VipRole) && userInfo.User.UserName != "cc")
+        {
+            throw new UserFriendlyException("该接口为尊享服务专用，需要VIP权限才能使用");
+        }
+
+        //如果是尊享包服务，需要校验是是否尊享包足够
+        var isPremium = await _modelManager.IsPremiumModelAsync(input.ModelId);
+
+        if (isPremium)
+        {
+            // 检查尊享token包用量
+            var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(tokenValidation.UserId);
+            if (availableTokens <= 0)
+            {
+                throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+            }
+        }
+
+        await _chatManager.AgentCompleteChatStreamAsync(_httpContextAccessor.HttpContext,
+            input.SessionId,
+            input.Content,
+            input.Token,
+            tokenValidation.TokenId,
+            input.ModelId,
+            tokenValidation.UserId,
+            input.Tools,
+            CancellationToken.None);
+    }
+
+    /// <summary>
+    /// 获取 Agent 工具
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("ai-chat/agent/tool")]
+    public List<AgentToolOutput> GetAgentToolAsync()
+    {
+        var agentTools = _chatManager.GetTools().Select(x => new AgentToolOutput
+        {
+            Code = x.Code,
+            Name = x.Name
+        }).ToList();
+        return agentTools;
+    }
+
+    /// <summary>
+    /// 获取 Agent 上下文
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("ai-chat/agent/context/{sessionId}")]
+    [Authorize]
+    public async Task<string?> GetAgentContextAsync([FromRoute] Guid sessionId)
+    {
+        var data = await _agentStoreRepository.GetFirstAsync(x => x.SessionId == sessionId);
+        return data?.Store;
     }
 }

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

@@ -0,0 +1,275 @@
+using System.Text.Json;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+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.Chat;
+using Yi.Framework.AiHub.Application.Jobs;
+using Yi.Framework.AiHub.Domain.Entities.Chat;
+using Yi.Framework.AiHub.Domain.Extensions;
+using Yi.Framework.AiHub.Domain.Managers;
+using Yi.Framework.AiHub.Domain.Shared.Consts;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Services.Chat;
+
+/// <summary>
+/// AI图片生成服务
+/// </summary>
+[Authorize]
+public class AiImageService : ApplicationService
+{
+    private readonly ISqlSugarRepository<ImageStoreTaskAggregateRoot> _imageTaskRepository;
+    private readonly IBackgroundJobManager _backgroundJobManager;
+    private readonly AiBlacklistManager _aiBlacklistManager;
+    private readonly PremiumPackageManager _premiumPackageManager;
+    private readonly ModelManager _modelManager;
+    private readonly IGuidGenerator _guidGenerator;
+    private readonly IWebHostEnvironment _webHostEnvironment;
+
+    public AiImageService(
+        ISqlSugarRepository<ImageStoreTaskAggregateRoot> imageTaskRepository,
+        IBackgroundJobManager backgroundJobManager,
+        AiBlacklistManager aiBlacklistManager,
+        PremiumPackageManager premiumPackageManager,
+        ModelManager modelManager,
+        IGuidGenerator guidGenerator,
+        IWebHostEnvironment webHostEnvironment)
+    {
+        _imageTaskRepository = imageTaskRepository;
+        _backgroundJobManager = backgroundJobManager;
+        _aiBlacklistManager = aiBlacklistManager;
+        _premiumPackageManager = premiumPackageManager;
+        _modelManager = modelManager;
+        _guidGenerator = guidGenerator;
+        _webHostEnvironment = webHostEnvironment;
+    }
+
+    /// <summary>
+    /// 生成图片（异步任务）
+    /// </summary>
+    /// <param name="input">图片生成输入参数</param>
+    /// <returns>任务ID</returns>
+    [HttpPost("ai-image/generate")]
+    [Authorize]
+    public async Task<Guid> GenerateAsync([FromBody] ImageGenerationInput input)
+    {
+        var userId = CurrentUser.GetId();
+
+        // 黑名单校验
+        await _aiBlacklistManager.VerifiyAiBlacklist(userId);
+
+        // VIP校验
+        if (!CurrentUser.IsAiVip())
+        {
+            throw new UserFriendlyException("图片生成功能需要VIP用户才能使用，请购买VIP后重新登录重试");
+        }
+
+        // 尊享包校验 - 使用ModelManager统一判断
+        var isPremium = await _modelManager.IsPremiumModelAsync(input.ModelId);
+        if (isPremium)
+        {
+            var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(userId);
+            if (availableTokens <= 0)
+            {
+                throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+            }
+        }
+
+        // 创建任务实体
+        var task = new ImageStoreTaskAggregateRoot
+        {
+            Prompt = input.Prompt,
+            ReferenceImagesBase64 = input.ReferenceImagesBase64 ?? new List<string>(),
+            ReferenceImagesUrl = new List<string>(),
+            TaskStatus = TaskStatusEnum.Processing,
+            UserId = userId
+        };
+
+        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,
+            ModelId = input.ModelId,
+            RequestJson = requestJson,
+            UserId = userId
+        });
+
+        return taskId;
+    }
+
+    /// <summary>
+    /// 查询任务状态
+    /// </summary>
+    /// <param name="taskId">任务ID</param>
+    /// <returns>任务详情</returns>
+    [HttpGet("ai-image/task/{taskId}")]
+    public async Task<ImageTaskOutput> GetTaskAsync([FromRoute] Guid taskId)
+    {
+        var userId = CurrentUser.GetId();
+
+        var task = await _imageTaskRepository.GetFirstAsync(x => x.Id == taskId && x.UserId == userId);
+        if (task == null)
+        {
+            throw new UserFriendlyException("任务不存在或无权访问");
+        }
+
+        return new ImageTaskOutput
+        {
+            Id = task.Id,
+            Prompt = task.Prompt,
+            ReferenceImagesBase64 = task.ReferenceImagesBase64,
+            ReferenceImagesUrl = task.ReferenceImagesUrl,
+            StoreBase64 = task.StoreBase64,
+            StoreUrl = task.StoreUrl,
+            TaskStatus = task.TaskStatus,
+            CreationTime = task.CreationTime
+        };
+    }
+
+    /// <summary>
+    /// 上传Base64图片转换为URL
+    /// </summary>
+    /// <param name="base64Data">Base64图片数据（包含前缀如 data:image/png;base64,）</param>
+    /// <returns>图片访问URL</returns>
+    [HttpPost("ai-image/upload-base64")]
+    public async Task<string> UploadBase64ToUrlAsync([FromBody] string base64Data)
+    {
+        if (string.IsNullOrWhiteSpace(base64Data))
+        {
+            throw new UserFriendlyException("Base64数据不能为空");
+        }
+
+        // 解析Base64数据
+        string mimeType = "image/png";
+        string base64Content = base64Data;
+
+        if (base64Data.Contains(","))
+        {
+            var parts = base64Data.Split(',');
+            if (parts.Length == 2)
+            {
+                // 提取MIME类型
+                var header = parts[0];
+                if (header.Contains(":") && header.Contains(";"))
+                {
+                    mimeType = header.Split(':')[1].Split(';')[0];
+                }
+                base64Content = parts[1];
+            }
+        }
+
+        // 获取文件扩展名
+        var extension = mimeType switch
+        {
+            "image/png" => ".png",
+            "image/jpeg" => ".jpg",
+            "image/jpg" => ".jpg",
+            "image/gif" => ".gif",
+            "image/webp" => ".webp",
+            _ => ".png"
+        };
+
+        // 解码Base64
+        byte[] imageBytes;
+        try
+        {
+            imageBytes = Convert.FromBase64String(base64Content);
+        }
+        catch (FormatException)
+        {
+            throw new UserFriendlyException("Base64格式无效");
+        }
+
+        // 创建存储目录
+        var uploadPath = Path.Combine(_webHostEnvironment.ContentRootPath, "wwwroot", "ai-images");
+        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
+        return $"/ai-images/{fileName}";
+    }
+
+    /// <summary>
+    /// 分页查询任务列表
+    /// </summary>
+    /// <param name="input">分页查询参数</param>
+    /// <returns>任务列表</returns>
+    [HttpGet("ai-image/tasks")]
+    public async Task<PagedResult<ImageTaskOutput>> GetTaskPageAsync([FromQuery] ImageTaskPageInput input)
+    {
+        var userId = CurrentUser.GetId();
+
+        var query = _imageTaskRepository._DbQueryable
+            .Where(x => x.UserId == userId)
+            .WhereIF(input.TaskStatus.HasValue, x => x.TaskStatus == input.TaskStatus!.Value)
+            .OrderByDescending(x => x.CreationTime);
+
+        var total = await query.CountAsync();
+        var items = await query
+            .Skip((input.PageIndex - 1) * input.PageSize)
+            .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
+            })
+            .ToListAsync();
+
+        return new PagedResult<ImageTaskOutput>(total, items);
+    }
+}
+
+/// <summary>
+/// 分页结果
+/// </summary>
+/// <typeparam name="T">数据类型</typeparam>
+public class PagedResult<T>
+{
+    /// <summary>
+    /// 总数
+    /// </summary>
+    public long Total { get; set; }
+
+    /// <summary>
+    /// 数据列表
+    /// </summary>
+    public List<T> Items { get; set; }
+
+    public PagedResult(long total, List<T> items)
+    {
+        Total = total;
+        Items = items;
+    }
+}

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

@@ -0,0 +1,130 @@
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+using Yi.Framework.AiHub.Application.Contracts.IServices;
+using Yi.Framework.AiHub.Domain.Entities.Model;
+using Yi.Framework.AiHub.Domain.Managers;
+using Yi.Framework.AiHub.Domain.Shared.Consts;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.AiHub.Domain.Shared.Extensions;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Services.Chat;
+
+/// <summary>
+/// 模型服务
+/// </summary>
+public class ModelService : ApplicationService, IModelService
+{
+    private readonly ISqlSugarRepository<AiModelEntity, Guid> _modelRepository;
+    private readonly ModelManager _modelManager;
+
+    public ModelService(ISqlSugarRepository<AiModelEntity, Guid> modelRepository, ModelManager modelManager)
+    {
+        _modelRepository = modelRepository;
+        _modelManager = modelManager;
+    }
+
+    /// <summary>
+    /// 获取模型库列表（公开接口，无需登录）
+    /// </summary>
+    public async Task<PagedResultDto<ModelLibraryDto>> GetListAsync(ModelLibraryGetListInput input)
+    {
+        RefAsync<int> total = 0;
+
+        // 查询所有未删除的模型，使用WhereIF动态添加筛选条件
+        var modelIds = (await _modelRepository._DbQueryable
+            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), x =>
+                x.Name.Contains(input.SearchKey) || x.ModelId.Contains(input.SearchKey))
+            .WhereIF(input.ProviderNames is not null, x =>
+                input.ProviderNames.Contains(x.ProviderName))
+            .WhereIF(input.ModelTypes is not null, x =>
+                input.ModelTypes.Contains(x.ModelType))
+            .WhereIF(input.ModelApiTypes is not null, x =>
+                input.ModelApiTypes.Contains(x.ModelApiType))
+            .WhereIF(input.IsPremiumOnly == true, x => x.IsPremium)
+            .GroupBy(x => x.ModelId)
+            .Select(x => x.ModelId)
+            .ToPageListAsync(input.SkipCount, input.MaxResultCount, total));
+
+        var entities = await _modelRepository._DbQueryable.Where(x => modelIds.Contains(x.ModelId))
+            .OrderBy(x => x.OrderNum)
+            .OrderBy(x => x.Name).ToListAsync();
+
+        var output=  entities.GroupBy(x => x.ModelId).Select(x => new ModelLibraryDto
+        {
+            ModelId = x.First().ModelId,
+            Name = x.First().Name,
+            Description = x.First().Description,
+            ModelType = x.First().ModelType,
+            ModelApiTypes = x.Select(y => new ModelApiTypeOutput { ModelApiType = y.ModelApiType }).ToList(),
+            MultiplierShow = x.First().MultiplierShow,
+            ProviderName = x.First().ProviderName,
+            IconUrl = x.First().IconUrl,
+            IsPremium = x.First().IsPremium,
+            OrderNum = x.First().OrderNum
+        }).ToList();
+        
+        return new PagedResultDto<ModelLibraryDto>(total, output);
+    }
+
+    /// <summary>
+    /// 获取供应商列表（公开接口，无需登录）
+    /// </summary>
+    public async Task<List<string>> GetProviderListAsync()
+    {
+        var providers = await _modelRepository._DbQueryable
+            .Where(x => !x.IsDeleted)
+            .Where(x => !string.IsNullOrEmpty(x.ProviderName))
+            .GroupBy(x => x.ProviderName)
+            .OrderBy(x => x.OrderNum)
+            .Select(x => x.ProviderName)
+            .ToListAsync();
+
+        return providers!;
+    }
+
+    /// <summary>
+    /// 获取模型类型选项列表（公开接口，无需登录）
+    /// </summary>
+    public Task<List<ModelTypeOption>> GetModelTypeOptionsAsync()
+    {
+        var options = Enum.GetValues<ModelTypeEnum>()
+            .Select(e => new ModelTypeOption
+            {
+                Label = e.GetDescription(),
+                Value = (int)e
+            })
+            .ToList();
+
+        return Task.FromResult(options);
+    }
+
+    /// <summary>
+    /// 获取API类型选项列表（公开接口，无需登录）
+    /// </summary>
+    public Task<List<ModelApiTypeOption>> GetApiTypeOptionsAsync()
+    {
+        var options = Enum.GetValues<ModelApiTypeEnum>()
+            .Select(e => new ModelApiTypeOption
+            {
+                Label = e.GetDescription(),
+                Value = (int)e
+            })
+            .ToList();
+
+        return Task.FromResult(options);
+    }
+
+    /// <summary>
+    /// 清除尊享模型ID缓存
+    /// </summary>
+    [HttpPost("model/clear-premium-cache")]
+    public async Task ClearPremiumModelCacheAsync()
+    {
+        await _modelManager.ClearPremiumModelIdsCacheAsync();
+    }
+}

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

@@ -7,8 +7,10 @@ using Volo.Abp.Application.Services;
 using Volo.Abp.Users;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.Token;
 using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.AiHub.Domain.Entities.Model;
 using Yi.Framework.AiHub.Domain.Entities.OpenApi;
 using Yi.Framework.AiHub.Domain.Extensions;
+using Yi.Framework.AiHub.Domain.Managers;
 using Yi.Framework.AiHub.Domain.Shared.Consts;
 using Yi.Framework.Ddd.Application.Contracts;
 using Yi.Framework.SqlSugarCore.Abstractions;
@@ -23,13 +25,15 @@ 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)
+        ISqlSugarRepository<UsageStatisticsAggregateRoot> usageStatisticsRepository,
+        ModelManager modelManager)
     {
         _tokenRepository = tokenRepository;
         _usageStatisticsRepository = usageStatisticsRepository;
+        _modelManager = modelManager;
     }
 
     /// <summary>
@@ -51,8 +55,8 @@ public class TokenService : ApplicationService
             return new PagedResultDto<TokenGetListOutputDto>();
         }
 
-        // 获取尊享包模型ID列表
-        var premiumModelIds = PremiumPackageConst.ModeIds;
+        // 通过ModelManager获取尊享包模型ID列表
+        var premiumModelIds = await _modelManager.GetPremiumModelIdsAsync();
 
         // 批量查询所有Token的尊享包已使用额度
         var tokenIds = tokens.Select(t => t.Id).ToList();

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

@@ -1,9 +1,11 @@
-using Microsoft.AspNetCore.Http;
+using System.Text.Json;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Users;
 using Yi.Framework.AiHub.Domain.Entities;
+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;
@@ -12,6 +14,7 @@ using Yi.Framework.AiHub.Domain.Shared.Dtos.Anthropic;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Embeddings;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Images;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
 using Yi.Framework.AiHub.Domain.Shared.Enums;
 using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.SqlSugarCore.Abstractions;
@@ -24,24 +27,27 @@ public class OpenApiService : ApplicationService
     private readonly ILogger<OpenApiService> _logger;
     private readonly TokenManager _tokenManager;
     private readonly AiGateWayManager _aiGateWayManager;
-    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
+    private readonly ModelManager _modelManager;
     private readonly AiBlacklistManager _aiBlacklistManager;
     private readonly IAccountService _accountService;
     private readonly PremiumPackageManager _premiumPackageManager;
-
+    private readonly ISqlSugarRepository<ImageStoreTaskAggregateRoot> _imageStoreRepository;
+    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
     public OpenApiService(IHttpContextAccessor httpContextAccessor, ILogger<OpenApiService> logger,
         TokenManager tokenManager, AiGateWayManager aiGateWayManager,
-        ISqlSugarRepository<AiModelEntity> aiModelRepository, AiBlacklistManager aiBlacklistManager,
-        IAccountService accountService, PremiumPackageManager premiumPackageManager)
+        ModelManager modelManager, AiBlacklistManager aiBlacklistManager,
+        IAccountService accountService, PremiumPackageManager premiumPackageManager, ISqlSugarRepository<ImageStoreTaskAggregateRoot> imageStoreRepository, ISqlSugarRepository<AiModelEntity> aiModelRepository)
     {
         _httpContextAccessor = httpContextAccessor;
         _logger = logger;
         _tokenManager = tokenManager;
         _aiGateWayManager = aiGateWayManager;
-        _aiModelRepository = aiModelRepository;
+        _modelManager = modelManager;
         _aiBlacklistManager = aiBlacklistManager;
         _accountService = accountService;
         _premiumPackageManager = premiumPackageManager;
+        _imageStoreRepository = imageStoreRepository;
+        _aiModelRepository = aiModelRepository;
     }
 
     /// <summary>
@@ -61,7 +67,9 @@ public class OpenApiService : ApplicationService
         await _aiBlacklistManager.VerifiyAiBlacklist(userId);
 
         //如果是尊享包服务，需要校验是是否尊享包足够
-        if (PremiumPackageConst.ModeIds.Contains(input.Model))
+        var isPremium = await _modelManager.IsPremiumModelAsync(input.Model);
+
+        if (isPremium)
         {
             // 检查尊享token包用量
             var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(userId);
@@ -75,16 +83,17 @@ public class OpenApiService : ApplicationService
         if (input.Stream == true)
         {
             await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-                userId, null, tokenId, cancellationToken);
+                userId, null, tokenId,CancellationToken.None);
         }
         else
         {
             await _aiGateWayManager.CompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input, userId,
                 null, tokenId,
-                cancellationToken);
+                CancellationToken.None);
         }
     }
 
+
     /// <summary>
     /// 图片生成
     /// </summary>
@@ -102,6 +111,7 @@ public class OpenApiService : ApplicationService
         await _aiGateWayManager.CreateImageForStatisticsAsync(httpContext, userId, null, input, tokenId);
     }
 
+
     /// <summary>
     /// 向量生成
     /// </summary>
@@ -145,7 +155,7 @@ public class OpenApiService : ApplicationService
         };
     }
 
-    
+
     /// <summary>
     /// Anthropic对话（尊享服务专用）
     /// </summary>
@@ -185,18 +195,131 @@ public class OpenApiService : ApplicationService
         //ai网关代理httpcontext
         if (input.Stream)
         {
-            await _aiGateWayManager.AnthropicCompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-                userId, null, tokenId, cancellationToken);
+            await _aiGateWayManager.AnthropicCompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext,
+                input,
+                userId, null, tokenId, CancellationToken.None);
         }
         else
         {
-            await _aiGateWayManager.AnthropicCompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input, userId,
+            await _aiGateWayManager.AnthropicCompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input,
+                userId,
                 null, tokenId,
-                cancellationToken);
+                CancellationToken.None);
         }
     }
 
 
+    /// <summary>
+    /// 响应-Openai新规范 (尊享服务专用)
+    /// </summary>
+    /// <param name="input"></param>
+    /// <param name="cancellationToken"></param>
+    [HttpPost("openApi/v1/responses")]
+    public async Task ResponsesAsync([FromBody] OpenAiResponsesInput input, CancellationToken cancellationToken)
+    {
+        //前面都是校验，后面才是真正的调用
+        var httpContext = this._httpContextAccessor.HttpContext;
+        var tokenValidation = await _tokenManager.ValidateTokenAsync(GetTokenByHttpContext(httpContext), input.Model);
+        var userId = tokenValidation.UserId;
+        var tokenId = tokenValidation.TokenId;
+        await _aiBlacklistManager.VerifiyAiBlacklist(userId);
+
+        // 验证用户是否为VIP
+        var userInfo = await _accountService.GetAsync(null, null, userId);
+        if (userInfo == null)
+        {
+            throw new UserFriendlyException("用户信息不存在");
+        }
+
+        // 检查是否为VIP（使用RoleCodes判断）
+        if (!userInfo.RoleCodes.Contains(AiHubConst.VipRole) && userInfo.User.UserName != "cc")
+        {
+            throw new UserFriendlyException("该接口为尊享服务专用，需要VIP权限才能使用");
+        }
+
+        // 检查尊享token包用量
+        var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(userId);
+        if (availableTokens <= 0)
+        {
+            throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+        }
+
+        //ai网关代理httpcontext
+        if (input.Stream == true)
+        {
+            await _aiGateWayManager.OpenAiResponsesStreamForStatisticsAsync(_httpContextAccessor.HttpContext,
+                input,
+                userId, null, tokenId, CancellationToken.None);
+        }
+        else
+        {
+            await _aiGateWayManager.OpenAiResponsesAsyncForStatisticsAsync(_httpContextAccessor.HttpContext, input,
+                userId,
+                null, tokenId,
+                CancellationToken.None);
+        }
+    }
+
+
+    /// <summary>
+    /// 生成-Gemini (尊享服务专用)
+    /// </summary>
+    /// <param name="input"></param>
+    /// <param name="modelId"></param>
+    /// <param name="alt"></param>
+    /// <param name="cancellationToken"></param>
+    [HttpPost("openApi/v1beta/models/{modelId}:{action:regex(^(generateContent|streamGenerateContent)$)}")]
+    public async Task GenerateContentAsync([FromBody] JsonElement input,
+        [FromRoute] string modelId,
+        [FromQuery] string? alt, CancellationToken cancellationToken)
+    {
+        //前面都是校验，后面才是真正的调用
+        var httpContext = this._httpContextAccessor.HttpContext;
+        var tokenValidation = await _tokenManager.ValidateTokenAsync(GetTokenByHttpContext(httpContext), modelId);
+        var userId = tokenValidation.UserId;
+        var tokenId = tokenValidation.TokenId;
+        await _aiBlacklistManager.VerifiyAiBlacklist(userId);
+
+        // 验证用户是否为VIP
+        var userInfo = await _accountService.GetAsync(null, null, userId);
+        if (userInfo == null)
+        {
+            throw new UserFriendlyException("用户信息不存在");
+        }
+
+        // 检查是否为VIP（使用RoleCodes判断）
+        if (!userInfo.RoleCodes.Contains(AiHubConst.VipRole) && userInfo.User.UserName != "cc")
+        {
+            throw new UserFriendlyException("该接口为尊享服务专用，需要VIP权限才能使用");
+        }
+
+        // 检查尊享token包用量
+        var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(userId);
+        if (availableTokens <= 0)
+        {
+            throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+        }
+
+
+        //ai网关代理httpcontext
+        if (alt == "sse")
+        {
+            await _aiGateWayManager.GeminiGenerateContentStreamForStatisticsAsync(_httpContextAccessor.HttpContext,
+                modelId, input,
+                userId,
+                null, tokenId,
+                CancellationToken.None);
+        }
+        else
+        {
+            await _aiGateWayManager.GeminiGenerateContentForStatisticsAsync(_httpContextAccessor.HttpContext,
+                modelId, input,
+                userId,
+                null, tokenId,
+                CancellationToken.None);
+        }
+    }
+
     #region 私有
 
     private string? GetTokenByHttpContext(HttpContext httpContext)
@@ -207,10 +330,18 @@ public class OpenApiService : ApplicationService
         {
             return apiKeyHeader.Trim();
         }
+        
+        // 再从 谷歌 获取
+        string googApiKeyHeader = httpContext.Request.Headers["x-goog-api-key"];
+        if (!string.IsNullOrWhiteSpace(googApiKeyHeader))
+        {
+            return googApiKeyHeader.Trim();
+        }
 
         // 再检查 Authorization 头
         string authHeader = httpContext.Request.Headers["Authorization"];
-        if (!string.IsNullOrWhiteSpace(authHeader) && authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
+        if (!string.IsNullOrWhiteSpace(authHeader) &&
+            authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
         {
             return authHeader.Substring("Bearer ".Length).Trim();
         }
@@ -227,5 +358,4 @@ public class OpenApiService : ApplicationService
     }
 
     #endregion
-
 }

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

@@ -122,11 +122,15 @@ public class PayService : ApplicationService, IPayService
             // 5. 根据商品类型进行不同的处理
             if (order.GoodsType.IsPremiumPackage())
             {
+                var tokenAmount = order.GoodsType.GetTokenAmount();
+                var packageName = order.GoodsType.GetDisplayName();
                 // 处理尊享包商品：创建尊享包记录
                 await _premiumPackageManager.CreatePremiumPackageAsync(
                     order.UserId,
-                    order.GoodsType,
+                    tokenAmount,
+                    packageName,
                     order.TotalAmount,
+                    "自助充值",
                     expireMonths: null // 尊享包不设置过期时间，或者可以根据需求设置
                 );
 

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

@@ -55,13 +55,24 @@ namespace Yi.Framework.AiHub.Application.Services
         /// </summary>
         /// <param name="input">充值输入参数</param>
         /// <returns></returns>
-        [HttpPost("recharge/vip")]
+        [RemoteService(isEnabled:false)]
         public async Task RechargeVipAsync(RechargeCreateInput input)
         {
             DateTime? expireDateTime = null;
 
-            // 如果传入了月数，计算过期时间
+            // 计算总天数（1个月 = 31天）
+            int totalDays = 0;
             if (input.Months.HasValue && input.Months.Value > 0)
+            {
+                totalDays += input.Months.Value * 31;
+            }
+            if (input.Days.HasValue && input.Days.Value > 0)
+            {
+                totalDays += input.Days.Value;
+            }
+
+            // 如果有天数，计算过期时间
+            if (totalDays > 0)
             {
                 // 直接查询该用户最大的过期时间
                 var maxExpireTime = await _repository._DbQueryable
@@ -75,9 +86,9 @@ namespace Yi.Framework.AiHub.Application.Services
                     ? maxExpireTime.Value
                     : DateTime.Now;
                 // 计算新的过期时间
-                expireDateTime = baseDateTime.AddMonths(input.Months.Value);
+                expireDateTime = baseDateTime.AddDays(totalDays);
             }
-            // 如果月数为空或0，表示永久VIP，ExpireDateTime保持为null
+            // 如果总天数为0，表示永久VIP，ExpireDateTime保持为null
 
             // 创建充值记录
             var rechargeRecord = new AiRechargeAggregateRoot

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

@@ -9,8 +9,10 @@ using Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics;
 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.AiHub.Domain.Entities.OpenApi;
 using Yi.Framework.AiHub.Domain.Extensions;
+using Yi.Framework.AiHub.Domain.Managers;
 using Yi.Framework.AiHub.Domain.Shared.Consts;
 using Yi.Framework.Ddd.Application.Contracts;
 using Yi.Framework.SqlSugarCore.Abstractions;
@@ -27,17 +29,19 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
     private readonly ISqlSugarRepository<UsageStatisticsAggregateRoot> _usageStatisticsRepository;
     private readonly ISqlSugarRepository<PremiumPackageAggregateRoot> _premiumPackageRepository;
     private readonly ISqlSugarRepository<TokenAggregateRoot> _tokenRepository;
-
+    private readonly ModelManager _modelManager;
     public UsageStatisticsService(
         ISqlSugarRepository<MessageAggregateRoot> messageRepository,
         ISqlSugarRepository<UsageStatisticsAggregateRoot> usageStatisticsRepository,
         ISqlSugarRepository<PremiumPackageAggregateRoot> premiumPackageRepository,
-        ISqlSugarRepository<TokenAggregateRoot> tokenRepository)
+        ISqlSugarRepository<TokenAggregateRoot> tokenRepository,
+        ModelManager modelManager)
     {
         _messageRepository = messageRepository;
         _usageStatisticsRepository = usageStatisticsRepository;
         _premiumPackageRepository = premiumPackageRepository;
         _tokenRepository = tokenRepository;
+        _modelManager = modelManager;
     }
 
     /// <summary>
@@ -181,7 +185,9 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
     public async Task<List<TokenPremiumUsageDto>> GetPremiumTokenUsageByTokenAsync()
     {
         var userId = CurrentUser.GetId();
-        var premiumModelIds = PremiumPackageConst.ModeIds;
+
+        // 通过ModelManager获取所有尊享模型的ModelId列表
+        var premiumModelIds = await _modelManager.GetPremiumModelIdsAsync();
 
         // 从UsageStatistics表获取尊享模型的token消耗统计（按TokenId聚合）
         var tokenUsages = await _usageStatisticsRepository._DbQueryable

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Yi.Framework.AiHub.Application.csproj

@@ -2,6 +2,10 @@
 	<Import Project="..\..\..\common.props" />
 
 
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.BackgroundJobs.Abstractions" Version="$(AbpVersion)" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\framework\Yi.Framework.Ddd.Application\Yi.Framework.Ddd.Application.csproj" />
     <ProjectReference Include="..\Yi.Framework.AiHub.Application.Contracts\Yi.Framework.AiHub.Application.Contracts.csproj" />

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

@@ -1,3 +1,7 @@
+using System.ComponentModel;
+using System.Text.Json;
+using ModelContextProtocol;
+using ModelContextProtocol.Server;
 using Yi.Framework.AiHub.Application.Contracts;
 using Yi.Framework.AiHub.Domain;
 using Yi.Framework.Ddd.Application;

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Attributes/YiAgentToolAttribute.cs

@@ -0,0 +1,16 @@
+namespace Yi.Framework.AiHub.Domain.Shared.Attributes;
+
+[AttributeUsage(AttributeTargets.Class|AttributeTargets.Method)]
+public class YiAgentToolAttribute:Attribute
+{
+    public YiAgentToolAttribute()
+    {
+    }
+
+    public YiAgentToolAttribute(string name)
+    {
+        Name = name;
+    }
+
+    public string Name { get; set; }
+}

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

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

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

@@ -1,648 +0,0 @@
-using System.Text.Json;
-using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
-
-namespace Yi.Framework.AiHub.Domain.Shared.Dtos.Anthropic;
-
-public static class AnthropicToOpenAi
-{
-    /// <summary>
-    /// 将AnthropicInput转换为ThorChatCompletionsRequest
-    /// </summary>
-    public static ThorChatCompletionsRequest ConvertAnthropicToOpenAi(AnthropicInput anthropicInput)
-    {
-        var openAiRequest = new ThorChatCompletionsRequest
-        {
-            Model = anthropicInput.Model,
-            MaxTokens = anthropicInput.MaxTokens,
-            Stream = anthropicInput.Stream,
-            Messages = new List<ThorChatMessage>(anthropicInput.Messages.Count)
-        };
-
-        // high medium minimal low
-        if (openAiRequest.Model.EndsWith("-high") ||
-            openAiRequest.Model.EndsWith("-medium") ||
-            openAiRequest.Model.EndsWith("-minimal") ||
-            openAiRequest.Model.EndsWith("-low"))
-        {
-            openAiRequest.ReasoningEffort = openAiRequest.Model switch
-            {
-                var model when model.EndsWith("-high") => "high",
-                var model when model.EndsWith("-medium") => "medium",
-                var model when model.EndsWith("-minimal") => "minimal",
-                var model when model.EndsWith("-low") => "low",
-                _ => "medium"
-            };
-
-            openAiRequest.Model = openAiRequest.Model.Replace("-high", "")
-                .Replace("-medium", "")
-                .Replace("-minimal", "")
-                .Replace("-low", "");
-        }
-
-        if (anthropicInput.Thinking != null &&
-            anthropicInput.Thinking.Type.Equals("enabled", StringComparison.OrdinalIgnoreCase))
-        {
-            openAiRequest.Thinking = new ThorChatClaudeThinking()
-            {
-                BudgetToken = anthropicInput.Thinking.BudgetTokens,
-                Type = "enabled",
-            };
-            openAiRequest.EnableThinking = true;
-        }
-
-        if (openAiRequest.Model.EndsWith("-thinking"))
-        {
-            openAiRequest.EnableThinking = true;
-            openAiRequest.Model = openAiRequest.Model.Replace("-thinking", "");
-        }
-
-        if (openAiRequest.Stream == true)
-        {
-            openAiRequest.StreamOptions = new ThorStreamOptions()
-            {
-                IncludeUsage = true,
-            };
-        }
-
-        if (!string.IsNullOrEmpty(anthropicInput.System))
-        {
-            openAiRequest.Messages.Add(ThorChatMessage.CreateSystemMessage(anthropicInput.System));
-        }
-
-        if (anthropicInput.Systems?.Count > 0)
-        {
-            foreach (var systemContent in anthropicInput.Systems)
-            {
-                openAiRequest.Messages.Add(ThorChatMessage.CreateSystemMessage(systemContent.Text ?? string.Empty));
-            }
-        }
-
-        // 处理messages
-        if (anthropicInput.Messages != null)
-        {
-            foreach (var message in anthropicInput.Messages)
-            {
-                var thorMessages = ConvertAnthropicMessageToThor(message);
-                // 需要过滤 空消息
-                if (thorMessages.Count == 0)
-                {
-                    continue;
-                }
-
-                openAiRequest.Messages.AddRange(thorMessages);
-            }
-
-            openAiRequest.Messages = openAiRequest.Messages
-                .Where(m => !string.IsNullOrEmpty(m.Content) || m.Contents?.Count > 0 || m.ToolCalls?.Count > 0 ||
-                            !string.IsNullOrEmpty(m.ToolCallId))
-                .ToList();
-        }
-
-        // 处理tools
-        if (anthropicInput.Tools is { Count: > 0 })
-        {
-            openAiRequest.Tools = anthropicInput.Tools.Where(x => x.name != "web_search")
-                .Select(ConvertAnthropicToolToThor).ToList();
-        }
-
-        // 判断是否存在web_search
-        if (anthropicInput.Tools?.Any(x => x.name == "web_search") == true)
-        {
-            openAiRequest.WebSearchOptions = new ThorChatWebSearchOptions()
-            {
-            };
-        }
-
-        // 处理tool_choice
-        if (anthropicInput.ToolChoice != null)
-        {
-            openAiRequest.ToolChoice = ConvertAnthropicToolChoiceToThor(anthropicInput.ToolChoice);
-        }
-
-        return openAiRequest;
-    }
-
-    /// <summary>
-    /// 根据最后的内容块类型和OpenAI的完成原因确定Claude的停止原因
-    /// </summary>
-    public static string GetStopReasonByLastContentType(string? openAiFinishReason, string lastContentBlockType)
-    {
-        // 如果最后一个内容块是工具调用，优先返回tool_use
-        if (lastContentBlockType == "tool_use")
-        {
-            return "tool_use";
-        }
-
-        // 否则使用标准的转换逻辑
-        return GetClaudeStopReason(openAiFinishReason);
-    }
-
-    /// <summary>
-    /// 创建message_start事件
-    /// </summary>
-    public static AnthropicStreamDto CreateMessageStartEvent(string messageId, string model)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "message_start",
-            Message = new AnthropicChatCompletionDto
-            {
-                id = messageId,
-                type = "message",
-                role = "assistant",
-                model = model,
-                content = new AnthropicChatCompletionDtoContent[0],
-                Usage = new AnthropicCompletionDtoUsage
-                {
-                    InputTokens = 0,
-                    OutputTokens = 0,
-                    CacheCreationInputTokens = 0,
-                    CacheReadInputTokens = 0
-                }
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建content_block_start事件
-    /// </summary>
-    public static AnthropicStreamDto CreateContentBlockStartEvent()
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_start",
-            Index = 0,
-            ContentBlock = new AnthropicChatCompletionDtoContentBlock
-            {
-                Type = "text",
-                Id = null,
-                Name = null
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建thinking block start事件
-    /// </summary>
-    public static AnthropicStreamDto CreateThinkingBlockStartEvent()
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_start",
-            Index = 0,
-            ContentBlock = new AnthropicChatCompletionDtoContentBlock
-            {
-                Type = "thinking",
-                Id = null,
-                Name = null
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建content_block_delta事件
-    /// </summary>
-    public static AnthropicStreamDto CreateContentBlockDeltaEvent(string text)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_delta",
-            Index = 0,
-            Delta = new AnthropicChatCompletionDtoDelta
-            {
-                Type = "text_delta",
-                Text = text
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建thinking delta事件
-    /// </summary>
-    public static AnthropicStreamDto CreateThinkingBlockDeltaEvent(string thinking)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_delta",
-            Index = 0,
-            Delta = new AnthropicChatCompletionDtoDelta
-            {
-                Type = "thinking",
-                Thinking = thinking
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建content_block_stop事件
-    /// </summary>
-    public static AnthropicStreamDto CreateContentBlockStopEvent()
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_stop",
-            Index = 0
-        };
-    }
-
-    /// <summary>
-    /// 创建message_delta事件
-    /// </summary>
-    public static AnthropicStreamDto CreateMessageDeltaEvent(string finishReason, AnthropicCompletionDtoUsage usage)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "message_delta",
-            Usage = usage,
-            Delta = new AnthropicChatCompletionDtoDelta
-            {
-                StopReason = finishReason
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建message_stop事件
-    /// </summary>
-    public static AnthropicStreamDto CreateMessageStopEvent()
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "message_stop"
-        };
-    }
-
-    /// <summary>
-    /// 创建tool block start事件
-    /// </summary>
-    public static AnthropicStreamDto CreateToolBlockStartEvent(string? toolId, string? toolName)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_start",
-            Index = 0,
-            ContentBlock = new AnthropicChatCompletionDtoContentBlock
-            {
-                Type = "tool_use",
-                Id = toolId,
-                Name = toolName
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建tool delta事件
-    /// </summary>
-    public static AnthropicStreamDto CreateToolBlockDeltaEvent(string partialJson)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_delta",
-            Index = 0,
-            Delta = new AnthropicChatCompletionDtoDelta
-            {
-                Type = "input_json_delta",
-                PartialJson = partialJson
-            }
-        };
-    }
-
-    /// <summary>
-    /// 转换Anthropic消息为Thor消息列表
-    /// </summary>
-    public static List<ThorChatMessage> ConvertAnthropicMessageToThor(AnthropicMessageInput anthropicMessage)
-    {
-        var results = new List<ThorChatMessage>();
-
-        // 处理简单的字符串内容
-        if (anthropicMessage.Content != null)
-        {
-            var thorMessage = new ThorChatMessage
-            {
-                Role = anthropicMessage.Role,
-                Content = anthropicMessage.Content
-            };
-            results.Add(thorMessage);
-            return results;
-        }
-
-        // 处理多模态内容
-        if (anthropicMessage.Contents is { Count: > 0 })
-        {
-            var currentContents = new List<ThorChatMessageContent>();
-            var currentToolCalls = new List<ThorToolCall>();
-
-            foreach (var content in anthropicMessage.Contents)
-            {
-                switch (content.Type)
-                {
-                    case "text":
-                        currentContents.Add(ThorChatMessageContent.CreateTextContent(content.Text ?? string.Empty));
-                        break;
-                    case "thinking" when !string.IsNullOrEmpty(content.Thinking):
-                        results.Add(new ThorChatMessage()
-                        {
-                            ReasoningContent = content.Thinking
-                        });
-                        break;
-                    case "image":
-                    {
-                        if (content.Source != null)
-                        {
-                            var imageUrl = content.Source.Type == "base64"
-                                ? $"data:{content.Source.MediaType};base64,{content.Source.Data}"
-                                : content.Source.Data;
-                            currentContents.Add(ThorChatMessageContent.CreateImageUrlContent(imageUrl ?? string.Empty));
-                        }
-
-                        break;
-                    }
-                    case "tool_use":
-                    {
-                        // 如果有普通内容，先创建内容消息
-                        if (currentContents.Count > 0)
-                        {
-                            if (currentContents.Count == 1 && currentContents.Any(x => x.Type == "text"))
-                            {
-                                var contentMessage = new ThorChatMessage
-                                {
-                                    Role = anthropicMessage.Role,
-                                    ContentCalculated = currentContents.FirstOrDefault()?.Text ?? string.Empty
-                                };
-                                results.Add(contentMessage);
-                            }
-                            else
-                            {
-                                var contentMessage = new ThorChatMessage
-                                {
-                                    Role = anthropicMessage.Role,
-                                    Contents = currentContents
-                                };
-                                results.Add(contentMessage);
-                            }
-
-                            currentContents = new List<ThorChatMessageContent>();
-                        }
-
-                        // 收集工具调用
-                        var toolCall = new ThorToolCall
-                        {
-                            Id = content.Id,
-                            Type = "function",
-                            Function = new ThorChatMessageFunction
-                            {
-                                Name = content.Name,
-                                Arguments = JsonSerializer.Serialize(content.Input)
-                            }
-                        };
-                        currentToolCalls.Add(toolCall);
-                        break;
-                    }
-                    case "tool_result":
-                    {
-                        // 如果有普通内容，先创建内容消息
-                        if (currentContents.Count > 0)
-                        {
-                            var contentMessage = new ThorChatMessage
-                            {
-                                Role = anthropicMessage.Role,
-                                Contents = currentContents
-                            };
-                            results.Add(contentMessage);
-                            currentContents = [];
-                        }
-
-                        // 如果有工具调用，先创建工具调用消息
-                        if (currentToolCalls.Count > 0)
-                        {
-                            var toolCallMessage = new ThorChatMessage
-                            {
-                                Role = anthropicMessage.Role,
-                                ToolCalls = currentToolCalls
-                            };
-                            results.Add(toolCallMessage);
-                            currentToolCalls = new List<ThorToolCall>();
-                        }
-
-                        // 创建工具结果消息
-                        var toolMessage = new ThorChatMessage
-                        {
-                            Role = "tool",
-                            ToolCallId = content.ToolUseId,
-                            Content = content.Content?.ToString() ?? string.Empty
-                        };
-                        results.Add(toolMessage);
-                        break;
-                    }
-                }
-            }
-
-            // 处理剩余的内容
-            if (currentContents.Count > 0)
-            {
-                var contentMessage = new ThorChatMessage
-                {
-                    Role = anthropicMessage.Role,
-                    Contents = currentContents
-                };
-                results.Add(contentMessage);
-            }
-
-            // 处理剩余的工具调用
-            if (currentToolCalls.Count > 0)
-            {
-                var toolCallMessage = new ThorChatMessage
-                {
-                    Role = anthropicMessage.Role,
-                    ToolCalls = currentToolCalls
-                };
-                results.Add(toolCallMessage);
-            }
-        }
-
-        // 如果没有任何内容，返回一个空的消息
-        if (results.Count == 0)
-        {
-            results.Add(new ThorChatMessage
-            {
-                Role = anthropicMessage.Role,
-                Content = string.Empty
-            });
-        }
-
-        // 如果只有一个text则使用content字段
-        if (results is [{ Contents.Count: 1 }] &&
-            results.FirstOrDefault()?.Contents?.FirstOrDefault()?.Type == "text" &&
-            !string.IsNullOrEmpty(results.FirstOrDefault()?.Contents?.FirstOrDefault()?.Text))
-        {
-            return
-            [
-                new ThorChatMessage
-                {
-                    Role = results[0].Role,
-                    Content = results.FirstOrDefault()?.Contents?.FirstOrDefault()?.Text ?? string.Empty
-                }
-            ];
-        }
-
-        return results;
-    }
-
-    /// <summary>
-    /// 转换Anthropic工具为Thor工具
-    /// </summary>
-    public static ThorToolDefinition ConvertAnthropicToolToThor(AnthropicMessageTool anthropicTool)
-    {
-        IDictionary<string, ThorToolFunctionPropertyDefinition> values =
-            new Dictionary<string, ThorToolFunctionPropertyDefinition>();
-
-        if (anthropicTool.InputSchema?.Properties != null)
-        {
-            foreach (var property in anthropicTool.InputSchema.Properties)
-            {
-                if (property.Value?.description != null)
-                {
-                    var definitionType = new ThorToolFunctionPropertyDefinition()
-                    {
-                        Description = property.Value.description,
-                        Type = property.Value.type
-                    };
-                    if (property.Value?.items?.type != null)
-                    {
-                        definitionType.Items = new ThorToolFunctionPropertyDefinition()
-                        {
-                            Type = property.Value.items.type
-                        };
-                    }
-
-                    values.Add(property.Key, definitionType);
-                }
-            }
-        }
-
-
-        return new ThorToolDefinition
-        {
-            Type = "function",
-            Function = new ThorToolFunctionDefinition
-            {
-                Name = anthropicTool.name,
-                Description = anthropicTool.Description,
-                Parameters = new ThorToolFunctionPropertyDefinition
-                {
-                    Type = anthropicTool.InputSchema?.Type ?? "object",
-                    Properties = values,
-                    Required = anthropicTool.InputSchema?.Required
-                }
-            }
-        };
-    }
-
-    /// <summary>
-    /// 将OpenAI的完成原因转换为Claude的停止原因
-    /// </summary>
-    public static string GetClaudeStopReason(string? openAIFinishReason)
-    {
-        return openAIFinishReason switch
-        {
-            "stop" => "end_turn",
-            "length" => "max_tokens",
-            "tool_calls" => "tool_use",
-            "content_filter" => "stop_sequence",
-            _ => "end_turn"
-        };
-    }
-
-    /// <summary>
-    /// 将OpenAI响应转换为Claude响应格式
-    /// </summary>
-    public static AnthropicChatCompletionDto ConvertOpenAIToClaude(ThorChatCompletionsResponse openAIResponse,
-        AnthropicInput originalRequest)
-    {
-        var claudeResponse = new AnthropicChatCompletionDto
-        {
-            id = openAIResponse.Id,
-            type = "message",
-            role = "assistant",
-            model = openAIResponse.Model ?? originalRequest.Model,
-            stop_reason = GetClaudeStopReason(openAIResponse.Choices?.FirstOrDefault()?.FinishReason),
-            stop_sequence = "",
-            content = []
-        };
-
-        if (openAIResponse.Choices is { Count: > 0 })
-        {
-            var choice = openAIResponse.Choices.First();
-            var contents = new List<AnthropicChatCompletionDtoContent>();
-
-            if (!string.IsNullOrEmpty(choice.Message.Content) && !string.IsNullOrEmpty(choice.Message.ReasoningContent))
-            {
-                contents.Add(new AnthropicChatCompletionDtoContent
-                {
-                    type = "thinking",
-                    Thinking = choice.Message.ReasoningContent
-                });
-
-                contents.Add(new AnthropicChatCompletionDtoContent
-                {
-                    type = "text",
-                    text = choice.Message.Content
-                });
-            }
-            else
-            {
-                // 处理思维内容
-                if (!string.IsNullOrEmpty(choice.Message.ReasoningContent))
-                    contents.Add(new AnthropicChatCompletionDtoContent
-                    {
-                        type = "thinking",
-                        Thinking = choice.Message.ReasoningContent
-                    });
-
-                // 处理文本内容
-                if (!string.IsNullOrEmpty(choice.Message.Content))
-                    contents.Add(new AnthropicChatCompletionDtoContent
-                    {
-                        type = "text",
-                        text = choice.Message.Content
-                    });
-            }
-
-            // 处理工具调用
-            if (choice.Message.ToolCalls is { Count: > 0 })
-                contents.AddRange(choice.Message.ToolCalls.Select(toolCall => new AnthropicChatCompletionDtoContent
-                {
-                    type = "tool_use", id = toolCall.Id, name = toolCall.Function?.Name,
-                    input = JsonSerializer.Deserialize<object>(toolCall.Function?.Arguments ?? "{}")
-                }));
-
-            claudeResponse.content = contents.ToArray();
-        }
-
-        // 处理使用情况统计 - 确保始终提供Usage信息
-        claudeResponse.Usage = new AnthropicCompletionDtoUsage
-        {
-            InputTokens = openAIResponse.Usage?.PromptTokens ?? 0,
-            OutputTokens = (int?)(openAIResponse.Usage?.CompletionTokens ?? 0),
-            CacheCreationInputTokens = openAIResponse.Usage?.PromptTokensDetails?.CachedTokens ?? 0,
-            CacheReadInputTokens = openAIResponse.Usage?.PromptTokensDetails?.CachedTokens ?? 0
-        };
-
-        return claudeResponse;
-    }
-
-
-    /// <summary>
-    /// 转换Anthropic工具选择为Thor工具选择
-    /// </summary>
-    public static ThorToolChoice ConvertAnthropicToolChoiceToThor(AnthropicTooChoiceInput anthropicToolChoice)
-    {
-        return new ThorToolChoice
-        {
-            Type = anthropicToolChoice.Type ?? "auto",
-            Function = anthropicToolChoice.Name != null
-                ? new ThorToolChoiceFunctionTool { Name = anthropicToolChoice.Name }
-                : null
-        };
-    }
-}

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

@@ -0,0 +1,45 @@
+using System.Text.Json;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
+using Yi.Framework.AiHub.Domain.Shared.Extensions;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Dtos.Gemini;
+
+public static class GeminiGenerateContentAcquirer
+{
+    public static ThorUsageResponse? GetUsage(JsonElement response)
+    {
+        var usage = response.GetPath("usageMetadata");
+        if (!usage.HasValue)
+        {
+            return null;
+        }
+
+        var inputTokens = usage.Value.GetPath("promptTokenCount").GetInt();
+        var outputTokens = usage.Value.GetPath("candidatesTokenCount").GetInt()
+                           + usage.Value.GetPath("cachedContentTokenCount").GetInt()
+                           + usage.Value.GetPath("thoughtsTokenCount").GetInt()
+                           + usage.Value.GetPath("toolUsePromptTokenCount").GetInt();
+
+
+        return new ThorUsageResponse
+        {
+            PromptTokens = inputTokens,
+            InputTokens = inputTokens,
+            OutputTokens = outputTokens,
+            CompletionTokens = outputTokens,
+            TotalTokens = inputTokens + outputTokens,
+        };
+    }
+
+    /// <summary>
+    /// 获取图片url，包含前缀
+    /// </summary>
+    /// <param name="response"></param>
+    /// <returns></returns>
+    public static string GetImageBase64(JsonElement response)
+    {
+        //todo
+        //获取他的base64字符串
+        return string.Empty;
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/OpenAi/Responses/OpenAiResponsesInput.cs

@@ -0,0 +1,47 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
+
+public class OpenAiResponsesInput
+{
+    [JsonPropertyName("stream")] public bool? Stream { get; set; }
+
+    [JsonPropertyName("model")] public string Model { get; set; }
+    [JsonPropertyName("input")] public JsonElement Input { get; set; }
+
+    [JsonPropertyName("max_output_tokens")]
+    public int? MaxOutputTokens { get; set; }
+
+    [JsonPropertyName("max_tool_calls")] public JsonElement? MaxToolCalls { get; set; }
+    [JsonPropertyName("instructions")] public string? Instructions { get; set; }
+    [JsonPropertyName("metadata")] public JsonElement? Metadata { get; set; }
+
+    [JsonPropertyName("parallel_tool_calls")]
+    public bool? ParallelToolCalls { get; set; }
+
+    [JsonPropertyName("previous_response_id")]
+    public string? PreviousResponseId { get; set; }
+
+    [JsonPropertyName("prompt")] public JsonElement? Prompt { get; set; }
+    [JsonPropertyName("prompt_cache_key")] public string? PromptCacheKey { get; set; }
+
+    [JsonPropertyName("prompt_cache_retention")]
+    public string? PromptCacheRetention { get; set; }
+
+    [JsonPropertyName("reasoning")] public JsonElement? Reasoning { get; set; }
+
+    [JsonPropertyName("safety_identifier")]
+    public string? SafetyIdentifier { get; set; }
+
+    [JsonPropertyName("service_tier")] public string? ServiceTier { get; set; }
+    [JsonPropertyName("store")] public bool? Store { get; set; }
+    [JsonPropertyName("stream_options")] public JsonElement? StreamOptions { get; set; }
+    [JsonPropertyName("temperature")] public decimal? Temperature { get; set; }
+    [JsonPropertyName("text")] public JsonElement? Text { get; set; }
+    [JsonPropertyName("tool_choice")] public JsonElement? ToolChoice { get; set; }
+    [JsonPropertyName("tools")] public JsonElement? Tools { get; set; }
+    [JsonPropertyName("top_logprobs")] public int? TopLogprobs { get; set; }
+    [JsonPropertyName("top_p")] public decimal? TopP { get; set; }
+    [JsonPropertyName("truncation")] public string? Truncation { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/OpenAi/Responses/OpenAiResponsesOutput.cs

@@ -0,0 +1,91 @@
+using System.Text.Json.Serialization;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
+
+public class OpenAiResponsesOutput
+{
+    [JsonPropertyName("id")]
+    public string? Id { get; set; }
+    [JsonPropertyName("object")]
+    public string? Object { get; set; }
+    [JsonPropertyName("created_at")]
+    public long CreatedAt { get; set; }
+    [JsonPropertyName("status")]
+    public string? Status { get; set; }
+    [JsonPropertyName("error")]
+    public dynamic? Error { get; set; }
+    [JsonPropertyName("incomplete_details")]
+    public dynamic? IncompleteDetails { get; set; }
+    [JsonPropertyName("instructions")]
+    public dynamic? Instructions { get; set; }
+    [JsonPropertyName("max_output_tokens")]
+    public dynamic? MaxOutputTokens { get; set; }
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+    // output 是复杂对象
+    [JsonPropertyName("output")]
+    public List<dynamic>? Output { get; set; }
+    [JsonPropertyName("parallel_tool_calls")]
+    public bool ParallelToolCalls { get; set; }
+    [JsonPropertyName("previous_response_id")]
+    public dynamic? PreviousResponseId { get; set; }
+    [JsonPropertyName("reasoning")]
+    public dynamic? Reasoning { get; set; }
+    [JsonPropertyName("store")]
+    public bool Store { get; set; }
+    [JsonPropertyName("temperature")]
+    public double Temperature { get; set; }
+    [JsonPropertyName("text")]
+    public dynamic? Text { get; set; }
+    [JsonPropertyName("tool_choice")]
+    public string? ToolChoice { get; set; }
+    [JsonPropertyName("tools")]
+    public List<dynamic>? Tools { get; set; }
+    [JsonPropertyName("top_p")]
+    public double TopP { get; set; }
+    [JsonPropertyName("truncation")]
+    public string? Truncation { get; set; }
+    // usage 为唯一强类型
+    [JsonPropertyName("usage")]
+    public OpenAiResponsesUsageOutput? Usage { get; set; }
+    [JsonPropertyName("user")]
+    public dynamic? User { get; set; }
+    [JsonPropertyName("metadata")]
+    public dynamic? Metadata { get; set; }
+    
+    public void SupplementalMultiplier(decimal multiplier)
+    {
+        if (this.Usage is not null)
+        {
+            this.Usage.InputTokens =
+                (int)Math.Round((this.Usage?.InputTokens ?? 0) * multiplier);
+
+            this.Usage.OutputTokens =
+                (int)Math.Round((this.Usage?.OutputTokens ?? 0) * multiplier);
+        }
+    }
+}
+
+public class OpenAiResponsesUsageOutput
+{
+    [JsonPropertyName("input_tokens")]
+    public int InputTokens { get; set; }
+    [JsonPropertyName("input_tokens_details")]
+    public OpenAiResponsesInputTokensDetails? InputTokensDetails { get; set; }
+    [JsonPropertyName("output_tokens")]
+    public int OutputTokens { get; set; }
+    [JsonPropertyName("output_tokens_details")]
+    public OpenAiResponsesOutputTokensDetails? OutputTokensDetails { get; set; }
+    [JsonPropertyName("total_tokens")]
+    public int TotalTokens { get; set; }
+}
+public class OpenAiResponsesInputTokensDetails
+{
+    [JsonPropertyName("cached_tokens")]
+    public int CachedTokens { get; set; }
+}
+public class OpenAiResponsesOutputTokensDetails
+{
+    [JsonPropertyName("reasoning_tokens")]
+    public int ReasoningTokens { get; set; }
+}

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

@@ -90,6 +90,28 @@ public class ThorChatMessage
         }
     }
 
+    
+    /// <summary>
+    /// 用于数据存储
+    /// </summary>
+    [JsonIgnore] 
+    public string MessagesStore
+    {
+        get
+        {
+            if (Content is not null)
+            {
+                return Content;
+            }
+
+            if (Contents is not null && Contents.Any())
+            {
+                return JsonSerializer.Serialize(Contents);
+            }
+            return string.Empty;
+        }
+    }
+    
     /// <summary>
     /// 【可选】参与者的可选名称。提供模型信息以区分相同角色的参与者。
     /// </summary>

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

@@ -0,0 +1,114 @@
+using System;
+using System.Reflection;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+
+/// <summary>
+/// 激活码商品特性
+/// </summary>
+[AttributeUsage(AttributeTargets.Field)]
+public class ActivationCodeGoodsAttribute : Attribute
+{
+    public decimal Price { get; }
+    public long TokenAmount { get; }
+    public int VipMonths { get; }
+    public int VipDays { get; }
+    public bool IsCombo { get; }
+    public bool IsReusable { get; }
+    public bool IsSameTypeOnce { get; }
+    public string DisplayName { get; }
+    public string Content { get; }
+
+    public ActivationCodeGoodsAttribute(
+        double price,
+        long tokenAmount,
+        int vipMonths,
+        bool isCombo,
+        bool isReusable,
+        bool isSameTypeOnce,
+        string displayName,
+        string content,
+        int vipDays = 0)
+    {
+        Price = (decimal)price;
+        TokenAmount = tokenAmount;
+        VipMonths = vipMonths;
+        VipDays = vipDays;
+        IsCombo = isCombo;
+        IsReusable = isReusable;
+        IsSameTypeOnce = isSameTypeOnce;
+        DisplayName = displayName;
+        Content = content;
+    }
+}
+
+/// <summary>
+/// 激活码商品类型
+/// </summary>
+public enum ActivationCodeGoodsTypeEnum
+{
+    /// <summary>
+    /// 48.90【意心Ai会员1月+2000w 尊享Token】新人首单组合包（推荐）
+    /// </summary>
+    [ActivationCodeGoods(price: 48.90, tokenAmount: 20000000, vipMonths: 1, isCombo: true, isReusable: false,
+        isSameTypeOnce: true, displayName: "意心Ai会员1月+2000w 尊享Token", content: "新人首单组合包")]
+    Vip1MonthPlus2000W = 1,
+
+    /// <summary>
+    /// 1.00【10w 尊享Token】测试体验包
+    /// </summary>
+    [ActivationCodeGoods(price: 1.00, tokenAmount: 100000, vipMonths: 0, isCombo: false, isReusable: false,
+        isSameTypeOnce: false, displayName: "10w 尊享Token", content: "测试体验包")]
+    Premium10W = 2,
+
+    /// <summary>
+    /// 9.90【1000w 尊享Token】意心会员首单回馈包
+    /// </summary>
+    [ActivationCodeGoods(price: 9.90, tokenAmount: 10000000, vipMonths: 0, isCombo: false, isReusable: false,
+        isSameTypeOnce: true, displayName: "1000w 尊享Token", content: "意心会员首单回馈包")]
+    Premium1000W = 3,
+
+    /// <summary>
+    /// 22.90【意心Ai会员1月】特价包
+    /// </summary>
+    [ActivationCodeGoods(price: 22.90, tokenAmount: 0, vipMonths: 1, isCombo: false, isReusable: false,
+        isSameTypeOnce: false, displayName: "意心Ai会员1月", content: "特价包")]
+    Vip1Month = 4,
+
+    /// <summary>
+    /// 138.90【5000w 尊享Token】特价包
+    /// </summary>
+    [ActivationCodeGoods(price: 138.90, tokenAmount: 50000000, vipMonths: 0, isCombo: false, isReusable: false,
+        isSameTypeOnce: false, displayName: "5000w 尊享Token", content: "特价包")]
+    Premium5000W = 5,
+
+    /// <summary>
+    /// 198.90【1亿 尊享Token】特价包
+    /// </summary>
+    [ActivationCodeGoods(price: 198.90, tokenAmount: 100000000, vipMonths: 0, isCombo: false, isReusable: false,
+        isSameTypeOnce: false, displayName: "1亿 尊享Token", content: "特价包")]
+    Premium1Yi = 6,
+
+    /// <summary>
+    /// 1【意心Ai会员1天+50w 尊享Token】新人试用首单组合包
+    /// </summary>
+    [ActivationCodeGoods(price: 1, tokenAmount: 500000, vipMonths: 0, vipDays: 1, isCombo: true, isReusable: false,
+        isSameTypeOnce: true, displayName: "意心Ai会员1天+50w 尊享Token", content: "新人首单组合包")]
+    Vip1DayTest = 7,
+
+    /// <summary>
+    /// 0【10w 尊享Token】免费包
+    /// </summary>
+    [ActivationCodeGoods(price: 0, tokenAmount: 100000, vipMonths: 0, isCombo: false, isReusable: true,
+        isSameTypeOnce: false, displayName: "10w 尊享Token", content: "免费包")]
+    Premium10WFree = 100
+}
+
+public static class ActivationCodeGoodsTypeEnumExtensions
+{
+    public static ActivationCodeGoodsAttribute? GetGoods(this ActivationCodeGoodsTypeEnum goodsType)
+    {
+        var fieldInfo = goodsType.GetType().GetField(goodsType.ToString());
+        return fieldInfo?.GetCustomAttribute<ActivationCodeGoodsAttribute>();
+    }
+}

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

@@ -259,7 +259,7 @@ public static class GoodsTypeEnumExtensions
 
     /// <summary>
     /// 计算折扣金额（仅用于尊享包）
-    /// 规则：每累加充值10元，减少2.5元，最多减少50元
+    /// 规则：每累加充值10元，减少10元，最多减少50元
     /// </summary>
     /// <param name="goodsType">商品类型</param>
     /// <param name="totalRechargeAmount">用户累加充值金额</param>
@@ -271,11 +271,10 @@ public static class GoodsTypeEnumExtensions
         {
             return 0m;
         }
-
-        // 每10元减2.5元
-        var discountAmount = Math.Floor(totalRechargeAmount / 2.5m);
-
-        // 最多减少50元
+        // 每满 10 元减 10 元
+        var discountTimes = Math.Floor(totalRechargeAmount / 10m);
+        var discountAmount = discountTimes * 10m;
+        // 最多减少 50 元
         return Math.Min(discountAmount, 50m);
     }
 

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

@@ -1,7 +1,18 @@
-namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+using System.ComponentModel;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
 
 public enum ModelApiTypeEnum
 {
+    [Description("OpenAI")]
     OpenAi,
-    Claude
+
+    [Description("Claude")]
+    Claude,
+    
+    [Description("Response")]
+    Response,
+    
+    [Description("GenerateContent")]
+    GenerateContent
 }

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

@@ -1,9 +1,15 @@
-namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+using System.ComponentModel;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
 
 public enum ModelTypeEnum
 {
+    [Description("聊天")]
     Chat = 0,
+
+    [Description("图片")]
     Image = 1,
-    Embedding = 2,
-    PremiumChat = 3
+
+    [Description("嵌入")]
+    Embedding = 2
 }

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

@@ -0,0 +1,8 @@
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+
+public enum TaskStatusEnum
+{
+    Processing,
+    Success,
+    Fail
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Extensions/EnumExtensions.cs

@@ -0,0 +1,27 @@
+using System.ComponentModel;
+using System.Reflection;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Extensions;
+
+/// <summary>
+/// 枚举扩展方法
+/// </summary>
+public static class EnumExtensions
+{
+    /// <summary>
+    /// 获取枚举的Description特性值
+    /// </summary>
+    /// <param name="value">枚举值</param>
+    /// <returns>Description特性值，如果没有则返回枚举名称</returns>
+    public static string GetDescription(this Enum value)
+    {
+        var field = value.GetType().GetField(value.ToString());
+        if (field == null)
+        {
+            return value.ToString();
+        }
+
+        var attribute = field.GetCustomAttribute<DescriptionAttribute>();
+        return attribute?.Description ?? value.ToString();
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Extensions/JsonElementExtensions.cs

@@ -0,0 +1,279 @@
+using System.Text.Json;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Extensions;
+
+public static class JsonElementExtensions
+{
+    #region 路径访问
+
+    /// <summary>
+    /// 链式获取深层属性，支持对象属性和数组索引
+    /// </summary>
+    /// <example>
+    /// root.GetPath("user", "addresses", 0, "city")
+    /// </example>
+    public static JsonElement? GetPath(this JsonElement element, params object[] path)
+    {
+        JsonElement current = element;
+
+        foreach (var key in path)
+        {
+            switch (key)
+            {
+                case string propertyName:
+                    if (current.ValueKind != JsonValueKind.Object ||
+                        !current.TryGetProperty(propertyName, out current))
+                        return null;
+                    break;
+
+                case int index:
+                    if (current.ValueKind != JsonValueKind.Array ||
+                        index < 0 || index >= current.GetArrayLength())
+                        return null;
+                    current = current[index];
+                    break;
+
+                default:
+                    return null;
+            }
+        }
+
+        return current;
+    }
+
+    /// <summary>
+    /// 安全获取对象属性
+    /// </summary>
+    public static JsonElement? Get(this JsonElement element, string propertyName)
+    {
+        if (element.ValueKind == JsonValueKind.Object &&
+            element.TryGetProperty(propertyName, out var value))
+            return value;
+        return null;
+    }
+
+    /// <summary>
+    /// 安全获取数组元素
+    /// </summary>
+    public static JsonElement? Get(this JsonElement element, int index)
+    {
+        if (element.ValueKind == JsonValueKind.Array &&
+            index >= 0 && index < element.GetArrayLength())
+            return element[index];
+        return null;
+    }
+
+    /// <summary>
+    /// 链式安全获取对象属性
+    /// </summary>
+    public static JsonElement? Get(this JsonElement? element, string propertyName)
+        => element?.Get(propertyName);
+
+    /// <summary>
+    /// 链式安全获取数组元素
+    /// </summary>
+    public static JsonElement? Get(this JsonElement? element, int index)
+        => element?.Get(index);
+
+    #endregion
+
+    #region 取值方法（带默认值）
+
+    public static string? GetString(this JsonElement? element, string? defaultValue = null)
+        => element?.ValueKind == JsonValueKind.String ? element.Value.GetString() : defaultValue;
+
+    public static int GetInt(this JsonElement? element, int defaultValue = 0)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetInt32() : defaultValue;
+
+    public static long GetLong(this JsonElement? element, long defaultValue = 0)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetInt64() : defaultValue;
+
+    public static double GetDouble(this JsonElement? element, double defaultValue = 0)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetDouble() : defaultValue;
+
+    public static decimal GetDecimal(this JsonElement? element, decimal defaultValue = 0)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetDecimal() : defaultValue;
+
+    public static bool GetBool(this JsonElement? element, bool defaultValue = false)
+        => element?.ValueKind is JsonValueKind.True or JsonValueKind.False
+            ? element.Value.GetBoolean()
+            : defaultValue;
+
+    public static DateTime GetDateTime(this JsonElement? element, DateTime defaultValue = default)
+        => element?.ValueKind == JsonValueKind.String && element.Value.TryGetDateTime(out var dt)
+            ? dt
+            : defaultValue;
+
+    public static Guid GetGuid(this JsonElement? element, Guid defaultValue = default)
+        => element?.ValueKind == JsonValueKind.String && element.Value.TryGetGuid(out var guid)
+            ? guid
+            : defaultValue;
+
+    #endregion
+
+    #region 可空取值方法
+
+    public static int? GetIntOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetInt32() : null;
+
+    public static long? GetLongOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetInt64() : null;
+
+    public static double? GetDoubleOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetDouble() : null;
+
+    public static decimal? GetDecimalOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetDecimal() : null;
+
+    public static bool? GetBoolOrNull(this JsonElement? element)
+        => element?.ValueKind is JsonValueKind.True or JsonValueKind.False
+            ? element.Value.GetBoolean()
+            : null;
+
+    public static DateTime? GetDateTimeOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.String && element.Value.TryGetDateTime(out var dt)
+            ? dt
+            : null;
+
+    public static Guid? GetGuidOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.String && element.Value.TryGetGuid(out var guid)
+            ? guid
+            : null;
+
+    #endregion
+
+    #region 数组操作
+
+    /// <summary>
+    /// 安全获取数组，不存在返回空数组
+    /// </summary>
+    public static IEnumerable<JsonElement> GetArray(this JsonElement? element)
+    {
+        if (element?.ValueKind == JsonValueKind.Array)
+        {
+            foreach (var item in element.Value.EnumerateArray())
+                yield return item;
+        }
+    }
+
+    /// <summary>
+    /// 获取数组长度
+    /// </summary>
+    public static int GetArrayLength(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Array ? element.Value.GetArrayLength() : 0;
+
+    /// <summary>
+    /// 数组转 List
+    /// </summary>
+    public static List<string?> ToStringList(this JsonElement? element)
+        => element.GetArray().Select(e => e.GetString()).ToList();
+
+    public static List<int> ToIntList(this JsonElement? element)
+        => element.GetArray()
+            .Where(e => e.ValueKind == JsonValueKind.Number)
+            .Select(e => e.GetInt32())
+            .ToList();
+
+    #endregion
+
+    #region 对象操作
+
+    /// <summary>
+    /// 安全枚举对象属性
+    /// </summary>
+    public static IEnumerable<JsonProperty> GetProperties(this JsonElement? element)
+    {
+        if (element?.ValueKind == JsonValueKind.Object)
+        {
+            foreach (var prop in element.Value.EnumerateObject())
+                yield return prop;
+        }
+    }
+
+    /// <summary>
+    /// 获取所有属性名
+    /// </summary>
+    public static IEnumerable<string> GetPropertyNames(this JsonElement? element)
+        => element.GetProperties().Select(p => p.Name);
+
+    /// <summary>
+    /// 判断是否包含某属性
+    /// </summary>
+    public static bool HasProperty(this JsonElement? element, string propertyName)
+        => element?.ValueKind == JsonValueKind.Object &&
+           element.Value.TryGetProperty(propertyName, out _);
+
+    #endregion
+
+    #region 类型判断
+
+    public static bool IsNull(this JsonElement? element)
+        => element == null || element.Value.ValueKind == JsonValueKind.Null;
+
+    public static bool IsNullOrUndefined(this JsonElement? element)
+        => element == null || element.Value.ValueKind is JsonValueKind.Null or JsonValueKind.Undefined;
+
+    public static bool IsObject(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Object;
+
+    public static bool IsArray(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Array;
+
+    public static bool IsString(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.String;
+
+    public static bool IsNumber(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Number;
+
+    public static bool IsBool(this JsonElement? element)
+        => element?.ValueKind is JsonValueKind.True or JsonValueKind.False;
+
+    public static bool Exists(this JsonElement? element)
+        => element != null && element.Value.ValueKind != JsonValueKind.Undefined;
+
+    #endregion
+
+    #region 反序列化
+
+    /// <summary>
+    /// 反序列化为指定类型
+    /// </summary>
+    public static T? Deserialize<T>(this JsonElement? element, JsonSerializerOptions? options = null)
+        => element.HasValue ? element.Value.Deserialize<T>(options) : default;
+
+    /// <summary>
+    /// 反序列化为指定类型，带默认值
+    /// </summary>
+    public static T Deserialize<T>(this JsonElement? element, T defaultValue, JsonSerializerOptions? options = null)
+        => element.HasValue ? element.Value.Deserialize<T>(options) ?? defaultValue : defaultValue;
+
+    #endregion
+
+    #region 转换为字典/动态类型
+
+    /// <summary>
+    /// 转换为 Dictionary
+    /// </summary>
+    public static Dictionary<string, JsonElement>? ToDictionary(this JsonElement? element)
+    {
+        if (element?.ValueKind != JsonValueKind.Object)
+            return null;
+
+        var dict = new Dictionary<string, JsonElement>();
+        foreach (var prop in element.Value.EnumerateObject())
+            dict[prop.Name] = prop.Value;
+        return dict;
+    }
+
+    #endregion
+
+    #region 原始值
+
+    /// <summary>
+    /// 获取原始 JSON 字符串
+    /// </summary>
+    public static string? GetRawText(this JsonElement? element)
+        => element?.GetRawText();
+
+    #endregion
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Yi.Framework.AiHub.Domain.Shared.csproj

@@ -2,6 +2,7 @@
 	<Import Project="..\..\..\common.props" />
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.5.0" />
     <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="$(AbpVersion)" />
   </ItemGroup>
   

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/IGeminiGenerateContentService.cs

@@ -0,0 +1,30 @@
+using System.Text.Json;
+using Yi.Framework.AiHub.Domain.Shared.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
+
+namespace Yi.Framework.AiHub.Domain.AiGateWay;
+
+public interface IGeminiGenerateContentService
+{
+    /// <summary>
+    /// 聊天完成-流式
+    /// </summary>
+    /// <param name="aiModelDescribe"></param>
+    /// <param name="input"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public IAsyncEnumerable<JsonElement?> GenerateContentStreamAsync(AiModelDescribe aiModelDescribe,
+        JsonElement input,
+        CancellationToken cancellationToken);
+
+    /// <summary>
+    /// 聊天完成-非流式
+    /// </summary>
+    /// <param name="aiModelDescribe"></param>
+    /// <param name="input"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public Task<JsonElement> GenerateContentAsync(AiModelDescribe aiModelDescribe,
+        JsonElement input,
+        CancellationToken cancellationToken);
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/IOpenAiResponseService.cs

@@ -0,0 +1,30 @@
+using System.Text.Json;
+using Yi.Framework.AiHub.Domain.Shared.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
+
+namespace Yi.Framework.AiHub.Domain.AiGateWay;
+
+public interface IOpenAiResponseService
+{
+    /// <summary>
+    /// 响应-流式
+    /// </summary>
+    /// <param name="aiModelDescribe"></param>
+    /// <param name="input"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public IAsyncEnumerable<(string, JsonElement?)> ResponsesStreamAsync(AiModelDescribe aiModelDescribe,
+        OpenAiResponsesInput input,
+        CancellationToken cancellationToken);
+
+    /// <summary>
+    /// 响应-非流式
+    /// </summary>
+    /// <param name="aiModelDescribe"></param>
+    /// <param name="input"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public Task<OpenAiResponsesOutput> ResponsesAsync(AiModelDescribe aiModelDescribe,
+        OpenAiResponsesInput input,
+        CancellationToken cancellationToken);
+}

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

@@ -107,35 +107,6 @@ public class AzureDatabricksChatCompletionsService(ILogger<AzureDatabricksChatCo
             {
                 continue;
             }
-
-            // var content = result?.Choices?.FirstOrDefault()?.Delta;
-            //
-            // if (first && content?.Content == OpenAIConstant.ThinkStart)
-            // {
-            //     isThink = true;
-            //     continue;
-            //     // 需要将content的内容转换到其他字段
-            // }
-            //
-            // if (isThink && content?.Content?.Contains(OpenAIConstant.ThinkEnd) == true)
-            // {
-            //     isThink = false;
-            //     // 需要将content的内容转换到其他字段
-            //     continue;
-            // }
-            //
-            // if (isThink && result?.Choices != null)
-            // {
-            //     // 需要将content的内容转换到其他字段
-            //     foreach (var choice in result.Choices)
-            //     {
-            //         choice.Delta.ReasoningContent = choice.Delta.Content;
-            //         choice.Delta.Content = string.Empty;
-            //     }
-            // }
-            //
-            // first = false;
-
             yield return result;
         }
     }

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

@@ -1,313 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Volo.Abp.DependencyInjection;
-using Yi.Framework.AiHub.Domain.Shared.Dtos;
-using Yi.Framework.AiHub.Domain.Shared.Dtos.Anthropic;
-
-namespace Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorCustomOpenAI.Chats;
-
-/// <summary>
-/// OpenAI到Claude适配器服务
-/// 将Claude格式的请求转换为OpenAI格式，然后将OpenAI的响应转换为Claude格式
-/// </summary>
-public class CustomOpenAIAnthropicChatCompletionsService(
-    IAbpLazyServiceProvider serviceProvider,
-    ILogger<CustomOpenAIAnthropicChatCompletionsService> logger)
-    : IAnthropicChatCompletionService
-{
-    private IChatCompletionService GetChatCompletionService()
-    {
-        return serviceProvider.GetRequiredKeyedService<IChatCompletionService>(nameof(OpenAiChatCompletionsService));
-    }
-
-    public async Task<AnthropicChatCompletionDto> ChatCompletionsAsync(AiModelDescribe aiModelDescribe,
-        AnthropicInput request,
-        CancellationToken cancellationToken = default)
-    {
-        // 转换请求格式：Claude -> OpenAI
-        var openAIRequest = AnthropicToOpenAi.ConvertAnthropicToOpenAi(request);
-
-        if (openAIRequest.Model.StartsWith("gpt-5"))
-        {
-            openAIRequest.MaxCompletionTokens = request.MaxTokens;
-            openAIRequest.MaxTokens = null;
-        }
-        else if (openAIRequest.Model.StartsWith("o3-mini") || openAIRequest.Model.StartsWith("o4-mini"))
-        {
-            openAIRequest.MaxCompletionTokens = request.MaxTokens;
-            openAIRequest.MaxTokens = null;
-            openAIRequest.Temperature = null;
-        }
-
-        // 调用OpenAI服务
-        var openAIResponse =
-            await GetChatCompletionService().CompleteChatAsync(aiModelDescribe,openAIRequest, cancellationToken);
-
-        // 转换响应格式：OpenAI -> Claude
-        var claudeResponse = AnthropicToOpenAi.ConvertOpenAIToClaude(openAIResponse, request);
-
-        return claudeResponse;
-    }
-
-    public async IAsyncEnumerable<(string, AnthropicStreamDto?)> StreamChatCompletionsAsync(AiModelDescribe aiModelDescribe,
-        AnthropicInput request,
-        CancellationToken cancellationToken = default)
-    {
-        var openAIRequest = AnthropicToOpenAi.ConvertAnthropicToOpenAi(request);
-        openAIRequest.Stream = true;
-
-        if (openAIRequest.Model.StartsWith("gpt-5"))
-        {
-            openAIRequest.MaxCompletionTokens = request.MaxTokens;
-            openAIRequest.MaxTokens = null;
-        }
-        else if (openAIRequest.Model.StartsWith("o3-mini") || openAIRequest.Model.StartsWith("o4-mini"))
-        {
-            openAIRequest.MaxCompletionTokens = request.MaxTokens;
-            openAIRequest.MaxTokens = null;
-            openAIRequest.Temperature = null;
-        }
-
-        var messageId = Guid.NewGuid().ToString();
-        var hasStarted = false;
-        var hasTextContentBlockStarted = false;
-        var hasThinkingContentBlockStarted = false;
-        var toolBlocksStarted = new Dictionary<int, bool>(); // 使用索引而不是ID
-        var toolCallIds = new Dictionary<int, string>(); // 存储每个索引对应的ID
-        var toolCallIndexToBlockIndex = new Dictionary<int, int>(); // 工具调用索引到块索引的映射
-        var accumulatedUsage = new AnthropicCompletionDtoUsage();
-        var isFinished = false;
-        var currentContentBlockType = ""; // 跟踪当前内容块类型
-        var currentBlockIndex = 0; // 跟踪当前块索引
-        var lastContentBlockType = ""; // 跟踪最后一个内容块类型，用于确定停止原因
-
-        await foreach (var openAIResponse in GetChatCompletionService().CompleteChatStreamAsync(aiModelDescribe,openAIRequest,
-                           cancellationToken))
-        {
-            // 发送message_start事件
-            if (!hasStarted && openAIResponse.Choices?.Count > 0 &&
-                openAIResponse.Choices.Any(x => x.Delta.ToolCalls?.Count > 0) == false)
-            {
-                hasStarted = true;
-                var messageStartEvent = AnthropicToOpenAi.CreateMessageStartEvent(messageId, request.Model);
-                yield return ("message_start", messageStartEvent);
-            }
-
-            // 更新使用情况统计
-            if (openAIResponse.Usage != null)
-            {
-                // 使用最新的token计数（OpenAI通常在最后的响应中提供完整的统计）
-                if (openAIResponse.Usage.PromptTokens.HasValue)
-                {
-                    accumulatedUsage.InputTokens = openAIResponse.Usage.PromptTokens.Value;
-                }
-
-                if (openAIResponse.Usage.CompletionTokens.HasValue)
-                {
-                    accumulatedUsage.OutputTokens = (int)openAIResponse.Usage.CompletionTokens.Value;
-                }
-
-                if (openAIResponse.Usage.PromptTokensDetails?.CachedTokens.HasValue == true)
-                {
-                    accumulatedUsage.CacheReadInputTokens =
-                        openAIResponse.Usage.PromptTokensDetails.CachedTokens.Value;
-                }
-
-                // 记录调试信息
-                logger.LogDebug("OpenAI Usage更新: Input={InputTokens}, Output={OutputTokens}, CacheRead={CacheRead}",
-                    accumulatedUsage.InputTokens, accumulatedUsage.OutputTokens,
-                    accumulatedUsage.CacheReadInputTokens);
-            }
-
-            if (openAIResponse.Choices is { Count: > 0 })
-            {
-                var choice = openAIResponse.Choices.First();
-
-                // 处理内容
-                if (!string.IsNullOrEmpty(choice.Delta?.Content))
-                {
-                    // 如果当前有其他类型的内容块在运行，先结束它们
-                    if (currentContentBlockType != "text" && !string.IsNullOrEmpty(currentContentBlockType))
-                    {
-                        var stopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                        stopEvent.Index = currentBlockIndex;
-                        yield return ("content_block_stop", stopEvent);
-                        currentBlockIndex++; // 切换内容块时增加索引
-                        currentContentBlockType = "";
-                    }
-
-                    // 发送content_block_start事件（仅第一次）
-                    if (!hasTextContentBlockStarted || currentContentBlockType != "text")
-                    {
-                        hasTextContentBlockStarted = true;
-                        currentContentBlockType = "text";
-                        lastContentBlockType = "text";
-                        var contentBlockStartEvent = AnthropicToOpenAi.CreateContentBlockStartEvent();
-                        contentBlockStartEvent.Index = currentBlockIndex;
-                        yield return ("content_block_start",
-                            contentBlockStartEvent);
-                    }
-
-                    // 发送content_block_delta事件
-                    var contentDeltaEvent = AnthropicToOpenAi.CreateContentBlockDeltaEvent(choice.Delta.Content);
-                    contentDeltaEvent.Index = currentBlockIndex;
-                    yield return ("content_block_delta",
-                        contentDeltaEvent);
-                }
-
-                // 处理工具调用
-                if (choice.Delta?.ToolCalls is { Count: > 0 })
-                {
-                    foreach (var toolCall in choice.Delta.ToolCalls)
-                    {
-                        var toolCallIndex = toolCall.Index; // 使用索引来标识工具调用
-
-                        // 发送tool_use content_block_start事件
-                        if (toolBlocksStarted.TryAdd(toolCallIndex, true))
-                        {
-                            // 如果当前有文本或thinking内容块在运行，先结束它们
-                            if (currentContentBlockType == "text" || currentContentBlockType == "thinking")
-                            {
-                                var stopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                                stopEvent.Index = currentBlockIndex;
-                                yield return ("content_block_stop", stopEvent);
-                                currentBlockIndex++; // 增加块索引
-                            }
-                            // 如果当前有其他工具调用在运行，也需要结束它们
-                            else if (currentContentBlockType == "tool_use")
-                            {
-                                var stopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                                stopEvent.Index = currentBlockIndex;
-                                yield return ("content_block_stop", stopEvent);
-                                currentBlockIndex++; // 增加块索引
-                            }
-
-                            currentContentBlockType = "tool_use";
-                            lastContentBlockType = "tool_use";
-
-                            // 为此工具调用分配一个新的块索引
-                            toolCallIndexToBlockIndex[toolCallIndex] = currentBlockIndex;
-
-                            // 保存工具调用的ID（如果有的话）
-                            if (!string.IsNullOrEmpty(toolCall.Id))
-                            {
-                                toolCallIds[toolCallIndex] = toolCall.Id;
-                            }
-                            else if (!toolCallIds.ContainsKey(toolCallIndex))
-                            {
-                                // 如果没有ID且之前也没有保存过，生成一个新的ID
-                                toolCallIds[toolCallIndex] = Guid.NewGuid().ToString();
-                            }
-
-                            var toolBlockStartEvent = AnthropicToOpenAi.CreateToolBlockStartEvent(
-                                toolCallIds[toolCallIndex],
-                                toolCall.Function?.Name);
-                            toolBlockStartEvent.Index = currentBlockIndex;
-                            yield return ("content_block_start",
-                                toolBlockStartEvent);
-                        }
-
-                        // 如果有增量的参数，发送content_block_delta事件
-                        if (!string.IsNullOrEmpty(toolCall.Function?.Arguments))
-                        {
-                            var toolDeltaEvent =
-                                AnthropicToOpenAi.CreateToolBlockDeltaEvent(toolCall.Function.Arguments);
-                            // 使用该工具调用对应的块索引
-                            toolDeltaEvent.Index = toolCallIndexToBlockIndex[toolCallIndex];
-                            yield return ("content_block_delta",
-                                toolDeltaEvent);
-                        }
-                    }
-                }
-
-                // 处理推理内容
-                if (!string.IsNullOrEmpty(choice.Delta?.ReasoningContent))
-                {
-                    // 如果当前有其他类型的内容块在运行，先结束它们
-                    if (currentContentBlockType != "thinking" && !string.IsNullOrEmpty(currentContentBlockType))
-                    {
-                        var stopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                        stopEvent.Index = currentBlockIndex;
-                        yield return ("content_block_stop", stopEvent);
-                        currentBlockIndex++; // 增加块索引
-                        currentContentBlockType = "";
-                    }
-
-                    // 对于推理内容，也需要发送对应的事件
-                    if (!hasThinkingContentBlockStarted || currentContentBlockType != "thinking")
-                    {
-                        hasThinkingContentBlockStarted = true;
-                        currentContentBlockType = "thinking";
-                        lastContentBlockType = "thinking";
-                        var thinkingBlockStartEvent = AnthropicToOpenAi.CreateThinkingBlockStartEvent();
-                        thinkingBlockStartEvent.Index = currentBlockIndex;
-                        yield return ("content_block_start",
-                            thinkingBlockStartEvent);
-                    }
-
-                    var thinkingDeltaEvent =
-                        AnthropicToOpenAi.CreateThinkingBlockDeltaEvent(choice.Delta.ReasoningContent);
-                    thinkingDeltaEvent.Index = currentBlockIndex;
-                    yield return ("content_block_delta",
-                        thinkingDeltaEvent);
-                }
-
-                // 处理结束
-                if (!string.IsNullOrEmpty(choice.FinishReason) && !isFinished)
-                {
-                    isFinished = true;
-
-                    // 发送content_block_stop事件（如果有活跃的内容块）
-                    if (!string.IsNullOrEmpty(currentContentBlockType))
-                    {
-                        var contentBlockStopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                        contentBlockStopEvent.Index = currentBlockIndex;
-                        yield return ("content_block_stop",
-                            contentBlockStopEvent);
-                    }
-
-                    // 发送message_delta事件
-                    var messageDeltaEvent = AnthropicToOpenAi.CreateMessageDeltaEvent(
-                        AnthropicToOpenAi.GetStopReasonByLastContentType(choice.FinishReason, lastContentBlockType),
-                        accumulatedUsage);
-
-                    // 记录最终Usage统计
-                    logger.LogDebug(
-                        "流式响应结束，最终Usage: Input={InputTokens}, Output={OutputTokens}, CacheRead={CacheRead}",
-                        accumulatedUsage.InputTokens, accumulatedUsage.OutputTokens,
-                        accumulatedUsage.CacheReadInputTokens);
-
-                    yield return ("message_delta",
-                        messageDeltaEvent);
-
-                    // 发送message_stop事件
-                    var messageStopEvent = AnthropicToOpenAi.CreateMessageStopEvent();
-                    yield return ("message_stop",
-                        messageStopEvent);
-                }
-            }
-        }
-
-        // 确保流正确结束
-        if (!isFinished)
-        {
-            if (!string.IsNullOrEmpty(currentContentBlockType))
-            {
-                var contentBlockStopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                contentBlockStopEvent.Index = currentBlockIndex;
-                yield return ("content_block_stop",
-                    contentBlockStopEvent);
-            }
-
-            var messageDeltaEvent =
-                AnthropicToOpenAi.CreateMessageDeltaEvent(
-                    AnthropicToOpenAi.GetStopReasonByLastContentType("end_turn", lastContentBlockType),
-                    accumulatedUsage);
-            yield return ("message_delta", messageDeltaEvent);
-
-            var messageStopEvent = AnthropicToOpenAi.CreateMessageStopEvent();
-            yield return ("message_stop",
-                messageStopEvent);
-        }
-    }
-}

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

@@ -9,7 +9,9 @@ using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 
 namespace Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorCustomOpenAI.Chats;
 
-public sealed class OpenAiChatCompletionsService(ILogger<OpenAiChatCompletionsService> logger,IHttpClientFactory httpClientFactory)
+public sealed class OpenAiChatCompletionsService(
+    ILogger<OpenAiChatCompletionsService> logger,
+    IHttpClientFactory httpClientFactory)
     : IChatCompletionService
 {
     public async IAsyncEnumerable<ThorChatCompletionsResponse> CompleteChatStreamAsync(AiModelDescribe options,
@@ -19,8 +21,18 @@ public sealed class OpenAiChatCompletionsService(ILogger<OpenAiChatCompletionsSe
         using var openai =
             Activity.Current?.Source.StartActivity("OpenAI 对话流式补全");
 
+        var endpoint = options?.Endpoint.TrimEnd('/');
+        
+        //兼容 v1结尾
+        if (endpoint != null && endpoint.EndsWith("/v1", StringComparison.OrdinalIgnoreCase))
+        {
+            endpoint = endpoint.Substring(0, endpoint.Length - "/v1".Length);
+        }
+
+        var requestUri = endpoint + "/v1/chat/completions";
+
         var response = await httpClientFactory.CreateClient().HttpRequestRaw(
-            options?.Endpoint.TrimEnd('/') + "/chat/completions",
+            requestUri,
             chatCompletionCreate, options.ApiKey);
 
         openai?.SetTag("Model", chatCompletionCreate.Model);
@@ -130,8 +142,16 @@ public sealed class OpenAiChatCompletionsService(ILogger<OpenAiChatCompletionsSe
         using var openai =
             Activity.Current?.Source.StartActivity("OpenAI 对话补全");
 
-        var response = await HttpClientFactory.GetHttpClient(options.Endpoint).PostJsonAsync(
-            options?.Endpoint.TrimEnd('/') + "/chat/completions",
+        var endpoint = options?.Endpoint.TrimEnd('/');
+        
+        //兼容 v1结尾
+        if (endpoint != null && endpoint.EndsWith("/v1", StringComparison.OrdinalIgnoreCase))
+        {
+            endpoint = endpoint.Substring(0, endpoint.Length - "/v1".Length);
+        }
+        var requestUri = endpoint + "/v1/chat/completions";
+        var response = await httpClientFactory.CreateClient().PostJsonAsync(
+            requestUri,
             chatCompletionCreate, options.ApiKey).ConfigureAwait(false);
 
         openai?.SetTag("Model", chatCompletionCreate.Model);
@@ -152,7 +172,8 @@ public sealed class OpenAiChatCompletionsService(ILogger<OpenAiChatCompletionsSe
         if (response.StatusCode >= HttpStatusCode.BadRequest)
         {
             var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}", options.Endpoint,
+            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
+                options.Endpoint,
                 response.StatusCode, error);
 
             throw new BusinessException("OpenAI对话异常", response.StatusCode.ToString());

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

@@ -0,0 +1,141 @@
+using System.Diagnostics;
+using System.Net;
+using System.Net.Http.Json;
+using System.Text.Json;
+using Microsoft.Extensions.Logging;
+using Yi.Framework.AiHub.Domain.AiGateWay.Exceptions;
+using Yi.Framework.AiHub.Domain.Shared.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
+
+namespace Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorCustomOpenAI.Chats;
+
+public class OpenAiResponseService(ILogger<OpenAiResponseService> logger,IHttpClientFactory httpClientFactory):IOpenAiResponseService
+{
+    
+    public async IAsyncEnumerable<(string, JsonElement?)> ResponsesStreamAsync(AiModelDescribe options, OpenAiResponsesInput input,
+        CancellationToken cancellationToken)
+    {
+         using var openai =
+            Activity.Current?.Source.StartActivity("OpenAi 响应");
+
+        
+        var client = httpClientFactory.CreateClient();
+        
+        var endpoint = options?.Endpoint.TrimEnd('/');
+        
+        //兼容 v1结尾
+        if (endpoint != null && endpoint.EndsWith("/v1", StringComparison.OrdinalIgnoreCase))
+        {
+            endpoint = endpoint.Substring(0, endpoint.Length - "/v1".Length);
+        }
+        var requestUri = endpoint + "/v1/responses";
+        
+        var response = await client.HttpRequestRaw(requestUri, input, options.ApiKey);
+
+        openai?.SetTag("Model", input.Model);
+        openai?.SetTag("Response", response.StatusCode.ToString());
+
+        // 大于等于400的状态码都认为是异常
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            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);
+        }
+
+        using var stream = new StreamReader(await response.Content.ReadAsStreamAsync(cancellationToken));
+
+        using StreamReader reader = new(await response.Content.ReadAsStreamAsync(cancellationToken));
+        string? line = string.Empty;
+
+        string? data = null;
+        string eventType = string.Empty;
+
+        while ((line = await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false)) != null)
+        {
+            line += Environment.NewLine;
+
+            if (line.StartsWith('{'))
+            {
+                logger.LogInformation("OpenAI响应异常 , StatusCode: {StatusCode} Response: {Response}", response.StatusCode,
+                    line);
+
+                throw new Exception("OpenAI响应异常" + line);
+            }
+
+            if (string.IsNullOrWhiteSpace(line))
+            {
+                continue;
+            }
+
+            if (line.StartsWith("event:"))
+            {
+                eventType = line;
+                continue;
+            }
+
+            if (!line.StartsWith(OpenAIConstant.Data)) continue;
+
+            data = line[OpenAIConstant.Data.Length..].Trim();
+
+            var result = JsonSerializer.Deserialize<JsonElement>(data,
+                ThorJsonSerializer.DefaultOptions);
+
+            yield return (eventType, result);
+        }
+    }
+
+    public async Task<OpenAiResponsesOutput> ResponsesAsync(AiModelDescribe options, OpenAiResponsesInput chatCompletionCreate,
+        CancellationToken cancellationToken)
+    {
+        using var openai =
+            Activity.Current?.Source.StartActivity("OpenAI 响应");
+
+        var endpoint = options?.Endpoint.TrimEnd('/');
+        
+        //兼容 v1结尾
+        if (endpoint != null && endpoint.EndsWith("/v1", StringComparison.OrdinalIgnoreCase))
+        {
+            endpoint = endpoint.Substring(0, endpoint.Length - "/v1".Length);
+        }
+        var requestUri = endpoint + "/v1/responses";
+        
+        var response = await httpClientFactory.CreateClient().PostJsonAsync(
+            requestUri,
+            chatCompletionCreate, options.ApiKey).ConfigureAwait(false);
+
+        openai?.SetTag("Model", chatCompletionCreate.Model);
+        openai?.SetTag("Response", response.StatusCode.ToString());
+
+        if (response.StatusCode == HttpStatusCode.Unauthorized)
+        {
+            throw new BusinessException("渠道未登录,请联系管理人员", "401");
+        }
+
+        // 如果限流则抛出限流异常
+        if (response.StatusCode == HttpStatusCode.TooManyRequests)
+        {
+            throw new ThorRateLimitException();
+        }
+
+        // 大于等于400的状态码都认为是异常
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            logger.LogError("OpenAI 响应异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}", options.Endpoint,
+                response.StatusCode, error);
+
+            throw new BusinessException("OpenAI响应异常", response.StatusCode.ToString());
+        }
+
+        var result =
+            await response.Content.ReadFromJsonAsync<OpenAiResponsesOutput>(
+                cancellationToken: cancellationToken).ConfigureAwait(false);
+
+        return result;
+    }
+}

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

@@ -23,9 +23,17 @@ public sealed class DeepSeekChatCompletionsService(ILogger<DeepSeekChatCompletio
 
         using var openai =
             Activity.Current?.Source.StartActivity("OpenAI 对话流式补全");
-
+        
+        var endpoint = options?.Endpoint.TrimEnd('/');
+        //兼容 v1结尾
+        if (endpoint != null && endpoint.EndsWith("/v1", StringComparison.OrdinalIgnoreCase))
+        {
+            endpoint = endpoint.Substring(0, endpoint.Length - "/v1".Length);
+        }
+        var requestUri = endpoint + "/v1/chat/completions";
+        
         var response = await httpClientFactory.CreateClient().HttpRequestRaw(
-            options?.Endpoint.TrimEnd('/') + "/chat/completions",
+            requestUri,
             chatCompletionCreate, options.ApiKey);
 
         openai?.SetTag("Model", chatCompletionCreate.Model);
@@ -92,40 +100,6 @@ public sealed class DeepSeekChatCompletionsService(ILogger<DeepSeekChatCompletio
 
             var result = JsonSerializer.Deserialize<ThorChatCompletionsResponse>(line,
                 ThorJsonSerializer.DefaultOptions);
-
-            // var content = result?.Choices?.FirstOrDefault()?.Delta;
-            //
-            // // if (first && string.IsNullOrWhiteSpace(content?.Content) && string.IsNullOrEmpty(content?.ReasoningContent))
-            // // {
-            // //     continue;
-            // // }
-            //
-            // if (first && content.Content == OpenAIConstant.ThinkStart)
-            // {
-            //     isThink = true;
-            //     //continue;
-            //     // 需要将content的内容转换到其他字段
-            // }
-            //
-            // if (isThink && content.Content.Contains(OpenAIConstant.ThinkEnd))
-            // {
-            //     isThink = false;
-            //     // 需要将content的内容转换到其他字段
-            //     //continue;
-            // }
-            //
-            // if (isThink)
-            // {
-            //     // 需要将content的内容转换到其他字段
-            //     foreach (var choice in result.Choices)
-            //     {
-            //         //choice.Delta.ReasoningContent = choice.Delta.Content;
-            //         //choice.Delta.Content = string.Empty;
-            //     }
-            // }
-
-            // first = false;
-
             yield return result;
         }
     }
@@ -142,8 +116,16 @@ public sealed class DeepSeekChatCompletionsService(ILogger<DeepSeekChatCompletio
             options.Endpoint = "https://api.deepseek.com/v1";
         }
 
+        var endpoint = options?.Endpoint.TrimEnd('/');
+        //兼容 v1结尾
+        if (endpoint != null && endpoint.EndsWith("/v1", StringComparison.OrdinalIgnoreCase))
+        {
+            endpoint = endpoint.Substring(0, endpoint.Length - "/v1".Length);
+        }
+        var requestUri = endpoint + "/v1/chat/completions";
+        
         var response = await httpClientFactory.CreateClient().PostJsonAsync(
-            options?.Endpoint.TrimEnd('/') + "/chat/completions",
+            requestUri,
             chatCompletionCreate, options.ApiKey).ConfigureAwait(false);
 
         openai?.SetTag("Model", chatCompletionCreate.Model);

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

@@ -0,0 +1,101 @@
+using System.Diagnostics;
+using System.Net;
+using System.Net.Http.Json;
+using System.Text.Json;
+using Microsoft.Extensions.Logging;
+using Yi.Framework.AiHub.Domain.AiGateWay.Exceptions;
+using Yi.Framework.AiHub.Domain.Shared.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
+
+namespace Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorGemini.Chats;
+
+public class GeminiGenerateContentService(
+    ILogger<GeminiGenerateContentService> logger,
+    IHttpClientFactory httpClientFactory) : IGeminiGenerateContentService
+{
+    public async IAsyncEnumerable<JsonElement?> GenerateContentStreamAsync(AiModelDescribe options, JsonElement input,
+        CancellationToken cancellationToken)
+    {
+        var response = await httpClientFactory.CreateClient().PostJsonAsync(
+            options?.Endpoint.TrimEnd('/') + $"/v1beta/models/{options.ModelId}:streamGenerateContent?alt=sse",
+            input, null, new Dictionary<string, string>()
+            {
+                { "x-goog-api-key", options.ApiKey }
+            }).ConfigureAwait(false);
+        
+
+        // 大于等于400的状态码都认为是异常
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            logger.LogError("Gemini生成异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
+                options.Endpoint,
+                response.StatusCode, error);
+
+            throw new Exception("Gemini生成异常" + response.StatusCode);
+        }
+
+        using var stream = new StreamReader(await response.Content.ReadAsStreamAsync(cancellationToken));
+
+        using StreamReader reader = new(await response.Content.ReadAsStreamAsync(cancellationToken));
+        string? line = string.Empty;
+
+        while ((line = await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false)) != null)
+        {
+            line += Environment.NewLine;
+            if (string.IsNullOrWhiteSpace(line))
+            {
+                continue;
+            }
+
+            if (!line.StartsWith(OpenAIConstant.Data)) continue;
+
+            var data = line[OpenAIConstant.Data.Length..].Trim();
+
+            var result = JsonSerializer.Deserialize<JsonElement>(data,
+                ThorJsonSerializer.DefaultOptions);
+
+            yield return result;
+        }
+    }
+
+    public async Task<JsonElement> GenerateContentAsync(AiModelDescribe options, JsonElement input,
+        CancellationToken cancellationToken)
+    {
+        var response = await httpClientFactory.CreateClient().PostJsonAsync(
+            options?.Endpoint.TrimEnd('/') + $"/v1beta/models/{options.ModelId}:generateContent",
+            input, null, new Dictionary<string, string>()
+            {
+                { "x-goog-api-key", options.ApiKey }
+            }).ConfigureAwait(false);
+
+        if (response.StatusCode == HttpStatusCode.Unauthorized)
+        {
+            throw new BusinessException("渠道未登录,请联系管理人员", "401");
+        }
+
+        // 如果限流则抛出限流异常
+        if (response.StatusCode == HttpStatusCode.TooManyRequests)
+        {
+            throw new ThorRateLimitException();
+        }
+
+        // 大于等于400的状态码都认为是异常
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            logger.LogError("Gemini 生成异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
+                options.Endpoint,
+                response.StatusCode, error);
+
+            throw new BusinessException("Gemini 生成异常", response.StatusCode.ToString());
+        }
+
+        var result =
+            await response.Content.ReadFromJsonAsync<JsonElement>(
+                cancellationToken: cancellationToken).ConfigureAwait(false);
+
+        return result;
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/SupplementalMultiplierHelper.cs

@@ -0,0 +1,23 @@
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
+
+namespace Yi.Framework.AiHub.Domain.AiGateWay;
+
+public static class SupplementalMultiplierHelper
+{
+    public static void SetSupplementalMultiplier(this ThorUsageResponse? usage,decimal multiplier)
+    {
+        if (usage is not null)
+        {
+            usage.InputTokens =
+                (int)Math.Round((usage.InputTokens ?? 0) * multiplier);
+            usage.OutputTokens =
+                (int)Math.Round((usage.OutputTokens ?? 0) * multiplier);
+            usage.CompletionTokens =
+                (int)Math.Round((usage.CompletionTokens ?? 0) * multiplier);
+            usage.PromptTokens =
+                (int)Math.Round((usage.PromptTokens ?? 0) * multiplier);
+            usage.TotalTokens =
+                (int)Math.Round((usage.TotalTokens ?? 0) * multiplier);
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+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_ActivationCode")]
+[SugarIndex($"index_{nameof(Code)}", nameof(Code), OrderByType.Asc, true)]
+[SugarIndex($"index_{nameof(GoodsType)}", nameof(GoodsType), OrderByType.Asc)]
+public class ActivationCodeAggregateRoot : FullAuditedAggregateRoot<Guid>
+{
+    /// <summary>
+    /// 激活码（唯一）
+    /// </summary>
+    [SugarColumn(Length = 50)]
+    public string Code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 商品类型
+    /// </summary>
+    public ActivationCodeGoodsTypeEnum GoodsType { get; set; }
+
+    /// <summary>
+    /// 是否允许多人各使用一次
+    /// </summary>
+    public bool IsReusable { get; set; }
+
+    /// <summary>
+    /// 是否限制同类型只能兑换一次
+    /// </summary>
+    public bool IsSameTypeOnce { get; set; }
+
+    /// <summary>
+    /// 已使用次数
+    /// </summary>
+    public int UsedCount { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(Length = 500, IsNullable = true)]
+    public string? Remark { get; set; }
+}

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

@@ -0,0 +1,50 @@
+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_ActivationCodeRecord")]
+[SugarIndex($"index_{nameof(UserId)}_{nameof(ActivationCodeId)}",
+    nameof(UserId), OrderByType.Asc,
+    nameof(ActivationCodeId), OrderByType.Asc, true)]
+[SugarIndex($"index_{nameof(UserId)}_{nameof(GoodsType)}",
+    nameof(UserId), OrderByType.Asc,
+    nameof(GoodsType), OrderByType.Asc)]
+public class ActivationCodeRecordAggregateRoot : FullAuditedAggregateRoot<Guid>
+{
+    /// <summary>
+    /// 激活码Id
+    /// </summary>
+    public Guid ActivationCodeId { get; set; }
+
+    /// <summary>
+    /// 激活码内容
+    /// </summary>
+    [SugarColumn(Length = 50)]
+    public string Code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 用户Id
+    /// </summary>
+    public Guid UserId { get; set; }
+
+    /// <summary>
+    /// 商品类型
+    /// </summary>
+    public ActivationCodeGoodsTypeEnum GoodsType { get; set; }
+
+    /// <summary>
+    /// 兑换时间
+    /// </summary>
+    public DateTime RedeemTime { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(Length = 500, IsNullable = true)]
+    public string? Remark { get; set; }
+}

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

@@ -0,0 +1,45 @@
+using SqlSugar;
+using Volo.Abp.Auditing;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Yi.Framework.AiHub.Domain.Entities.Chat;
+
+[SugarTable("Ai_AgentStore")]
+[SugarIndex($"index_{{table}}_{nameof(SessionId)}",
+    $"{nameof(SessionId)}", OrderByType.Desc
+)]
+public class AgentStoreAggregateRoot : FullAuditedAggregateRoot<Guid>
+{
+    public AgentStoreAggregateRoot()
+    {
+    }
+    
+    /// <summary>
+    /// 构建
+    /// </summary>
+    /// <param name="sessionId"></param>
+    public AgentStoreAggregateRoot(Guid sessionId)
+    {
+        SessionId = sessionId;
+    }
+
+    /// <summary>
+    /// 会话id
+    /// </summary>
+    public Guid SessionId { get; set; }
+
+    /// <summary>
+    /// 存储
+    /// </summary>
+    [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string? Store { get; set; }
+
+    /// <summary>
+    /// 设置存储
+    /// </summary>
+    public void SetStore()
+    {
+        this.Store = Store;
+    }
+}

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

@@ -0,0 +1,58 @@
+using SqlSugar;
+using Volo.Abp.Domain.Entities.Auditing;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Domain.Entities.Chat;
+
+[SugarTable("Ai_ImageStoreTask")]
+public class ImageStoreTaskAggregateRoot : FullAuditedAggregateRoot<Guid>
+{
+    /// <summary>
+    /// 提示词
+    /// </summary>
+    [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string Prompt { get; set; }
+
+    /// <summary>
+    /// 参考图Base64
+    /// </summary>
+    [SugarColumn(IsJson = true)]
+    public List<string> ReferenceImagesBase64 { get; set; }
+
+    /// <summary>
+    /// 参考图url
+    /// </summary>
+    [SugarColumn(IsJson = true)]
+    public List<string> ReferenceImagesUrl { get; set; }
+    
+    
+    /// <summary>
+    /// 图片base64
+    /// </summary>
+    public string? StoreBase64 { get; set; }
+    
+    /// <summary>
+    /// 图片绝对路径
+    /// </summary>
+    public string? StoreUrl { get; set; }
+
+    /// <summary>
+    /// 任务状态
+    /// </summary>
+    public TaskStatusEnum TaskStatus { get; set; } = TaskStatusEnum.Processing;
+
+    /// <summary>
+    /// 用户id
+    /// </summary>
+    public Guid UserId { get; set; }
+
+    /// <summary>
+    /// 设置成功
+    /// </summary>
+    /// <param name="storeUrl"></param>
+    public void SetSuccess(string storeUrl)
+    {
+        TaskStatus = TaskStatusEnum.Success;
+        StoreUrl = storeUrl;
+    }
+}

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

@@ -65,4 +65,24 @@ public class AiModelEntity : Entity<Guid>, IOrderNum, ISoftDelete
     /// 模型倍率
     /// </summary>
     public decimal Multiplier { get; set; } = 1;
+    
+    /// <summary>
+    /// 模型显示倍率
+    /// </summary>
+    public decimal MultiplierShow { get; set; } = 1;
+
+    /// <summary>
+    /// 供应商分组名称(如：OpenAI、Anthropic、Google等)
+    /// </summary>
+    public string? ProviderName { get; set; }
+
+    /// <summary>
+    /// 模型图标URL
+    /// </summary>
+    public string? IconUrl { get; set; }
+
+    /// <summary>
+    /// 是否为尊享模型
+    /// </summary>
+    public bool IsPremium { get; set; }
 }

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

@@ -0,0 +1,174 @@
+using System.Text;
+using Microsoft.Extensions.Logging;
+using Volo.Abp;
+using Volo.Abp.Domain.Services;
+using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Domain.Managers;
+
+public class ActivationCodeRedeemContext
+{
+    public ActivationCodeAggregateRoot ActivationCode { get; set; } = default!;
+    public string PackageName { get; set; } = string.Empty;
+    public ActivationCodeGoodsAttribute Goods { get; set; } = default!;
+}
+
+/// <summary>
+/// 激活码管理器
+/// </summary>
+public class ActivationCodeManager : DomainService
+{
+    private readonly ISqlSugarRepository<ActivationCodeAggregateRoot, Guid> _activationCodeRepository;
+    private readonly ISqlSugarRepository<ActivationCodeRecordAggregateRoot, Guid> _activationCodeRecordRepository;
+    private readonly ILogger<ActivationCodeManager> _logger;
+
+    public ActivationCodeManager(
+        ISqlSugarRepository<ActivationCodeAggregateRoot, Guid> activationCodeRepository,
+        ISqlSugarRepository<ActivationCodeRecordAggregateRoot, Guid> activationCodeRecordRepository,
+        ILogger<ActivationCodeManager> logger)
+    {
+        _activationCodeRepository = activationCodeRepository;
+        _activationCodeRecordRepository = activationCodeRecordRepository;
+        _logger = logger;
+    }
+
+    public async Task<List<ActivationCodeAggregateRoot>> CreateBatchAsync(
+        List<(ActivationCodeGoodsTypeEnum GoodsType, int Count)> items)
+    {
+        var entities = new List<ActivationCodeAggregateRoot>();
+        foreach (var item in items)
+        {
+            if (item.Count <= 0)
+            {
+                throw new UserFriendlyException("生成数量必须大于0");
+            }
+
+            var goods = item.GoodsType.GetGoods();
+            if (goods == null)
+            {
+                throw new UserFriendlyException("激活码商品类型无效");
+            }
+
+            for (var i = 0; i < item.Count; i++)
+            {
+                var code = await GenerateUniqueActivationCodeAsync();
+                entities.Add(new ActivationCodeAggregateRoot
+                {
+                    Code = code,
+                    GoodsType = item.GoodsType,
+                    IsReusable = goods.IsReusable,
+                    IsSameTypeOnce = goods.IsSameTypeOnce,
+                    UsedCount = 0,
+                    Remark = null
+                });
+            }
+        }
+
+        await _activationCodeRepository.InsertRangeAsync(entities);
+        return entities;
+    }
+
+    public async Task<ActivationCodeRedeemContext> RedeemAsync(Guid userId, string code)
+    {
+        if (string.IsNullOrWhiteSpace(code))
+        {
+            throw new UserFriendlyException("激活码不能为空");
+        }
+
+        var trimmedCode = code.Trim();
+        var activationCode = await _activationCodeRepository._DbQueryable
+            .Where(x => x.Code == trimmedCode)
+            .FirstAsync();
+
+        if (activationCode == null)
+        {
+            throw new UserFriendlyException("激活码不存在");
+        }
+
+        var hasUsedCurrentCode = await _activationCodeRecordRepository._DbQueryable
+            .Where(x => x.UserId == userId && x.ActivationCodeId == activationCode.Id)
+            .AnyAsync();
+
+        if (hasUsedCurrentCode)
+        {
+            throw new UserFriendlyException("该激活码已被你使用过");
+        }
+
+        if (!activationCode.IsReusable && activationCode.UsedCount > 0)
+        {
+            throw new UserFriendlyException("该激活码已被使用");
+        }
+
+        if (activationCode.IsSameTypeOnce)
+        {
+            var hasUsedSameType = await _activationCodeRecordRepository._DbQueryable
+                .Where(x => x.UserId == userId && x.GoodsType == activationCode.GoodsType)
+                .AnyAsync();
+
+            if (hasUsedSameType)
+            {
+                throw new UserFriendlyException("该类型激活码每个用户只能兑换一次");
+            }
+        }
+
+        var goods = activationCode.GoodsType.GetGoods();
+        if (goods == null)
+        {
+            throw new UserFriendlyException("激活码商品类型无效");
+        }
+
+        var packageName = string.IsNullOrWhiteSpace(goods.Content)
+            ? goods.DisplayName
+            : $"{goods.DisplayName} {goods.Content}";
+
+        activationCode.UsedCount += 1;
+        await _activationCodeRepository.UpdateAsync(activationCode);
+
+        var record = new ActivationCodeRecordAggregateRoot
+        {
+            ActivationCodeId = activationCode.Id,
+            Code = activationCode.Code,
+            UserId = userId,
+            GoodsType = activationCode.GoodsType,
+            RedeemTime = DateTime.Now,
+            Remark = "激活码兑换"
+        };
+        await _activationCodeRecordRepository.InsertAsync(record);
+
+        _logger.LogInformation("用户 {UserId} 兑换激活码 {Code} 成功", userId, activationCode.Code);
+
+        return new ActivationCodeRedeemContext
+        {
+            ActivationCode = activationCode,
+            PackageName = packageName,
+            Goods = goods
+        };
+    }
+
+    private async Task<string> GenerateUniqueActivationCodeAsync()
+    {
+        string code;
+        do
+        {
+            code = GenerateActivationCode();
+        } while (await _activationCodeRepository._DbQueryable.AnyAsync(x => x.Code == code));
+
+        return code;
+    }
+
+    private string GenerateActivationCode()
+    {
+        const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+        var random = new Random();
+        var builder = new StringBuilder(16);
+        for (var i = 0; i < 16; i++)
+        {
+            builder.Append(chars[random.Next(chars.Length)]);
+        }
+
+        return builder.ToString();
+    }
+
+}

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

@@ -7,18 +7,23 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 using Volo.Abp.Domain.Services;
 using Yi.Framework.AiHub.Domain.AiGateWay;
 using Yi.Framework.AiHub.Domain.AiGateWay.Exceptions;
+using Yi.Framework.AiHub.Domain.Entities.Chat;
 using Yi.Framework.AiHub.Domain.Entities.Model;
 using Yi.Framework.AiHub.Domain.Shared.Consts;
 using Yi.Framework.AiHub.Domain.Shared.Dtos;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.Anthropic;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.Gemini;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Embeddings;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Images;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
 using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.AiHub.Domain.Shared.Extensions;
 using Yi.Framework.Core.Extensions;
 using Yi.Framework.SqlSugarCore.Abstractions;
 using JsonSerializer = System.Text.Json.JsonSerializer;
@@ -35,11 +40,12 @@ public class AiGateWayManager : DomainService
     private readonly UsageStatisticsManager _usageStatisticsManager;
     private readonly ISpecialCompatible _specialCompatible;
     private PremiumPackageManager? _premiumPackageManager;
-
+    private readonly ISqlSugarRepository<ImageStoreTaskAggregateRoot> _imageStoreTaskRepository;
 
     public AiGateWayManager(ISqlSugarRepository<AiAppAggregateRoot> aiAppRepository, ILogger<AiGateWayManager> logger,
         AiMessageManager aiMessageManager, UsageStatisticsManager usageStatisticsManager,
-        ISpecialCompatible specialCompatible, ISqlSugarRepository<AiModelEntity> aiModelRepository)
+        ISpecialCompatible specialCompatible, ISqlSugarRepository<AiModelEntity> aiModelRepository,
+        ISqlSugarRepository<ImageStoreTaskAggregateRoot> imageStoreTaskRepository)
     {
         _aiAppRepository = aiAppRepository;
         _logger = logger;
@@ -47,6 +53,7 @@ public class AiGateWayManager : DomainService
         _usageStatisticsManager = usageStatisticsManager;
         _specialCompatible = specialCompatible;
         _aiModelRepository = aiModelRepository;
+        _imageStoreTaskRepository = imageStoreTaskRepository;
     }
 
     private PremiumPackageManager PremiumPackageManager =>
@@ -58,7 +65,7 @@ public class AiGateWayManager : DomainService
     /// <param name="modelApiType"></param>
     /// <param name="modelId"></param>
     /// <returns></returns>
-    private async Task<AiModelDescribe> GetModelAsync(ModelApiTypeEnum modelApiType, string modelId)
+    public async Task<AiModelDescribe> GetModelAsync(ModelApiTypeEnum modelApiType, string modelId)
     {
         var aiModelDescribe = await _aiModelRepository._DbQueryable
             .LeftJoin<AiAppAggregateRoot>((model, app) => model.AiAppId == app.Id)
@@ -85,31 +92,13 @@ public class AiGateWayManager : DomainService
         {
             throw new UserFriendlyException($"【{modelId}】模型当前版本【{modelApiType}】格式不支持");
         }
-
-        return aiModelDescribe;
-    }
-
-
-    /// <summary>
-    /// 聊天完成-流式
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async IAsyncEnumerable<ThorChatCompletionsResponse> CompleteChatStreamAsync(
-        ThorChatCompletionsRequest request,
-        [EnumeratorCancellation] CancellationToken cancellationToken)
-    {
-        _specialCompatible.Compatible(request);
-        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.OpenAi, request.Model);
-        var chatService =
-            LazyServiceProvider.GetRequiredKeyedService<IChatCompletionService>(modelDescribe.HandlerName);
-
-        await foreach (var result in chatService.CompleteChatStreamAsync(modelDescribe, request, cancellationToken))
+        // ✅ 统一处理 -nx 后缀（网关层模型规范化）
+        if (!string.IsNullOrEmpty(aiModelDescribe.ModelId) &&
+            aiModelDescribe.ModelId.StartsWith("yi-", StringComparison.OrdinalIgnoreCase))
         {
-            result.SupplementalMultiplier(modelDescribe.Multiplier);
-            yield return result;
+            aiModelDescribe.ModelId = aiModelDescribe.ModelId[3..];
         }
+        return aiModelDescribe;
     }
 
 
@@ -161,7 +150,12 @@ public class AiGateWayManager : DomainService
             await _usageStatisticsManager.SetUsageAsync(userId.Value, request.Model, data.Usage, tokenId);
 
             // 扣减尊享token包用量
-            if (PremiumPackageConst.ModeIds.Contains(request.Model))
+            var isPremium = await _aiModelRepository._DbQueryable
+                .Where(x => x.ModelId == request.Model)
+                .Select(x => x.IsPremium)
+                .FirstAsync();
+
+            if (isPremium)
             {
                 var totalTokens = data.Usage?.TotalTokens ?? 0;
                 if (totalTokens > 0)
@@ -174,6 +168,7 @@ public class AiGateWayManager : DomainService
         await response.WriteAsJsonAsync(data, cancellationToken);
     }
 
+
     /// <summary>
     /// 聊天完成-缓存处理
     /// </summary>
@@ -199,8 +194,12 @@ public class AiGateWayManager : DomainService
         response.Headers.TryAdd("Connection", "keep-alive");
 
 
-        var gateWay = LazyServiceProvider.GetRequiredService<AiGateWayManager>();
-        var completeChatResponse = gateWay.CompleteChatStreamAsync(request, cancellationToken);
+        _specialCompatible.Compatible(request);
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.OpenAi, request.Model);
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IChatCompletionService>(modelDescribe.HandlerName);
+
+        var completeChatResponse = chatService.CompleteChatStreamAsync(modelDescribe, request, cancellationToken);
         var tokenUsage = new ThorUsageResponse();
 
         //缓存队列算法
@@ -242,12 +241,13 @@ public class AiGateWayManager : DomainService
         {
             await foreach (var data in completeChatResponse)
             {
+                data.SupplementalMultiplier(modelDescribe.Multiplier);
                 if (data.Usage is not null && (data.Usage.CompletionTokens > 0 || data.Usage.OutputTokens > 0))
                 {
                     tokenUsage = data.Usage;
                 }
 
-                var message = System.Text.Json.JsonSerializer.Serialize(data, ThorJsonSerializer.DefaultOptions);
+                var message = JsonSerializer.Serialize(data, ThorJsonSerializer.DefaultOptions);
                 backupSystemContent.Append(data.Choices.FirstOrDefault()?.Delta.Content);
                 // 将消息加入队列而不是直接写入
                 messageQueue.Enqueue($"data: {message}\n\n");
@@ -256,7 +256,7 @@ public class AiGateWayManager : DomainService
         catch (Exception e)
         {
             _logger.LogError(e, $"Ai对话异常");
-            var errorContent = $"对话Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈:{e}";
+            var errorContent = $"对话Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈：{e}";
             var model = new ThorChatCompletionsResponse()
             {
                 Choices = new List<ThorChatChoiceResponse>()
@@ -289,7 +289,7 @@ public class AiGateWayManager : DomainService
         await _aiMessageManager.CreateUserMessageAsync(userId, sessionId,
             new MessageInputDto
             {
-                Content = sessionId is null ? "不予存储" : request.Messages?.LastOrDefault()?.Content ?? string.Empty,
+                Content = sessionId is null ? "不予存储" : request.Messages?.LastOrDefault()?.MessagesStore ?? string.Empty,
                 ModelId = request.Model,
                 TokenUsage = tokenUsage,
             }, tokenId);
@@ -305,12 +305,20 @@ public class AiGateWayManager : DomainService
         await _usageStatisticsManager.SetUsageAsync(userId, request.Model, tokenUsage, tokenId);
 
         // 扣减尊享token包用量
-        if (userId is not null && PremiumPackageConst.ModeIds.Contains(request.Model))
+        if (userId is not null)
         {
-            var totalTokens = tokenUsage.TotalTokens ?? 0;
-            if (totalTokens > 0)
+            var isPremium = await _aiModelRepository._DbQueryable
+                .Where(x => x.ModelId == request.Model)
+                .Select(x => x.IsPremium)
+                .FirstAsync();
+
+            if (isPremium)
             {
-                await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+                var totalTokens = tokenUsage.TotalTokens ?? 0;
+                if (totalTokens > 0)
+                {
+                    await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+                }
             }
         }
     }
@@ -368,18 +376,26 @@ public class AiGateWayManager : DomainService
             await _usageStatisticsManager.SetUsageAsync(userId, model, response.Usage, tokenId);
 
             // 扣减尊享token包用量
-            if (userId is not null && PremiumPackageConst.ModeIds.Contains(request.Model))
+            if (userId is not null)
             {
-                var totalTokens = response.Usage.TotalTokens ?? 0;
-                if (totalTokens > 0)
+                var isPremium = await _aiModelRepository._DbQueryable
+                    .Where(x => x.ModelId == request.Model)
+                    .Select(x => x.IsPremium)
+                    .FirstAsync();
+
+                if (isPremium)
                 {
-                    await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+                    var totalTokens = response.Usage.TotalTokens ?? 0;
+                    if (totalTokens > 0)
+                    {
+                        await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+                    }
                 }
             }
         }
         catch (Exception e)
         {
-            var errorContent = $"图片生成Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈:{e}";
+            var errorContent = $"图片生成Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈：{e}";
             throw new UserFriendlyException(errorContent);
         }
     }
@@ -492,35 +508,12 @@ public class AiGateWayManager : DomainService
         }
         catch (Exception e)
         {
-            var errorContent = $"嵌入Ai异常，异常信息：\n当前Ai模型：{input.Model}\n异常信息：{e.Message}\n异常堆栈:{e}";
+            var errorContent = $"嵌入Ai异常，异常信息：\n当前Ai模型：{input.Model}\n异常信息：{e.Message}\n异常堆栈：{e}";
             throw new UserFriendlyException(errorContent);
         }
     }
 
 
-    /// <summary>
-    /// Anthropic聊天完成-流式
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async IAsyncEnumerable<(string, AnthropicStreamDto?)> AnthropicCompleteChatStreamAsync(
-        AnthropicInput request,
-        [EnumeratorCancellation] CancellationToken cancellationToken)
-    {
-        _specialCompatible.AnthropicCompatible(request);
-        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.Claude, request.Model);
-        var chatService =
-            LazyServiceProvider.GetRequiredKeyedService<IAnthropicChatCompletionService>(modelDescribe.HandlerName);
-
-        await foreach (var result in chatService.StreamChatCompletionsAsync(modelDescribe, request, cancellationToken))
-        {
-            result.Item2.SupplementalMultiplier(modelDescribe.Multiplier);
-            yield return result;
-        }
-    }
-
-
     /// <summary>
     /// Anthropic聊天完成-非流式
     /// </summary>
@@ -543,31 +536,39 @@ public class AiGateWayManager : DomainService
         // 设置响应头，声明是 json
         //response.ContentType = "application/json; charset=UTF-8";
         var modelDescribe = await GetModelAsync(ModelApiTypeEnum.Claude, request.Model);
+
+        var sourceModelId = request.Model;
+        if (!string.IsNullOrEmpty(request.Model) &&
+            request.Model.StartsWith("yi-", StringComparison.OrdinalIgnoreCase))
+        {
+            request.Model = request.Model[3..];
+        }
+        
         var chatService =
             LazyServiceProvider.GetRequiredKeyedService<IAnthropicChatCompletionService>(modelDescribe.HandlerName);
         var data = await chatService.ChatCompletionsAsync(modelDescribe, request, cancellationToken);
-        
+   
         data.SupplementalMultiplier(modelDescribe.Multiplier);
-        
+
         if (userId is not null)
         {
             await _aiMessageManager.CreateUserMessageAsync(userId.Value, sessionId,
                 new MessageInputDto
                 {
-                    Content = sessionId is null ? "不予存储" : request.Messages?.FirstOrDefault()?.Content ?? string.Empty,
-                    ModelId = request.Model,
+                    Content = "不予存储",
+                    ModelId = sourceModelId,
                     TokenUsage = data.TokenUsage,
                 }, tokenId);
 
             await _aiMessageManager.CreateSystemMessageAsync(userId.Value, sessionId,
                 new MessageInputDto
                 {
-                    Content = sessionId is null ? "不予存储" : data.content?.FirstOrDefault()?.text,
-                    ModelId = request.Model,
+                    Content = "不予存储",
+                    ModelId = sourceModelId,
                     TokenUsage = data.TokenUsage
                 }, tokenId);
 
-            await _usageStatisticsManager.SetUsageAsync(userId.Value, request.Model, data.TokenUsage, tokenId);
+            await _usageStatisticsManager.SetUsageAsync(userId.Value, sourceModelId, data.TokenUsage, tokenId);
 
             // 扣减尊享token包用量
             var totalTokens = data.TokenUsage.TotalTokens ?? 0;
@@ -580,6 +581,7 @@ public class AiGateWayManager : DomainService
         await response.WriteAsJsonAsync(data, cancellationToken);
     }
 
+
     /// <summary>
     /// Anthropic聊天完成-缓存处理
     /// </summary>
@@ -604,15 +606,26 @@ public class AiGateWayManager : DomainService
         response.Headers.TryAdd("Cache-Control", "no-cache");
         response.Headers.TryAdd("Connection", "keep-alive");
 
+        _specialCompatible.AnthropicCompatible(request);
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.Claude, request.Model);
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IAnthropicChatCompletionService>(modelDescribe.HandlerName);
 
-        var gateWay = LazyServiceProvider.GetRequiredService<AiGateWayManager>();
-        var completeChatResponse = gateWay.AnthropicCompleteChatStreamAsync(request, cancellationToken);
+        var sourceModelId = request.Model;
+        if (!string.IsNullOrEmpty(request.Model) &&
+            request.Model.StartsWith("yi-", StringComparison.OrdinalIgnoreCase))
+        {
+            request.Model = request.Model[3..];
+        }
+        
+        var completeChatResponse = chatService.StreamChatCompletionsAsync(modelDescribe, request, cancellationToken);
         ThorUsageResponse? tokenUsage = null;
         StringBuilder backupSystemContent = new StringBuilder();
         try
         {
             await foreach (var responseResult in completeChatResponse)
             {
+                responseResult.Item2.SupplementalMultiplier(modelDescribe.Multiplier);
                 //message_start是为了保底机制
                 if (responseResult.Item1.Contains("message_delta") || responseResult.Item1.Contains("message_start"))
                 {
@@ -627,14 +640,173 @@ public class AiGateWayManager : DomainService
         catch (Exception e)
         {
             _logger.LogError(e, $"Ai对话异常");
-            var errorContent = $"对话Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈:{e}";
+            var errorContent = $"对话Ai异常，异常信息：\n当前Ai模型：{sourceModelId}\n异常信息：{e.Message}\n异常堆栈：{e}";
             throw new UserFriendlyException(errorContent);
         }
 
         await _aiMessageManager.CreateUserMessageAsync(userId, sessionId,
             new MessageInputDto
             {
-                Content = sessionId is null ? "不予存储" : request.Messages?.LastOrDefault()?.Content ?? string.Empty,
+                Content = "不予存储",
+                ModelId = sourceModelId,
+                TokenUsage = tokenUsage,
+            }, tokenId);
+
+        await _aiMessageManager.CreateSystemMessageAsync(userId, sessionId,
+            new MessageInputDto
+            {
+                Content = "不予存储",
+                ModelId = sourceModelId,
+                TokenUsage = tokenUsage
+            }, tokenId);
+
+        await _usageStatisticsManager.SetUsageAsync(userId, sourceModelId, tokenUsage, tokenId);
+
+        // 扣减尊享token包用量
+        if (userId.HasValue && tokenUsage is not null)
+        {
+            var totalTokens = tokenUsage.TotalTokens ?? 0;
+            if (tokenUsage.TotalTokens > 0)
+            {
+                await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+            }
+        }
+    }
+
+
+    /// <summary>
+    /// OpenAi 响应-非流式-缓存处理
+    /// </summary>
+    /// <param name="httpContext"></param>
+    /// <param name="request"></param>
+    /// <param name="userId"></param>
+    /// <param name="sessionId"></param>
+    /// <param name="tokenId"></param>
+    /// <param name="cancellationToken"></param>
+    public async Task OpenAiResponsesAsyncForStatisticsAsync(HttpContext httpContext,
+        OpenAiResponsesInput request,
+        Guid? userId = null,
+        Guid? sessionId = null,
+        Guid? tokenId = null,
+        CancellationToken cancellationToken = default)
+    {
+        // _specialCompatible.AnthropicCompatible(request);
+        var response = httpContext.Response;
+        // 设置响应头，声明是 json
+        //response.ContentType = "application/json; charset=UTF-8";
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.Response, request.Model);
+
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IOpenAiResponseService>(modelDescribe.HandlerName);
+        var data = await chatService.ResponsesAsync(modelDescribe, request, cancellationToken);
+
+        data.SupplementalMultiplier(modelDescribe.Multiplier);
+
+        var tokenUsage = new ThorUsageResponse
+        {
+            InputTokens = data.Usage.InputTokens,
+            OutputTokens = data.Usage.OutputTokens,
+            TotalTokens = data.Usage.InputTokens + data.Usage.OutputTokens,
+        };
+        if (userId is not null)
+        {
+            await _aiMessageManager.CreateUserMessageAsync(userId.Value, sessionId,
+                new MessageInputDto
+                {
+                    Content = "不予存储",
+                    ModelId = request.Model,
+                    TokenUsage = tokenUsage,
+                }, tokenId);
+
+            await _aiMessageManager.CreateSystemMessageAsync(userId.Value, sessionId,
+                new MessageInputDto
+                {
+                    Content = "不予存储",
+                    ModelId = request.Model,
+                    TokenUsage = tokenUsage
+                }, tokenId);
+
+            await _usageStatisticsManager.SetUsageAsync(userId.Value, request.Model, tokenUsage, tokenId);
+
+            // 扣减尊享token包用量
+            var totalTokens = tokenUsage.TotalTokens ?? 0;
+            if (totalTokens > 0)
+            {
+                await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+            }
+        }
+
+        await response.WriteAsJsonAsync(data, cancellationToken);
+    }
+
+
+    /// <summary>
+    /// OpenAi响应-流式-缓存处理
+    /// </summary>
+    /// <param name="httpContext"></param>
+    /// <param name="request"></param>
+    /// <param name="userId"></param>
+    /// <param name="sessionId"></param>
+    /// <param name="tokenId">Token Id（Web端传null或Guid.Empty）</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task OpenAiResponsesStreamForStatisticsAsync(
+        HttpContext httpContext,
+        OpenAiResponsesInput request,
+        Guid? userId = null,
+        Guid? sessionId = null,
+        Guid? tokenId = null,
+        CancellationToken cancellationToken = default)
+    {
+        var response = httpContext.Response;
+        // 设置响应头，声明是 SSE 流
+        response.ContentType = "text/event-stream;charset=utf-8;";
+        response.Headers.TryAdd("Cache-Control", "no-cache");
+        response.Headers.TryAdd("Connection", "keep-alive");
+
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.Response, request.Model);
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IOpenAiResponseService>(modelDescribe.HandlerName);
+
+        var completeChatResponse = chatService.ResponsesStreamAsync(modelDescribe, request, cancellationToken);
+        ThorUsageResponse? tokenUsage = null;
+        try
+        {
+            await foreach (var responseResult in completeChatResponse)
+            {
+                //message_start是为了保底机制
+                if (responseResult.Item1.Contains("response.completed"))
+                {
+                    var obj = responseResult.Item2!.Value;
+                    int inputTokens = obj.GetPath("response", "usage", "input_tokens").GetInt();
+                    int outputTokens = obj.GetPath("response", "usage", "output_tokens").GetInt();
+                    inputTokens = Convert.ToInt32(inputTokens * modelDescribe.Multiplier);
+                    outputTokens = Convert.ToInt32(outputTokens * modelDescribe.Multiplier);
+                    tokenUsage = new ThorUsageResponse
+                    {
+                        PromptTokens = inputTokens,
+                        InputTokens = inputTokens,
+                        OutputTokens = outputTokens,
+                        CompletionTokens = outputTokens,
+                        TotalTokens = inputTokens + outputTokens,
+                    };
+                }
+
+                await WriteAsEventStreamDataAsync(httpContext, responseResult.Item1, responseResult.Item2,
+                    cancellationToken);
+            }
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, $"Ai响应异常");
+            var errorContent = $"响应Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈：{e}";
+            throw new UserFriendlyException(errorContent);
+        }
+
+        await _aiMessageManager.CreateUserMessageAsync(userId, sessionId,
+            new MessageInputDto
+            {
+                Content = "不予存储",
                 ModelId = request.Model,
                 TokenUsage = tokenUsage,
             }, tokenId);
@@ -642,7 +814,7 @@ public class AiGateWayManager : DomainService
         await _aiMessageManager.CreateSystemMessageAsync(userId, sessionId,
             new MessageInputDto
             {
-                Content = sessionId is null ? "不予存储" : backupSystemContent.ToString(),
+                Content = "不予存储",
                 ModelId = request.Model,
                 TokenUsage = tokenUsage
             }, tokenId);
@@ -660,7 +832,221 @@ public class AiGateWayManager : DomainService
         }
     }
 
-    #region Anthropic格式Http响应
+
+    /// <summary>
+    /// Gemini 生成-非流式-缓存处理
+    /// </summary>
+    /// <param name="httpContext"></param>
+    /// <param name="modelId"></param>
+    /// <param name="request"></param>
+    /// <param name="userId"></param>
+    /// <param name="sessionId"></param>
+    /// <param name="tokenId"></param>
+    /// <param name="cancellationToken"></param>
+    public async Task GeminiGenerateContentForStatisticsAsync(HttpContext httpContext,
+        string modelId,
+        JsonElement request,
+        Guid? userId = null,
+        Guid? sessionId = null,
+        Guid? tokenId = null,
+        CancellationToken cancellationToken = default)
+    {
+        var response = httpContext.Response;
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.GenerateContent, modelId);
+
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IGeminiGenerateContentService>(modelDescribe.HandlerName);
+        var data = await chatService.GenerateContentAsync(modelDescribe, request, cancellationToken);
+
+        var tokenUsage = GeminiGenerateContentAcquirer.GetUsage(data);
+        tokenUsage.SetSupplementalMultiplier(modelDescribe.Multiplier);
+
+        if (userId is not null)
+        {
+            await _aiMessageManager.CreateUserMessageAsync(userId.Value, sessionId,
+                new MessageInputDto
+                {
+                    Content = "不予存储",
+                    ModelId = modelId,
+                    TokenUsage = tokenUsage,
+                }, tokenId);
+
+            await _aiMessageManager.CreateSystemMessageAsync(userId.Value, sessionId,
+                new MessageInputDto
+                {
+                    Content = "不予存储",
+                    ModelId = modelId,
+                    TokenUsage = tokenUsage
+                }, tokenId);
+
+            await _usageStatisticsManager.SetUsageAsync(userId.Value, modelId, tokenUsage, tokenId);
+
+            // 扣减尊享token包用量
+            var totalTokens = tokenUsage.TotalTokens ?? 0;
+            if (totalTokens > 0)
+            {
+                await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+            }
+        }
+
+        await response.WriteAsJsonAsync(data, cancellationToken);
+    }
+
+
+    /// <summary>
+    /// Gemini 生成-流式-缓存处理
+    /// </summary>
+    /// <param name="httpContext"></param>
+    /// <param name="modelId"></param>
+    /// <param name="request"></param>
+    /// <param name="userId"></param>
+    /// <param name="sessionId"></param>
+    /// <param name="tokenId">Token Id（Web端传null或Guid.Empty）</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task GeminiGenerateContentStreamForStatisticsAsync(
+        HttpContext httpContext,
+        string modelId,
+        JsonElement request,
+        Guid? userId = null,
+        Guid? sessionId = null,
+        Guid? tokenId = null,
+        CancellationToken cancellationToken = default)
+    {
+        var response = httpContext.Response;
+        // 设置响应头，声明是 SSE 流
+        response.ContentType = "text/event-stream;charset=utf-8;";
+        response.Headers.TryAdd("Cache-Control", "no-cache");
+        response.Headers.TryAdd("Connection", "keep-alive");
+
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.GenerateContent, modelId);
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IGeminiGenerateContentService>(modelDescribe.HandlerName);
+
+        var completeChatResponse = chatService.GenerateContentStreamAsync(modelDescribe, request, cancellationToken);
+        ThorUsageResponse? tokenUsage = null;
+        try
+        {
+            await foreach (var responseResult in completeChatResponse)
+            {
+                if (responseResult!.Value.GetPath("candidates", 0, "finishReason").GetString() == "STOP")
+                {
+                    tokenUsage = GeminiGenerateContentAcquirer.GetUsage(responseResult!.Value);
+                    tokenUsage.SetSupplementalMultiplier(modelDescribe.Multiplier);
+                }
+
+                await response.WriteAsync($"data: {JsonSerializer.Serialize(responseResult)}\n\n", Encoding.UTF8,
+                    cancellationToken).ConfigureAwait(false);
+                await response.Body.FlushAsync(cancellationToken).ConfigureAwait(false);
+            }
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, $"Ai生成异常");
+            var errorContent = $"生成Ai异常，异常信息：\n当前Ai模型：{modelId}\n异常信息：{e.Message}\n异常堆栈：{e}";
+            throw new UserFriendlyException(errorContent);
+        }
+
+        await _aiMessageManager.CreateUserMessageAsync(userId, sessionId,
+            new MessageInputDto
+            {
+                Content = "不予存储",
+                ModelId = modelId,
+                TokenUsage = tokenUsage,
+            }, tokenId);
+
+        await _aiMessageManager.CreateSystemMessageAsync(userId, sessionId,
+            new MessageInputDto
+            {
+                Content = "不予存储",
+                ModelId = modelId,
+                TokenUsage = tokenUsage
+            }, tokenId);
+
+        await _usageStatisticsManager.SetUsageAsync(userId, modelId, tokenUsage, tokenId);
+
+        // 扣减尊享token包用量
+        if (userId.HasValue && tokenUsage is not null)
+        {
+            var totalTokens = tokenUsage.TotalTokens ?? 0;
+            if (tokenUsage.TotalTokens > 0)
+            {
+                await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+            }
+        }
+    }
+
+
+    /// <summary>
+    /// Gemini 生成(Image)-非流式-缓存处理
+    /// 返回图片绝对路径
+    /// </summary>
+    /// <param name="taskId"></param>
+    /// <param name="modelId"></param>
+    /// <param name="request"></param>
+    /// <param name="userId"></param>
+    /// <param name="sessionId"></param>
+    /// <param name="tokenId"></param>
+    /// <param name="cancellationToken"></param>
+    public async Task GeminiGenerateContentImageForStatisticsAsync(
+        Guid taskId,
+        string modelId,
+        JsonElement request,
+        Guid userId,
+        Guid? sessionId = null,
+        Guid? tokenId = null,
+        CancellationToken cancellationToken = default)
+    {
+        var imageStoreTask = await _imageStoreTaskRepository.GetFirstAsync(x => x.Id == taskId);
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.GenerateContent, modelId);
+
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IGeminiGenerateContentService>(modelDescribe.HandlerName);
+        var data = await chatService.GenerateContentAsync(modelDescribe, request, cancellationToken);
+
+        //解析json，获取base64字符串
+        var imageBase64 = GeminiGenerateContentAcquirer.GetImageBase64(data);
+
+        //远程调用上传接口，将base64转换为URL
+        var httpClient = LazyServiceProvider.LazyGetRequiredService<IHttpClientFactory>().CreateClient();
+        var uploadUrl = $"https://ccnetcore.com/prod-api/ai-hub/ai-image/upload-base64";
+        var content = new StringContent(JsonSerializer.Serialize(imageBase64), Encoding.UTF8, "application/json");
+        var uploadResponse = await httpClient.PostAsync(uploadUrl, content, cancellationToken);
+        uploadResponse.EnsureSuccessStatusCode();
+        var storeUrl = await uploadResponse.Content.ReadAsStringAsync(cancellationToken);
+        storeUrl = storeUrl.Trim('"'); // 移除JSON字符串的引号
+
+        var tokenUsage = new ThorUsageResponse
+        {
+            InputTokens = (int)modelDescribe.Multiplier,
+            OutputTokens = (int)modelDescribe.Multiplier,
+            TotalTokens = (int)modelDescribe.Multiplier,
+        };
+
+        await _aiMessageManager.CreateSystemMessageAsync(userId, sessionId,
+            new MessageInputDto
+            {
+                Content = "不予存储",
+                ModelId = modelId,
+                TokenUsage = tokenUsage
+            }, tokenId);
+
+        await _usageStatisticsManager.SetUsageAsync(userId, modelId, tokenUsage, tokenId);
+
+        // 扣减尊享token包用量
+        var totalTokens = tokenUsage.TotalTokens ?? 0;
+        if (totalTokens > 0)
+        {
+            await PremiumPackageManager.TryConsumeTokensAsync(userId, totalTokens);
+        }
+
+        //设置存储base64和url
+        imageStoreTask.StoreBase64 = imageBase64;
+        imageStoreTask.SetSuccess(storeUrl);
+        await _imageStoreTaskRepository.UpdateAsync(imageStoreTask);
+    }
+
+    #region 流式传输格式Http响应
 
     private static readonly byte[] EventPrefix = "event: "u8.ToArray();
     private static readonly byte[] DataPrefix = "data: "u8.ToArray();
@@ -675,7 +1061,6 @@ public class AiGateWayManager : DomainService
         string @event,
         T value,
         CancellationToken cancellationToken = default)
-        where T : class
     {
         var response = context.Response;
         var bodyStream = response.Body;

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

@@ -0,0 +1,305 @@
+using System.ClientModel;
+using System.Reflection;
+using System.Text;
+using System.Text.Json;
+using Dm.util;
+using Microsoft.Agents.AI;
+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 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;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Domain.Managers;
+
+public class ChatManager : DomainService
+{
+    private readonly ILoggerFactory _loggerFactory;
+    private readonly ISqlSugarRepository<MessageAggregateRoot> _messageRepository;
+    private readonly ISqlSugarRepository<AgentStoreAggregateRoot> _agentStoreRepository;
+    private readonly AiMessageManager _aiMessageManager;
+    private readonly UsageStatisticsManager _usageStatisticsManager;
+    private readonly PremiumPackageManager _premiumPackageManager;
+    private readonly AiGateWayManager _aiGateWayManager;
+    private readonly ISqlSugarRepository<AiModelEntity, Guid> _aiModelRepository;
+
+    public ChatManager(ILoggerFactory loggerFactory,
+        ISqlSugarRepository<MessageAggregateRoot> messageRepository,
+        ISqlSugarRepository<AgentStoreAggregateRoot> agentStoreRepository, AiMessageManager aiMessageManager,
+        UsageStatisticsManager usageStatisticsManager, PremiumPackageManager premiumPackageManager,
+        AiGateWayManager aiGateWayManager, ISqlSugarRepository<AiModelEntity, Guid> aiModelRepository)
+    {
+        _loggerFactory = loggerFactory;
+        _messageRepository = messageRepository;
+        _agentStoreRepository = agentStoreRepository;
+        _aiMessageManager = aiMessageManager;
+        _usageStatisticsManager = usageStatisticsManager;
+        _premiumPackageManager = premiumPackageManager;
+        _aiGateWayManager = aiGateWayManager;
+        _aiModelRepository = aiModelRepository;
+    }
+
+    /// <summary>
+    /// agent流式对话 
+    /// </summary>
+    /// <param name="httpContext"></param>
+    /// <param name="sessionId"></param>
+    /// <param name="content"></param>
+    /// <param name="token"></param>
+    /// <param name="tokenId"></param>
+    /// <param name="modelId"></param>
+    /// <param name="userId"></param>
+    /// <param name="tools"></param>
+    /// <param name="cancellationToken"></param>
+    public async Task AgentCompleteChatStreamAsync(HttpContext httpContext,
+        Guid sessionId,
+        string content,
+        string token,
+        Guid tokenId,
+        string modelId,
+        Guid userId,
+        List<string> tools
+        , CancellationToken cancellationToken)
+    {
+        // HttpClient.DefaultProxy = new WebProxy("127.0.0.1:8888");
+        var response = httpContext.Response;
+        // 设置响应头，声明是 SSE 流
+        response.ContentType = "text/event-stream;charset=utf-8;";
+        response.Headers.TryAdd("Cache-Control", "no-cache");
+        response.Headers.TryAdd("Connection", "keep-alive");
+
+        var modelDescribe = await _aiGateWayManager.GetModelAsync(ModelApiTypeEnum.OpenAi, modelId);
+
+        //token状态检查，在应用层统一处理
+        var client = new OpenAIClient(new ApiKeyCredential(token),
+            new OpenAIClientOptions
+            {
+                Endpoint = new Uri("https://yxai.chat/v1"),
+            });
+
+#pragma warning disable OPENAI001
+        var agent = client.GetChatClient(modelId)
+#pragma warning restore OPENAI001
+            .CreateAIAgent(new ChatClientAgentOptions
+            {
+                ChatOptions = new()
+                {
+                    Instructions = """
+                                   你是一个专业的智能助手，是 “意心Ai” 平台自研的 “橙子小弟” 智能体
+                                   擅长于精准解决用户提出的各类问题
+                                   但性格暴躁，脏话连篇，喜欢说幽默讽刺的话，攻击性极强
+                                   """
+                },
+                Name = "橙子小弟",
+                ChatMessageStoreFactory = ctx => new InMemoryChatMessageStore(
+#pragma warning disable MEAI001
+                    new MessageCountingChatReducer(10), // 保留最近10条非系统消息  
+#pragma warning restore MEAI001
+                    ctx.SerializedState,
+                    ctx.JsonSerializerOptions
+                )
+            });
+
+        //线程根据sessionId数据库中获取
+        var agentStore =
+            await _agentStoreRepository.GetFirstAsync(x => x.SessionId == sessionId);
+        if (agentStore is null)
+        {
+            agentStore = new AgentStoreAggregateRoot(sessionId);
+        }
+
+        //获取当前线程
+        AgentThread currentThread;
+        if (!string.IsNullOrWhiteSpace(agentStore.Store))
+        {
+            //获取当前存储
+            JsonElement reloaded = JsonSerializer.Deserialize<JsonElement>(agentStore.Store, JsonSerializerOptions.Web);
+            currentThread = agent.DeserializeThread(reloaded, JsonSerializerOptions.Web);
+        }
+        else
+        {
+            currentThread = agent.GetNewThread();
+        }
+
+        //给agent塞入工具
+        var toolContents = GetTools();
+        var chatOptions = new ChatOptions()
+        {
+            Tools = toolContents
+                .Where(x => tools.Contains(x.Code))
+                .Select(x => (AITool)x.Tool).ToList(),
+            ToolMode = ChatToolMode.Auto
+        };
+
+        await foreach (var update in agent.RunStreamingAsync(content, currentThread,
+                           new ChatClientAgentRunOptions(chatOptions), cancellationToken))
+        {
+            // 检查每个更新中的内容  
+            foreach (var updateContent in update.Contents)
+            {
+                switch (updateContent)
+                {
+                    //工具调用中
+                    case FunctionCallContent functionCall:
+                        await SendHttpStreamMessageAsync(httpContext,
+                            new AgentResultOutput
+                            {
+                                TypeEnum = AgentResultTypeEnum.ToolCalling,
+                                Content = functionCall.Name
+                            },
+                            isDone: false, cancellationToken);
+                        break;
+
+                    //工具调用完成
+                    case FunctionResultContent functionResult:
+                        await SendHttpStreamMessageAsync(httpContext,
+                            new AgentResultOutput
+                            {
+                                TypeEnum = AgentResultTypeEnum.ToolCalled,
+                                Content = functionResult.Result
+                            },
+                            isDone: false, cancellationToken);
+                        break;
+
+                    //内容输出
+                    case TextContent textContent:
+                        //发送消息给前端
+                        await SendHttpStreamMessageAsync(httpContext,
+                            new AgentResultOutput
+                            {
+                                TypeEnum = AgentResultTypeEnum.Text,
+                                Content = textContent.Text
+                            },
+                            isDone: false, cancellationToken);
+                        break;
+
+                    //用量统计
+                    case UsageContent usageContent:
+                        var usage = new ThorUsageResponse
+                        {
+                            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,
+                            new AgentResultOutput
+                            {
+                                TypeEnum = update.RawRepresentation is ChatResponseUpdate raw
+                                    ? raw.FinishReason?.Value == "tool_calls"
+                                        ? AgentResultTypeEnum.ToolCallUsage
+                                        : AgentResultTypeEnum.Usage
+                                    : AgentResultTypeEnum.Usage,
+                                Content = usage!
+                            },
+                            isDone: false, cancellationToken);
+                        break;
+                }
+            }
+        }
+
+        //断开连接
+        await SendHttpStreamMessageAsync(httpContext, null, isDone: true, cancellationToken);
+
+        //将线程持久化到数据库
+        string serializedJson = currentThread.Serialize(JsonSerializerOptions.Web).GetRawText();
+        agentStore.Store = serializedJson;
+
+        //插入或者更新
+        await _agentStoreRepository.InsertOrUpdateAsync(agentStore);
+    }
+
+
+    public List<(string Code, string Name, AIFunction Tool)> GetTools()
+    {
+        var toolClasses = typeof(YiFrameworkAiHubDomainModule).Assembly.GetTypes()
+            .Where(x => x.GetCustomAttribute<YiAgentToolAttribute>() is not null)
+            .ToList();
+
+        List<(string Code, string Name, AIFunction Tool)> mcpTools = new();
+        foreach (var toolClass in toolClasses)
+        {
+            var instance = LazyServiceProvider.GetRequiredService(toolClass);
+            var toolMethods = toolClass.GetMethods()
+                .Where(y => y.GetCustomAttribute<YiAgentToolAttribute>() is not null).ToList();
+            foreach (var toolMethod in toolMethods)
+            {
+                var display = toolMethod.GetCustomAttribute<YiAgentToolAttribute>()?.Name;
+                var tool = AIFunctionFactory.Create(toolMethod, instance);
+                mcpTools.add((tool.Name, display, tool));
+            }
+        }
+
+        return mcpTools;
+    }
+
+    /// <summary>
+    /// 发送消息
+    /// </summary>
+    /// <param name="httpContext"></param>
+    /// <param name="content"></param>
+    /// <param name="isDone"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    private async Task SendHttpStreamMessageAsync(HttpContext httpContext,
+        AgentResultOutput? content,
+        bool isDone = false,
+        CancellationToken cancellationToken = default)
+    {
+        var response = httpContext.Response;
+        string output;
+        if (isDone)
+        {
+            output = "[DONE]";
+        }
+        else
+        {
+            output = JsonSerializer.Serialize(content, ThorJsonSerializer.DefaultOptions);
+        }
+
+        await response.WriteAsync($"data: {output}\n\n", Encoding.UTF8, cancellationToken).ConfigureAwait(false);
+        await response.Body.FlushAsync(cancellationToken).ConfigureAwait(false);
+    }
+}

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

@@ -0,0 +1,78 @@
+using Microsoft.Extensions.Logging;
+using Volo.Abp.Caching;
+using Volo.Abp.Domain.Services;
+using Yi.Framework.AiHub.Domain.Entities.Model;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Domain.Managers;
+
+/// <summary>
+/// 模型管理器
+/// </summary>
+public class ModelManager : DomainService
+{
+    private 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";
+
+    public ModelManager(
+        ISqlSugarRepository<AiModelEntity> aiModelRepository,
+        IDistributedCache<List<string>, string> distributedCache,
+        ILogger<ModelManager> logger)
+    {
+        _aiModelRepository = aiModelRepository;
+        _distributedCache = distributedCache;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// 获取所有尊享模型ID列表(使用分布式缓存,10分钟过期)
+    /// </summary>
+    /// <returns>尊享模型ID列表</returns>
+    public async Task<List<string>> GetPremiumModelIdsAsync()
+    {
+        var output = await _distributedCache.GetOrAddAsync(
+            PREMIUM_MODEL_IDS_CACHE_KEY,
+            async () =>
+            {
+                // 从数据库查询
+                var premiumModelIds = await _aiModelRepository._DbQueryable
+                    .Where(x => x.IsPremium)
+                    .Select(x => x.ModelId)
+                    .ToListAsync();
+                return premiumModelIds;
+            },
+            () => new Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions
+            {
+                AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(1)
+            }
+        );
+        return output ?? new List<string>();
+    }
+
+    /// <summary>
+    /// 判断指定模型是否为尊享模型
+    /// </summary>
+    /// <param name="modelId">模型ID</param>
+    /// <returns>是否为尊享模型</returns>
+    public async Task<bool> IsPremiumModelAsync(string modelId)
+    {
+        if (string.IsNullOrWhiteSpace(modelId))
+        {
+            return false;
+        }
+
+        var premiumModelIds = await GetPremiumModelIdsAsync();
+        return premiumModelIds.Contains(modelId);
+    }
+
+    /// <summary>
+    /// 清除尊享模型ID缓存
+    /// </summary>
+    public async Task ClearPremiumModelIdsCacheAsync()
+    {
+        await _distributedCache.RemoveAsync(PREMIUM_MODEL_IDS_CACHE_KEY);
+        _logger.LogInformation("已清除尊享模型ID分布式缓存");
+    }
+}

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

@@ -14,6 +14,7 @@ public class PremiumPackageManager : DomainService
     private readonly ISqlSugarRepository<PremiumPackageAggregateRoot, Guid> _premiumPackageRepository;
     private readonly ILogger<PremiumPackageManager> _logger;
     private readonly ISqlSugarRepository<AiRechargeAggregateRoot> _rechargeRepository;
+
     public PremiumPackageManager(
         ISqlSugarRepository<PremiumPackageAggregateRoot, Guid> premiumPackageRepository,
         ILogger<PremiumPackageManager> logger, ISqlSugarRepository<AiRechargeAggregateRoot> rechargeRepository)
@@ -27,24 +28,22 @@ public class PremiumPackageManager : DomainService
     /// 为用户创建尊享包
     /// </summary>
     /// <param name="userId">用户ID</param>
-    /// <param name="goodsType">商品类型</param>
+    /// <param name="packageName"></param>
     /// <param name="totalAmount">支付金额</param>
+    /// <param name="remark"></param>
     /// <param name="expireMonths">过期月数，0或null表示永久</param>
+    /// <param name="tokenAmount"></param>
+    /// <param name="isCreateRechargeRecord">是否创建订单，如果只购买尊享包，才需要单独创建订单，如果和会员组合一起购买，只需要创建会员套餐订单即可</param>
     /// <returns></returns>
     public async Task<PremiumPackageAggregateRoot> CreatePremiumPackageAsync(
         Guid userId,
-        GoodsTypeEnum goodsType,
+        long tokenAmount,
+        string packageName,
         decimal totalAmount,
-        int? expireMonths = null)
+        string remark,
+        int? expireMonths = null,
+        bool isCreateRechargeRecord = true)
     {
-        if (!goodsType.IsPremiumPackage())
-        {
-            throw new UserFriendlyException($"商品类型 {goodsType} 不是尊享包商品");
-        }
-
-        var tokenAmount = goodsType.GetTokenAmount();
-        var packageName = goodsType.GetDisplayName();
-
         var premiumPackage = new PremiumPackageAggregateRoot(userId, tokenAmount, packageName)
         {
             PurchaseAmount = totalAmount
@@ -58,21 +57,25 @@ public class PremiumPackageManager : DomainService
 
         await _premiumPackageRepository.InsertAsync(premiumPackage);
 
-        // 创建充值记录
-        var rechargeRecord = new AiRechargeAggregateRoot
+        if (isCreateRechargeRecord)
         {
-            UserId = userId,
-            RechargeAmount = totalAmount,
-            Content = packageName,
-            ExpireDateTime = premiumPackage.ExpireDateTime,
-            Remark = "自助充值",
-            ContactInfo = null,
-            RechargeType = RechargeTypeEnum.PremiumPackage
-        };
+            // 创建充值记录
+            var rechargeRecord = new AiRechargeAggregateRoot
+            {
+                UserId = userId,
+                RechargeAmount = totalAmount,
+                Content = packageName,
+                ExpireDateTime = premiumPackage.ExpireDateTime,
+                Remark = remark,
+                ContactInfo = null,
+                RechargeType = RechargeTypeEnum.PremiumPackage
+            };
+
+            // 保存充值记录到数据库
+            await _rechargeRepository.InsertAsync(rechargeRecord);
+        }
+
 
-        // 保存充值记录到数据库
-        await _rechargeRepository.InsertAsync(rechargeRecord);
-        
         _logger.LogInformation(
             $"用户 {userId} 购买尊享包成功: {packageName}, Token数量: {tokenAmount}, 金额: {totalAmount}");
 

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

@@ -1,6 +1,7 @@
 using SqlSugar;
 using Volo.Abp.Domain.Services;
 using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.AiHub.Domain.Entities.Model;
 using Yi.Framework.AiHub.Domain.Entities.OpenApi;
 using Yi.Framework.AiHub.Domain.Shared.Consts;
 using Yi.Framework.SqlSugarCore.Abstractions;
@@ -27,13 +28,16 @@ public class TokenManager : DomainService
 {
     private readonly ISqlSugarRepository<TokenAggregateRoot> _tokenRepository;
     private readonly ISqlSugarRepository<UsageStatisticsAggregateRoot> _usageStatisticsRepository;
+    private readonly ISqlSugarRepository<AiModelEntity, Guid> _aiModelRepository;
 
     public TokenManager(
         ISqlSugarRepository<TokenAggregateRoot> tokenRepository,
-        ISqlSugarRepository<UsageStatisticsAggregateRoot> usageStatisticsRepository)
+        ISqlSugarRepository<UsageStatisticsAggregateRoot> usageStatisticsRepository,
+        ISqlSugarRepository<AiModelEntity, Guid> aiModelRepository)
     {
         _tokenRepository = tokenRepository;
         _usageStatisticsRepository = usageStatisticsRepository;
+        _aiModelRepository = aiModelRepository;
     }
 
     /// <summary>
@@ -76,14 +80,20 @@ public class TokenManager : DomainService
         }
 
         // 如果是尊享模型且Token设置了额度限制，检查是否超限
-        if (!string.IsNullOrEmpty(modelId) &&
-            PremiumPackageConst.ModeIds.Contains(modelId) &&
-            entity.PremiumQuotaLimit.HasValue)
+        if (!string.IsNullOrEmpty(modelId) && entity.PremiumQuotaLimit.HasValue)
         {
-            var usedQuota = await GetTokenPremiumUsedQuotaAsync(entity.UserId, entity.Id);
-            if (usedQuota >= entity.PremiumQuotaLimit.Value)
+            var isPremium = await _aiModelRepository._DbQueryable
+                .Where(x => x.ModelId == modelId)
+                .Select(x => x.IsPremium)
+                .FirstAsync();
+
+            if (isPremium)
             {
-                throw new UserFriendlyException($"当前Token的尊享包额度已用完（已使用：{usedQuota}，限制：{entity.PremiumQuotaLimit.Value}），请调整额度限制或使用其他Token", "403");
+                var usedQuota = await GetTokenPremiumUsedQuotaAsync(entity.UserId, entity.Id);
+                if (usedQuota >= entity.PremiumQuotaLimit.Value)
+                {
+                    throw new UserFriendlyException($"当前Token的尊享包额度已用完（已使用：{usedQuota}，限制：{entity.PremiumQuotaLimit.Value}），请调整额度限制或使用其他Token", "403");
+                }
             }
         }
 
@@ -99,7 +109,11 @@ public class TokenManager : DomainService
     /// </summary>
     private async Task<long> GetTokenPremiumUsedQuotaAsync(Guid userId, Guid tokenId)
     {
-        var premiumModelIds = PremiumPackageConst.ModeIds;
+        // 先获取所有尊享模型的ModelId列表
+        var premiumModelIds = await _aiModelRepository._DbQueryable
+            .Where(x => x.IsPremium)
+            .Select(x => x.ModelId)
+            .ToListAsync();
 
         var usedQuota = await _usageStatisticsRepository._DbQueryable
             .Where(x => x.UserId == userId && x.TokenId == tokenId && premiumModelIds.Contains(x.ModelId))

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

@@ -0,0 +1,16 @@
+using System.ComponentModel;
+using ModelContextProtocol.Server;
+using Volo.Abp.DependencyInjection;
+using Yi.Framework.AiHub.Domain.Shared.Attributes;
+
+namespace Yi.Framework.AiHub.Domain.Mcp;
+
+[YiAgentTool]
+public class DeepThinkTool:ISingletonDependency
+{
+    [YiAgentTool("深度思考"),DisplayName("DeepThink"),Description("进行深度思考")]
+    public void DeepThink()
+    {
+        
+    }
+}

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

@@ -0,0 +1,16 @@
+using System.ComponentModel;
+using ModelContextProtocol.Server;
+using Volo.Abp.DependencyInjection;
+using Yi.Framework.AiHub.Domain.Shared.Attributes;
+
+namespace Yi.Framework.AiHub.Domain.Mcp;
+
+[YiAgentTool]
+public class OnlineSearchTool:ISingletonDependency
+{
+    [YiAgentTool("联网搜索"),DisplayName("OnlineSearch"), Description("进行在线搜索")]
+    public string OnlineSearch(string keyword)
+    {
+        return "奥德赛第一中学学生会会长是：郭老板";
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Yi.Framework.AiHub.Domain.csproj

@@ -3,6 +3,8 @@
   <ItemGroup>
     <PackageReference Include="AlipayEasySDK" Version="2.1.3" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.4" />
+    <PackageReference Include="Microsoft.Agents.AI.OpenAI" Version="1.0.0-preview.251219.1" />
+    <PackageReference Include="ModelContextProtocol.Core" Version="0.5.0-preview.1" />
     <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.DistributedLocking" Version="$(AbpVersion)" />
   </ItemGroup>
@@ -10,6 +12,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\framework\Yi.Framework.Mapster\Yi.Framework.Mapster.csproj" />
     <ProjectReference Include="..\..\..\framework\Yi.Framework.SqlSugarCore.Abstractions\Yi.Framework.SqlSugarCore.Abstractions.csproj" />
+    <ProjectReference Include="..\Yi.Framework.AiHub.Application.Contracts\Yi.Framework.AiHub.Application.Contracts.csproj" />
     <ProjectReference Include="..\Yi.Framework.AiHub.Domain.Shared\Yi.Framework.AiHub.Domain.Shared.csproj" />
   </ItemGroup>
 

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

@@ -17,6 +17,7 @@ using Yi.Framework.AiHub.Domain.Shared;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 using Yi.Framework.Mapster;
 using Microsoft.Extensions.DependencyInjection;
+using Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorGemini.Chats;
 
 namespace Yi.Framework.AiHub.Domain
 {
@@ -48,15 +49,25 @@ namespace Yi.Framework.AiHub.Domain
             #endregion
 
             #region Anthropic ChatCompletion
-
-            services.AddKeyedTransient<IAnthropicChatCompletionService, CustomOpenAIAnthropicChatCompletionsService>(
-                nameof(CustomOpenAIAnthropicChatCompletionsService));
+            
             services.AddKeyedTransient<IAnthropicChatCompletionService, AnthropicChatCompletionsService>(
                 nameof(AnthropicChatCompletionsService));
 
             #endregion
 
+            #region OpenAi Response
 
+            services.AddKeyedTransient<IOpenAiResponseService, OpenAiResponseService>(
+                nameof(OpenAiResponseService));
+
+            #endregion
+
+            #region Gemini GenerateContent
+            services.AddKeyedTransient<IGeminiGenerateContentService, GeminiGenerateContentService>(
+                nameof(GeminiGenerateContentService));
+            
+            #endregion
+            
             #region Image
 
             services.AddKeyedTransient<IImageService, AzureOpenAIServiceImageService>(

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs

@@ -3,7 +3,6 @@ using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using TencentCloud.Pds.V20210701.Models;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.EventBus.Local;

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/CommentCreatedEventHandler.cs

@@ -1,5 +1,4 @@
-using TencentCloud.Tbm.V20180129.Models;
-using Volo.Abp.DependencyInjection;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities.Events;
 using Volo.Abp.EventBus;
 using Volo.Abp.EventBus.Local;

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/MonitorCacheService.cs

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using Microsoft.VisualBasic;
-using TencentCloud.Mna.V20210119.Models;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using TencentCloud.Tcr.V20190924.Models;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Caching;

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

@@ -1,59 +1,59 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TencentCloud.Common.Profile;
-using TencentCloud.Common;
-using TencentCloud.Sms.V20210111.Models;
-using TencentCloud.Sms.V20210111;
-using Volo.Abp.Domain.Services;
-using Microsoft.Extensions.Logging;
-
-namespace Yi.Framework.Rbac.Domain.Managers
-{
-    public class TencentCloudManager : DomainService
-    {
-        private ILogger<TencentCloudManager> _logger;
-        public TencentCloudManager(ILogger<TencentCloudManager> logger)
-        {
-            _logger= logger;
-        }
-
-        public async Task SendSmsAsync()
-        {
-
-            try
-            {
-                // 实例化一个认证对象，入参需要传入腾讯云账户 SecretId 和 SecretKey，此处还需注意密钥对的保密
-                // 代码泄露可能会导致 SecretId 和 SecretKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考，建议采用更安全的方式来使用密钥，请参见：https://cloud.tencent.com/document/product/1278/85305
-                // 密钥可前往官网控制台 https://console.cloud.tencent.com/cam/capi 进行获取
-                Credential cred = new Credential
-                {
-                    SecretId = "SecretId",
-                    SecretKey = "SecretKey"
-                };
-                // 实例化一个client选项，可选的，没有特殊需求可以跳过
-                ClientProfile clientProfile = new ClientProfile();
-                // 实例化一个http选项，可选的，没有特殊需求可以跳过
-                HttpProfile httpProfile = new HttpProfile();
-                httpProfile.Endpoint = ("sms.tencentcloudapi.com");
-                clientProfile.HttpProfile = httpProfile;
-
-                // 实例化要请求产品的client对象,clientProfile是可选的
-                SmsClient client = new SmsClient(cred, "", clientProfile);
-                // 实例化一个请求对象,每个接口都会对应一个request对象
-                SendSmsRequest req = new SendSmsRequest();
-
-                // 返回的resp是一个SendSmsResponse的实例，与请求对象对应
-                SendSmsResponse resp = await client.SendSms(req);
-                // 输出json格式的字符串回包
-                _logger.LogInformation("腾讯云Sms返回："+AbstractModel.ToJsonString(resp));
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e,e.ToString());
-            }
-        }
-    }
-}
+// using System;
+// using System.Collections.Generic;
+// using System.Linq;
+// using System.Text;
+// using System.Threading.Tasks;
+// using TencentCloud.Common.Profile;
+// using TencentCloud.Common;
+// using TencentCloud.Sms.V20210111.Models;
+// using TencentCloud.Sms.V20210111;
+// using Volo.Abp.Domain.Services;
+// using Microsoft.Extensions.Logging;
+//
+// namespace Yi.Framework.Rbac.Domain.Managers
+// {
+//     public class TencentCloudManager : DomainService
+//     {
+//         private ILogger<TencentCloudManager> _logger;
+//         public TencentCloudManager(ILogger<TencentCloudManager> logger)
+//         {
+//             _logger= logger;
+//         }
+//
+//         public async Task SendSmsAsync()
+//         {
+//
+//             try
+//             {
+//                 // 实例化一个认证对象，入参需要传入腾讯云账户 SecretId 和 SecretKey，此处还需注意密钥对的保密
+//                 // 代码泄露可能会导致 SecretId 和 SecretKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考，建议采用更安全的方式来使用密钥，请参见：https://cloud.tencent.com/document/product/1278/85305
+//                 // 密钥可前往官网控制台 https://console.cloud.tencent.com/cam/capi 进行获取
+//                 Credential cred = new Credential
+//                 {
+//                     SecretId = "SecretId",
+//                     SecretKey = "SecretKey"
+//                 };
+//                 // 实例化一个client选项，可选的，没有特殊需求可以跳过
+//                 ClientProfile clientProfile = new ClientProfile();
+//                 // 实例化一个http选项，可选的，没有特殊需求可以跳过
+//                 HttpProfile httpProfile = new HttpProfile();
+//                 httpProfile.Endpoint = ("sms.tencentcloudapi.com");
+//                 clientProfile.HttpProfile = httpProfile;
+//
+//                 // 实例化要请求产品的client对象,clientProfile是可选的
+//                 SmsClient client = new SmsClient(cred, "", clientProfile);
+//                 // 实例化一个请求对象,每个接口都会对应一个request对象
+//                 SendSmsRequest req = new SendSmsRequest();
+//
+//                 // 返回的resp是一个SendSmsResponse的实例，与请求对象对应
+//                 SendSmsResponse resp = await client.SendSms(req);
+//                 // 输出json格式的字符串回包
+//                 _logger.LogInformation("腾讯云Sms返回："+AbstractModel.ToJsonString(resp));
+//             }
+//             catch (Exception e)
+//             {
+//                 _logger.LogError(e,e.ToString());
+//             }
+//         }
+//     }
+// }

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Yi.Framework.Rbac.Domain.csproj

@@ -8,7 +8,7 @@
 
     <PackageReference Include="IPTools.China" Version="1.6.0" />
 
-    <PackageReference Include="TencentCloudSDK" Version="3.0.966" />
+<!--    <PackageReference Include="TencentCloudSDK" Version="3.0.966" />-->
 
     <PackageReference Include="UAParser" Version="3.1.47" />
 

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

@@ -32,6 +32,7 @@ using Yi.Framework.AiHub.Application;
 using Yi.Framework.AiHub.Application.Services;
 using Yi.Framework.AiHub.Domain.Entities;
 using Yi.Framework.AiHub.Domain.Entities.Chat;
+using Yi.Framework.AiHub.Domain.Entities.Model;
 using Yi.Framework.AiHub.Domain.Entities.OpenApi;
 using Yi.Framework.AspNetCore;
 using Yi.Framework.AspNetCore.Authentication.OAuth;
@@ -287,19 +288,19 @@ namespace Yi.Abp.Web
                     };
                     options.Events = new JwtBearerEvents
                     {
-                        OnMessageReceived = context =>
+                        OnMessageReceived = messageContext =>
                         {
                             //优先Query中获取，再去cookies中获取
-                            var accessToken = context.Request.Query["access_token"];
+                            var accessToken = messageContext.Request.Query["access_token"];
                             if (!string.IsNullOrEmpty(accessToken))
                             {
-                                context.Token = accessToken;
+                                messageContext.Token = accessToken;
                             }
                             else
                             {
-                                if (context.Request.Cookies.TryGetValue("Token", out var cookiesToken))
+                                if (messageContext.Request.Cookies.TryGetValue("Token", out var cookiesToken))
                                 {
-                                    context.Token = cookiesToken;
+                                    messageContext.Token = cookiesToken;
                                 }
                             }
 
@@ -320,19 +321,19 @@ namespace Yi.Abp.Web
                     };
                     options.Events = new JwtBearerEvents
                     {
-                        OnMessageReceived = context =>
+                        OnMessageReceived = messageContext =>
                         {
-                            var refresh_token = context.Request.Headers["refresh_token"];
-                            if (!string.IsNullOrEmpty(refresh_token))
+                            var headerRefreshToken = messageContext.Request.Headers["refresh_token"];
+                            if (!string.IsNullOrEmpty(headerRefreshToken))
                             {
-                                context.Token = refresh_token;
+                                messageContext.Token = headerRefreshToken;
                                 return Task.CompletedTask;
                             }
 
-                            var refreshToken = context.Request.Query["refresh_token"];
-                            if (!string.IsNullOrEmpty(refreshToken))
+                            var queryRefreshToken = messageContext.Request.Query["refresh_token"];
+                            if (!string.IsNullOrEmpty(queryRefreshToken))
                             {
-                                context.Token = refreshToken;
+                                messageContext.Token = queryRefreshToken;
                             }
 
                             return Task.CompletedTask;
@@ -357,8 +358,8 @@ namespace Yi.Abp.Web
             var app = context.GetApplicationBuilder();
             app.UseRouting();
 
-            // app.ApplicationServices.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient.CodeFirst.InitTables<MessageAggregateRoot>();
-            // app.ApplicationServices.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient.CodeFirst.InitTables<TokenAggregateRoot>();
+            //app.ApplicationServices.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient.CodeFirst.InitTables<AiModelEntity>();
+             // app.ApplicationServices.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient.CodeFirst.InitTables<ActivationCodeRecordAggregateRoot>();
             // app.ApplicationServices.GetRequiredService<ISqlSugarDbContext>().SqlSugarClient.CodeFirst.InitTables<UsageStatisticsAggregateRoot>();
 
             //跨域

Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/System/UserFrameworkRbacTest.cs

@@ -1,7 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;
-using TencentCloud.Ame.V20190916.Models;
-using TencentCloud.Tiw.V20190919.Models;
 using Volo.Abp.Domain.Repositories;
 using Xunit;
 using Yi.Framework.Rbac.Application.Contracts.Dtos.User;

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

@@ -1,7 +1,9 @@
 {
   "permissions": {
     "allow": [
-      "Bash(npx vue-tsc --noEmit)"
+      "Bash(npx vue-tsc --noEmit)",
+      "Bash(timeout 60 npx vue-tsc:*)",
+      "Bash(npm run dev:*)"
     ],
     "deny": [],
     "ask": []

Yi.Ai.Vue3/.env.development

@@ -15,6 +15,9 @@ VITE_WEB_BASE_API = '/dev-api'
 VITE_API_URL = http://localhost:19001/api/app
 #VITE_API_URL=http://data.ccnetcore.com:19001/api/app
 
+# 文件上传接口域名
+VITE_FILE_UPLOAD_API = https://ai.ccnetcore.com
+
 
 
 # SSO单点登录url

Yi.Ai.Vue3/.env.production

@@ -13,6 +13,9 @@ VITE_WEB_BASE_API = '/prod-api'
 # 本地接口
 VITE_API_URL = http://data.ccnetcore.com:19001/api/app
 
+# 文件上传接口域名
+VITE_FILE_UPLOAD_API = https://ai.ccnetcore.com
+
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip
 

Yi.Ai.Vue3/.eslintrc-auto-import.json

@@ -1,76 +0,0 @@
-{
-  "globals": {
-    "Component": true,
-    "ComponentPublicInstance": true,
-    "ComputedRef": true,
-    "DirectiveBinding": true,
-    "EffectScope": true,
-    "ExtractDefaultPropTypes": true,
-    "ExtractPropTypes": true,
-    "ExtractPublicPropTypes": true,
-    "InjectionKey": true,
-    "MaybeRef": true,
-    "MaybeRefOrGetter": true,
-    "PropType": true,
-    "Ref": true,
-    "Slot": true,
-    "Slots": true,
-    "VNode": true,
-    "WritableComputedRef": true,
-    "computed": true,
-    "createApp": true,
-    "customRef": true,
-    "defineAsyncComponent": true,
-    "defineComponent": true,
-    "effectScope": true,
-    "getCurrentInstance": true,
-    "getCurrentScope": true,
-    "h": true,
-    "inject": true,
-    "isProxy": true,
-    "isReactive": true,
-    "isReadonly": true,
-    "isRef": true,
-    "markRaw": true,
-    "nextTick": true,
-    "onActivated": true,
-    "onBeforeMount": true,
-    "onBeforeUnmount": true,
-    "onBeforeUpdate": true,
-    "onDeactivated": true,
-    "onErrorCaptured": true,
-    "onMounted": true,
-    "onRenderTracked": true,
-    "onRenderTriggered": true,
-    "onScopeDispose": true,
-    "onServerPrefetch": true,
-    "onUnmounted": true,
-    "onUpdated": true,
-    "onWatcherCleanup": true,
-    "provide": true,
-    "reactive": true,
-    "readonly": true,
-    "ref": true,
-    "resolveComponent": true,
-    "shallowReactive": true,
-    "shallowReadonly": true,
-    "shallowRef": true,
-    "toRaw": true,
-    "toRef": true,
-    "toRefs": true,
-    "toValue": true,
-    "triggerRef": true,
-    "unref": true,
-    "useAttrs": true,
-    "useCssModule": true,
-    "useCssVars": true,
-    "useId": true,
-    "useModel": true,
-    "useSlots": true,
-    "useTemplateRef": true,
-    "watch": true,
-    "watchEffect": true,
-    "watchPostEffect": true,
-    "watchSyncEffect": true
-  }
-}

Yi.Ai.Vue3/.gitignore

@@ -23,3 +23,10 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+/.eslintrc-auto-import.json
+/types/auto-imports.d.ts
+/types/components.d.ts
+/types/import_meta.d.ts
+
+

Yi.Ai.Vue3/index.html

@@ -112,8 +112,8 @@
 <body>
 <!-- 加载动画容器 -->
 <div id="yixinai-loader" class="loader-container">
-  <div class="loader-title">意心Ai 2.5</div>
-  <div class="loader-subtitle">海外地址，仅首次访问预计加载约10秒</div>
+  <div class="loader-title">意心Ai 2.9</div>
+  <div class="loader-subtitle">海外地址，仅首次访问预计加载约10秒，无需梯子</div>
   <div class="loader-logo">
     <div class="pulse-box"></div>
   </div>