Revert "Merge pull request #292 from iRubbish/dev"

This reverts commit 9e8e74ce6b, reversing
changes made to 222f4e44fe.
This commit is contained in:
shaw
2025-08-30 20:09:41 +08:00
parent 3bc239e85c
commit a54622e3d7
16 changed files with 30 additions and 3448 deletions

View File

@@ -32,9 +32,7 @@ class ApiKeyService {
enableClientRestriction = false,
allowedClients = [],
dailyCostLimit = 0,
tags = [],
owner = null,
ownerType = null
tags = []
} = options
// 生成简单的API Key (64字符十六进制)
@@ -68,9 +66,7 @@ class ApiKeyService {
createdAt: new Date().toISOString(),
lastUsedAt: '',
expiresAt: expiresAt || '',
createdBy: 'admin', // 可以根据需要扩展用户系统
owner: owner || '',
ownerType: ownerType || ''
createdBy: 'admin' // 可以根据需要扩展用户系统
}
// 保存API Key数据并建立哈希映射
@@ -103,9 +99,7 @@ class ApiKeyService {
tags: JSON.parse(keyData.tags || '[]'),
createdAt: keyData.createdAt,
expiresAt: keyData.expiresAt,
createdBy: keyData.createdBy,
owner: keyData.owner,
ownerType: keyData.ownerType
createdBy: keyData.createdBy
}
}
@@ -300,21 +294,11 @@ class ApiKeyService {
// 📝 更新API Key
async updateApiKey(keyId, updates) {
try {
logger.debug(`🔧 Updating API key ${keyId} with:`, updates)
const keyData = await redis.getApiKey(keyId)
if (!keyData || Object.keys(keyData).length === 0) {
logger.error(`❌ API key not found: ${keyId}`)
throw new Error('API key not found')
}
logger.debug(`📋 Current API key data:`, {
id: keyData.id,
name: keyData.name,
owner: keyData.owner,
ownerType: keyData.ownerType
})
// 允许更新的字段
const allowedUpdates = [
'name',
@@ -360,10 +344,7 @@ class ApiKeyService {
// 更新时不需要重新建立哈希映射因为API Key本身没有变化
await redis.setApiKey(keyId, updatedData)
logger.success(`📝 Updated API key: ${keyId}`, {
updatedFields: Object.keys(updates),
newName: updatedData.name
})
logger.success(`📝 Updated API key: ${keyId}`)
return { success: true }
} catch (error) {