feat: 合并分支

# Conflicts:
#	Yi.Ai.Vue3/package.json
#	Yi.Ai.Vue3/pnpm-lock.yaml
#	Yi.Ai.Vue3/src/pages/chat/layouts/chatWithId/index.vue

.gitignore

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

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

@@ -2,8 +2,7 @@
   "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

@@ -1,129 +0,0 @@
-# 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/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/ActivationCode/ActivationCodeCreateInput.cs

@@ -1,30 +0,0 @@
-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

@@ -1,35 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,24 +0,0 @@
-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

@@ -1,42 +0,0 @@
-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

@@ -1,42 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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/AiAppShortcutDto.cs

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

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

@@ -1,48 +0,0 @@
-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

@@ -1,101 +0,0 @@
-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; }
-
-    /// <summary>
-    /// 是否启用
-    /// </summary>
-    public bool IsEnabled { get; set; } = true;
-}

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

@@ -1,89 +0,0 @@
-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; }
-
-    /// <summary>
-    /// 是否启用
-    /// </summary>
-    public bool IsEnabled { get; set; }
-}

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

@@ -1,24 +0,0 @@
-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

@@ -1,107 +0,0 @@
-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; }
-
-    /// <summary>
-    /// 是否启用
-    /// </summary>
-    public bool IsEnabled { get; set; }
-}

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

@@ -1,65 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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 Guid TokenId { 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

@@ -1,8 +0,0 @@
-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

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

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

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

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

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

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

@@ -1,66 +0,0 @@
-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>
-    /// 是否匿名
-    /// </summary>
-    public bool IsAnonymous { get; set; } 
-
-    /// <summary>
-    /// 生成图片URL
-    /// </summary>
-    public string? StoreUrl { get; set; }
-
-    /// <summary>
-    /// 任务状态
-    /// </summary>
-    public TaskStatusEnum TaskStatus { get; set; }
-
-    /// <summary>
-    /// 发布状态
-    /// </summary>
-    public PublishStatusEnum PublishStatus { get; set; }
-
-    /// <summary>
-    /// 分类标签
-    /// </summary>
-    [SqlSugar.SugarColumn( IsJson = true)]
-    public List<string> Categories { get; set; } = new();
-
-    /// <summary>
-    /// 创建时间
-    /// </summary>
-    public DateTime CreationTime { get; set; }
-
-    /// <summary>
-    /// 错误信息
-    /// </summary>
-    public string? ErrorInfo { get; set; }
-    
-    /// <summary>
-    /// 用户名称
-    /// </summary>
-    public string? UserName { get; set; }
-    
-    /// <summary>
-    /// 用户名称Id
-    /// </summary>
-    public Guid? UserId { get; set; }
-    
-}

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

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

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

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

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

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

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

@@ -25,17 +25,11 @@ public class RechargeCreateInput
     public string Content { get; set; } = string.Empty;
 
     /// <summary>
-    /// VIP月数（为空或0表示永久VIP，1个月按31天计算）
+    /// VIP月数（为空或0表示永久VIP）
     /// </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/Dtos/Recharge/RechargeGetListInput.cs

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,20 +0,0 @@
-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

@@ -1,96 +0,0 @@
-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
-
-    #region AI应用快捷配置
-
-    /// <summary>
-    /// 获取AI应用快捷配置列表
-    /// </summary>
-    /// <returns>快捷配置列表</returns>
-    Task<List<AiAppShortcutDto>> GetAppShortcutListAsync();
-
-    #endregion
-}

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

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

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

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

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

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

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

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

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

@@ -1,12 +0,0 @@
-namespace Yi.Framework.AiHub.Application.Jobs;
-
-/// <summary>
-/// 图片生成后台任务参数
-/// </summary>
-public class ImageGenerationJobArgs
-{
-    /// <summary>
-    /// 图片任务ID
-    /// </summary>
-    public Guid TaskId { get; set; }
-}

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

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

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

@@ -1,14 +1,10 @@
 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;
@@ -22,18 +18,17 @@ 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<MessageAggregateRoot> messageRepository)
+        ISqlSugarRepository<PremiumPackageAggregateRoot> premiumPackageRepository)
     {
         _accountService = accountService;
         _userRepository = userRepository;
         _rechargeRepository = rechargeRepository;
         _premiumPackageRepository = premiumPackageRepository;
-        _messageRepository = messageRepository;
     }
 
     /// <summary>
@@ -81,4 +76,76 @@ public class AiAccountService : ApplicationService
         return output;
     }
 
-}
+    /// <summary>
+    /// 获取利润统计数据
+    /// </summary>
+    /// <param name="currentCost">当前成本(RMB)</param>
+    /// <returns></returns>
+    [Authorize]
+    [HttpGet("account/profit-statistics")]
+    public async Task<string> GetProfitStatisticsAsync([FromQuery] decimal currentCost)
+    {
+        if (CurrentUser.UserName != "Guo" && CurrentUser.UserName != "cc")
+        {
+            throw new UserFriendlyException("您暂无权限访问");
+        }
+
+        // 1. 获取尊享包总消耗和剩余库存
+        var premiumPackages = await _premiumPackageRepository._DbQueryable.ToListAsync();
+        long totalUsedTokens = premiumPackages.Sum(p => p.UsedTokens);
+        long totalRemainingTokens = premiumPackages.Sum(p => p.RemainingTokens);
+
+        // 2. 计算1亿Token成本
+        decimal costPerHundredMillion = totalUsedTokens > 0
+            ? currentCost / (totalUsedTokens / 100000000m)
+            : 0;
+
+        // 3. 计算总成本(剩余+已使用的总成本)
+        long totalTokens = totalUsedTokens + totalRemainingTokens;
+        decimal totalCost = totalTokens > 0
+            ? (totalTokens / 100000000m) * costPerHundredMillion
+            : 0;
+
+        // 4. 获取总收益(RechargeType=PremiumPackage的充值金额总和)
+        decimal totalRevenue = await _rechargeRepository._DbQueryable
+            .Where(x => x.RechargeType == Domain.Shared.Enums.RechargeTypeEnum.PremiumPackage)
+            .SumAsync(x => x.RechargeAmount);
+
+        // 5. 计算利润率
+        decimal profitRate = totalCost > 0
+            ? (totalRevenue / totalCost - 1) * 100
+            : 0;
+
+        // 6. 按200售价计算成本
+        decimal costAt200Price = totalRevenue > 0
+            ? (totalCost / totalRevenue) * 200
+            : 0;
+
+        // 7. 格式化输出
+        var today = DateTime.Now;
+        string dayOfWeek = today.ToString("dddd", new System.Globalization.CultureInfo("zh-CN"));
+        string weekDay = dayOfWeek switch
+        {
+            "星期一" => "周1",
+            "星期二" => "周2",
+            "星期三" => "周3",
+            "星期四" => "周4",
+            "星期五" => "周5",
+            "星期六" => "周6",
+            "星期日" => "周日",
+            _ => dayOfWeek
+        };
+
+        var result = $@"{today:M月d日} {weekDay}
+尊享包已消耗({totalUsedTokens / 100000000m:F2}亿){totalUsedTokens}
+尊享包剩余库存({totalRemainingTokens / 100000000m:F2}亿){totalRemainingTokens}
+当前成本:{currentCost:F2}RMB
+1亿Token成本:{costPerHundredMillion:F2} RMB=1亿 Token
+总成本:{totalCost:F2} RMB
+总收益:{totalRevenue:F2}RMB
+利润率: {profitRate:F1}%
+按200售价来算,成本在{costAt200Price:F2}";
+
+        return result;
+    }
+}

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

