From 23cb78558dee27cd28bc7e41057701e0f76e3c6d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 18 Aug 2025 11:16:13 +0000 Subject: [PATCH 1/5] chore: sync VERSION file with release v1.1.115 [skip ci] --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1f837000..97553d5b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.114 +1.1.115 From b1f2b4f6c162fdd47055e292719b81c7bf6a431f Mon Sep 17 00:00:00 2001 From: mouyong Date: Wed, 20 Aug 2025 09:34:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix(proxy):=20=E5=BC=BA=E5=88=B6=20SOCKS5?= =?UTF-8?q?=20=E4=BB=A3=E7=90=86=E4=BD=BF=E7=94=A8=20IPv4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WHAT: 为 SOCKS5 代理配置添加 family: 4 选项强制使用 IPv4 地址族 WHY: 解决 IPv4 主机名在代理连接时被意外解析到 IPv6 地址的问题，确保代理连接的稳定性和可预期性 HOW: 在 SocksProxyAgent 构造函数中添加 family: 4 配置选项；保持与现有 HTTP/HTTPS 代理的兼容性；无破坏性变更 --- src/routes/openaiRoutes.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/routes/openaiRoutes.js b/src/routes/openaiRoutes.js index 2a237f26..9d67e73f 100644 --- a/src/routes/openaiRoutes.js +++ b/src/routes/openaiRoutes.js @@ -21,7 +21,9 @@ function createProxyAgent(proxy) { if (proxy.type === 'socks5') { const auth = proxy.username && proxy.password ? `${proxy.username}:${proxy.password}@` : '' const socksUrl = `socks5://${auth}${proxy.host}:${proxy.port}` - return new SocksProxyAgent(socksUrl) + return new SocksProxyAgent(socksUrl, { + family: 4, + }) } else if (proxy.type === 'http' || proxy.type === 'https') { const auth = proxy.username && proxy.password ? `${proxy.username}:${proxy.password}@` : '' const proxyUrl = `${proxy.type}://${auth}${proxy.host}:${proxy.port}` From 5ae136a5dc70be0f6c8ea1499c3b262fc0c46122 Mon Sep 17 00:00:00 2001 From: mouyong Date: Wed, 20 Aug 2025 09:45:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?style:=20=E7=A7=BB=E9=99=A4=E5=B0=BE?= =?UTF-8?q?=E9=9A=8F=E9=80=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WHAT: 移除 SocksProxyAgent 配置对象中的尾随逗号 WHY: 保持代码格式的一致性和整洁性，符合项目的代码规范 HOW: 删除 family: 4 后的尾随逗号；无功能变更；纯格式化修改 --- src/routes/openaiRoutes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/openaiRoutes.js b/src/routes/openaiRoutes.js index 9d67e73f..2e6ff9f0 100644 --- a/src/routes/openaiRoutes.js +++ b/src/routes/openaiRoutes.js @@ -22,7 +22,7 @@ function createProxyAgent(proxy) { const auth = proxy.username && proxy.password ? `${proxy.username}:${proxy.password}@` : '' const socksUrl = `socks5://${auth}${proxy.host}:${proxy.port}` return new SocksProxyAgent(socksUrl, { - family: 4, + family: 4 }) } else if (proxy.type === 'http' || proxy.type === 'https') { const auth = proxy.username && proxy.password ? `${proxy.username}:${proxy.password}@` : '' From 54dca0f28570ce66f863ee3527b9dd2333f1cc27 Mon Sep 17 00:00:00 2001 From: mouyong Date: Wed, 20 Aug 2025 21:37:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(frontend):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=86=E7=BB=84=E6=A8=A1=E6=80=81=E6=A1=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WHAT: 修复账户分组管理中编辑分组表单无法显示的问题 WHY: 编辑模态框使用无效的 z-60 类名导致层级冲突，编辑表单被主模态框遮挡 HOW: 将编辑模态框的 z-index 类名从 z-60 改为 z-50，与主模态框同级但利用 DOM 顺序确保正确显示；保持其他样式和功能不变 --- web/admin-spa/src/components/accounts/GroupManagementModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/admin-spa/src/components/accounts/GroupManagementModal.vue b/web/admin-spa/src/components/accounts/GroupManagementModal.vue index b70fa1d6..b793c356 100644 --- a/web/admin-spa/src/components/accounts/GroupManagementModal.vue +++ b/web/admin-spa/src/components/accounts/GroupManagementModal.vue @@ -172,7 +172,7 @@
From 5af8913954bd9f92f3ed40bb9e5c3279ff7cb4e8 Mon Sep 17 00:00:00 2001 From: mouyong Date: Wed, 20 Aug 2025 21:40:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?refactor(backend):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=B9=B3=E5=8F=B0=E6=A0=87=E8=AF=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WHAT: 统一 Claude 账户的平台标识，从 claude-oauth 改为 claude WHY: 简化平台标识命名规范，提高前后端数据一致性，为多平台支持奠定基础 HOW: 在账户创建和查询接口中添加 platform 字段支持；更新 claudeAccountService 默认平台标识；保持向后兼容性，旧数据自动使用默认值 --- scripts/test-api-response.js | 2 +- src/routes/admin.js | 2 ++ src/services/claudeAccountService.js | 10 +++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/test-api-response.js b/scripts/test-api-response.js index 02453708..8131e0f9 100644 --- a/scripts/test-api-response.js +++ b/scripts/test-api-response.js @@ -79,7 +79,7 @@ async function testApiResponse() { console.log('\n\n📊 验证结果:') // 检查 platform 字段 - const claudeWithPlatform = claudeAccounts.filter((a) => a.platform === 'claude-oauth') + const claudeWithPlatform = claudeAccounts.filter((a) => a.platform === 'claude') const consoleWithPlatform = consoleAccounts.filter((a) => a.platform === 'claude-console') if (claudeWithPlatform.length === claudeAccounts.length) { diff --git a/src/routes/admin.js b/src/routes/admin.js index f6e9cf2d..4b29ade0 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -1242,6 +1242,7 @@ router.post('/claude-accounts', authenticateAdmin, async (req, res) => { claudeAiOauth, proxy, accountType, + platform = 'claude', priority, groupId } = req.body @@ -1279,6 +1280,7 @@ router.post('/claude-accounts', authenticateAdmin, async (req, res) => { claudeAiOauth, proxy, accountType: accountType || 'shared', // 默认为共享类型 + platform, priority: priority || 50 // 默认优先级为50 }) diff --git a/src/services/claudeAccountService.js b/src/services/claudeAccountService.js index 6577535d..cc2a8089 100644 --- a/src/services/claudeAccountService.js +++ b/src/services/claudeAccountService.js @@ -55,6 +55,7 @@ class ClaudeAccountService { proxy = null, // { type: 'socks5', host: 'localhost', port: 1080, username: '', password: '' } isActive = true, accountType = 'shared', // 'dedicated' or 'shared' + platform = 'claude', priority = 50, // 调度优先级 (1-100，数字越小优先级越高) schedulable = true, // 是否可被调度 subscriptionInfo = null // 手动设置的订阅信息 @@ -79,7 +80,8 @@ class ClaudeAccountService { scopes: claudeAiOauth.scopes.join(' '), proxy: proxy ? JSON.stringify(proxy) : '', isActive: isActive.toString(), - accountType, // 账号类型：'dedicated' 或 'shared' + accountType, // 账号类型：'dedicated' 或 'shared' 或 'group' + platform, priority: priority.toString(), // 调度优先级 createdAt: new Date().toISOString(), lastUsedAt: '', @@ -108,7 +110,8 @@ class ClaudeAccountService { scopes: '', proxy: proxy ? JSON.stringify(proxy) : '', isActive: isActive.toString(), - accountType, // 账号类型：'dedicated' 或 'shared' + accountType, // 账号类型：'dedicated' 或 'shared' 或 'group' + platform, priority: priority.toString(), // 调度优先级 createdAt: new Date().toISOString(), lastUsedAt: '', @@ -151,6 +154,7 @@ class ClaudeAccountService { isActive, proxy, accountType, + platform, priority, status: accountData.status, createdAt: accountData.createdAt, @@ -444,7 +448,7 @@ class ClaudeAccountService { errorMessage: account.errorMessage, accountType: account.accountType || 'shared', // 兼容旧数据，默认为共享 priority: parseInt(account.priority) || 50, // 兼容旧数据，默认优先级50 - platform: 'claude-oauth', // 添加平台标识，用于前端区分 + platform: account.platform || 'claude', // 添加平台标识，用于前端区分 createdAt: account.createdAt, lastUsedAt: account.lastUsedAt, lastRefreshAt: account.lastRefreshAt,