mirror of
https://github.com/Wei-Shaw/claude-relay-service.git
synced 2026-01-23 00:53:33 +00:00
feat: 支持Gemini-Api接入
This commit is contained in:
@@ -572,6 +572,19 @@
|
||||
<span>x{{ getDroidApiKeyCount(account) }}</span>
|
||||
</span>
|
||||
</div>
|
||||
<div
|
||||
v-else-if="account.platform === 'gemini-api'"
|
||||
class="flex items-center gap-1.5 rounded-lg border border-amber-200 bg-gradient-to-r from-amber-100 to-yellow-100 px-2.5 py-1 dark:border-amber-700 dark:from-amber-900/20 dark:to-yellow-900/20"
|
||||
>
|
||||
<i class="fas fa-robot text-xs text-amber-700 dark:text-amber-400" />
|
||||
<span class="text-xs font-semibold text-amber-800 dark:text-amber-300"
|
||||
>Gemini-API</span
|
||||
>
|
||||
<span class="mx-1 h-4 w-px bg-amber-300 dark:bg-amber-600" />
|
||||
<span class="text-xs font-medium text-amber-700 dark:text-amber-400"
|
||||
>API Key</span
|
||||
>
|
||||
</div>
|
||||
<div
|
||||
v-else
|
||||
class="flex items-center gap-1.5 rounded-lg border border-gray-200 bg-gradient-to-r from-gray-100 to-gray-200 px-2.5 py-1"
|
||||
@@ -725,7 +738,8 @@
|
||||
account.platform === 'openai-responses' ||
|
||||
account.platform === 'azure_openai' ||
|
||||
account.platform === 'ccr' ||
|
||||
account.platform === 'droid'
|
||||
account.platform === 'droid' ||
|
||||
account.platform === 'gemini-api'
|
||||
"
|
||||
class="flex items-center gap-2"
|
||||
>
|
||||
@@ -1832,7 +1846,8 @@ const supportedUsagePlatforms = [
|
||||
'openai',
|
||||
'openai-responses',
|
||||
'gemini',
|
||||
'droid'
|
||||
'droid',
|
||||
'gemini-api'
|
||||
]
|
||||
|
||||
// 过期时间编辑弹窗状态
|
||||
@@ -1859,6 +1874,7 @@ const platformOptions = ref([
|
||||
{ value: 'claude', label: 'Claude', icon: 'fa-brain' },
|
||||
{ value: 'claude-console', label: 'Claude Console', icon: 'fa-terminal' },
|
||||
{ value: 'gemini', label: 'Gemini', icon: 'fab fa-google' },
|
||||
{ value: 'gemini-api', label: 'Gemini API', icon: 'fa-key' },
|
||||
{ value: 'openai', label: 'OpenAi', icon: 'fa-openai' },
|
||||
{ value: 'azure_openai', label: 'Azure OpenAI', icon: 'fab fa-microsoft' },
|
||||
{ value: 'bedrock', label: 'Bedrock', icon: 'fab fa-aws' },
|
||||
@@ -2189,7 +2205,8 @@ const loadAccounts = async (forceReload = false) => {
|
||||
apiClient.get('/admin/azure-openai-accounts', { params }),
|
||||
apiClient.get('/admin/openai-responses-accounts', { params }),
|
||||
apiClient.get('/admin/ccr-accounts', { params }),
|
||||
apiClient.get('/admin/droid-accounts', { params })
|
||||
apiClient.get('/admin/droid-accounts', { params }),
|
||||
apiClient.get('/admin/gemini-api-accounts', { params })
|
||||
)
|
||||
} else {
|
||||
// 只请求指定平台,其他平台设为null占位
|
||||
@@ -2204,7 +2221,8 @@ const loadAccounts = async (forceReload = false) => {
|
||||
Promise.resolve({ success: true, data: [] }), // azure-openai 占位
|
||||
Promise.resolve({ success: true, data: [] }), // openai-responses 占位
|
||||
Promise.resolve({ success: true, data: [] }), // ccr 占位
|
||||
Promise.resolve({ success: true, data: [] }) // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }), // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }) // gemini-api 占位
|
||||
)
|
||||
break
|
||||
case 'claude-console':
|
||||
@@ -2217,7 +2235,8 @@ const loadAccounts = async (forceReload = false) => {
|
||||
Promise.resolve({ success: true, data: [] }), // azure-openai 占位
|
||||
Promise.resolve({ success: true, data: [] }), // openai-responses 占位
|
||||
Promise.resolve({ success: true, data: [] }), // ccr 占位
|
||||
Promise.resolve({ success: true, data: [] }) // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }), // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }) // gemini-api 占位
|
||||
)
|
||||
break
|
||||
case 'bedrock':
|
||||
@@ -2230,7 +2249,8 @@ const loadAccounts = async (forceReload = false) => {
|
||||
Promise.resolve({ success: true, data: [] }), // azure-openai 占位
|
||||
Promise.resolve({ success: true, data: [] }), // openai-responses 占位
|
||||
Promise.resolve({ success: true, data: [] }), // ccr 占位
|
||||
Promise.resolve({ success: true, data: [] }) // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }), // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }) // gemini-api 占位
|
||||
)
|
||||
break
|
||||
case 'gemini':
|
||||
@@ -2243,7 +2263,8 @@ const loadAccounts = async (forceReload = false) => {
|
||||
Promise.resolve({ success: true, data: [] }), // azure-openai 占位
|
||||
Promise.resolve({ success: true, data: [] }), // openai-responses 占位
|
||||
Promise.resolve({ success: true, data: [] }), // ccr 占位
|
||||
Promise.resolve({ success: true, data: [] }) // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }), // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }) // gemini-api 占位
|
||||
)
|
||||
break
|
||||
case 'openai':
|
||||
@@ -2256,7 +2277,8 @@ const loadAccounts = async (forceReload = false) => {
|
||||
Promise.resolve({ success: true, data: [] }), // azure-openai 占位
|
||||
Promise.resolve({ success: true, data: [] }), // openai-responses 占位
|
||||
Promise.resolve({ success: true, data: [] }), // ccr 占位
|
||||
Promise.resolve({ success: true, data: [] }) // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }), // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }) // gemini-api 占位
|
||||
)
|
||||
break
|
||||
case 'azure_openai':
|
||||
@@ -2269,7 +2291,8 @@ const loadAccounts = async (forceReload = false) => {
|
||||
apiClient.get('/admin/azure-openai-accounts', { params }),
|
||||
Promise.resolve({ success: true, data: [] }), // openai-responses 占位
|
||||
Promise.resolve({ success: true, data: [] }), // ccr 占位
|
||||
Promise.resolve({ success: true, data: [] }) // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }), // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }) // gemini-api 占位
|
||||
)
|
||||
break
|
||||
case 'openai-responses':
|
||||
@@ -2282,7 +2305,8 @@ const loadAccounts = async (forceReload = false) => {
|
||||
Promise.resolve({ success: true, data: [] }), // azure-openai 占位
|
||||
apiClient.get('/admin/openai-responses-accounts', { params }),
|
||||
Promise.resolve({ success: true, data: [] }), // ccr 占位
|
||||
Promise.resolve({ success: true, data: [] }) // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }), // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }) // gemini-api 占位
|
||||
)
|
||||
break
|
||||
case 'ccr':
|
||||
@@ -2295,7 +2319,8 @@ const loadAccounts = async (forceReload = false) => {
|
||||
Promise.resolve({ success: true, data: [] }), // azure 占位
|
||||
Promise.resolve({ success: true, data: [] }), // openai-responses 占位
|
||||
apiClient.get('/admin/ccr-accounts', { params }),
|
||||
Promise.resolve({ success: true, data: [] }) // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }), // droid 占位
|
||||
Promise.resolve({ success: true, data: [] }) // gemini-api 占位
|
||||
)
|
||||
break
|
||||
case 'droid':
|
||||
@@ -2308,7 +2333,22 @@ const loadAccounts = async (forceReload = false) => {
|
||||
Promise.resolve({ success: true, data: [] }), // azure 占位
|
||||
Promise.resolve({ success: true, data: [] }), // openai-responses 占位
|
||||
Promise.resolve({ success: true, data: [] }), // ccr 占位
|
||||
apiClient.get('/admin/droid-accounts', { params })
|
||||
apiClient.get('/admin/droid-accounts', { params }),
|
||||
Promise.resolve({ success: true, data: [] }) // gemini-api 占位
|
||||
)
|
||||
break
|
||||
case 'gemini-api':
|
||||
requests.push(
|
||||
Promise.resolve({ success: true, data: [] }), // claude 占位
|
||||
Promise.resolve({ success: true, data: [] }), // claude-console 占位
|
||||
Promise.resolve({ success: true, data: [] }), // bedrock 占位
|
||||
Promise.resolve({ success: true, data: [] }), // gemini 占位
|
||||
Promise.resolve({ success: true, data: [] }), // openai 占位
|
||||
Promise.resolve({ success: true, data: [] }), // azure-openai 占位
|
||||
Promise.resolve({ success: true, data: [] }), // openai-responses 占位
|
||||
Promise.resolve({ success: true, data: [] }), // ccr 占位
|
||||
Promise.resolve({ success: true, data: [] }), // droid 占位
|
||||
apiClient.get('/admin/gemini-api-accounts', { params })
|
||||
)
|
||||
break
|
||||
default:
|
||||
@@ -2322,6 +2362,7 @@ const loadAccounts = async (forceReload = false) => {
|
||||
Promise.resolve({ success: true, data: [] }),
|
||||
Promise.resolve({ success: true, data: [] }),
|
||||
Promise.resolve({ success: true, data: [] }),
|
||||
Promise.resolve({ success: true, data: [] }),
|
||||
Promise.resolve({ success: true, data: [] })
|
||||
)
|
||||
break
|
||||
@@ -2343,7 +2384,8 @@ const loadAccounts = async (forceReload = false) => {
|
||||
azureOpenaiData,
|
||||
openaiResponsesData,
|
||||
ccrData,
|
||||
droidData
|
||||
droidData,
|
||||
geminiApiData
|
||||
] = await Promise.all(requests)
|
||||
|
||||
const allAccounts = []
|
||||
@@ -2449,6 +2491,20 @@ const loadAccounts = async (forceReload = false) => {
|
||||
allAccounts.push(...droidAccounts)
|
||||
}
|
||||
|
||||
// Gemini API 账户
|
||||
if (geminiApiData && geminiApiData.success) {
|
||||
const geminiApiAccounts = (geminiApiData.data || []).map((acc) => {
|
||||
// 计算每个Gemini-API账户绑定的API Key数量
|
||||
// Gemini-API账户使用 api: 前缀
|
||||
const boundApiKeysCount = apiKeys.value.filter(
|
||||
(key) => key.geminiAccountId === `api:${acc.id}`
|
||||
).length
|
||||
// 后端已经包含了groupInfos,直接使用
|
||||
return { ...acc, platform: 'gemini-api', boundApiKeysCount }
|
||||
})
|
||||
allAccounts.push(...geminiApiAccounts)
|
||||
}
|
||||
|
||||
// 根据分组筛选器过滤账户
|
||||
let filteredAccounts = allAccounts
|
||||
if (groupFilter.value !== 'all') {
|
||||
@@ -2788,7 +2844,8 @@ const getBoundApiKeysForAccount = (account) => {
|
||||
key.geminiAccountId === accountId ||
|
||||
key.openaiAccountId === accountId ||
|
||||
key.azureOpenaiAccountId === accountId ||
|
||||
key.openaiAccountId === `responses:${accountId}`
|
||||
key.openaiAccountId === `responses:${accountId}` ||
|
||||
key.geminiAccountId === `api:${accountId}`
|
||||
)
|
||||
})
|
||||
}
|
||||
@@ -2813,6 +2870,8 @@ const resolveAccountDeleteEndpoint = (account) => {
|
||||
return `/admin/gemini-accounts/${account.id}`
|
||||
case 'droid':
|
||||
return `/admin/droid-accounts/${account.id}`
|
||||
case 'gemini-api':
|
||||
return `/admin/gemini-api-accounts/${account.id}`
|
||||
default:
|
||||
return null
|
||||
}
|
||||
@@ -2993,6 +3052,8 @@ const resetAccountStatus = async (account) => {
|
||||
endpoint = `/admin/ccr-accounts/${account.id}/reset-status`
|
||||
} else if (account.platform === 'droid') {
|
||||
endpoint = `/admin/droid-accounts/${account.id}/reset-status`
|
||||
} else if (account.platform === 'gemini-api') {
|
||||
endpoint = `/admin/gemini-api-accounts/${account.id}/reset-status`
|
||||
} else {
|
||||
showToast('不支持的账户类型', 'error')
|
||||
account.isResetting = false
|
||||
@@ -3041,6 +3102,8 @@ const toggleSchedulable = async (account) => {
|
||||
endpoint = `/admin/ccr-accounts/${account.id}/toggle-schedulable`
|
||||
} else if (account.platform === 'droid') {
|
||||
endpoint = `/admin/droid-accounts/${account.id}/toggle-schedulable`
|
||||
} else if (account.platform === 'gemini-api') {
|
||||
endpoint = `/admin/gemini-api-accounts/${account.id}/toggle-schedulable`
|
||||
} else {
|
||||
showToast('该账户类型暂不支持调度控制', 'warning')
|
||||
return
|
||||
|
||||
@@ -2287,6 +2287,7 @@ const loadAccounts = async () => {
|
||||
claudeData,
|
||||
claudeConsoleData,
|
||||
geminiData,
|
||||
geminiApiData,
|
||||
openaiData,
|
||||
openaiResponsesData,
|
||||
bedrockData,
|
||||
@@ -2296,6 +2297,7 @@ const loadAccounts = async () => {
|
||||
apiClient.get('/admin/claude-accounts'),
|
||||
apiClient.get('/admin/claude-console-accounts'),
|
||||
apiClient.get('/admin/gemini-accounts'),
|
||||
apiClient.get('/admin/gemini-api-accounts'), // 加载 Gemini-API 账号
|
||||
apiClient.get('/admin/openai-accounts'),
|
||||
apiClient.get('/admin/openai-responses-accounts'), // 加载 OpenAI-Responses 账号
|
||||
apiClient.get('/admin/bedrock-accounts'),
|
||||
@@ -2328,13 +2330,31 @@ const loadAccounts = async () => {
|
||||
|
||||
accounts.value.claude = claudeAccounts
|
||||
|
||||
// 合并 Gemini OAuth 和 Gemini API 账户
|
||||
const geminiAccounts = []
|
||||
|
||||
if (geminiData.success) {
|
||||
accounts.value.gemini = (geminiData.data || []).map((account) => ({
|
||||
...account,
|
||||
isDedicated: account.accountType === 'dedicated'
|
||||
}))
|
||||
;(geminiData.data || []).forEach((account) => {
|
||||
geminiAccounts.push({
|
||||
...account,
|
||||
platform: 'gemini',
|
||||
isDedicated: account.accountType === 'dedicated'
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
if (geminiApiData.success) {
|
||||
;(geminiApiData.data || []).forEach((account) => {
|
||||
geminiAccounts.push({
|
||||
...account,
|
||||
platform: 'gemini-api',
|
||||
isDedicated: account.accountType === 'dedicated'
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
accounts.value.gemini = geminiAccounts
|
||||
|
||||
if (openaiData.success) {
|
||||
accounts.value.openai = (openaiData.data || []).map((account) => ({
|
||||
...account,
|
||||
@@ -2501,6 +2521,19 @@ const getBoundAccountName = (accountId) => {
|
||||
return `${claudeAccount.name}`
|
||||
}
|
||||
|
||||
// 处理 api: 前缀的 Gemini-API 账户
|
||||
if (accountId.startsWith('api:')) {
|
||||
const realAccountId = accountId.replace('api:', '')
|
||||
const geminiApiAccount = accounts.value.gemini.find(
|
||||
(acc) => acc.id === realAccountId && acc.platform === 'gemini-api'
|
||||
)
|
||||
if (geminiApiAccount) {
|
||||
return `${geminiApiAccount.name}`
|
||||
}
|
||||
// 如果找不到,返回ID的前8位
|
||||
return `${realAccountId.substring(0, 8)}`
|
||||
}
|
||||
|
||||
// 从Gemini账户列表中查找
|
||||
const geminiAccount = accounts.value.gemini.find((acc) => acc.id === accountId)
|
||||
if (geminiAccount) {
|
||||
@@ -2583,7 +2616,23 @@ const getGeminiBindingInfo = (key) => {
|
||||
if (key.geminiAccountId.startsWith('group:')) {
|
||||
return info
|
||||
}
|
||||
// 检查账户是否存在
|
||||
|
||||
// 处理 api: 前缀的 Gemini-API 账户
|
||||
if (key.geminiAccountId.startsWith('api:')) {
|
||||
const realAccountId = key.geminiAccountId.replace('api:', '')
|
||||
const account = accounts.value.gemini.find(
|
||||
(acc) => acc.id === realAccountId && acc.platform === 'gemini-api'
|
||||
)
|
||||
if (!account) {
|
||||
return `⚠️ ${info} (账户不存在)`
|
||||
}
|
||||
if (account.accountType === 'dedicated') {
|
||||
return `🔒 API专属-${info}`
|
||||
}
|
||||
return `API-${info}`
|
||||
}
|
||||
|
||||
// 检查 Gemini OAuth 账户是否存在
|
||||
const account = accounts.value.gemini.find((acc) => acc.id === key.geminiAccountId)
|
||||
if (!account) {
|
||||
return `⚠️ ${info} (账户不存在)`
|
||||
|
||||
Reference in New Issue
Block a user