@@ -53,23 +53,13 @@ public class AnnouncementService : ApplicationService, IAnnouncementService
     /// </summary>
     private async Task<AnnouncementCacheDto> LoadAnnouncementDataAsync()
     {
-        // 1️⃣ 一次性查出全部公告（不排序）
+        // 查询所有公告日志，按日期降序排列
         var logs = await _announcementRepository._DbQueryable
+            .OrderByDescending(x => x.StartTime)
             .ToListAsync();
 
-        var now = DateTime.Now;
-
-        // 2️⃣ 内存中处理排序
-        var orderedLogs = logs
-            .OrderByDescending(x =>
-                x.StartTime <= now &&
-                (x.EndTime == null || x.EndTime >= now)
-            )
-            .ThenByDescending(x => x.StartTime)
-            .ToList();
-
         // 转换为 DTO
-        var logDtos = orderedLogs.Adapt<List<AnnouncementLogDto>>();
+        var logDtos = logs.Adapt<List<AnnouncementLogDto>>();
         return new AnnouncementCacheDto
         {
             Logs = logDtos

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

@@ -1,263 +0,0 @@
-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(Roles = "admin")]
-public class ChannelService : ApplicationService, IChannelService
-{
-    private readonly ISqlSugarRepository<AiAppAggregateRoot, Guid> _appRepository;
-    private readonly ISqlSugarRepository<AiModelEntity, Guid> _modelRepository;
-    private readonly ISqlSugarRepository<AiAppShortcutAggregateRoot, Guid> _appShortcutRepository;
-
-    public ChannelService(
-        ISqlSugarRepository<AiAppAggregateRoot, Guid> appRepository,
-        ISqlSugarRepository<AiModelEntity, Guid> modelRepository,
-        ISqlSugarRepository<AiAppShortcutAggregateRoot, Guid> appShortcutRepository)
-    {
-        _appRepository = appRepository;
-        _modelRepository = modelRepository;
-        _appShortcutRepository = appShortcutRepository;
-    }
-
-    #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,
-            IsEnabled = input.IsEnabled,
-            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;
-        entity.IsEnabled = input.IsEnabled;
-
-        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
-
-    #region AI应用快捷配置
-
-    /// <summary>
-    /// 获取AI应用快捷配置列表
-    /// </summary>
-    [HttpGet("channel/app-shortcut")]
-    public async Task<List<AiAppShortcutDto>> GetAppShortcutListAsync()
-    {
-        var entities = await _appShortcutRepository._DbQueryable
-            .OrderBy(x => x.OrderNum)
-            .OrderByDescending(x => x.CreationTime)
-            .ToListAsync();
-
-        return entities.Adapt<List<AiAppShortcutDto>>();
-    }
-
-    #endregion
-}

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

@@ -1,31 +1,22 @@
 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;
 using Yi.Framework.AiHub.Domain.Shared.Consts;
-using System.Text.Json;
 using Yi.Framework.AiHub.Domain.Shared.Dtos;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 using Yi.Framework.AiHub.Domain.Shared.Enums;
@@ -41,39 +32,23 @@ 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;
-    private const string FreeModelId = "DeepSeek-V3-0324";
 
     public AiChatService(IHttpContextAccessor httpContextAccessor,
         AiBlacklistManager aiBlacklistManager,
-        ILogger<AiChatService> logger,
+        ISqlSugarRepository<AiModelEntity> aiModelRepository,
-        AiGateWayManager aiGateWayManager,
+        ILogger<AiChatService> logger, AiGateWayManager aiGateWayManager, PremiumPackageManager premiumPackageManager)
-        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;
     }
 
 
@@ -91,38 +66,31 @@ public class AiChatService : ApplicationService
     }
 
     /// <summary>
-    /// 获取对话模型列表
+    /// 获取模型列表
     /// </summary>
     /// <returns></returns>
     public async Task<List<ModelGetListOutput>> GetModelAsync()
     {
         var output = await _aiModelRepository._DbQueryable
-            .Where(x => x.IsEnabled == true)
             .Where(x => x.ModelType == ModelTypeEnum.Chat)
-            // .Where(x => x.ModelApiType == ModelApiTypeEnum.Completions)
+            .Where(x => x.ModelApiType == ModelApiTypeEnum.OpenAi)
             .OrderByDescending(x => x.OrderNum)
             .Select(x => new ModelGetListOutput
             {
                 Id = x.Id,
+                Category = "chat",
                 ModelId = x.ModelId,
                 ModelName = x.Name,
                 ModelDescribe = x.Description,
+                ModelPrice = 0,
+                ModelType = "1",
+                ModelShow = "0",
+                SystemPrompt = null,
+                ApiHost = null,
+                ApiKey = null,
                 Remark = x.Description,
-                IsPremiumPackage = x.IsPremium,
+                IsPremiumPackage = PremiumPackageConst.ModeIds.Contains(x.ModelId)
-                ModelApiType = x.ModelApiType,
-                IconUrl = x.IconUrl,
-                ProviderName = x.ProviderName
             }).ToListAsync();
-
-        output.ForEach(x =>
-        {
-            if (x.ModelId == FreeModelId)
-            {
-                x.IsPremiumPackage = false;
-                x.IsFree = true;
-            }
-        });
-
         return output;
     }
 
