Merge branch 'ai-agent-backend' into ai-agent
# Conflicts: # Yi.Ai.Vue3/src/pages/console/index.vue # Yi.Ai.Vue3/src/routers/modules/staticRouter.ts
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user