|
名称
@@ -89,10 +106,10 @@
/>
|
- 平台
+ 平台/类型
|
- 类型
-
-
- |
-
状态
@@ -131,7 +134,7 @@
/>
|
优先级
@@ -144,19 +147,19 @@
class="fas fa-sort ml-1 text-gray-400"
/>
|
-
+ |
代理
|
-
+ |
今日使用
|
-
+ |
会话窗口
|
-
+ |
最后使用
|
-
+ |
操作
|
@@ -167,14 +170,14 @@
:key="account.id"
class="table-row"
>
-
+ |
-
+
-
+
-
+
{{ account.name }}
专属
+
+ 分组调度
+
共享
+
+ {{ account.groupInfo.name }}
+
-
|
-
-
- Gemini
-
-
- Claude Console
-
-
- Claude
-
+ |
+
+
+
+
+ Gemini
+
+
+ {{ (account.scopes && account.scopes.length > 0) ? 'OAuth' : '传统' }}
+
+
+
+
+ Console
+
+ API Key
+
+
+
+ Claude
+
+
+ {{ (account.scopes && account.scopes.length > 0) ? 'OAuth' : '传统' }}
+
+
+ |
-
-
- API Key
-
-
- OAuth
-
-
- 传统
-
- |
-
+ |
+ |
N/A
|
-
+ |
{{ formatProxyDisplay(account.proxy) }}
@@ -315,7 +328,7 @@
无代理
|
-
+ |
|
-
+ |
N/A
|
-
+ |
{{ formatLastUsed(account.lastUsedAt) }}
|
-
-
+
+
+ 刷新
+ {{ account.schedulable ? '调度' : '停用' }}
|
@@ -447,7 +466,7 @@
{
- if (!accountsSortBy.value) return accounts.value
+ const sourceAccounts = filteredAccounts.value.length > 0 ? filteredAccounts.value : accounts.value
+ if (!accountsSortBy.value) return sourceAccounts
- const sorted = [...accounts.value].sort((a, b) => {
+ const sorted = [...sourceAccounts].sort((a, b) => {
let aVal = a[accountsSortBy.value]
let bVal = b[accountsSortBy.value]
@@ -720,11 +743,12 @@ const sortedAccounts = computed(() => {
const loadAccounts = async () => {
accountsLoading.value = true
try {
- const [claudeData, claudeConsoleData, geminiData, apiKeysData] = await Promise.all([
+ const [claudeData, claudeConsoleData, geminiData, apiKeysData, groupsData] = await Promise.all([
apiClient.get('/admin/claude-accounts'),
apiClient.get('/admin/claude-console-accounts'),
apiClient.get('/admin/gemini-accounts'),
- apiClient.get('/admin/api-keys')
+ apiClient.get('/admin/api-keys'),
+ apiClient.get('/admin/account-groups')
])
// 更新API Keys列表
@@ -732,22 +756,49 @@ const loadAccounts = async () => {
apiKeys.value = apiKeysData.data || []
}
+ // 更新分组列表
+ if (groupsData.success) {
+ accountGroups.value = groupsData.data || []
+ }
+
+ // 创建分组ID到分组信息的映射
+ const groupMap = new Map()
+ const accountGroupMap = new Map()
+
+ // 获取所有分组的成员信息
+ for (const group of accountGroups.value) {
+ groupMap.set(group.id, group)
+ try {
+ const membersResponse = await apiClient.get(`/admin/account-groups/${group.id}/members`)
+ if (membersResponse.success) {
+ const members = membersResponse.data || []
+ members.forEach(member => {
+ accountGroupMap.set(member.id, group)
+ })
+ }
+ } catch (error) {
+ console.error(`Failed to load members for group ${group.id}:`, error)
+ }
+ }
+
const allAccounts = []
if (claudeData.success) {
const claudeAccounts = (claudeData.data || []).map(acc => {
// 计算每个Claude账户绑定的API Key数量
const boundApiKeysCount = apiKeys.value.filter(key => key.claudeAccountId === acc.id).length
- return { ...acc, platform: 'claude', boundApiKeysCount }
+ // 检查是否属于某个分组
+ const groupInfo = accountGroupMap.get(acc.id) || null
+ return { ...acc, platform: 'claude', boundApiKeysCount, groupInfo }
})
allAccounts.push(...claudeAccounts)
}
if (claudeConsoleData.success) {
const claudeConsoleAccounts = (claudeConsoleData.data || []).map(acc => {
- // 计算每个Claude Console账户绑定的API Key数量
- const boundApiKeysCount = apiKeys.value.filter(key => key.claudeConsoleAccountId === acc.id).length
- return { ...acc, platform: 'claude-console', boundApiKeysCount }
+ // Claude Console账户暂时不支持直接绑定
+ const groupInfo = accountGroupMap.get(acc.id) || null
+ return { ...acc, platform: 'claude-console', boundApiKeysCount: 0, groupInfo }
})
allAccounts.push(...claudeConsoleAccounts)
}
@@ -756,12 +807,15 @@ const loadAccounts = async () => {
const geminiAccounts = (geminiData.data || []).map(acc => {
// 计算每个Gemini账户绑定的API Key数量
const boundApiKeysCount = apiKeys.value.filter(key => key.geminiAccountId === acc.id).length
- return { ...acc, platform: 'gemini', boundApiKeysCount }
+ const groupInfo = accountGroupMap.get(acc.id) || null
+ return { ...acc, platform: 'gemini', boundApiKeysCount, groupInfo }
})
allAccounts.push(...geminiAccounts)
}
accounts.value = allAccounts
+ // 初始化过滤后的账户列表
+ filterByGroup()
} catch (error) {
showToast('加载账户失败', 'error')
} finally {
@@ -819,19 +873,38 @@ const loadApiKeys = async () => {
}
}
+// 按分组筛选账户
+const filterByGroup = () => {
+ if (groupFilter.value === 'all') {
+ filteredAccounts.value = accounts.value
+ } else if (groupFilter.value === 'ungrouped') {
+ filteredAccounts.value = accounts.value.filter(acc => !acc.groupInfo)
+ } else {
+ // 按特定分组筛选
+ filteredAccounts.value = accounts.value.filter(acc =>
+ acc.groupInfo && acc.groupInfo.id === groupFilter.value
+ )
+ }
+}
+
// 格式化代理信息显示
const formatProxyDisplay = (proxy) => {
if (!proxy || !proxy.host || !proxy.port) return null
- let display = `${proxy.type}://${proxy.host}:${proxy.port}`
+ // 缩短类型名称
+ const typeShort = proxy.type === 'socks5' ? 'S5' : proxy.type.toUpperCase()
+
+ // 缩短主机名（如果太长）
+ let host = proxy.host
+ if (host.length > 15) {
+ host = host.substring(0, 12) + '...'
+ }
+
+ let display = `${typeShort}://${host}:${proxy.port}`
// 如果有用户名密码，添加认证信息（部分隐藏）
if (proxy.username) {
- const maskedUsername = proxy.username.length > 2
- ? proxy.username[0] + '***' + proxy.username[proxy.username.length - 1]
- : '***'
- const maskedPassword = proxy.password ? '****' : ''
- display = `${proxy.type}://${maskedUsername}:${maskedPassword}@${proxy.host}:${proxy.port}`
+ display = `${typeShort}://***@${host}:${proxy.port}`
}
return display
@@ -1104,6 +1177,33 @@ onMounted(() => {
| |