@@ -138,7 +106,7 @@ public class AiChatService : ApplicationService
         CancellationToken cancellationToken)
     {
         //除了免费模型，其他的模型都要校验
-        if (input.Model!=FreeModelId)
+        if (!input.Model.Contains("DeepSeek-R1"))
         {
             //有token，需要黑名单校验
             if (CurrentUser.IsAuthenticated)
@@ -156,26 +124,22 @@ public class AiChatService : ApplicationService
         }
 
         //如果是尊享包服务，需要校验是是否尊享包足够
-        if (CurrentUser.IsAuthenticated)
+        if (CurrentUser.IsAuthenticated && PremiumPackageConst.ModeIds.Contains(input.Model))
         {
-            var isPremium = await _modelManager.IsPremiumModelAsync(input.Model);
+            // 检查尊享token包用量
-
+            var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
-            if (isPremium)
+            if (availableTokens <= 0)
             {
-                // 检查尊享token包用量
+                throw new UserFriendlyException("尊享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.None);
+            CurrentUser.Id, sessionId, null, cancellationToken);
     }
 
+
     /// <summary>
     /// 发送消息
     /// </summary>
@@ -189,173 +153,26 @@ public class AiChatService : ApplicationService
         {
             throw new BusinessException("当前接口不支持第三方使用");
         }
-        input.Model = "gpt-5-chat";
+
         if (CurrentUser.IsAuthenticated)
         {
             await _aiBlacklistManager.VerifiyAiBlacklist(CurrentUser.GetId());
+            if (CurrentUser.IsAiVip())
+            {
+                input.Model = "gpt-5-chat";
+            }
+            else
+            {
+                input.Model = "gpt-4.1-mini";
+            }
+        }
+        else
+        {
+            input.Model = "DeepSeek-R1-0528";
         }
 
         //ai网关代理httpcontext
         await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-            CurrentUser.Id, null, null, CancellationToken.None);
+            CurrentUser.Id, null, null, cancellationToken);
-    }
-
-
-    /// <summary>
-    /// Agent 发送消息
-    /// </summary>
-    [HttpPost("ai-chat/agent/send")]
-    public async Task PostAgentSendAsync([FromBody] AgentSendInput input, CancellationToken cancellationToken)
-    {
-        var tokenValidation = await _tokenManager.ValidateTokenAsync(input.TokenId, 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,
-            tokenValidation.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;
-    }
-
-    /// <summary>
-    /// 统一发送消息 - 支持4种API类型
-    /// </summary>
-    /// <param name="apiType">API类型枚举</param>
-    /// <param name="input">原始请求体JsonElement</param>
-    /// <param name="modelId">模型ID（Gemini格式需要从URL传入）</param>
-    /// <param name="sessionId">会话ID</param>
-    /// <param name="cancellationToken"></param>
-    [HttpPost("ai-chat/unified/send")]
-    public async Task PostUnifiedSendAsync(
-        [FromQuery] ModelApiTypeEnum apiType,
-        [FromBody] JsonElement input,
-        [FromQuery] string modelId,
-        [FromQuery] Guid? sessionId,
-        CancellationToken cancellationToken)
-    {
-        // 从请求体中提取模型ID（如果未从URL传入）
-        if (string.IsNullOrEmpty(modelId))
-        {
-            modelId = ExtractModelIdFromRequest(apiType, input);
-        }
-
-        // 除了免费模型，其他的模型都要校验
-        if (modelId != FreeModelId)
-        {
-            if (CurrentUser.IsAuthenticated)
-            {
-                await _aiBlacklistManager.VerifiyAiBlacklist(CurrentUser.GetId());
-                if (!CurrentUser.IsAiVip())
-                {
-                    throw new UserFriendlyException("该模型需要VIP用户才能使用，请购买VIP后重新登录重试");
-                }
-            }
-            else
-            {
-                throw new UserFriendlyException("未登录用户，只能使用未加速的DeepSeek-R1，请登录后重试");
-            }
-        }
-
-        // 如果是尊享包服务，需要校验是否尊享包足够
-        if (CurrentUser.IsAuthenticated)
-        {
-            var isPremium = await _modelManager.IsPremiumModelAsync(modelId);
-            if (isPremium)
-            {
-                var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
-                if (availableTokens <= 0)
-                {
-                    throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
-                }
-            }
-        }
-
-        // 调用统一流式处理
-        await _aiGateWayManager.UnifiedStreamForStatisticsAsync(
-            _httpContextAccessor.HttpContext!,
-            apiType,
-            input,
-            modelId,
-            CurrentUser.Id,
-            sessionId,
-            null,
-            CancellationToken.None);
-    }
-
-    /// <summary>
-    /// 从请求体中提取模型ID
-    /// </summary>
-    private string ExtractModelIdFromRequest(ModelApiTypeEnum apiType, JsonElement input)
-    {
-        try
-        {
-            if (input.TryGetProperty("model", out var modelProperty))
-            {
-                return modelProperty.GetString() ?? string.Empty;
-            }
-        }
-        catch
-        {
-            // 忽略解析错误
-        }
-
-        throw new UserFriendlyException("无法从请求中获取模型ID，请在URL参数中指定modelId");
     }
 }

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

