diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppCreateInput.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppCreateInput.cs new file mode 100644 index 00000000..f3c8ee6f --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppCreateInput.cs @@ -0,0 +1,42 @@ +using System.ComponentModel.DataAnnotations; + +namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel; + +/// +/// 创建AI应用输入 +/// +public class AiAppCreateInput +{ + /// + /// 应用名称 + /// + [Required(ErrorMessage = "应用名称不能为空")] + [StringLength(100, ErrorMessage = "应用名称不能超过100个字符")] + public string Name { get; set; } + + /// + /// 应用终结点 + /// + [Required(ErrorMessage = "应用终结点不能为空")] + [StringLength(500, ErrorMessage = "应用终结点不能超过500个字符")] + public string Endpoint { get; set; } + + /// + /// 额外URL + /// + [StringLength(500, ErrorMessage = "额外URL不能超过500个字符")] + public string? ExtraUrl { get; set; } + + /// + /// 应用Key + /// + [Required(ErrorMessage = "应用Key不能为空")] + [StringLength(500, ErrorMessage = "应用Key不能超过500个字符")] + public string ApiKey { get; set; } + + /// + /// 排序 + /// + [Range(0, int.MaxValue, ErrorMessage = "排序必须大于等于0")] + public int OrderNum { get; set; } +} diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppDto.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppDto.cs new file mode 100644 index 00000000..95be653d --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppDto.cs @@ -0,0 +1,42 @@ +namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel; + +/// +/// AI应用DTO +/// +public class AiAppDto +{ + /// + /// 应用ID + /// + public Guid Id { get; set; } + + /// + /// 应用名称 + /// + public string Name { get; set; } + + /// + /// 应用终结点 + /// + public string Endpoint { get; set; } + + /// + /// 额外URL + /// + public string? ExtraUrl { get; set; } + + /// + /// 应用Key + /// + public string ApiKey { get; set; } + + /// + /// 排序 + /// + public int OrderNum { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreationTime { get; set; } +} diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppGetListInput.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppGetListInput.cs new file mode 100644 index 00000000..c1e98085 --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppGetListInput.cs @@ -0,0 +1,14 @@ +using Yi.Framework.Ddd.Application.Contracts; + +namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel; + +/// +/// 获取AI应用列表输入 +/// +public class AiAppGetListInput : PagedAllResultRequestDto +{ + /// + /// 搜索关键词（搜索应用名称） + /// + public string? SearchKey { get; set; } +} diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppUpdateInput.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppUpdateInput.cs new file mode 100644 index 00000000..ee14667c --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiAppUpdateInput.cs @@ -0,0 +1,48 @@ +using System.ComponentModel.DataAnnotations; + +namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel; + +/// +/// 更新AI应用输入 +/// +public class AiAppUpdateInput +{ + /// + /// 应用ID + /// + [Required(ErrorMessage = "应用ID不能为空")] + public Guid Id { get; set; } + + /// + /// 应用名称 + /// + [Required(ErrorMessage = "应用名称不能为空")] + [StringLength(100, ErrorMessage = "应用名称不能超过100个字符")] + public string Name { get; set; } + + /// + /// 应用终结点 + /// + [Required(ErrorMessage = "应用终结点不能为空")] + [StringLength(500, ErrorMessage = "应用终结点不能超过500个字符")] + public string Endpoint { get; set; } + + /// + /// 额外URL + /// + [StringLength(500, ErrorMessage = "额外URL不能超过500个字符")] + public string? ExtraUrl { get; set; } + + /// + /// 应用Key + /// + [Required(ErrorMessage = "应用Key不能为空")] + [StringLength(500, ErrorMessage = "应用Key不能超过500个字符")] + public string ApiKey { get; set; } + + /// + /// 排序 + /// + [Range(0, int.MaxValue, ErrorMessage = "排序必须大于等于0")] + public int OrderNum { get; set; } +} diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelCreateInput.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelCreateInput.cs new file mode 100644 index 00000000..9e956c52 --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelCreateInput.cs @@ -0,0 +1,96 @@ +using System.ComponentModel.DataAnnotations; +using Yi.Framework.AiHub.Domain.Shared.Enums; + +namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel; + +/// +/// 创建AI模型输入 +/// +public class AiModelCreateInput +{ + /// + /// 处理名 + /// + [Required(ErrorMessage = "处理名不能为空")] + [StringLength(100, ErrorMessage = "处理名不能超过100个字符")] + public string HandlerName { get; set; } + + /// + /// 模型ID + /// + [Required(ErrorMessage = "模型ID不能为空")] + [StringLength(200, ErrorMessage = "模型ID不能超过200个字符")] + public string ModelId { get; set; } + + /// + /// 模型名称 + /// + [Required(ErrorMessage = "模型名称不能为空")] + [StringLength(200, ErrorMessage = "模型名称不能超过200个字符")] + public string Name { get; set; } + + /// + /// 模型描述 + /// + [StringLength(1000, ErrorMessage = "模型描述不能超过1000个字符")] + public string? Description { get; set; } + + /// + /// 排序 + /// + [Range(0, int.MaxValue, ErrorMessage = "排序必须大于等于0")] + public int OrderNum { get; set; } + + /// + /// AI应用ID + /// + [Required(ErrorMessage = "AI应用ID不能为空")] + public Guid AiAppId { get; set; } + + /// + /// 额外信息 + /// + [StringLength(2000, ErrorMessage = "额外信息不能超过2000个字符")] + public string? ExtraInfo { get; set; } + + /// + /// 模型类型 + /// + [Required(ErrorMessage = "模型类型不能为空")] + public ModelTypeEnum ModelType { get; set; } + + /// + /// 模型API类型 + /// + [Required(ErrorMessage = "模型API类型不能为空")] + public ModelApiTypeEnum ModelApiType { get; set; } + + /// + /// 模型倍率 + /// + [Range(0.01, double.MaxValue, ErrorMessage = "模型倍率必须大于0")] + public decimal Multiplier { get; set; } = 1; + + /// + /// 模型显示倍率 + /// + [Range(0.01, double.MaxValue, ErrorMessage = "模型显示倍率必须大于0")] + public decimal MultiplierShow { get; set; } = 1; + + /// + /// 供应商分组名称 + /// + [StringLength(100, ErrorMessage = "供应商分组名称不能超过100个字符")] + public string? ProviderName { get; set; } + + /// + /// 模型图标URL + /// + [StringLength(500, ErrorMessage = "模型图标URL不能超过500个字符")] + public string? IconUrl { get; set; } + + /// + /// 是否为尊享模型 + /// + public bool IsPremium { get; set; } +} diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelDto.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelDto.cs new file mode 100644 index 00000000..3b93b680 --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelDto.cs @@ -0,0 +1,84 @@ +using Yi.Framework.AiHub.Domain.Shared.Enums; + +namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel; + +/// +/// AI模型DTO +/// +public class AiModelDto +{ + /// + /// 模型ID + /// + public Guid Id { get; set; } + + /// + /// 处理名 + /// + public string HandlerName { get; set; } + + /// + /// 模型ID + /// + public string ModelId { get; set; } + + /// + /// 模型名称 + /// + public string Name { get; set; } + + /// + /// 模型描述 + /// + public string? Description { get; set; } + + /// + /// 排序 + /// + public int OrderNum { get; set; } + + /// + /// AI应用ID + /// + public Guid AiAppId { get; set; } + + /// + /// 额外信息 + /// + public string? ExtraInfo { get; set; } + + /// + /// 模型类型 + /// + public ModelTypeEnum ModelType { get; set; } + + /// + /// 模型API类型 + /// + public ModelApiTypeEnum ModelApiType { get; set; } + + /// + /// 模型倍率 + /// + public decimal Multiplier { get; set; } + + /// + /// 模型显示倍率 + /// + public decimal MultiplierShow { get; set; } + + /// + /// 供应商分组名称 + /// + public string? ProviderName { get; set; } + + /// + /// 模型图标URL + /// + public string? IconUrl { get; set; } + + /// + /// 是否为尊享模型 + /// + public bool IsPremium { get; set; } +} diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelGetListInput.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelGetListInput.cs new file mode 100644 index 00000000..c71cfc9b --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelGetListInput.cs @@ -0,0 +1,24 @@ +using Yi.Framework.Ddd.Application.Contracts; + +namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel; + +/// +/// 获取AI模型列表输入 +/// +public class AiModelGetListInput : PagedAllResultRequestDto +{ + /// + /// 搜索关键词(搜索模型名称、模型ID) + /// + public string? SearchKey { get; set; } + + /// + /// AI应用ID筛选 + /// + public Guid? AiAppId { get; set; } + + /// + /// 是否只显示尊享模型 + /// + public bool? IsPremiumOnly { get; set; } +} diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelUpdateInput.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelUpdateInput.cs new file mode 100644 index 00000000..b35065d9 --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Channel/AiModelUpdateInput.cs @@ -0,0 +1,102 @@ +using System.ComponentModel.DataAnnotations; +using Yi.Framework.AiHub.Domain.Shared.Enums; + +namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Channel; + +/// +/// 更新AI模型输入 +/// +public class AiModelUpdateInput +{ + /// + /// 模型ID + /// + [Required(ErrorMessage = "模型ID不能为空")] + public Guid Id { get; set; } + + /// + /// 处理名 + /// + [Required(ErrorMessage = "处理名不能为空")] + [StringLength(100, ErrorMessage = "处理名不能超过100个字符")] + public string HandlerName { get; set; } + + /// + /// 模型ID + /// + [Required(ErrorMessage = "模型ID不能为空")] + [StringLength(200, ErrorMessage = "模型ID不能超过200个字符")] + public string ModelId { get; set; } + + /// + /// 模型名称 + /// + [Required(ErrorMessage = "模型名称不能为空")] + [StringLength(200, ErrorMessage = "模型名称不能超过200个字符")] + public string Name { get; set; } + + /// + /// 模型描述 + /// + [StringLength(1000, ErrorMessage = "模型描述不能超过1000个字符")] + public string? Description { get; set; } + + /// + /// 排序 + /// + [Range(0, int.MaxValue, ErrorMessage = "排序必须大于等于0")] + public int OrderNum { get; set; } + + /// + /// AI应用ID + /// + [Required(ErrorMessage = "AI应用ID不能为空")] + public Guid AiAppId { get; set; } + + /// + /// 额外信息 + /// + [StringLength(2000, ErrorMessage = "额外信息不能超过2000个字符")] + public string? ExtraInfo { get; set; } + + /// + /// 模型类型 + /// + [Required(ErrorMessage = "模型类型不能为空")] + public ModelTypeEnum ModelType { get; set; } + + /// + /// 模型API类型 + /// + [Required(ErrorMessage = "模型API类型不能为空")] + public ModelApiTypeEnum ModelApiType { get; set; } + + /// + /// 模型倍率 + /// + [Range(0.01, double.MaxValue, ErrorMessage = "模型倍率必须大于0")] + public decimal Multiplier { get; set; } + + /// + /// 模型显示倍率 + /// + [Range(0.01, double.MaxValue, ErrorMessage = "模型显示倍率必须大于0")] + public decimal MultiplierShow { get; set; } + + /// + /// 供应商分组名称 + /// + [StringLength(100, ErrorMessage = "供应商分组名称不能超过100个字符")] + public string? ProviderName { get; set; } + + /// + /// 模型图标URL + /// + [StringLength(500, ErrorMessage = "模型图标URL不能超过500个字符")] + public string? IconUrl { get; set; } + + /// + /// 是否为尊享模型 + /// + public bool IsPremium { get; set; } +} diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IChannelService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IChannelService.cs new file mode 100644 index 00000000..d45b542e --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IChannelService.cs @@ -0,0 +1,86 @@ +using Volo.Abp.Application.Dtos; +using Yi.Framework.AiHub.Application.Contracts.Dtos.Channel; + +namespace Yi.Framework.AiHub.Application.Contracts.IServices; + +/// +/// 渠道商管理服务接口 +/// +public interface IChannelService +{ + #region AI应用管理 + + /// + /// 获取AI应用列表 + /// + /// 查询参数 + /// 分页应用列表 + Task> GetAppListAsync(AiAppGetListInput input); + + /// + /// 根据ID获取AI应用 + /// + /// 应用ID + /// 应用详情 + Task GetAppByIdAsync(Guid id); + + /// + /// 创建AI应用 + /// + /// 创建输入 + /// 创建的应用 + Task CreateAppAsync(AiAppCreateInput input); + + /// + /// 更新AI应用 + /// + /// 更新输入 + /// 更新后的应用 + Task UpdateAppAsync(AiAppUpdateInput input); + + /// + /// 删除AI应用 + /// + /// 应用ID + Task DeleteAppAsync(Guid id); + + #endregion + + #region AI模型管理 + + /// + /// 获取AI模型列表 + /// + /// 查询参数 + /// 分页模型列表 + Task> GetModelListAsync(AiModelGetListInput input); + + /// + /// 根据ID获取AI模型 + /// + /// 模型ID + /// 模型详情 + Task GetModelByIdAsync(Guid id); + + /// + /// 创建AI模型 + /// + /// 创建输入 + /// 创建的模型 + Task CreateModelAsync(AiModelCreateInput input); + + /// + /// 更新AI模型 + /// + /// 更新输入 + /// 更新后的模型 + Task UpdateModelAsync(AiModelUpdateInput input); + + /// + /// 删除AI模型(软删除) + /// + /// 模型ID + Task DeleteModelAsync(Guid id); + + #endregion +} diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/ActivationCodeService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Activities/ActivationCodeService.cs similarity index 100% rename from Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/ActivationCodeService.cs rename to Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Activities/ActivationCodeService.cs diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Activities/DailyTaskService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Activities/DailyTaskService.cs index 013a82f4..33394c9a 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Activities/DailyTaskService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Activities/DailyTaskService.cs @@ -7,6 +7,7 @@ using Volo.Abp.Users; using Yi.Framework.AiHub.Application.Contracts.Dtos.DailyTask; using Yi.Framework.AiHub.Domain.Entities; using Yi.Framework.AiHub.Domain.Entities.Chat; +using Yi.Framework.AiHub.Domain.Entities.Model; using Yi.Framework.AiHub.Domain.Extensions; using Yi.Framework.AiHub.Domain.Managers; using Yi.Framework.AiHub.Domain.Shared.Consts; @@ -25,6 +26,7 @@ public class DailyTaskService : ApplicationService private readonly ISqlSugarRepository _premiumPackageRepository; private readonly ILogger _logger; private IDistributedLockProvider DistributedLock => LazyServiceProvider.LazyGetRequiredService(); + private readonly ISqlSugarRepository _aiModelRepository; // 任务配置 private readonly Dictionary _taskConfigs = new() @@ -37,12 +39,13 @@ public class DailyTaskService : ApplicationService ISqlSugarRepository dailyTaskRepository, ISqlSugarRepository messageRepository, ISqlSugarRepository premiumPackageRepository, - ILogger logger) + ILogger logger, ISqlSugarRepository aiModelRepository) { _dailyTaskRepository = dailyTaskRepository; _messageRepository = messageRepository; _premiumPackageRepository = premiumPackageRepository; _logger = logger; + _aiModelRepository = aiModelRepository; } /// @@ -179,10 +182,16 @@ public class DailyTaskService : ApplicationService var tomorrow = today.AddDays(1); // 查询今日所有使用尊享包模型的消息（role=system 表示消耗） + // 先获取所有尊享模型的ModelId列表 + var premiumModelIds = await _aiModelRepository._DbQueryable + .Where(x => x.IsPremium) + .Select(x => x.ModelId) + .ToListAsync(); + var totalTokens = await _messageRepository._DbQueryable .Where(x => x.UserId == userId) .Where(x => x.Role == "system") // system角色表示实际消耗 - .Where(x => PremiumPackageConst.ModeIds.Contains(x.ModelId)) // 尊享包模型 + .Where(x => premiumModelIds.Contains(x.ModelId)) // 尊享包模型 .Where(x => x.CreationTime >= today && x.CreationTime < tomorrow) .SumAsync(x => x.TokenUsage.TotalTokenCount); diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/ChannelService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/ChannelService.cs new file mode 100644 index 00000000..66f1bc0e --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/ChannelService.cs @@ -0,0 +1,240 @@ +using Mapster; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; +using Yi.Framework.AiHub.Application.Contracts.Dtos.Channel; +using Yi.Framework.AiHub.Application.Contracts.IServices; +using Yi.Framework.AiHub.Domain.Entities.Model; +using Yi.Framework.SqlSugarCore.Abstractions; + +namespace Yi.Framework.AiHub.Application.Services; + +/// +/// 渠道商管理服务实现 +/// +[Authorize] +public class ChannelService : ApplicationService, IChannelService +{ + private readonly ISqlSugarRepository _appRepository; + private readonly ISqlSugarRepository _modelRepository; + + public ChannelService( + ISqlSugarRepository appRepository, + ISqlSugarRepository modelRepository) + { + _appRepository = appRepository; + _modelRepository = modelRepository; + } + + #region AI应用管理 + + /// + /// 获取AI应用列表 + /// + [HttpGet("channel/app")] + public async Task> GetAppListAsync(AiAppGetListInput input) + { + RefAsync 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>(); + return new PagedResultDto(total, output); + } + + /// + /// 根据ID获取AI应用 + /// + [HttpGet("channel/app/{id}")] + public async Task GetAppByIdAsync([FromRoute]Guid id) + { + var entity = await _appRepository.GetByIdAsync(id); + return entity.Adapt(); + } + + /// + /// 创建AI应用 + /// + public async Task 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(); + } + + /// + /// 更新AI应用 + /// + public async Task 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(); + } + + /// + /// 删除AI应用 + /// + [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模型管理 + + /// + /// 获取AI模型列表 + /// + [HttpGet("channel/model")] + public async Task> GetModelListAsync(AiModelGetListInput input) + { + RefAsync 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>(); + return new PagedResultDto(total, output); + } + + /// + /// 根据ID获取AI模型 + /// + [HttpGet("channel/model/{id}")] + public async Task GetModelByIdAsync([FromRoute]Guid id) + { + var entity = await _modelRepository.GetByIdAsync(id); + return entity.Adapt(); + } + + /// + /// 创建AI模型 + /// + public async Task CreateModelAsync(AiModelCreateInput input) + { + // 验证应用是否存在 + var appExists = await _appRepository._DbQueryable + .Where(x => x.Id == input.AiAppId) + .AnyAsync(); + + if (!appExists) + { + throw new Volo.Abp.UserFriendlyException("指定的AI应用不存在"); + } + + var entity = new AiModelEntity + { + HandlerName = input.HandlerName, + ModelId = input.ModelId, + Name = input.Name, + Description = input.Description, + OrderNum = input.OrderNum, + AiAppId = input.AiAppId, + ExtraInfo = input.ExtraInfo, + ModelType = input.ModelType, + ModelApiType = input.ModelApiType, + Multiplier = input.Multiplier, + MultiplierShow = input.MultiplierShow, + ProviderName = input.ProviderName, + IconUrl = input.IconUrl, + IsPremium = input.IsPremium, + IsDeleted = false + }; + + await _modelRepository.InsertAsync(entity); + return entity.Adapt(); + } + + /// + /// 更新AI模型 + /// + public async Task UpdateModelAsync(AiModelUpdateInput input) + { + var entity = await _modelRepository.GetByIdAsync(input.Id); + + // 验证应用是否存在 + if (entity.AiAppId != input.AiAppId) + { + var appExists = await _appRepository._DbQueryable + .Where(x => x.Id == input.AiAppId) + .AnyAsync(); + + if (!appExists) + { + throw new Volo.Abp.UserFriendlyException("指定的AI应用不存在"); + } + } + + entity.HandlerName = input.HandlerName; + entity.ModelId = input.ModelId; + entity.Name = input.Name; + entity.Description = input.Description; + entity.OrderNum = input.OrderNum; + entity.AiAppId = input.AiAppId; + entity.ExtraInfo = input.ExtraInfo; + entity.ModelType = input.ModelType; + entity.ModelApiType = input.ModelApiType; + entity.Multiplier = input.Multiplier; + entity.MultiplierShow = input.MultiplierShow; + entity.ProviderName = input.ProviderName; + entity.IconUrl = input.IconUrl; + entity.IsPremium = input.IsPremium; + + await _modelRepository.UpdateAsync(entity); + return entity.Adapt(); + } + + /// + /// 删除AI模型(软删除) + /// + [HttpDelete("channel/model/{id}")] + public async Task DeleteModelAsync(Guid id) + { + await _modelRepository.DeleteByIdAsync(id); + } + + #endregion +} \ No newline at end of file diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiChatService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiChatService.cs index e24d5aca..69ef325e 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiChatService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiChatService.cs @@ -40,35 +40,37 @@ namespace Yi.Framework.AiHub.Application.Services; public class AiChatService : ApplicationService { private readonly IHttpContextAccessor _httpContextAccessor; - private readonly ISqlSugarRepository _aiModelRepository; private readonly AiBlacklistManager _aiBlacklistManager; private readonly ILogger _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 _agentStoreRepository; + private readonly ISqlSugarRepository _aiModelRepository; public AiChatService(IHttpContextAccessor httpContextAccessor, AiBlacklistManager aiBlacklistManager, - ISqlSugarRepository aiModelRepository, ILogger logger, AiGateWayManager aiGateWayManager, + ModelManager modelManager, PremiumPackageManager premiumPackageManager, ChatManager chatManager, TokenManager tokenManager, IAccountService accountService, - ISqlSugarRepository agentStoreRepository) + ISqlSugarRepository agentStoreRepository, ISqlSugarRepository 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; } @@ -102,7 +104,7 @@ public class AiChatService : ApplicationService ModelName = x.Name, ModelDescribe = x.Description, Remark = x.Description, - IsPremiumPackage = PremiumPackageConst.ModeIds.Contains(x.ModelId) + IsPremiumPackage = x.IsPremium }).ToListAsync(); return output; } @@ -137,19 +139,24 @@ public class AiChatService : ApplicationService } //如果是尊享包服务，需要校验是是否尊享包足够 - if (CurrentUser.IsAuthenticated && PremiumPackageConst.ModeIds.Contains(input.Model)) + if (CurrentUser.IsAuthenticated) { - // 检查尊享token包用量 - var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId()); - if (availableTokens <= 0) + var isPremium = await _modelManager.IsPremiumModelAsync(input.Model); + + if (isPremium) { - throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包"); + // 检查尊享token包用量 + var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId()); + if (availableTokens <= 0) + { + throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包"); + } } } //ai网关代理httpcontext await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input, - CurrentUser.Id, sessionId, null, cancellationToken); + CurrentUser.Id, sessionId, null, CancellationToken.None); } /// @@ -185,7 +192,7 @@ public class AiChatService : ApplicationService //ai网关代理httpcontext await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input, - CurrentUser.Id, null, null, cancellationToken); + CurrentUser.Id, null, null, CancellationToken.None); } @@ -212,7 +219,9 @@ public class AiChatService : ApplicationService } //如果是尊享包服务，需要校验是是否尊享包足够 - if (PremiumPackageConst.ModeIds.Contains(input.ModelId)) + var isPremium = await _modelManager.IsPremiumModelAsync(input.ModelId); + + if (isPremium) { // 检查尊享token包用量 var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(tokenValidation.UserId); @@ -230,7 +239,7 @@ public class AiChatService : ApplicationService input.ModelId, tokenValidation.UserId, input.Tools, - cancellationToken); + CancellationToken.None); } /// diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiImageService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiImageService.cs index 59098622..8f1325fa 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiImageService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiImageService.cs @@ -29,6 +29,7 @@ public class AiImageService : ApplicationService 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; @@ -37,6 +38,7 @@ public class AiImageService : ApplicationService IBackgroundJobManager backgroundJobManager, AiBlacklistManager aiBlacklistManager, PremiumPackageManager premiumPackageManager, + ModelManager modelManager, IGuidGenerator guidGenerator, IWebHostEnvironment webHostEnvironment, TokenManager tokenManager) { @@ -44,6 +46,7 @@ public class AiImageService : ApplicationService _backgroundJobManager = backgroundJobManager; _aiBlacklistManager = aiBlacklistManager; _premiumPackageManager = premiumPackageManager; + _modelManager = modelManager; _guidGenerator = guidGenerator; _webHostEnvironment = webHostEnvironment; _tokenManager = tokenManager; @@ -76,8 +79,9 @@ public class AiImageService : ApplicationService throw new UserFriendlyException("图片生成功能需要VIP用户才能使用，请购买VIP后重新登录重试"); } - // 尊享包校验 - if (PremiumPackageConst.ModeIds.Contains(input.ModelId)) + // 尊享包校验 - 使用ModelManager统一判断 + var isPremium = await _modelManager.IsPremiumModelAsync(input.ModelId); + if (isPremium) { var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(userId); if (availableTokens <= 0) diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/ModelService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/ModelService.cs index 98faf61c..957931e8 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/ModelService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/ModelService.cs @@ -1,10 +1,12 @@ 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; @@ -18,10 +20,12 @@ namespace Yi.Framework.AiHub.Application.Services.Chat; public class ModelService : ApplicationService, IModelService { private readonly ISqlSugarRepository _modelRepository; + private readonly ModelManager _modelManager; - public ModelService(ISqlSugarRepository modelRepository) + public ModelService(ISqlSugarRepository modelRepository, ModelManager modelManager) { _modelRepository = modelRepository; + _modelManager = modelManager; } /// @@ -41,8 +45,7 @@ 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 => - PremiumPackageConst.ModeIds.Contains(x.ModelId)) + .WhereIF(input.IsPremiumOnly == true, x => x.IsPremium) .GroupBy(x => x.ModelId) .Select(x => x.ModelId) .ToPageListAsync(input.SkipCount, input.MaxResultCount, total)); @@ -61,7 +64,7 @@ public class ModelService : ApplicationService, IModelService MultiplierShow = x.First().MultiplierShow, ProviderName = x.First().ProviderName, IconUrl = x.First().IconUrl, - IsPremium = PremiumPackageConst.ModeIds.Contains(x.First().ModelId), + IsPremium = x.First().IsPremium, OrderNum = x.First().OrderNum }).ToList(); @@ -77,11 +80,11 @@ public class ModelService : ApplicationService, IModelService .Where(x => !x.IsDeleted) .Where(x => !string.IsNullOrEmpty(x.ProviderName)) .GroupBy(x => x.ProviderName) - .OrderBy(x => x.ProviderName) + .OrderBy(x => x.OrderNum) .Select(x => x.ProviderName) .ToListAsync(); - return providers; + return providers!; } /// @@ -115,4 +118,13 @@ public class ModelService : ApplicationService, IModelService return Task.FromResult(options); } + + /// + /// 清除尊享模型ID缓存 + /// + [HttpPost("model/clear-premium-cache")] + public async Task ClearPremiumModelCacheAsync() + { + await _modelManager.ClearPremiumModelIdsCacheAsync(); + } } \ No newline at end of file diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/TokenService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/TokenService.cs index 23e7e666..2e192c62 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/TokenService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/TokenService.cs @@ -7,8 +7,10 @@ using Volo.Abp.Application.Services; using Volo.Abp.Users; using Yi.Framework.AiHub.Application.Contracts.Dtos.Token; using Yi.Framework.AiHub.Domain.Entities; +using Yi.Framework.AiHub.Domain.Entities.Model; using Yi.Framework.AiHub.Domain.Entities.OpenApi; using Yi.Framework.AiHub.Domain.Extensions; +using Yi.Framework.AiHub.Domain.Managers; using Yi.Framework.AiHub.Domain.Shared.Consts; using Yi.Framework.Ddd.Application.Contracts; using Yi.Framework.SqlSugarCore.Abstractions; @@ -23,13 +25,15 @@ public class TokenService : ApplicationService { private readonly ISqlSugarRepository _tokenRepository; private readonly ISqlSugarRepository _usageStatisticsRepository; - + private readonly ModelManager _modelManager; public TokenService( ISqlSugarRepository tokenRepository, - ISqlSugarRepository usageStatisticsRepository) + ISqlSugarRepository usageStatisticsRepository, + ModelManager modelManager) { _tokenRepository = tokenRepository; _usageStatisticsRepository = usageStatisticsRepository; + _modelManager = modelManager; } /// @@ -51,8 +55,8 @@ public class TokenService : ApplicationService return new PagedResultDto(); } - // 获取尊享包模型ID列表 - var premiumModelIds = PremiumPackageConst.ModeIds; + // 通过ModelManager获取尊享包模型ID列表 + var premiumModelIds = await _modelManager.GetPremiumModelIdsAsync(); // 批量查询所有Token的尊享包已使用额度 var tokenIds = tokens.Select(t => t.Id).ToList(); diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/OpenApiService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/OpenApiService.cs index ccb05089..5e4b0cf9 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/OpenApiService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/OpenApiService.cs @@ -27,25 +27,27 @@ public class OpenApiService : ApplicationService private readonly ILogger _logger; private readonly TokenManager _tokenManager; private readonly AiGateWayManager _aiGateWayManager; - private readonly ISqlSugarRepository _aiModelRepository; + private readonly ModelManager _modelManager; private readonly AiBlacklistManager _aiBlacklistManager; private readonly IAccountService _accountService; private readonly PremiumPackageManager _premiumPackageManager; private readonly ISqlSugarRepository _imageStoreRepository; + private readonly ISqlSugarRepository _aiModelRepository; public OpenApiService(IHttpContextAccessor httpContextAccessor, ILogger logger, TokenManager tokenManager, AiGateWayManager aiGateWayManager, - ISqlSugarRepository aiModelRepository, AiBlacklistManager aiBlacklistManager, - IAccountService accountService, PremiumPackageManager premiumPackageManager, ISqlSugarRepository imageStoreRepository) + ModelManager modelManager, AiBlacklistManager aiBlacklistManager, + IAccountService accountService, PremiumPackageManager premiumPackageManager, ISqlSugarRepository imageStoreRepository, ISqlSugarRepository aiModelRepository) { _httpContextAccessor = httpContextAccessor; _logger = logger; _tokenManager = tokenManager; _aiGateWayManager = aiGateWayManager; - _aiModelRepository = aiModelRepository; + _modelManager = modelManager; _aiBlacklistManager = aiBlacklistManager; _accountService = accountService; _premiumPackageManager = premiumPackageManager; _imageStoreRepository = imageStoreRepository; + _aiModelRepository = aiModelRepository; } /// @@ -65,7 +67,9 @@ public class OpenApiService : ApplicationService await _aiBlacklistManager.VerifiyAiBlacklist(userId); //如果是尊享包服务，需要校验是是否尊享包足够 - if (PremiumPackageConst.ModeIds.Contains(input.Model)) + var isPremium = await _modelManager.IsPremiumModelAsync(input.Model); + + if (isPremium) { // 检查尊享token包用量 var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(userId); @@ -79,13 +83,13 @@ public class OpenApiService : ApplicationService if (input.Stream == true) { await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input, - userId, null, tokenId, cancellationToken); + userId, null, tokenId,CancellationToken.None); } else { await _aiGateWayManager.CompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input, userId, null, tokenId, - cancellationToken); + CancellationToken.None); } } @@ -193,14 +197,14 @@ public class OpenApiService : ApplicationService { await _aiGateWayManager.AnthropicCompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input, - userId, null, tokenId, cancellationToken); + userId, null, tokenId, CancellationToken.None); } else { await _aiGateWayManager.AnthropicCompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input, userId, null, tokenId, - cancellationToken); + CancellationToken.None); } } @@ -245,14 +249,14 @@ public class OpenApiService : ApplicationService { await _aiGateWayManager.OpenAiResponsesStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input, - userId, null, tokenId, cancellationToken); + userId, null, tokenId, CancellationToken.None); } else { await _aiGateWayManager.OpenAiResponsesAsyncForStatisticsAsync(_httpContextAccessor.HttpContext, input, userId, null, tokenId, - cancellationToken); + CancellationToken.None); } } @@ -304,7 +308,7 @@ public class OpenApiService : ApplicationService modelId, input, userId, null, tokenId, - cancellationToken); + CancellationToken.None); } else { @@ -312,7 +316,7 @@ public class OpenApiService : ApplicationService modelId, input, userId, null, tokenId, - cancellationToken); + CancellationToken.None); } } diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/UsageStatisticsService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/UsageStatisticsService.cs index bffce1e6..6f988d41 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/UsageStatisticsService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/UsageStatisticsService.cs @@ -9,8 +9,10 @@ using Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics; using Yi.Framework.AiHub.Application.Contracts.IServices; using Yi.Framework.AiHub.Domain.Entities; using Yi.Framework.AiHub.Domain.Entities.Chat; +using Yi.Framework.AiHub.Domain.Entities.Model; using Yi.Framework.AiHub.Domain.Entities.OpenApi; using Yi.Framework.AiHub.Domain.Extensions; +using Yi.Framework.AiHub.Domain.Managers; using Yi.Framework.AiHub.Domain.Shared.Consts; using Yi.Framework.Ddd.Application.Contracts; using Yi.Framework.SqlSugarCore.Abstractions; @@ -27,17 +29,19 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic private readonly ISqlSugarRepository _usageStatisticsRepository; private readonly ISqlSugarRepository _premiumPackageRepository; private readonly ISqlSugarRepository _tokenRepository; - + private readonly ModelManager _modelManager; public UsageStatisticsService( ISqlSugarRepository messageRepository, ISqlSugarRepository usageStatisticsRepository, ISqlSugarRepository premiumPackageRepository, - ISqlSugarRepository tokenRepository) + ISqlSugarRepository tokenRepository, + ModelManager modelManager) { _messageRepository = messageRepository; _usageStatisticsRepository = usageStatisticsRepository; _premiumPackageRepository = premiumPackageRepository; _tokenRepository = tokenRepository; + _modelManager = modelManager; } /// @@ -181,7 +185,9 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic public async Task> GetPremiumTokenUsageByTokenAsync() { var userId = CurrentUser.GetId(); - var premiumModelIds = PremiumPackageConst.ModeIds; + + // 通过ModelManager获取所有尊享模型的ModelId列表 + var premiumModelIds = await _modelManager.GetPremiumModelIdsAsync(); // 从UsageStatistics表获取尊享模型的token消耗统计（按TokenId聚合） var tokenUsages = await _usageStatisticsRepository._DbQueryable diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureDatabricks/Chats/AzureDatabricksChatCompletionsService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureDatabricks/Chats/AzureDatabricksChatCompletionsService.cs index f1382b38..8026da63 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureDatabricks/Chats/AzureDatabricksChatCompletionsService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorAzureDatabricks/Chats/AzureDatabricksChatCompletionsService.cs @@ -107,35 +107,6 @@ public class AzureDatabricksChatCompletionsService(ILogger logger,IHttpClientFactory httpClientFactory) +public sealed class OpenAiChatCompletionsService( + ILogger logger, + IHttpClientFactory httpClientFactory) : IChatCompletionService { public async IAsyncEnumerable CompleteChatStreamAsync(AiModelDescribe options, @@ -19,8 +21,18 @@ public sealed class OpenAiChatCompletionsService(ILogger= HttpStatusCode.BadRequest) { var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false); - logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}", options.Endpoint, + logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}", + options.Endpoint, response.StatusCode, error); throw new BusinessException("OpenAI对话异常", response.StatusCode.ToString()); diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorCustomOpenAI/Chats/OpenAiResponseService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorCustomOpenAI/Chats/OpenAiResponseService.cs index 975c28a1..42e80f9d 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorCustomOpenAI/Chats/OpenAiResponseService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorCustomOpenAI/Chats/OpenAiResponseService.cs @@ -22,7 +22,16 @@ public class OpenAiResponseService(ILogger logger,IHttpCl var client = httpClientFactory.CreateClient(); - var response = await client.HttpRequestRaw(options.Endpoint.TrimEnd('/') + "/responses", input, options.ApiKey); + var endpoint = options?.Endpoint.TrimEnd('/'); + + //兼容 v1结尾 + if (endpoint != null && endpoint.EndsWith("/v1", StringComparison.OrdinalIgnoreCase)) + { + endpoint = endpoint.Substring(0, endpoint.Length - "/v1".Length); + } + var requestUri = endpoint + "/v1/responses"; + + var response = await client.HttpRequestRaw(requestUri, input, options.ApiKey); openai?.SetTag("Model", input.Model); openai?.SetTag("Response", response.StatusCode.ToString()); @@ -86,8 +95,17 @@ public class OpenAiResponseService(ILogger 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( - options?.Endpoint.TrimEnd('/') + "/responses", + requestUri, chatCompletionCreate, options.ApiKey).ConfigureAwait(false); openai?.SetTag("Model", chatCompletionCreate.Model); diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorDeepSeek/Chats/DeepSeekChatCompletionsService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorDeepSeek/Chats/DeepSeekChatCompletionsService.cs index dde9b819..b93fce50 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorDeepSeek/Chats/DeepSeekChatCompletionsService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorDeepSeek/Chats/DeepSeekChatCompletionsService.cs @@ -23,9 +23,17 @@ public sealed class DeepSeekChatCompletionsService(ILogger(line, ThorJsonSerializer.DefaultOptions); - - // var content = result?.Choices?.FirstOrDefault()?.Delta; - // - // // if (first && string.IsNullOrWhiteSpace(content?.Content) && string.IsNullOrEmpty(content?.ReasoningContent)) - // // { - // // continue; - // // } - // - // if (first && content.Content == OpenAIConstant.ThinkStart) - // { - // isThink = true; - // //continue; - // // 需要将content的内容转换到其他字段 - // } - // - // if (isThink && content.Content.Contains(OpenAIConstant.ThinkEnd)) - // { - // isThink = false; - // // 需要将content的内容转换到其他字段 - // //continue; - // } - // - // if (isThink) - // { - // // 需要将content的内容转换到其他字段 - // foreach (var choice in result.Choices) - // { - // //choice.Delta.ReasoningContent = choice.Delta.Content; - // //choice.Delta.Content = string.Empty; - // } - // } - - // first = false; - yield return result; } } @@ -142,8 +116,16 @@ public sealed class DeepSeekChatCompletionsService(ILogger, IOrderNum, ISoftDelete /// 模型图标URL /// public string? IconUrl { get; set; } + + /// + /// 是否为尊享模型 + /// + public bool IsPremium { get; set; } } \ No newline at end of file diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/AiGateWayManager.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/AiGateWayManager.cs index 22bc92a0..497fcc3b 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/AiGateWayManager.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/AiGateWayManager.cs @@ -150,7 +150,12 @@ public class AiGateWayManager : DomainService await _usageStatisticsManager.SetUsageAsync(userId.Value, request.Model, data.Usage, tokenId); // 扣减尊享token包用量 - if (PremiumPackageConst.ModeIds.Contains(request.Model)) + var isPremium = await _aiModelRepository._DbQueryable + .Where(x => x.ModelId == request.Model) + .Select(x => x.IsPremium) + .FirstAsync(); + + if (isPremium) { var totalTokens = data.Usage?.TotalTokens ?? 0; if (totalTokens > 0) @@ -300,12 +305,20 @@ public class AiGateWayManager : DomainService await _usageStatisticsManager.SetUsageAsync(userId, request.Model, tokenUsage, tokenId); // 扣减尊享token包用量 - if (userId is not null && PremiumPackageConst.ModeIds.Contains(request.Model)) + if (userId is not null) { - var totalTokens = tokenUsage.TotalTokens ?? 0; - if (totalTokens > 0) + var isPremium = await _aiModelRepository._DbQueryable + .Where(x => x.ModelId == request.Model) + .Select(x => x.IsPremium) + .FirstAsync(); + + if (isPremium) { - await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens); + var totalTokens = tokenUsage.TotalTokens ?? 0; + if (totalTokens > 0) + { + await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens); + } } } } @@ -363,12 +376,20 @@ public class AiGateWayManager : DomainService await _usageStatisticsManager.SetUsageAsync(userId, model, response.Usage, tokenId); // 扣减尊享token包用量 - if (userId is not null && PremiumPackageConst.ModeIds.Contains(request.Model)) + if (userId is not null) { - var totalTokens = response.Usage.TotalTokens ?? 0; - if (totalTokens > 0) + var isPremium = await _aiModelRepository._DbQueryable + .Where(x => x.ModelId == request.Model) + .Select(x => x.IsPremium) + .FirstAsync(); + + if (isPremium) { - await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens); + var totalTokens = response.Usage.TotalTokens ?? 0; + if (totalTokens > 0) + { + await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens); + } } } } diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/ChatManager.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/ChatManager.cs index b4d9110c..5e411fbb 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/ChatManager.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/ChatManager.cs @@ -15,6 +15,7 @@ using Volo.Abp.Domain.Services; using Yi.Framework.AiHub.Application.Contracts.Dtos.Chat; using Yi.Framework.AiHub.Domain.AiGateWay; using Yi.Framework.AiHub.Domain.Entities.Chat; +using Yi.Framework.AiHub.Domain.Entities.Model; using Yi.Framework.AiHub.Domain.Entities.OpenApi; using Yi.Framework.AiHub.Domain.Shared.Attributes; using Yi.Framework.AiHub.Domain.Shared.Consts; @@ -34,12 +35,13 @@ public class ChatManager : DomainService private readonly UsageStatisticsManager _usageStatisticsManager; private readonly PremiumPackageManager _premiumPackageManager; private readonly AiGateWayManager _aiGateWayManager; + private readonly ISqlSugarRepository _aiModelRepository; public ChatManager(ILoggerFactory loggerFactory, ISqlSugarRepository messageRepository, ISqlSugarRepository agentStoreRepository, AiMessageManager aiMessageManager, UsageStatisticsManager usageStatisticsManager, PremiumPackageManager premiumPackageManager, - AiGateWayManager aiGateWayManager) + AiGateWayManager aiGateWayManager, ISqlSugarRepository aiModelRepository) { _loggerFactory = loggerFactory; _messageRepository = messageRepository; @@ -48,6 +50,7 @@ public class ChatManager : DomainService _usageStatisticsManager = usageStatisticsManager; _premiumPackageManager = premiumPackageManager; _aiGateWayManager = aiGateWayManager; + _aiModelRepository = aiModelRepository; } /// @@ -207,7 +210,12 @@ public class ChatManager : DomainService await _usageStatisticsManager.SetUsageAsync(userId, modelId, usage, tokenId); //扣减尊享token包用量 - if (PremiumPackageConst.ModeIds.Contains(modelId)) + 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) diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/ModelManager.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/ModelManager.cs new file mode 100644 index 00000000..e3a0df3a --- /dev/null +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/ModelManager.cs @@ -0,0 +1,78 @@ +using Microsoft.Extensions.Logging; +using Volo.Abp.Caching; +using Volo.Abp.Domain.Services; +using Yi.Framework.AiHub.Domain.Entities.Model; +using Yi.Framework.SqlSugarCore.Abstractions; + +namespace Yi.Framework.AiHub.Domain.Managers; + +/// +/// 模型管理器 +/// +public class ModelManager : DomainService +{ + private readonly ISqlSugarRepository _aiModelRepository; + private readonly IDistributedCache, string> _distributedCache; + private readonly ILogger _logger; + private const string PREMIUM_MODEL_IDS_CACHE_KEY = "PremiumModelIds"; + + public ModelManager( + ISqlSugarRepository aiModelRepository, + IDistributedCache, string> distributedCache, + ILogger logger) + { + _aiModelRepository = aiModelRepository; + _distributedCache = distributedCache; + _logger = logger; + } + + /// + /// 获取所有尊享模型ID列表(使用分布式缓存,10分钟过期) + /// + /// 尊享模型ID列表 + public async Task> GetPremiumModelIdsAsync() + { + var output = await _distributedCache.GetOrAddAsync( + PREMIUM_MODEL_IDS_CACHE_KEY, + async () => + { + // 从数据库查询 + var premiumModelIds = await _aiModelRepository._DbQueryable + .Where(x => x.IsPremium) + .Select(x => x.ModelId) + .ToListAsync(); + return premiumModelIds; + }, + () => new Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions + { + AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(1) + } + ); + return output ?? new List(); + } + + /// + /// 判断指定模型是否为尊享模型 + /// + /// 模型ID + /// 是否为尊享模型 + public async Task IsPremiumModelAsync(string modelId) + { + if (string.IsNullOrWhiteSpace(modelId)) + { + return false; + } + + var premiumModelIds = await GetPremiumModelIdsAsync(); + return premiumModelIds.Contains(modelId); + } + + /// + /// 清除尊享模型ID缓存 + /// + public async Task ClearPremiumModelIdsCacheAsync() + { + await _distributedCache.RemoveAsync(PREMIUM_MODEL_IDS_CACHE_KEY); + _logger.LogInformation("已清除尊享模型ID分布式缓存"); + } +} \ No newline at end of file diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/TokenManager.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/TokenManager.cs index fc9ee5f7..9dc1fad9 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/TokenManager.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/TokenManager.cs @@ -1,6 +1,7 @@ using SqlSugar; using Volo.Abp.Domain.Services; using Yi.Framework.AiHub.Domain.Entities; +using Yi.Framework.AiHub.Domain.Entities.Model; using Yi.Framework.AiHub.Domain.Entities.OpenApi; using Yi.Framework.AiHub.Domain.Shared.Consts; using Yi.Framework.SqlSugarCore.Abstractions; @@ -32,13 +33,16 @@ public class TokenManager : DomainService { private readonly ISqlSugarRepository _tokenRepository; private readonly ISqlSugarRepository _usageStatisticsRepository; + private readonly ISqlSugarRepository _aiModelRepository; public TokenManager( ISqlSugarRepository tokenRepository, - ISqlSugarRepository usageStatisticsRepository) + ISqlSugarRepository usageStatisticsRepository, + ISqlSugarRepository aiModelRepository) { _tokenRepository = tokenRepository; _usageStatisticsRepository = usageStatisticsRepository; + _aiModelRepository = aiModelRepository; } /// @@ -92,14 +96,20 @@ public class TokenManager : DomainService } // 如果是尊享模型且Token设置了额度限制，检查是否超限 - if (!string.IsNullOrEmpty(modelId) && - PremiumPackageConst.ModeIds.Contains(modelId) && - entity.PremiumQuotaLimit.HasValue) + if (!string.IsNullOrEmpty(modelId) && entity.PremiumQuotaLimit.HasValue) { - var usedQuota = await GetTokenPremiumUsedQuotaAsync(entity.UserId, entity.Id); - if (usedQuota >= entity.PremiumQuotaLimit.Value) + var isPremium = await _aiModelRepository._DbQueryable + .Where(x => x.ModelId == modelId) + .Select(x => x.IsPremium) + .FirstAsync(); + + if (isPremium) { - throw new UserFriendlyException($"当前Token的尊享包额度已用完（已使用：{usedQuota}，限制：{entity.PremiumQuotaLimit.Value}），请调整额度限制或使用其他Token", "403"); + var usedQuota = await GetTokenPremiumUsedQuotaAsync(entity.UserId, entity.Id); + if (usedQuota >= entity.PremiumQuotaLimit.Value) + { + throw new UserFriendlyException($"当前Token的尊享包额度已用完（已使用：{usedQuota}，限制：{entity.PremiumQuotaLimit.Value}），请调整额度限制或使用其他Token", "403"); + } } } @@ -116,7 +126,11 @@ public class TokenManager : DomainService /// private async Task GetTokenPremiumUsedQuotaAsync(Guid userId, Guid tokenId) { - var premiumModelIds = PremiumPackageConst.ModeIds; + // 先获取所有尊享模型的ModelId列表 + var premiumModelIds = await _aiModelRepository._DbQueryable + .Where(x => x.IsPremium) + .Select(x => x.ModelId) + .ToListAsync(); var usedQuota = await _usageStatisticsRepository._DbQueryable .Where(x => x.UserId == userId && x.TokenId == tokenId && premiumModelIds.Contains(x.ModelId)) diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs index 62cf6531..cc52d77f 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs @@ -358,7 +358,7 @@ namespace Yi.Abp.Web var app = context.GetApplicationBuilder(); app.UseRouting(); - //app.ApplicationServices.GetRequiredService().SqlSugarClient.CodeFirst.InitTables(); + //app.ApplicationServices.GetRequiredService().SqlSugarClient.CodeFirst.InitTables(); // app.ApplicationServices.GetRequiredService().SqlSugarClient.CodeFirst.InitTables(); // app.ApplicationServices.GetRequiredService().SqlSugarClient.CodeFirst.InitTables(); diff --git a/Yi.Ai.Vue3/src/api/channel/index.ts b/Yi.Ai.Vue3/src/api/channel/index.ts new file mode 100644 index 00000000..cd31154f --- /dev/null +++ b/Yi.Ai.Vue3/src/api/channel/index.ts @@ -0,0 +1,100 @@ +import { del, get, post, put } from '@/utils/request'; +import type { + AiAppDto, + AiAppCreateInput, + AiAppUpdateInput, + AiAppGetListInput, + AiModelDto, + AiModelCreateInput, + AiModelUpdateInput, + AiModelGetListInput, + PagedResultDto, +} from './types'; + +// ==================== AI应用管理 ==================== + +// 获取AI应用列表 +export function getAppList(params?: AiAppGetListInput) { + const queryParams = new URLSearchParams(); + if (params?.searchKey) { + queryParams.append('SearchKey', params.searchKey); + } + if (params?.skipCount !== undefined) { + queryParams.append('SkipCount', params.skipCount.toString()); + } + if (params?.maxResultCount !== undefined) { + queryParams.append('MaxResultCount', params.maxResultCount.toString()); + } + + const queryString = queryParams.toString(); + const url = queryString ? `/channel/app?${queryString}` : '/channel/app'; + + return get>(url).json(); +} + +// 根据ID获取AI应用 +export function getAppById(id: string) { + return get(`/channel/app/${id}`).json(); +} + +// 创建AI应用 +export function createApp(data: AiAppCreateInput) { + return post('/channel/app', data).json(); +} + +// 更新AI应用 +export function updateApp(data: AiAppUpdateInput) { + return put('/channel/app', data).json(); +} + +// 删除AI应用 +export function deleteApp(id: string) { + return del(`/channel/app/${id}`).json(); +} + +// ==================== AI模型管理 ==================== + +// 获取AI模型列表 +export function getModelList(params?: AiModelGetListInput) { + const queryParams = new URLSearchParams(); + if (params?.searchKey) { + queryParams.append('SearchKey', params.searchKey); + } + if (params?.aiAppId) { + queryParams.append('AiAppId', params.aiAppId); + } + if (params?.isPremiumOnly !== undefined) { + queryParams.append('IsPremiumOnly', params.isPremiumOnly.toString()); + } + if (params?.skipCount !== undefined) { + queryParams.append('SkipCount', params.skipCount.toString()); + } + if (params?.maxResultCount !== undefined) { + queryParams.append('MaxResultCount', params.maxResultCount.toString()); + } + + const queryString = queryParams.toString(); + const url = queryString ? `/channel/model?${queryString}` : '/channel/model'; + + return get>(url).json(); +} + +// 根据ID获取AI模型 +export function getModelById(id: string) { + return get(`/channel/model/${id}`).json(); +} + +// 创建AI模型 +export function createModel(data: AiModelCreateInput) { + return post('/channel/model', data).json(); +} + +// 更新AI模型 +export function updateModel(data: AiModelUpdateInput) { + return put('/channel/model', data).json(); +} + +// 删除AI模型 +export function deleteModel(id: string) { + return del(`/channel/model/${id}`).json(); +} diff --git a/Yi.Ai.Vue3/src/api/channel/types.ts b/Yi.Ai.Vue3/src/api/channel/types.ts new file mode 100644 index 00000000..76a6306a --- /dev/null +++ b/Yi.Ai.Vue3/src/api/channel/types.ts @@ -0,0 +1,121 @@ +// 模型类型枚举 +export enum ModelTypeEnum { + Chat = 0, + Image = 1, + Embedding = 2, + PremiumChat = 3, +} + +// 模型API类型枚举 +export enum ModelApiTypeEnum { + OpenAi = 0, + Claude = 1, +} + +// AI应用DTO +export interface AiAppDto { + id: string; + name: string; + endpoint: string; + extraUrl?: string; + apiKey: string; + orderNum: number; + creationTime: string; +} + +// 创建AI应用输入 +export interface AiAppCreateInput { + name: string; + endpoint: string; + extraUrl?: string; + apiKey: string; + orderNum: number; +} + +// 更新AI应用输入 +export interface AiAppUpdateInput { + id: string; + name: string; + endpoint: string; + extraUrl?: string; + apiKey: string; + orderNum: number; +} + +// 获取AI应用列表输入 +export interface AiAppGetListInput { + searchKey?: string; + skipCount?: number; + maxResultCount?: number; +} + +// AI模型DTO +export interface AiModelDto { + id: string; + handlerName: string; + modelId: string; + name: string; + description?: string; + orderNum: number; + aiAppId: string; + extraInfo?: string; + modelType: ModelTypeEnum; + modelApiType: ModelApiTypeEnum; + multiplier: number; + multiplierShow: number; + providerName?: string; + iconUrl?: string; + isPremium: boolean; +} + +// 创建AI模型输入 +export interface AiModelCreateInput { + handlerName: string; + modelId: string; + name: string; + description?: string; + orderNum: number; + aiAppId: string; + extraInfo?: string; + modelType: ModelTypeEnum; + modelApiType: ModelApiTypeEnum; + multiplier: number; + multiplierShow: number; + providerName?: string; + iconUrl?: string; + isPremium: boolean; +} + +// 更新AI模型输入 +export interface AiModelUpdateInput { + id: string; + handlerName: string; + modelId: string; + name: string; + description?: string; + orderNum: number; + aiAppId: string; + extraInfo?: string; + modelType: ModelTypeEnum; + modelApiType: ModelApiTypeEnum; + multiplier: number; + multiplierShow: number; + providerName?: string; + iconUrl?: string; + isPremium: boolean; +} + +// 获取AI模型列表输入 +export interface AiModelGetListInput { + searchKey?: string; + aiAppId?: string; + isPremiumOnly?: boolean; + skipCount?: number; + maxResultCount?: number; +} + +// 分页结果 +export interface PagedResultDto { + items: T[]; + totalCount: number; +} diff --git a/Yi.Ai.Vue3/src/pages/console/channel/index.vue b/Yi.Ai.Vue3/src/pages/console/channel/index.vue new file mode 100644 index 00000000..318a79f2 --- /dev/null +++ b/Yi.Ai.Vue3/src/pages/console/channel/index.vue @@ -0,0 +1,550 @@ + + + + + diff --git a/Yi.Ai.Vue3/src/pages/console/index.vue b/Yi.Ai.Vue3/src/pages/console/index.vue index 44aece8f..15ae21dd 100644 --- a/Yi.Ai.Vue3/src/pages/console/index.vue +++ b/Yi.Ai.Vue3/src/pages/console/index.vue @@ -19,6 +19,7 @@ const navItems = [ { name: 'daily-task', label: '每日任务（限时）', icon: 'Trophy', path: '/console/daily-task' }, { name: 'invite', label: '每周邀请（限时）', icon: 'Present', path: '/console/invite' }, { name: 'activation', label: '激活码兑换', icon: 'MagicStick', path: '/console/activation' }, + { name: 'channel', label: '渠道商管理', icon: 'Setting', path: '/console/channel' }, ]; // 当前激活的菜单 diff --git a/Yi.Ai.Vue3/src/routers/modules/staticRouter.ts b/Yi.Ai.Vue3/src/routers/modules/staticRouter.ts index b94431ec..496bb214 100644 --- a/Yi.Ai.Vue3/src/routers/modules/staticRouter.ts +++ b/Yi.Ai.Vue3/src/routers/modules/staticRouter.ts @@ -207,6 +207,14 @@ export const layoutRouter: RouteRecordRaw[] = [ title: '激活码兑换', }, }, + { + path: 'channel', + name: 'consoleChannel', + component: () => import('@/pages/console/channel/index.vue'), + meta: { + title: '渠道商管理', + }, + }, ], }, ], diff --git a/Yi.Ai.Vue3/types/import_meta.d.ts b/Yi.Ai.Vue3/types/import_meta.d.ts index c98d612e..8f2a798b 100644 --- a/Yi.Ai.Vue3/types/import_meta.d.ts +++ b/Yi.Ai.Vue3/types/import_meta.d.ts @@ -7,7 +7,6 @@ interface ImportMetaEnv { readonly VITE_WEB_BASE_API: string; readonly VITE_API_URL: string; readonly VITE_FILE_UPLOAD_API: string; - readonly VITE_BUILD_COMPRESS: string; readonly VITE_SSO_SEVER_URL: string; readonly VITE_APP_VERSION: string; }