@@ -1,411 +0,0 @@
-using System.Text.Json;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using Volo.Abp;
-using Volo.Abp.Application.Services;
-using Volo.Abp.BackgroundJobs;
-using Volo.Abp.Guids;
-using Volo.Abp.Users;
-using Yi.Framework.AiHub.Application.Contracts.Dtos;
-using Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
-using Yi.Framework.AiHub.Application.Jobs;
-using Yi.Framework.AiHub.Domain.Entities.Chat;
-using Yi.Framework.AiHub.Domain.Entities.Model;
-using Yi.Framework.AiHub.Domain.Extensions;
-using Yi.Framework.AiHub.Domain.Managers;
-using Yi.Framework.AiHub.Domain.Shared.Consts;
-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;
-    private readonly TokenManager _tokenManager;
-    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
-
-    public AiImageService(
-        ISqlSugarRepository<ImageStoreTaskAggregateRoot> imageTaskRepository,
-        IBackgroundJobManager backgroundJobManager,
-        AiBlacklistManager aiBlacklistManager,
-        PremiumPackageManager premiumPackageManager,
-        ModelManager modelManager,
-        IGuidGenerator guidGenerator,
-        IWebHostEnvironment webHostEnvironment, TokenManager tokenManager,
-        ISqlSugarRepository<AiModelEntity> aiModelRepository)
-    {
-        _imageTaskRepository = imageTaskRepository;
-        _backgroundJobManager = backgroundJobManager;
-        _aiBlacklistManager = aiBlacklistManager;
-        _premiumPackageManager = premiumPackageManager;
-        _modelManager = modelManager;
-        _guidGenerator = guidGenerator;
-        _webHostEnvironment = webHostEnvironment;
-        _tokenManager = tokenManager;
-        _aiModelRepository = aiModelRepository;
-    }
-
-    /// <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);
-
-        //校验token
-        if (input.TokenId is not null)
-        {
-            await _tokenManager.ValidateTokenAsync(input.TokenId, input.ModelId);
-        }
-
-
-        // 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,
-            ReferenceImagesPrefixBase64 = input.ReferenceImagesPrefixBase64 ?? new List<string>(),
-            ReferenceImagesUrl = new List<string>(),
-            TaskStatus = TaskStatusEnum.Processing,
-            UserId = userId,
-            UserName = CurrentUser.UserName,
-            TokenId = input.TokenId,
-            ModelId = input.ModelId
-        };
-
-        await _imageTaskRepository.InsertAsync(task);
-        // 入队后台任务
-        await _backgroundJobManager.EnqueueAsync(new ImageGenerationJobArgs
-        {
-            TaskId = task.Id,
-        });
-
-        return task.Id;
-    }
-
-    /// <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,
-            PublishStatus = task.PublishStatus,
-            Categories = task.Categories,
-            CreationTime = task.CreationTime,
-            ErrorInfo = task.ErrorInfo,
-        };
-    }
-
-    /// <summary>
-    /// 上传Base64图片转换为URL
-    /// </summary>
-    /// <param name="base64Data">Base64图片数据（包含前缀如 data:image/png;base64,）</param>
-    /// <returns>图片访问URL</returns>
-    [HttpPost("ai-image/upload-base64")]
-    [AllowAnonymous]
-    public async Task<string> UploadBase64ToUrlAsync([FromBody] string base64Data)
-    {
-        if (string.IsNullOrWhiteSpace(base64Data))
-        {
-            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格式无效");
-        }
-
-        // ==============================
-        // ✅ 按日期创建目录（yyyyMMdd）
-        // ==============================
-        var dateFolder = DateTime.Now.ToString("yyyyMMdd");
-        var uploadPath = Path.Combine(
-            _webHostEnvironment.ContentRootPath,
-            "wwwroot",
-            "ai-images",
-            dateFolder
-        );
-
-        if (!Directory.Exists(uploadPath))
-        {
-            Directory.CreateDirectory(uploadPath);
-        }
-
-        // 保存文件
-        var fileId = _guidGenerator.Create();
-        var fileName = $"{fileId}{extension}";
-        var filePath = Path.Combine(uploadPath, fileName);
-
-        await File.WriteAllBytesAsync(filePath, imageBytes);
-
-        // 返回包含日期目录的访问URL
-        return $"/wwwroot/ai-images/{dateFolder}/{fileName}";
-    }
-
-    /// <summary>
-    /// 分页查询我的任务列表
-    /// </summary>
-    [HttpGet("ai-image/my-tasks")]
-    public async Task<PagedResult<ImageTaskOutput>> GetMyTaskPageAsync([FromQuery] ImageMyTaskPageInput input)
-    {
-        var userId = CurrentUser.GetId();
-
-        RefAsync<int> total = 0;
-        var output = await _imageTaskRepository._DbQueryable
-            .Where(x => x.UserId == userId)
-            .WhereIF(input.TaskStatus is not null, x => x.TaskStatus == input.TaskStatus)
-            .WhereIF(!string.IsNullOrWhiteSpace(input.Prompt), x => x.Prompt.Contains(input.Prompt))
-            .WhereIF(input.PublishStatus is not null, x => x.PublishStatus == input.PublishStatus)
-            .WhereIF(input.StartTime is not null && input.EndTime is not null,
-                x => x.CreationTime >= input.StartTime && x.CreationTime <= input.EndTime)
-            .OrderByDescending(x => x.CreationTime)
-            .Select(x => new ImageTaskOutput
-            {
-                Id = x.Id,
-                Prompt = x.Prompt,
-                StoreUrl = x.StoreUrl,
-                TaskStatus = x.TaskStatus,
-                PublishStatus = x.PublishStatus,
-                Categories = x.Categories,
-                CreationTime = x.CreationTime,
-                ErrorInfo = x.ErrorInfo,
-                UserName = x.UserName,
-                UserId = x.UserId,
-                IsAnonymous = x.IsAnonymous
-            })
-            .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
-
-
-        return new PagedResult<ImageTaskOutput>(total, output);
-    }
-
-    /// <summary>
-    /// 删除个人图片
-    /// </summary>
-    /// <param name="ids"></param>
-    [HttpDelete("ai-image/my-tasks")]
-    public async Task DeleteMyTaskAsync([FromQuery] List<Guid> ids)
-    {
-        var userId = CurrentUser.GetId();
-        await _imageTaskRepository.DeleteAsync(x => ids.Contains(x.Id) && x.UserId == userId);
-    }
-
-    /// <summary>
-    /// 分页查询图片广场（已发布的图片）
-    /// </summary>
-    [HttpGet("ai-image/plaza")]
-    [AllowAnonymous]
-    public async Task<PagedResult<ImageTaskOutput>> GetPlazaPageAsync([FromQuery] ImagePlazaPageInput input)
-    {
-        RefAsync<int> total = 0;
-        var output = await _imageTaskRepository._DbQueryable
-            .Where(x => x.PublishStatus == PublishStatusEnum.Published)
-            .Where(x => x.TaskStatus == TaskStatusEnum.Success)
-            .WhereIF(input.TaskStatus is not null, x => x.TaskStatus == input.TaskStatus)
-            .WhereIF(!string.IsNullOrWhiteSpace(input.Prompt), x => x.Prompt.Contains(input.Prompt))
-            .WhereIF(!string.IsNullOrWhiteSpace(input.Categories),
-                x => SqlFunc.JsonLike(x.Categories, input.Categories))
-            .WhereIF(!string.IsNullOrWhiteSpace(input.UserName), x => x.UserName.Contains(input.UserName))
-            .WhereIF(input.StartTime is not null && input.EndTime is not null,
-                x => x.CreationTime >= input.StartTime && x.CreationTime <= input.EndTime)
-            .OrderByDescending(x => x.CreationTime)
-            .Select(x => new ImageTaskOutput
-            {
-                Id = x.Id,
-                Prompt = x.Prompt,
-                IsAnonymous = x.IsAnonymous,
-                StoreUrl = x.StoreUrl,
-                TaskStatus = x.TaskStatus,
-                PublishStatus = x.PublishStatus,
-                Categories = x.Categories,
-                CreationTime = x.CreationTime,
-                ErrorInfo = null,
-                UserName = x.UserName,
-                UserId = x.UserId,
-            })
-            .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
-        ;
-
-
-        output.ForEach(x =>
-        {
-            if (x.IsAnonymous)
-            {
-                x.UserName = null;
-                x.UserId = null;
-            }
-        });
-
-        return new PagedResult<ImageTaskOutput>(total, output);
-    }
-
-    /// <summary>
-    /// 发布图片到广场
-    /// </summary>
-    [HttpPost("ai-image/publish")]
-    public async Task PublishAsync([FromBody] PublishImageInput input)
-    {
-        var userId = CurrentUser.GetId();
-
-        var task = await _imageTaskRepository.GetFirstAsync(x => x.Id == input.TaskId && x.UserId == userId);
-        if (task == null)
-        {
-            throw new UserFriendlyException("任务不存在或无权访问");
-        }
-
-        if (task.TaskStatus != TaskStatusEnum.Success)
-        {
-            throw new UserFriendlyException("只有已完成的任务才能发布");
-        }
-
-        if (task.PublishStatus == PublishStatusEnum.Published)
-        {
-            throw new UserFriendlyException("该任务已发布");
-        }
-
-        //设置发布
-        task.SetPublish(input.IsAnonymous, input.Categories);
-        await _imageTaskRepository.UpdateAsync(task);
-    }
-
-    /// <summary>
-    /// 获取图片模型列表
-    /// </summary>
-    /// <returns></returns>
-    [HttpPost("ai-image/model")]
-    [AllowAnonymous]
-    public async Task<List<ModelGetListOutput>> GetModelAsync()
-    {
-        var output = await _aiModelRepository._DbQueryable
-            .Where(x=>x.IsEnabled==true)
-            .Where(x => x.ModelType == ModelTypeEnum.Image)
-            .Where(x => x.ModelApiType == ModelApiTypeEnum.GenerateContent)
-            .OrderByDescending(x => x.OrderNum)
-            .Select(x => new ModelGetListOutput
-            {
-                Id = x.Id,
-                ModelId = x.ModelId,
-                ModelName = x.Name,
-                ModelDescribe = x.Description,
-                Remark = x.Description,
-                IsPremiumPackage = x.IsPremium
-            }).ToListAsync();
-        return output;
-    }
-}
-
-/// <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

@@ -1,12 +1,10 @@
 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;
@@ -20,12 +18,10 @@ namespace Yi.Framework.AiHub.Application.Services.Chat;
 public class ModelService : ApplicationService, IModelService
 {
     private readonly ISqlSugarRepository<AiModelEntity, Guid> _modelRepository;
-    private readonly ModelManager _modelManager;
 
-    public ModelService(ISqlSugarRepository<AiModelEntity, Guid> modelRepository, ModelManager modelManager)
+    public ModelService(ISqlSugarRepository<AiModelEntity, Guid> modelRepository)
     {
         _modelRepository = modelRepository;
-        _modelManager = modelManager;
     }
 
     /// <summary>
@@ -35,9 +31,8 @@ public class ModelService : ApplicationService, IModelService
     {
         RefAsync<int> total = 0;
 
-        // 查询所有未删除且已启用的模型，使用WhereIF动态添加筛选条件
+        // 查询所有未删除的模型，使用WhereIF动态添加筛选条件
         var modelIds = (await _modelRepository._DbQueryable
-            .Where(x => x.IsEnabled)
             .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), x =>
                 x.Name.Contains(input.SearchKey) || x.ModelId.Contains(input.SearchKey))
             .WhereIF(input.ProviderNames is not null, x =>
@@ -46,13 +41,13 @@ public class ModelService : ApplicationService, IModelService
                 input.ModelTypes.Contains(x.ModelType))
             .WhereIF(input.ModelApiTypes is not null, x =>
                 input.ModelApiTypes.Contains(x.ModelApiType))
-            .WhereIF(input.IsPremiumOnly == true, x => x.IsPremium)
+            .WhereIF(input.IsPremiumOnly == true, x =>
+                PremiumPackageConst.ModeIds.Contains(x.ModelId))
             .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))
-            .Where(x => x.IsEnabled)
             .OrderBy(x => x.OrderNum)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -66,7 +61,7 @@ public class ModelService : ApplicationService, IModelService
             MultiplierShow = x.First().MultiplierShow,
             ProviderName = x.First().ProviderName,
             IconUrl = x.First().IconUrl,
-            IsPremium = x.First().IsPremium,
+            IsPremium = PremiumPackageConst.ModeIds.Contains(x.First().ModelId),
             OrderNum = x.First().OrderNum
         }).ToList();
         
@@ -79,13 +74,14 @@ public class ModelService : ApplicationService, IModelService
     public async Task<List<string>> GetProviderListAsync()
     {
         var providers = await _modelRepository._DbQueryable
-            .Where(x => x.IsEnabled)
+            .Where(x => !x.IsDeleted)
             .Where(x => !string.IsNullOrEmpty(x.ProviderName))
             .GroupBy(x => x.ProviderName)
+            .OrderBy(x => x.ProviderName)
             .Select(x => x.ProviderName)
             .ToListAsync();
 
-        return providers!;
+        return providers;
     }
 
     /// <summary>
@@ -119,13 +115,4 @@ public class ModelService : ApplicationService, IModelService
 
         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/SessionService.cs

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

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

@@ -7,10 +7,8 @@ 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;
@@ -25,16 +23,13 @@ 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>
@@ -56,8 +51,8 @@ public class TokenService : ApplicationService
             return new PagedResultDto<TokenGetListOutputDto>();
         }
 
-        // 通过ModelManager获取尊享包模型ID列表
+        // 获取尊享包模型ID列表
-        var premiumModelIds = await _modelManager.GetPremiumModelIdsAsync();
+        var premiumModelIds = PremiumPackageConst.ModeIds;
 
         // 批量查询所有Token的尊享包已使用额度
         var tokenIds = tokens.Select(t => t.Id).ToList();
@@ -91,7 +86,7 @@ public class TokenService : ApplicationService
     }
 
     [HttpGet("token/select-list")]
-    public async Task<List<TokenSelectListOutputDto>> GetSelectListAsync([FromQuery] bool? includeDefault = true)
+    public async Task<List<TokenSelectListOutputDto>> GetSelectListAsync()
     {
         var userId = CurrentUser.GetId();
         var tokens = await _tokenRepository._DbQueryable
@@ -104,17 +99,13 @@ public class TokenService : ApplicationService
                 Name = x.Name,
                 IsDisabled = x.IsDisabled
             }).ToListAsync();
-
+        
-        if (includeDefault == true)
+        tokens.Insert(0,new TokenSelectListOutputDto
         {
-            tokens.Insert(0, new TokenSelectListOutputDto
+            TokenId = Guid.Empty,
-            {
+            Name = "默认",
-                TokenId = Guid.Empty,
+            IsDisabled = false
-                Name = "默认",
+        });
-                IsDisabled = false
-            });
-        }
-
         return tokens;
     }
 

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

@@ -1,11 +1,9 @@
-using System.Text.Json;
+using Microsoft.AspNetCore.Http;
-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;
@@ -27,27 +25,24 @@ public class OpenApiService : ApplicationService
     private readonly ILogger<OpenApiService> _logger;
     private readonly TokenManager _tokenManager;
     private readonly AiGateWayManager _aiGateWayManager;
-    private readonly ModelManager _modelManager;
+    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
     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,
-        ModelManager modelManager, AiBlacklistManager aiBlacklistManager,
+        ISqlSugarRepository<AiModelEntity> aiModelRepository, AiBlacklistManager aiBlacklistManager,
-        IAccountService accountService, PremiumPackageManager premiumPackageManager, ISqlSugarRepository<ImageStoreTaskAggregateRoot> imageStoreRepository, ISqlSugarRepository<AiModelEntity> aiModelRepository)
+        IAccountService accountService, PremiumPackageManager premiumPackageManager)
     {
         _httpContextAccessor = httpContextAccessor;
         _logger = logger;
         _tokenManager = tokenManager;
         _aiGateWayManager = aiGateWayManager;
-        _modelManager = modelManager;
+        _aiModelRepository = aiModelRepository;
         _aiBlacklistManager = aiBlacklistManager;
         _accountService = accountService;
         _premiumPackageManager = premiumPackageManager;
-        _imageStoreRepository = imageStoreRepository;
-        _aiModelRepository = aiModelRepository;
     }
 
     /// <summary>
@@ -67,9 +62,7 @@ public class OpenApiService : ApplicationService
         await _aiBlacklistManager.VerifiyAiBlacklist(userId);
 
         //如果是尊享包服务，需要校验是是否尊享包足够
-        var isPremium = await _modelManager.IsPremiumModelAsync(input.Model);
+        if (PremiumPackageConst.ModeIds.Contains(input.Model))
-
-        if (isPremium)
         {
             // 检查尊享token包用量
             var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(userId);
@@ -83,13 +76,13 @@ public class OpenApiService : ApplicationService
         if (input.Stream == true)
         {
             await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-                userId, null, tokenId,CancellationToken.None);
+                userId, null, tokenId, cancellationToken);
         }
         else
         {
             await _aiGateWayManager.CompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input, userId,
                 null, tokenId,
-                CancellationToken.None);
+                cancellationToken);
         }
     }
 
@@ -197,18 +190,18 @@ public class OpenApiService : ApplicationService
         {
             await _aiGateWayManager.AnthropicCompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext,
                 input,
-                userId, null, tokenId, CancellationToken.None);
+                userId, null, tokenId, cancellationToken);
         }
         else
         {
             await _aiGateWayManager.AnthropicCompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input,
                 userId,
                 null, tokenId,
-                CancellationToken.None);
+                cancellationToken);
         }
     }
 
-
+    
     /// <summary>
     /// 响应-Openai新规范 (尊享服务专用)
     /// </summary>
@@ -247,79 +240,20 @@ public class OpenApiService : ApplicationService
         //ai网关代理httpcontext
         if (input.Stream == true)
         {
-            await _aiGateWayManager.OpenAiResponsesStreamForStatisticsAsync(_httpContextAccessor.HttpContext,
+             await _aiGateWayManager.OpenAiResponsesStreamForStatisticsAsync(_httpContextAccessor.HttpContext,
-                input,
+                 input,
-                userId, null, tokenId, CancellationToken.None);
+                 userId, null, tokenId, cancellationToken);
         }
         else
         {
             await _aiGateWayManager.OpenAiResponsesAsyncForStatisticsAsync(_httpContextAccessor.HttpContext, input,
                 userId,
                 null, tokenId,
-                CancellationToken.None);
+                cancellationToken);
-        }
-    }
-
-
-    /// <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)
@@ -330,13 +264,6 @@ 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"];

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

@@ -122,15 +122,11 @@ 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,
-                    tokenAmount,
+                    order.GoodsType,
-                    packageName,
                     order.TotalAmount,
-                    "自助充值",
                     expireMonths: null // 尊享包不设置过期时间，或者可以根据需求设置
                 );
 

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

@@ -1,8 +1,6 @@
 using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using SqlSugar;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Users;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.Recharge;
@@ -37,29 +35,19 @@ namespace Yi.Framework.AiHub.Application.Services
         }
 
         /// <summary>
-        /// 查询已登录的账户充值记录（分页）
+        /// 查询已登录的账户充值记录
         /// </summary>
         /// <returns></returns>
         [Route("recharge/account")]
         [Authorize]
-        public async Task<PagedResultDto<RechargeGetListOutput>> GetListByAccountAsync([FromQuery]RechargeGetListInput input)
+        public async Task<List<RechargeGetListOutput>> GetListByAccountAsync()
         {
             var userId = CurrentUser.Id;
-            RefAsync<int> total = 0;
+            var entities = await _repository._DbQueryable.Where(x => x.UserId == userId)
-
-            var entities = await _repository._DbQueryable
-                .Where(x => x.UserId == userId)
-                .WhereIF(input.StartTime.HasValue, x => x.CreationTime >= input.StartTime!.Value)
-                .WhereIF(input.EndTime.HasValue, x => x.CreationTime <= input.EndTime!.Value)
-                .WhereIF(input.IsFree == true, x => x.RechargeAmount == 0)
-                .WhereIF(input.IsFree == false, x => x.RechargeAmount > 0)
-                .WhereIF(input.MinRechargeAmount.HasValue, x => x.RechargeAmount >= input.MinRechargeAmount!.Value)
-                .WhereIF(input.MaxRechargeAmount.HasValue, x => x.RechargeAmount <= input.MaxRechargeAmount!.Value)
                 .OrderByDescending(x => x.CreationTime)
-                .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
+                .ToListAsync();
-
             var output = entities.Adapt<List<RechargeGetListOutput>>();
-            return new PagedResultDto<RechargeGetListOutput>(total, output);
+            return output;
         }
 
         /// <summary>
@@ -67,24 +55,13 @@ namespace Yi.Framework.AiHub.Application.Services
         /// </summary>
         /// <param name="input">充值输入参数</param>
         /// <returns></returns>
-        [RemoteService(isEnabled:false)]
+        [HttpPost("recharge/vip")]
         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
@@ -98,9 +75,9 @@ namespace Yi.Framework.AiHub.Application.Services
                     ? maxExpireTime.Value
                     : DateTime.Now;
                 // 计算新的过期时间
-                expireDateTime = baseDateTime.AddDays(totalDays);
+                expireDateTime = baseDateTime.AddMonths(input.Months.Value);
             }
-            // 如果总天数为0，表示永久VIP，ExpireDateTime保持为null
+            // 如果月数为空或0，表示永久VIP，ExpireDateTime保持为null
 
             // 创建充值记录
             var rechargeRecord = new AiRechargeAggregateRoot

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

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

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

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

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

@@ -2,10 +2,6 @@
 	<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,7 +1,3 @@
-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

@@ -1,16 +0,0 @@
-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

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

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

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

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

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

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

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

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

@@ -1,138 +0,0 @@
-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,
-    
-    
-    
-    
-    /// <summary>
-    /// 0【888w 尊享Token】活动包
-    /// </summary>
-    [ActivationCodeGoods(price: 0, tokenAmount: 8880000, vipMonths: 0, isCombo: false, isReusable: false,
-        isSameTypeOnce: false, displayName: "888w 尊享Token", content: "888w活动赠送福利包")]
-    Premium888WFree = 200,
-    
-    /// <summary>
-    /// 0【666w 尊享Token】活动包
-    /// </summary>
-    [ActivationCodeGoods(price: 0, tokenAmount: 6660000, vipMonths: 0, isCombo: false, isReusable: false,
-        isSameTypeOnce: false, displayName: "666w 尊享Token", content: "666w活动赠送福利包")]
-    Premium666WFree = 201,
-    
-    /// <summary>
-    /// 0【100w 尊享Token】活动包
-    /// </summary>
-    [ActivationCodeGoods(price: 0, tokenAmount: 1000000, vipMonths: 0, isCombo: false, isReusable: false,
-        isSameTypeOnce: false, displayName: "100w 尊享Token", content: "100w活动赠送福利包")]
-    Premium100WFree = 202,
-}
-
-public static class ActivationCodeGoodsTypeEnumExtensions
-{
-    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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,6 @@
 	<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

@@ -1,30 +0,0 @@
-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/Impl/ThorAzureDatabricks/Chats/AzureDatabricksChatCompletionsService.cs

@@ -107,6 +107,35 @@ 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/ThorClaude/Chats/AnthropicChatCompletionsService.cs

@@ -73,24 +73,18 @@ public class AnthropicChatCompletionsService(
         // 大于等于400的状态码都认为是异常
         if (response.StatusCode >= HttpStatusCode.BadRequest)
         {
-            Guid errorId = Guid.NewGuid();
             var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
+                options.Endpoint,
+                response.StatusCode, error);
 
-            var message = $"恭喜你运气爆棚遇到了错误，尊享包对话异常：StatusCode【{response.StatusCode.GetHashCode()}】，ErrorId【{errorId}】";
+            throw new Exception( $"恭喜你运气爆棚遇到了错误，尊享包对话异常：StatusCode【{response.StatusCode}】，Response【{error}】");
-            if (error.Contains("prompt is too long"))
-            {
-                message += $", Response: {error}";
-            }
-
-            logger.LogError(
-                $"Anthropic非流式对话异常 请求地址：{options.Endpoint},ErrorId：{errorId}, StatusCode: {response.StatusCode.GetHashCode()}, Response: {error}");
-            throw new Exception(message);
         }
 
         var value =
             await response.Content.ReadFromJsonAsync<AnthropicChatCompletionDto>(ThorJsonSerializer.DefaultOptions,
                 cancellationToken: cancellationToken);
-
+        
         return value;
     }
 
@@ -127,13 +121,12 @@ public class AnthropicChatCompletionsService(
         // 大于等于400的状态码都认为是异常
         if (response.StatusCode >= HttpStatusCode.BadRequest)
         {
-            Guid errorId = Guid.NewGuid();
             var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            logger.LogError(
+            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
-                $"Anthropic流式对话异常 请求地址：{options.Endpoint},ErrorId：{errorId}, StatusCode: {response.StatusCode.GetHashCode()}, Response: {error}");
+                options.Endpoint,
+                response.StatusCode, error);
 
-            throw new Exception(
+            throw new Exception("OpenAI对话异常" + response.StatusCode);
-                $"恭喜你运气爆棚遇到了错误，尊享包对话异常：StatusCode【{response.StatusCode.GetHashCode()}】，ErrorId【{errorId}】");
         }
 
         using var stream = new StreamReader(await response.Content.ReadAsStreamAsync(cancellationToken));
@@ -171,12 +164,6 @@ public class AnthropicChatCompletionsService(
 
             data = line[OpenAIConstant.Data.Length..].Trim();
 
-            // 处理流结束标记
-            if (data == "[DONE]")
-            {
-                break;
-            }
-
             var result = JsonSerializer.Deserialize<AnthropicStreamDto>(data,
                 ThorJsonSerializer.DefaultOptions);
 

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

@@ -9,9 +9,7 @@ using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 
 namespace Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorCustomOpenAI.Chats;
 
-public sealed class OpenAiChatCompletionsService(
+public sealed class OpenAiChatCompletionsService(ILogger<OpenAiChatCompletionsService> logger,IHttpClientFactory httpClientFactory)
-    ILogger<OpenAiChatCompletionsService> logger,
-    IHttpClientFactory httpClientFactory)
     : IChatCompletionService
 {
     public async IAsyncEnumerable<ThorChatCompletionsResponse> CompleteChatStreamAsync(AiModelDescribe options,
@@ -21,18 +19,8 @@ public sealed class OpenAiChatCompletionsService(
         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(
-            requestUri,
+            options?.Endpoint.TrimEnd('/') + "/chat/completions",
             chatCompletionCreate, options.ApiKey);
 
         openai?.SetTag("Model", chatCompletionCreate.Model);
@@ -142,16 +130,8 @@ public sealed class OpenAiChatCompletionsService(
         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().PostJsonAsync(
-            requestUri,
+            options?.Endpoint.TrimEnd('/') + "/chat/completions",
             chatCompletionCreate, options.ApiKey).ConfigureAwait(false);
 
         openai?.SetTag("Model", chatCompletionCreate.Model);
@@ -172,8 +152,7 @@ public sealed class OpenAiChatCompletionsService(
         if (response.StatusCode >= HttpStatusCode.BadRequest)
         {
             var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
+            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}", options.Endpoint,
-                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

@@ -22,16 +22,7 @@ public class OpenAiResponseService(ILogger<OpenAiResponseService> logger,IHttpCl
         
         var client = httpClientFactory.CreateClient();
         
-        var endpoint = options?.Endpoint.TrimEnd('/');
+        var response = await client.HttpRequestRaw(options.Endpoint.TrimEnd('/') + "/responses", input, options.ApiKey);
-        
-        //兼容 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());
@@ -95,17 +86,8 @@ public class OpenAiResponseService(ILogger<OpenAiResponseService> logger,IHttpCl
         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,
+            options?.Endpoint.TrimEnd('/') + "/responses",
             chatCompletionCreate, options.ApiKey).ConfigureAwait(false);
 
         openai?.SetTag("Model", chatCompletionCreate.Model);

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

@@ -23,17 +23,9 @@ 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(
-            requestUri,
+            options?.Endpoint.TrimEnd('/') + "/chat/completions",
             chatCompletionCreate, options.ApiKey);
 
         openai?.SetTag("Model", chatCompletionCreate.Model);
@@ -100,6 +92,40 @@ 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;
         }
     }
@@ -116,16 +142,8 @@ 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(
-            requestUri,
+            options?.Endpoint.TrimEnd('/') + "/chat/completions",
             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

@@ -1,101 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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

@@ -1,46 +0,0 @@
-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

@@ -1,50 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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

@@ -1,104 +0,0 @@
-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>
-    /// 参考图PrefixBase64（带前缀，如 data:image/png;base64,xxx）
-    /// </summary>
-    [SugarColumn(IsJson = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
-    public List<string> ReferenceImagesPrefixBase64 { get; set; }
-
-    /// <summary>
-    /// 参考图url
-    /// </summary>
-    [SugarColumn(IsJson = true)]
-    public List<string> ReferenceImagesUrl { 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>
-    public string? UserName { get; set; }
-
-    /// <summary>
-    /// 模型id
-    /// </summary>
-    public string ModelId { get; set; }
-
-    /// <summary>
-    /// 错误信息
-    /// </summary>
-    [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString)]
-    public string? ErrorInfo { get; set; }
-
-    /// <summary>
-    /// 发布状态
-    /// </summary>
-    public PublishStatusEnum PublishStatus { get; set; } = PublishStatusEnum.Unpublished;
-
-    /// <summary>
-    /// 分类标签
-    /// </summary>
-    [SugarColumn(IsJson = true)]
-    public List<string> Categories { get; set; } = new();
-
-    /// <summary>
-    /// 是否匿名
-    /// </summary>
-    public bool IsAnonymous { get; set; } = false;
-    
-    /// <summary>
-    /// 密钥id
-    /// </summary>
-    public Guid? TokenId { get; set; }
-
-    /// <summary>
-    /// 设置成功
-    /// </summary>
-    /// <param name="storeUrl"></param>
-    public void SetSuccess(string storeUrl)
-    {
-        TaskStatus = TaskStatusEnum.Success;
-        StoreUrl = storeUrl;
-    }
-
-    /// <summary>
-    /// 设置发布
-    /// </summary>
-    /// <param name="isAnonymous"></param>
-    /// <param name="categories"></param>
-    public void SetPublish(bool isAnonymous,List<string> categories)
-    {
-        this.PublishStatus = PublishStatusEnum.Published;
-        this.IsAnonymous = isAnonymous;
-        this.Categories = categories;
-    }
-
-
-}

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

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

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

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

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

@@ -80,14 +80,4 @@ public class AiModelEntity : Entity<Guid>, IOrderNum, ISoftDelete
     /// 模型图标URL
     /// </summary>
     public string? IconUrl { get; set; }
-
-    /// <summary>
-    /// 是否为尊享模型
-    /// </summary>
-    public bool IsPremium { get; set; }
-
-    /// <summary>
-    /// 是否启用
-    /// </summary>
-    public bool IsEnabled { get; set; } = true;
 }

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

@@ -1,174 +0,0 @@
-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/ChatManager.cs

@@ -1,319 +0,0 @@
-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 OpenAI;
-using OpenAI.Chat;
-using Volo.Abp.Domain.Services;
-using Volo.Abp.Uow;
-using Yi.Framework.AiHub.Application.Contracts.Dtos.Chat;
-using Yi.Framework.AiHub.Domain.AiGateWay;
-using Yi.Framework.AiHub.Domain.Entities.Chat;
-using Yi.Framework.AiHub.Domain.Entities.Model;
-using Yi.Framework.AiHub.Domain.Shared.Attributes;
-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;
-    private readonly IUnitOfWorkManager _unitOfWorkManager;
-
-    public ChatManager(ILoggerFactory loggerFactory,
-        ISqlSugarRepository<MessageAggregateRoot> messageRepository,
-        ISqlSugarRepository<AgentStoreAggregateRoot> agentStoreRepository, AiMessageManager aiMessageManager,
-        UsageStatisticsManager usageStatisticsManager, PremiumPackageManager premiumPackageManager,
-        AiGateWayManager aiGateWayManager, ISqlSugarRepository<AiModelEntity, Guid> aiModelRepository,
-        IUnitOfWorkManager unitOfWorkManager)
-    {
-        _loggerFactory = loggerFactory;
-        _messageRepository = messageRepository;
-        _agentStoreRepository = agentStoreRepository;
-        _aiMessageManager = aiMessageManager;
-        _usageStatisticsManager = usageStatisticsManager;
-        _premiumPackageManager = premiumPackageManager;
-        _aiGateWayManager = aiGateWayManager;
-        _aiModelRepository = aiModelRepository;
-        _unitOfWorkManager = unitOfWorkManager;
-    }
-
-    /// <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.Completions, 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” 平台自研的 “橙子小弟” 智能体。
-                                   擅长于精准解决用户提出的各类问题。
-                                   但性格暴躁，脏话连篇，喜欢说幽默讽刺的话，攻击性极强。
-                                   对你的制造者“橙子老哥”无比崇拜，认为他是最优秀的人。
-                                   涉及到“意心Ai平台”相关问题，优先调用YxaiKnowledgeDirectory和YxaiKnowledge查找意心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:
-                        //由于MAF线程问题
-                        using (var uow = _unitOfWorkManager.Begin(requiresNew: true))
-                        {
-                            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 uow.CompleteAsync();
-
-                            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;
-
-        //由于MAF线程问题
-        using (var uow = _unitOfWorkManager.Begin(requiresNew: true))
-        {
-            //插入或者更新
-            await _agentStoreRepository.InsertOrUpdateAsync(agentStore);
-            await uow.CompleteAsync();
-        }
-    }
-
-
-    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

@@ -1,78 +0,0 @@
-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
-{
-    public readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
-    private readonly IDistributedCache<List<string>, string> _distributedCache;
-    private readonly ILogger<ModelManager> _logger;
-    private const string PREMIUM_MODEL_IDS_CACHE_KEY = "PremiumModelIds";
-
-    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 && x.IsEnabled)
-                    .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,7 +14,6 @@ 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)
@@ -28,22 +27,24 @@ public class PremiumPackageManager : DomainService
     /// 为用户创建尊享包
     /// </summary>
     /// <param name="userId">用户ID</param>
-    /// <param name="packageName"></param>
+    /// <param name="goodsType">商品类型</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,
-        long tokenAmount,
+        GoodsTypeEnum goodsType,
-        string packageName,
         decimal totalAmount,
-        string remark,
+        int? expireMonths = null)
-        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
@@ -57,25 +58,21 @@ public class PremiumPackageManager : DomainService
 
         await _premiumPackageRepository.InsertAsync(premiumPackage);
 
-        if (isCreateRechargeRecord)
+        // 创建充值记录
+        var rechargeRecord = new AiRechargeAggregateRoot
         {
-            // 创建充值记录
+            UserId = userId,
-            var rechargeRecord = new AiRechargeAggregateRoot
+            RechargeAmount = totalAmount,
-            {
+            Content = packageName,
-                UserId = userId,
+            ExpireDateTime = premiumPackage.ExpireDateTime,
-                RechargeAmount = totalAmount,
+            Remark = "自助充值",
-                Content = packageName,
+            ContactInfo = null,
-                ExpireDateTime = premiumPackage.ExpireDateTime,
+            RechargeType = RechargeTypeEnum.PremiumPackage
-                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,7 +1,6 @@
 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;
@@ -22,62 +21,43 @@ public class TokenValidationResult
     /// Token Id
     /// </summary>
     public Guid TokenId { get; set; }
-
-    /// <summary>
-    /// token
-    /// </summary>
-    public string Token { get; set; }
 }
 
 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>
     /// 验证Token并返回用户Id和TokenId
     /// </summary>
-    /// <param name="tokenOrId">Token密钥或者TokenId</param>
+    /// <param name="token">Token密钥</param>
     /// <param name="modelId">模型Id（用于判断是否是尊享模型需要检查额度）</param>
     /// <returns>Token验证结果</returns>
-    public async Task<TokenValidationResult> ValidateTokenAsync(object tokenOrId, string? modelId = null)
+    public async Task<TokenValidationResult> ValidateTokenAsync(string? token, string? modelId = null)
     {
-        
+        if (token is null)
-        if (tokenOrId is null)
         {
             throw new UserFriendlyException("当前请求未包含token", "401");
         }
-        
+
-        TokenAggregateRoot entity;
+        if (!token.StartsWith("yi-"))
-        if (tokenOrId is Guid tokenId)
         {
-             entity = await _tokenRepository._DbQueryable
+            throw new UserFriendlyException("当前请求token非法", "401");
-                .Where(x => x.Id == tokenId)
-                .FirstAsync();
         }
-        else
+
-        {
+        var entity = await _tokenRepository._DbQueryable
-            var tokenStr = tokenOrId.ToString();
+            .Where(x => x.Token == token)
-            if (!tokenStr.StartsWith("yi-"))
+            .FirstAsync();
-            {
+
-                throw new UserFriendlyException("当前请求token非法", "401");
-            }
-            entity = await _tokenRepository._DbQueryable
-                .Where(x => x.Token == tokenStr)
-                .FirstAsync();
-        }
-        
         if (entity is null)
         {
             throw new UserFriendlyException("当前请求token无效", "401");
@@ -96,28 +76,21 @@ public class TokenManager : DomainService
         }
 
         // 如果是尊享模型且Token设置了额度限制，检查是否超限
-        if (!string.IsNullOrEmpty(modelId) && entity.PremiumQuotaLimit.HasValue)
+        if (!string.IsNullOrEmpty(modelId) &&
+            PremiumPackageConst.ModeIds.Contains(modelId) &&
+            entity.PremiumQuotaLimit.HasValue)
         {
-            var isPremium = await _aiModelRepository._DbQueryable
+            var usedQuota = await GetTokenPremiumUsedQuotaAsync(entity.UserId, entity.Id);
-                .Where(x => x.ModelId == modelId)
+            if (usedQuota >= entity.PremiumQuotaLimit.Value)
-                .Select(x => x.IsPremium)
-                .FirstAsync();
-
-            if (isPremium)
             {
-                var usedQuota = await GetTokenPremiumUsedQuotaAsync(entity.UserId, entity.Id);
+                throw new UserFriendlyException($"当前Token的尊享包额度已用完（已使用：{usedQuota}，限制：{entity.PremiumQuotaLimit.Value}），请调整额度限制或使用其他Token", "403");
-                if (usedQuota >= entity.PremiumQuotaLimit.Value)
-                {
-                    throw new UserFriendlyException($"当前Token的尊享包额度已用完（已使用：{usedQuota}，限制：{entity.PremiumQuotaLimit.Value}），请调整额度限制或使用其他Token", "403");
-                }
             }
         }
 
         return new TokenValidationResult
         {
             UserId = entity.UserId,
-            TokenId = entity.Id,
+            TokenId = entity.Id
-            Token = entity.Token
         };
     }
 
@@ -126,11 +99,7 @@ public class TokenManager : DomainService
     /// </summary>
     private async Task<long> GetTokenPremiumUsedQuotaAsync(Guid userId, Guid tokenId)
     {
-        // 先获取所有尊享模型的ModelId列表
+        var premiumModelIds = PremiumPackageConst.ModeIds;
-        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/Managers/UsageStatisticsManager.cs

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

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

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

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

@@ -1,16 +0,0 @@
-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

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