Compare commits

..
225 Commits
Author SHA1 Message Date
jinghui 7f47841fdc feat(submission): 移除技能/插件提交入口,仅保留 MCP 服务
release / release (release) Canceled after 0s
2026-11-14 00:54:47 +08:00
jinghui f5b45af30a docs: README 增加国内镜像部署章节(docker run + docker-compose 两种方式)
release / release (release) Canceled after 0s
2026-11-13 22:07:52 +08:00
jinghui 851d45a573 feat(console): 用户中心新增发布 MCP 服务入口与我的提交记录
- 侧边栏新增「发布 MCP 服务」入口(Rocket 图标)跳转 /submit,补 zh-CN 翻译键
- /submit 新增「我的提交记录」:登录后展示自己的提交列表(类型/时间/状态徽章/审核备注),提交成功自动刷新
- 修复登录判断:改读 zustand store 的 user_token(原读 localStorage['user_token'],
  网页登录只写 zustand 不写该键,导致所有网页用户提交时误报「请先登录后再提交」)
- 列表加载改为按接口返回判定登录态(token 失效自动清空记录)
2026-11-13 22:07:50 +08:00
jinghui b7a10ca678 feat(ui): 站点货币单位由美元改为人民币
release / release (release) Canceled after 0s
- currency.ts: formatCurrency/formatPrice/formatBalance/getCurrencySymbol 默认币种
  USD→CNY,Intl locale en-US→zh-CN,显示为 ¥ 而非 CN¥
- 平台配置与管理后台默认 currency: USD→CNY
- 硬编码 $ 符号处(商品价格/余额表/充值弹窗/控制台营收/主题 Demo)全部改 ¥
- i18n: 'Minimum recharge amount is $1' key 改为 ¥1(中英同步)
- 说明: 易支付 exchange_rate=1,余额数值即人民币,仅改显示符号不改数值
2026-11-13 18:53:57 +08:00
jinghui 8f0796c031 fix(payment): epay异步回调免鉴权 + Dockerfile构建代理参数
release / release (release) Canceled after 0s
- /api/payment/callback_epay 与 refund_callback_epay 加入 NO_AUTH 白名单,
  易支付异步notify无用户token,此前被401拦截导致订单无法回执
- Dockerfile 增加 HTTP(S)_PROXY 构建参数,受限网络可构建
2026-11-13 18:16:29 +08:00
jinghui 721a2be32b feat(payment): integrate epay (易支付) gateway for CNY recharges
release / release (release) Canceled after 0s
- new EpayClient: V1 md5 signing, submit.php page pay, api.php order query
- create/verify epay payment links with CNY exchange-rate conversion
- signed async notify handler (/admin/payment/callback_epay) with amount
  check plus idempotent crediting, and a gateway query fallback
- epay channel config form, channel row and payment_method enum extended
- RechargeModal: send payment_method (was payment_channel, so every recharge
  fell through to Stripe and 500'd) and re-enable the channel picker
- payment config encryption key moved to a local .env, never committed
2026-11-13 15:17:05 +08:00
jinghui 1fbb6711f2 feat(submission): auto-publish approved submissions and expose review tab
- approving a submission now creates the McpService/McpToolApi records
- and records the published service id back on the submission
- review console folded into the admin console as a Submissions tab
- submit page rewritten around the shared submission API
2026-11-13 15:17:05 +08:00
jinghui d18adf035b feat(billing): per-service and platform-wide free call limits
release / release (release) Canceled after 0s
- mcp_service.free_daily_limit: per service, per user per day (NULL/0 = unlimited)
- sys_config free_global_daily_limit: applies to every free service
- effective limit = smaller of the two, so a service without its own value
  still inherits the global one
- admin: Pricing tab input, System Settings > Business > Free Call Limits
- submission review pages and endpoints (scaffolding, not yet published end to end)
- allow LAN IPs in http_utils, add docker-compose.yml
2026-11-13 10:20:25 +08:00
Dot.L 2fd6272bbd Update release.yaml 2026-10-26 19:02:45 +08:00
Liujian 470d53cad6 feat(mcp): support MCP 0728 stateless JSON-RPC protocol and pin mcp SDK version
- Implement stateless HTTP JSON-RPC request handling (discover, tools/list, tools/call)
- Support extracting apikey from Authorization and X-Api-Key headers
- Pin mcp dependency to '>=1.12.0,<2.0.0' to prevent breaking changes in v2.x
- Update docker-compose image tag and volume config
2026-10-26 18:57:48 +08:00
Liujian f2b61bae7d Change the mysql-connector-python dependency to pymysql 2026-05-18 11:00:07 +08:00
Dot.L 588f2770b7 Merge pull request #167 from xpack-ai/feature/fix-billing-transaction
Feature/fix billing transaction
2026-04-01 17:23:01 +08:00
Liujian ad743d6ab7 Cancel the _update_wallet_cache method from being included in transactions 2026-03-30 18:17:27 +08:00
Liujian 6145d0b005 _update_wallet_cache is also included in transactions. 2026-03-30 18:01:08 +08:00
Dot.L d147fcb070 Merge pull request #166 from xpack-ai/feature/fix-billing-transaction
Feature/fix billing transaction
2026-03-30 16:40:17 +08:00
Liujian 6196b93e97 The billing processor adds transaction processing and retry mechanisms. 2026-03-30 16:00:58 +08:00
Liujian b51933d625 Fixed the issue where access remained even after the API key was deleted. 2026-03-30 15:59:49 +08:00
Liujian 40ff118798 Handling billing transactions 2026-03-27 18:36:28 +08:00
Dot.L d470677abe Merge pull request #155 from xpack-ai/revert-154-dev
Revert "Dev"
2026-03-11 15:59:28 +08:00
Dot.L 6eac3c6100 Revert "Dev" 2026-03-11 15:56:53 +08:00
Dot.L d22513730a Merge pull request #154 from xpack-ai/dev
Dev
2026-03-11 15:56:36 +08:00
Dot.L 613cece94b Merge pull request #153 from xpack-ai/open-base
user service add update_password
2026-03-11 15:25:00 +08:00
Liujian 5cd1c12323 user service add update_password 2026-03-11 15:13:28 +08:00
Dot.L dcf73b25bf Merge pull request #152 from xpack-ai/open-base
update temp_mcp_service_repository.py
2026-03-11 11:37:35 +08:00
Liujian 64a67e9c8d update temp_mcp_service_repository.py 2026-03-11 11:36:30 +08:00
Dot.L b6160af3c5 Merge pull request #150 from xpack-ai/open-base
mcp service add sort and category_id
2026-03-11 10:57:22 +08:00
Liujian 2ea41dfb75 mcp service add sort and category_id 2026-03-11 10:56:54 +08:00
Dot.L cbcc419f0b Merge pull request #149 from xpack-ai/open-base
update tenant_id type
2026-03-10 18:42:45 +08:00
Liujian 687949beb2 update tenant_id type 2026-03-10 18:41:49 +08:00
Dot.L fedaa5f5df Merge pull request #148 from xpack-ai/open-base
update sys_config index
2026-03-10 16:19:17 +08:00
Liujian c272c87e1f update sys_config index 2026-03-10 16:18:34 +08:00
Dot.L 8a052ff910 Merge pull request #147 from xpack-ai/open-base
The concept of a tenant is added as the foundation of the SaaS code.
2026-03-10 15:37:05 +08:00
Liujian d1c7a4b8c0 The concept of a tenant is added as the foundation of the SaaS code. 2026-03-10 15:33:57 +08:00
Dot.L 1a104338e8 Merge pull request #144 from xpack-ai/feature/1.4-liujian
Feature/1.4 liujian
2026-02-28 16:02:01 +08:00
Liujian 5dd47b2d01 Redis client methods supplement 2026-02-28 15:53:35 +08:00
Dot.L a28de60b1c Merge pull request #143 from xpack-ai/feature/1.4-liujian
Adjustment of some interface permissions
2026-02-26 10:29:38 +08:00
Liujian e4a807b2a0 Delete Print code 2026-02-26 10:28:18 +08:00
Liujian d0e7ed2771 Remove authentication checks from /api/common/config and /api/common/homepage 2026-02-26 10:26:00 +08:00
Dot.L 05c0088f1b Merge pull request #142 from xpack-ai/feature/1.4-liujian
Adjust the streamable-http initialization connection waiting logic
2026-02-25 15:23:08 +08:00
Liujian 7f66cfd21e Adjust the streamable-http initialization connection waiting logic 2026-02-25 15:22:10 +08:00
Dot.L 05b48f3656 Merge pull request #141 from xpack-ai/feature/1.4-liujian
Fix: Removed permission verification from the user information retrie…
2026-02-25 15:18:58 +08:00
Liujian 07fe83b7b5 Fix: Removed permission verification from the user information retrieval interface. 2026-02-25 15:18:19 +08:00
Dot.L 5fa1cd741e Merge pull request #140 from xpack-ai/feature/1.4-liujian
Adjust the streamable-http initialization connection waiting timeout
2026-02-25 11:24:50 +08:00
Liujian 3e1d986c1c Adjust the streamable-http initialization connection waiting timeout 2026-02-25 11:24:23 +08:00
Dot.L 2cf95fd1c1 Merge pull request #139 from xpack-ai/feature/1.4-liujian
Adjust the streamable-http initialization connection waiting logic
2026-02-25 11:13:53 +08:00
Liujian 09b6811391 Adjust the streamable-http initialization connection waiting logic 2026-02-25 11:13:18 +08:00
Dot.L 08d326dc1f Merge pull request #138 from xpack-ai/feature/1.4-liujian
fix: Handle None message in custom MCP event store during priming event
2026-02-24 16:28:17 +08:00
Dot.L fb23d62fb2 Merge pull request #137 from xpack-ai/feature/1.4-liujian
fix: Handle None message in custom MCP event store during priming event
2026-02-24 15:16:14 +08:00
Liujian 79400146ea fix: Handle None message in custom MCP event store during priming event 2026-02-24 15:15:09 +08:00
Dot.L 503b3bf078 Merge pull request #136 from xpack-ai/feature/1.4-liujian
API adds user role verification
2026-02-23 19:10:38 +08:00
Dot.L eb4ecff6ed Merge pull request #135 from xpack-ai/feature/1.4-liujian
API adds user role verification
2026-02-14 11:24:00 +08:00
Liujian 7f8947f070 Modify payment-related interface permissions 2026-02-14 11:23:50 +08:00
Liujian 6dca9b08cc API adds user role verification 2026-02-14 10:03:22 +08:00
lcx 06034cf46e Merge remote-tracking branch 'origin/feature/cx-1.4' 2026-02-06 15:53:17 +08:00
ningyv ffdf931cad Merge pull request #134 from xpack-ai/feature/cx-1.4
chore: upgrade Next.js version
2026-02-06 15:36:06 +08:00
lcx 24e59f18d0 chore: upgrade Next.js version 2026-02-06 15:35:16 +08:00
lcx 5a538863b1 Merge remote-tracking branch 'origin/feature/cx-1.4' into dev 2026-02-06 14:49:55 +08:00
lcx f468fe270f chore: upgrade Next.js version 2026-02-06 14:49:10 +08:00
lcx 4cc8b87de5 chore: upgrade Next.js version 2026-02-06 14:44:28 +08:00
Dot.L f6e0130035 Merge pull request #132 from xpack-ai/feature/1.4-liujian
MySQL reconnection mechanism optimization
2026-02-05 13:43:56 +08:00
Dot.L d351afb732 Merge pull request #131 from xpack-ai/feature/1.4-liujian
Version 1.4 development completed
2026-02-03 10:18:43 +08:00
Liujian fab064975d MySQL reconnection mechanism optimization 2026-02-03 10:00:02 +08:00
ningyv 30a06d74d6 Merge pull request #130 from xpack-ai/feature/cx-1.4
Feature/cx 1.4
2026-02-02 17:56:01 +08:00
Dot.L 6f882845c2 Merge pull request #129 from xpack-ai/feature/1.4-liujian
Optimize return prompt words
2026-01-29 18:26:34 +08:00
Liujian 33d66e7d3b Optimize return prompt words 2026-01-29 18:26:06 +08:00
ningyv 5654f83644 Merge pull request #128 from xpack-ai/feature/cx-1.4
feat: 1.4 - List supports search
2026-01-29 18:13:24 +08:00
lcx b7c67cc44f feat: 1.4 - List supports search 2026-01-29 18:12:35 +08:00
Dot.L 6d15420b08 Merge pull request #127 from xpack-ai/feature/1.4-liujian
Optimize return prompt words
2026-01-29 18:07:56 +08:00
Liujian 32562b9c25 Optimize return prompt words 2026-01-29 18:07:28 +08:00
Dot.L 5469eca450 Merge pull request #126 from xpack-ai/feature/1.4-liujian
Optimize return prompt words
2026-01-29 17:51:28 +08:00
ningyv 94fd46c8ca Merge pull request #125 from xpack-ai/feature/cx-1.4
feat: 1.4 - List supports search
2026-01-29 17:51:15 +08:00
Liujian ffc09b7b83 Optimize return prompt words 2026-01-29 17:50:59 +08:00
lcx f4bd572fff feat: 1.4 - List supports search 2026-01-29 17:49:57 +08:00
Dot.L 57bd964d22 Merge pull request #124 from xpack-ai/feature/1.4-liujian
Optimize return prompt words
2026-01-29 16:31:00 +08:00
Liujian 3c4e2be1dd Optimize return prompt words 2026-01-29 16:30:30 +08:00
Dot.L aac3a187d1 Merge pull request #123 from xpack-ai/feature/1.4-liujian
Added logic to disable IP login after repeated login failures
2026-01-28 19:18:17 +08:00
Liujian c0ec39f1d6 Merge remote-tracking branch 'origin/dev' into feature/1.4-liujian
# Conflicts:
#	services/admin_service/controllers/auth.py
2026-01-28 19:17:58 +08:00
Liujian 22fa608220 Added logic to disable IP login after repeated login failures 2026-01-28 19:14:07 +08:00
Dot.L e20dacde6b Merge pull request #122 from xpack-ai/feature/1.4-liujian
1. Optimized the issue of duplicate names in newly created resource g…
2026-01-28 17:24:33 +08:00
Liujian fef2e2a1f7 1. Optimized the issue of duplicate names in newly created resource groups
2. Fixed the issue of new users not being bound to the default resource group after logging in
2026-01-28 17:23:56 +08:00
ningyv 3cb1cca751 Merge pull request #121 from xpack-ai/feature/cx-1.4
Feature/cx 1.4
2026-01-28 15:59:37 +08:00
lcx 71807c0c67 feat: 1.4 - List supports search 2026-01-28 15:58:48 +08:00
lcx 14e6b5c23b feat: 1.4 - List supports search 2026-01-28 15:47:26 +08:00
Dot.L 64d5b2abfc Merge pull request #120 from xpack-ai/feature/1.4-liujian
finish 1.4 api
2026-01-28 13:57:59 +08:00
Liujian fdbb077293 Merge remote-tracking branch 'origin/dev' into feature/1.4-liujian
# Conflicts:
#	services/admin_service/services/user_wallet_history_service.py
2026-01-28 13:57:45 +08:00
Liujian 10809113f4 finish 1.4 api 2026-01-28 13:56:14 +08:00
ningyv f592178d83 Merge pull request #119 from xpack-ai/hotfix/ui-cx
Hotfix/UI cx
2026-01-16 17:38:10 +08:00
ningyv db9a5d571c Merge pull request #118 from xpack-ai/hotfix/ui-cx
fix: Limit resource group name length to 255 characters or less
2026-01-16 17:35:08 +08:00
lcx 1ebac24a3b fix: Limit resource group name length to 255 characters or less 2026-01-16 17:34:09 +08:00
Dot.L 875a7bf906 Merge pull request #117 from xpack-ai/feature/1.3-liujian
Bug fixes and prompt optimizations.
2026-01-16 17:12:45 +08:00
Liujian bf79191194 Optimize the error message for login failures. 2026-01-16 17:10:02 +08:00
Liujian 24ee3078d8 fix bug: Failed to set SQLAlchemy list cache for key xpack:resource_group: id:.... 'list' object has no attribute '__table__'"} 2026-01-16 17:09:10 +08:00
Liujian 302277bad2 fix bug: OpenAPI requestBody Not Parsed for MCP Tools 2026-01-16 17:08:47 +08:00
Dot.L 6724801d60 Merge pull request #116 from xpack-ai/feature/1.3-liujian
Feature/1.3 liujian
2026-01-15 15:19:20 +08:00
Dot.L 51338373e7 Merge pull request #115 from xpack-ai/feature/1.3-liujian
Fixed an issue where deletion failed when there were no users in the …
2026-01-08 11:21:57 +08:00
Liujian aa2fd609c6 Fixed an issue where deletion failed when there were no users in the resource group. 2026-01-08 11:20:51 +08:00
Dot.L 46bdf470c8 Merge pull request #114 from xpack-ai/feature/1.3-liujian
Fixed an issue where deletion failed when there were no users in the …
2026-01-08 11:16:11 +08:00
Liujian 6b758c3acd Fixed an issue where deletion failed when there were no users in the resource group. 2026-01-08 11:13:35 +08:00
Dot.L 1589d6ef0a Merge pull request #113 from xpack-ai/feature/1.3-liujian
fix bug: Issues with duplicate data in resource group list pagination.
2026-01-07 18:09:07 +08:00
Liujian d55cc3e216 fix bug: Issues with duplicate data in resource group list pagination. 2026-01-07 18:08:26 +08:00
ningyv e1c59da804 Merge pull request #112 from xpack-ai/hotfix/ui-cx
fix: prevent "Deny All" resource group from being set as default
2026-01-07 17:41:17 +08:00
lcx 60c9698cdd fix: prevent "Deny All" resource group from being set as default 2026-01-07 17:39:50 +08:00
Dot.L 11de1de3b1 Merge pull request #111 from xpack-ai/feature/1.3-liujian
fix bug: Deleting MCP Service causes errors in all associated Resourc…
2026-01-07 17:08:42 +08:00
Liujian c16bab66ee fix bug: Deleting MCP Service causes errors in all associated Resource Groups 2026-01-07 17:08:12 +08:00
ningyv ec3bef1cae Merge pull request #110 from xpack-ai/hotfix/ui-cx
Hotfix/UI cx
2026-01-07 16:57:03 +08:00
lcx 060bcf7f73 fix: prevent "Allow All" resource group from being set as default 2026-01-07 16:49:59 +08:00
Dot.L 8394afe581 Merge pull request #109 from xpack-ai/feature/1.3-liujian
Feature/1.3 liujian
2026-01-05 14:30:22 +08:00
ningyv 85140f8bdc Merge pull request #108 from xpack-ai/feature/1.3-cx
Feature/1.3 cx
2026-01-05 14:03:07 +08:00
ningyv 595994de8c Merge pull request #107 from xpack-ai/feature/1.3-cx
feat: add MCP service tag filtering, transaction record viewing, and …
2026-01-05 11:53:15 +08:00
lcx ff725d766f feat: add MCP service tag filtering, transaction record viewing, and various optimizations 2026-01-05 11:52:27 +08:00
ningyv c7bbd0589c Merge pull request #106 from xpack-ai/feature/1.3-cx
feat: add MCP service tag filtering, transaction record viewing, and…
2026-01-04 19:03:39 +08:00
lcx cbfc4310b5 feat: add MCP service tag filtering, transaction record viewing, and various optimizations 2026-01-04 19:02:42 +08:00
ningyv 6f83fc7a88 Merge pull request #105 from xpack-ai/feature/1.3-cx
feat: add MCP service tag filtering, transaction record viewing, and …
2025-12-31 11:38:41 +08:00
lcx 714e19a4fc feat: add MCP service tag filtering, transaction record viewing, and various optimizations 2025-12-31 11:36:57 +08:00
Dot.L 64d559dd31 Merge pull request #104 from xpack-ai/feature/1.3-liujian
Change the balance_after field to balance
2025-12-30 18:44:06 +08:00
Liujian 50637087ae Change the balance_after field to balance 2025-12-30 18:43:35 +08:00
Dot.L d9fe780665 Merge pull request #103 from xpack-ai/feature/1.3-liujian
Change the balance_after field to balance
2025-12-30 18:41:51 +08:00
Liujian fa23805b5c Change the balance_after field to balance 2025-12-30 18:41:18 +08:00
ningyv 9d5d1ce2c5 Merge pull request #102 from xpack-ai/feature/1.3-cx
feat: add MCP service tag filtering, transaction record viewing, and …
2025-12-30 18:29:36 +08:00
lcx d6dea1f1e8 feat: add MCP service tag filtering, transaction record viewing, and various optimizations 2025-12-30 18:28:25 +08:00
Dot.L f9c8a74849 Merge pull request #101 from xpack-ai/feature/1.3-liujian
The transaction list now includes "balance" and "description" fields.
2025-12-30 15:09:03 +08:00
Liujian 915a2bcf9e The transaction list now includes "balance" and "description" fields. 2025-12-30 15:08:19 +08:00
Dot.L b23662d76a Merge pull request #100 from xpack-ai/feature/1.3-liujian
The system settings support setting the tag_bar_display variable.
2025-12-29 15:44:40 +08:00
Liujian 77ca12045d The system settings support setting the tag_bar_display variable. 2025-12-29 15:43:10 +08:00
Dot.L 4f27baf93a Merge pull request #99 from xpack-ai/feature/1.3-liujian
Feature/1.3 liujian
2025-12-29 14:20:19 +08:00
Liujian 88325a0ba9 1. Users can view transaction data on the client side.
2. The MCP service list supports tag filtering.
2025-12-29 14:19:26 +08:00
Dot.L 276817e624 Merge pull request #98 from xpack-ai/feature/scripts
update frontend_build.sh
2025-12-23 14:51:31 +08:00
Liujian 3a622c452a update frontend_build.sh 2025-12-23 14:50:53 +08:00
Liujian e26e6a7f24 fix: domain check error 2025-12-23 14:16:04 +08:00
Liujian 4d590bdb80 update start script 2025-12-22 17:24:46 +08:00
ningyv 2ee39124b0 Merge pull request #97 from xpack-ai/feat/resource-group-management
Feat/resource group management
2025-12-22 16:58:54 +08:00
ningyv 20f09ce044 Merge pull request #96 from xpack-ai/feat/resource-group-management
chore: upgrade Next.js to version 15.5.9
2025-12-22 16:51:55 +08:00
lcx 65128b1d2a chore: upgrade Next.js to version 15.5.9 2025-12-22 16:51:03 +08:00
ningyv cb93e5c5aa Merge pull request #95 from xpack-ai/feat/resource-group-management
chore: upgrade Next.js to version 15.5.9
2025-12-22 16:26:50 +08:00
lcx 5ce7cc4a2a chore: upgrade Next.js to version 15.5.9 2025-12-22 16:25:07 +08:00
Dot.L 6d33d99d94 Merge pull request #94 from xpack-ai/feature/resource_group
update 1.2.0 upgrade sql
2025-12-22 13:48:08 +08:00
Liujian 15fe7b4aff update 1.2.0 upgrade sql 2025-12-22 13:47:41 +08:00
Dot.L 8f340cb3d5 Merge pull request #93 from xpack-ai/feature/resource_group
Resource group functionality complete
2025-12-22 11:08:57 +08:00
Liujian dab04242e6 Resource group service list sorted in descending order of creation time 2025-12-22 11:07:54 +08:00
ningyv a1740ab227 Merge pull request #92 from xpack-ai/feat/resource-group-management
Feat/resource group management
2025-12-19 18:30:05 +08:00
Dot.L ae57e5b431 Merge pull request #91 from xpack-ai/feature/resource_group
Feature/resource group
2025-12-18 15:50:24 +08:00
Liujian 8abc7469cd fix: service configuration information reset when "Update from OpenAPI" 2025-12-18 15:43:18 +08:00
Liujian 2309de4025 1. fix: charge fees even if the call tool fails due to MCP service not being available/under maintenance.
2. fix: OpenAPI requestBody Not Parsed for MCP Tools
2025-12-18 15:19:32 +08:00
ningyv 06b71995f3 Merge pull request #90 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-18 15:19:19 +08:00
lcx c675b273a8 feat: resource-group-management 2025-12-18 15:18:23 +08:00
ningyv 52c135a7c6 Merge pull request #89 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-18 14:19:56 +08:00
lcx fbb06d3c53 feat: resource-group-management 2025-12-18 14:17:32 +08:00
Dot.L 2c5c28c74f Merge pull request #88 from xpack-ai/feature/resource_group
fix bug
2025-12-18 11:29:37 +08:00
Liujian ab04738aff fix bug 2025-12-18 11:28:50 +08:00
ningyv 1eb0e23971 Merge pull request #87 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-18 11:21:26 +08:00
lcx 0ae8a4037d feat: resource-group-management 2025-12-18 11:20:07 +08:00
Dot.L a0c2bfe9a6 Merge pull request #86 from xpack-ai/feature/resource_group
fix bug
2025-12-18 11:10:28 +08:00
Liujian 5fa4d25e44 fix bug 2025-12-18 11:10:00 +08:00
ningyv 9f55110fb3 Merge pull request #85 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-18 10:32:49 +08:00
lcx 5fd1025340 feat: resource-group-management 2025-12-18 10:31:56 +08:00
Dot.L 01cbdbe5b0 Merge pull request #84 from xpack-ai/feature/resource_group
fix bug
2025-12-17 19:07:44 +08:00
Liujian a744f5a6c4 1. fix: No reject when input domain with special character like "test_domain.com"
2. fix: When updating service with "Update from OpenAPI" in Tools Management tab, Tool URL is removed, when reloading it is displayed again.
2025-12-17 19:05:44 +08:00
ningyv 0e58492387 Merge pull request #83 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-17 18:47:54 +08:00
lcx d518efb843 feat: resource-group-management 2025-12-17 18:46:49 +08:00
Dot.L 8fabe93710 Merge pull request #82 from xpack-ai/feature/resource_group
Feature/resource group
2025-12-17 14:44:48 +08:00
Liujian 924bee4a96 Optimize login failure message 2025-12-17 14:44:16 +08:00
Liujian 2dcd42a546 MCP calls introduce resource group restrictions. 2025-12-17 14:33:31 +08:00
Liujian f416f4c278 Merge remote-tracking branch 'origin/dev' into feature/resource_group 2025-12-17 14:13:07 +08:00
ningyv 1b6d3bc5bd Merge pull request #81 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-16 18:40:16 +08:00
lcx 5d30306ad7 feat: resource-group-management 2025-12-16 18:39:04 +08:00
Dot.L 127327e226 Merge pull request #80 from xpack-ai/feature/resource_group
fix api: /api/web/mcp_service_info
2025-12-16 17:57:41 +08:00
Liujian c82718e155 fix api: /api/web/mcp_service_info 2025-12-16 17:56:38 +08:00
Dot.L 6ad1e01814 Merge pull request #79 from xpack-ai/feature/resource_group
Add an accessible service ID field to user information.
2025-12-16 17:44:51 +08:00
Liujian 1c6773a95b Add an accessible service ID field to user information. 2025-12-16 17:44:25 +08:00
ningyv b74a042f75 Merge pull request #78 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-16 15:48:13 +08:00
lcx c5a020c65c feat: resource-group-management 2025-12-16 15:47:11 +08:00
ningyv 61004e4686 Merge pull request #77 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-16 15:37:06 +08:00
lcx ff870630fa feat: resource-group-management 2025-12-16 15:36:16 +08:00
Dot.L 1da7e2a618 Merge pull request #76 from xpack-ai/feature/resource_group
Newly registered users use the default resource group.
2025-12-16 15:03:45 +08:00
Liujian de4b1bef32 Newly registered users use the default resource group. 2025-12-16 14:56:18 +08:00
Dot.L f5ba03ca33 Merge pull request #75 from xpack-ai/feature/resource_group
Added API:/api/mcp/service/resource_group/list/unbind
2025-12-16 14:46:19 +08:00
Liujian b00fca810d Added API:/api/mcp/service/resource_group/list/unbind 2025-12-16 14:45:45 +08:00
Dot.L 132f26e565 Merge pull request #74 from xpack-ai/feature/resource_group
Added API: /api/resource_group/service/list/unbind
2025-12-16 14:33:19 +08:00
Liujian c5854a1d6f Added API: /api/resource_group/service/list/unbind 2025-12-16 14:31:28 +08:00
ningyv d0caf957fe Merge pull request #73 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-16 14:30:17 +08:00
lcx fc3f633141 feat: resource-group-management 2025-12-16 14:29:18 +08:00
ningyv ada170e525 Merge pull request #72 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-16 14:20:53 +08:00
lcx 95ec31d5c0 feat: resource-group-management 2025-12-16 14:19:42 +08:00
Dot.L a6242af7b1 Merge pull request #71 from xpack-ai/feature/resource_group
fix: fail to delete resource group
2025-12-16 13:55:06 +08:00
Liujian 028de0338e fix: fail to delete resource group 2025-12-16 13:54:36 +08:00
Dot.L e6a197e709 Merge pull request #70 from xpack-ai/feature/resource_group
Service binding resource group related interfaces completed
2025-12-16 11:18:00 +08:00
Liujian 61a313d8ff Service binding resource group related interfaces completed 2025-12-16 11:16:56 +08:00
ningyv bbe94deedb Merge pull request #69 from xpack-ai/feat/resource-group-management
feat:  resource-group-management
2025-12-15 19:19:58 +08:00
lcx 5c90b8e1ca feat: resource-group-management 2025-12-15 18:52:37 +08:00
Dot.L 23f3c07d6b Merge pull request #68 from xpack-ai/feature/resource_group
update api: /api/mcp/service/list/simple
2025-12-15 18:15:47 +08:00
Liujian 27f76d5cf0 update api: /api/mcp/service/list/simple 2025-12-15 18:14:51 +08:00
Dot.L 732fefeb7e Merge pull request #67 from xpack-ai/feature/resource_group
update api: /api/resource_group_info
2025-12-15 18:08:57 +08:00
Liujian 6fb71a48fe update api: /api/resource_group_info 2025-12-15 18:08:16 +08:00
Dot.L 3daa8eaec1 Merge pull request #66 from xpack-ai/feature/resource_group
Added default resource groups: allow all and deny all
2025-12-15 17:59:08 +08:00
Liujian 811618d8e6 Added default resource groups: allow all and deny all 2025-12-15 17:58:33 +08:00
Dot.L 67819ad4d6 Merge pull request #65 from xpack-ai/feature/resource_group
finish resource group api
2025-12-15 16:55:36 +08:00
Liujian 6405713314 finish resource group api 2025-12-15 16:54:37 +08:00
riverLethe 60a6318663 fix:set mcp server edit rules, server id and server name change rule is max length 255 2025-12-11 18:14:32 +08:00
riverLethe 3e83446a2c fix:set mcp server edit rules, server id and server name change rule is max length 255 2025-12-11 18:14:04 +08:00
Dot.L d725e9d896 Merge pull request #64 from xpack-ai/feature/mcp
Check if base_url is valid
2025-12-08 10:17:17 +08:00
riverLethe 68c4b2fcc2 Merge branch 'main' of https://github.com/xpack-ai/XPack-MCP-Market 2025-12-08 09:08:25 +08:00
riverLethe 96db00418c feat:Add more constraints for server name, server ID, and api endpoint. 2025-12-08 09:08:09 +08:00
Liujian 2def6457fe Merge remote-tracking branch 'origin/main' into feature/mcp 2025-12-07 15:54:19 +08:00
Liujian b9123d68a0 Check if base_url is valid 2025-12-07 15:51:32 +08:00
Dot.L ebbf9b22da Merge pull request #63 from xpack-ai/feature/mcp
Bug fixes and improved prompts
2025-12-07 14:09:15 +08:00
Liujian eace543d74 Check if the price is a positive number. 2025-12-07 14:03:32 +08:00
Liujian 73cd1a01a0 Fix: Issue where billing continued even after calling the mcp tool failed. 2025-12-07 13:46:21 +08:00
Liujian 8186b4c0b5 fix: User Dashboard - AuthKey Analytics: display Total spending discrepancy 2025-12-06 00:50:36 +09:00
Liujian 5023e4494c fix: The balance field has an incorrect data type; it should be Decimal. 2025-12-05 23:50:41 +09:00
Liujian e2d360d5de fix: Balance Doubled When Depositing Funds 2025-12-05 22:57:44 +09:00
Liujian 948046948a fix:Relate to transaction_id value when admin recharge for user 2025-12-05 21:50:48 +09:00
Liujian 4e3fd1afaf fix: login failed 2025-12-05 12:17:49 +09:00
Liujian e2ae502b48 fix bug:Admin upload image should support format GIF, SVG to update logo 2025-12-05 11:02:07 +09:00
Liujian 6561435a38 Merge remote-tracking branch 'origin/main' into feature/mcp 2025-12-05 10:59:48 +09:00
Liujian 1846aafc1e fix bug:
1. Service_type do not set after add server
2. Issue relate pricing when "Update from OpenAPI"
3. Failed to set SQLAlchemy cache for key Error
4. Request Body Logging in Internal Service
5. Deleted API Key Remains Valid for 5 Minutes
2025-12-05 10:27:19 +09:00
riverLethe 54654b386d feat: Upgrade Next.js and refine password/amount restrictions
This commit addresses several key updates and fixes:

1.  **Security Update:** Upgraded Next.js to fix the vulnerability identified as **CVE-2025-55182**.
2.  **Password Policy:** Globally adjusted the password requirement for "change password" operations to a minimum length of **6 characters**.
3.  **Validation Improvement:** Enhanced validation logic for amount fields during MCP (Multi-Currency Purchase/Payment, assuming this acronym) creation to ensure proper limits and constraints are applied.
2025-12-04 17:43:59 +08:00
Dot.L 755d48a2f8 Merge pull request #61 from xpack-ai/feature/mcp
Update client IP acquisition logic
2025-11-26 18:02:54 +08:00
Liujian 284880a170 Update client IP acquisition logic 2025-11-26 18:02:10 +08:00
Dot.L 950b516081 Merge pull request #60 from xpack-ai/feature/mcp
Email captcha rate limiting fix && CORS tightening via configuration
2025-11-26 17:08:41 +08:00
Liujian 0088a7b447 Merge remote-tracking branch 'origin/main' into feature/mcp 2025-11-26 17:00:29 +08:00
Liujian 19f646c318 Email captcha rate limiting fix && CORS tightening via configuration 2025-11-26 16:58:54 +08:00
Dot.L 115ac5caf7 Merge pull request #59 from xpack-ai/feature/mcp
repairing potential risks
2025-11-26 16:39:29 +08:00
Liujian 798082934e Merge remote-tracking branch 'origin/main' into feature/mcp 2025-11-26 16:21:40 +08:00
Liujian a017b0fa93 repairing potential risks 2025-11-26 16:16:23 +08:00
Liujian 877dbb6a4e MCP session keys use client fingerprints to distinguish requests from different clients. 2025-11-26 15:09:35 +08:00
195 changed files with 9844 additions and 16687 deletions

No files matched your search

+10 -1
View File
@@ -26,8 +26,17 @@ RABBITMQ_USER=rabbitmq
RABBITMQ_PASSWORD=rabbitmq_Gs123dA
RABBITMQ_VHOST=/
# Billing queue / retry settings
BILLING_QUEUE_NAME=billing.api.calls
# Max retry attempts (excluding initial consumption)
BILLING_RETRY_TIMES=3
# Base delay seconds for exponential backoff: base * 2^retry_count
BILLING_RETRY_BASE_DELAY_SECONDS=30
# Max delay seconds cap
BILLING_RETRY_MAX_DELAY_SECONDS=1800
# Payment config encryption key (Base64-encoded 32-byte random value for AES-GCM)
# Quick generation: python -c "import os,base64; print(base64.b64encode(os.urandom(32)).decode())"
PAYMENT_CONFIG_SECRET_KEY=uyyhfMJ+xpEE+IC5mPigpscekkR2ucz6Sj7sHYLhJQA=
# Optional: key ID used to support key rotation identification
PAYMENT_CONFIG_KEY_ID=default
PAYMENT_CONFIG_KEY_ID=default
+2 -2
View File
@@ -20,7 +20,7 @@ jobs:
node-version: '22.16'
- name: Pnpm install and build
run: |
npm install -g pnpm
npm install -g pnpm@9
./scripts/frontend_build.sh
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
@@ -43,4 +43,4 @@ jobs:
QINIU_BUCKET: ${{ secrets.QINIU_BUCKET }}
QINIU_NAME: ${{ secrets.QINIU_NAME }}
run: cd scripts && ./docker_publish.sh ${{ secrets.DOCKER_USERNAME }} upload_qiniu
+3
View File
@@ -42,3 +42,6 @@ local_settings.py
/.secrets
/uploads/
/.vercel/
# Local deployment data
mysql-data/
+1
View File
@@ -0,0 +1 @@
/mcp.json
+43
View File
@@ -343,3 +343,46 @@ For details, please see the [LICENSE](./LICENSE) file.
- [XRoute](https://xroute.ai): The Unified Interface For LLMs, provides better prices, better throughput, and no subscription.
- [MemU](https://github.com/NevaMind-AI/memU): MemU is an open-source memory framework for AI companions
---
## 国内镜像部署(本项目维护,随 Release 更新)
镜像已双渠道发布,任选其一拉取:
- 公网:`gitea.88531.cn/jinghui/xpack-mcp-market:v1.5.0`、`jpccr.ccs.tencentyun.com/jinghui/xpack-mcp-market:v1.5.0`
- 内网:`192.168.68.19:3200/jinghui/xpack-mcp-market:v1.5.0`
### 方式一:docker-compose(推荐,带齐全部服务参数)
```bash
git clone http://192.168.68.19:3200/jinghui/xpack-mcp.git && cd xpack-mcp
# 1) 把 docker-compose.yml 中 xpack-mcp-market 服务的 image 改为公网镜像:
# image: xpackai/xpack-mcp-market:zhcn
# → image: gitea.88531.cn/jinghui/xpack-mcp-market:v1.5.0
# 2) 准备环境变量(支付渠道加密密钥,必须改掉示例值)
cp .env.example .env && vim .env # 修改 PAYMENT_CONFIG_SECRET_KEY 为自己的 32 字节随机串
docker compose up -d # 启动 mysql/redis/rabbitmq/market 四个容器
```
注意事项:
- `PAYMENT_CONFIG_SECRET_KEY` 缺失时 compose 会直接报错拒绝启动(`.env` 不可删);
- 数据库账号、Redis 密码、RabbitMQ 密码在 compose 里已固定,改任何一项都要同步改应用配置;
- 数据目录 `./mysql-data` 与容器网络 `172.101.0.0/24` 不要与已有环境冲突。
### 方式二:docker run(主站单容器)
前置:MySQL 8.0.37 / Redis 7.2.4 / RabbitMQ 4.1.2 已就绪,且容器与依赖服务同一网络(应用默认按主机名 `xpack-mysql`、`xpack-redis`、`xpack-rabbitmq` 连接)。
```bash
docker run -d --name xpack-mcp-market \
--restart always --privileged \
-p 8010:80 \
-e PAYMENT_CONFIG_SECRET_KEY='<32字节随机串>' \
-e PAYMENT_CONFIG_KEY_ID=default \
--network <依赖服务所在网络> \
gitea.88531.cn/jinghui/xpack-mcp-market:v1.5.0
```
+68
View File
@@ -0,0 +1,68 @@
version: '3'
services:
xpack-mysql:
image: mysql:8.0.37
privileged: true
restart: always
container_name: xpack-mysql
hostname: xpack-mysql
command:
- "--character-set-server=utf8mb4"
- "--collation-server=utf8mb4_unicode_ci"
ports:
- "33306:3306"
environment:
- MYSQL_ROOT_PASSWORD=mysql_ZTdhRB
- MYSQL_DATABASE=xpack
volumes:
- /vol3/1000/HD3/docker/xpack-mcp/mysql-data:/var/lib/mysql
networks:
- xpack
xpack-mcp-market:
image: xpackai/xpack-mcp-market:zhcn
container_name: xpack-mcp-market
privileged: true
restart: always
environment:
# AES-256-GCM key protecting payment channel config (epay merchant key, stripe secret).
# Lives here rather than in the image so the sample key shipped in .env.example
# can never decrypt this deployment's config.
- PAYMENT_CONFIG_SECRET_KEY=${PAYMENT_CONFIG_SECRET_KEY:?PAYMENT_CONFIG_SECRET_KEY not set - copy .env.example to .env}
- PAYMENT_CONFIG_KEY_ID=default
networks:
- xpack
ports:
- "8010:80"
depends_on:
- xpack-mysql
- xpack-redis
- xpack-rabbitmq
xpack-redis:
container_name: xpack-redis
image: redis:7.2.4
hostname: xpack-redis
privileged: true
restart: always
command:
- bash
- -c
- "redis-server --protected-mode yes --logfile redis.log --appendonly no --port 6379 --requirepass redis_6sJZDm"
networks:
- xpack
xpack-rabbitmq:
container_name: xpack-rabbitmq
image: rabbitmq:4.1.2-alpine
privileged: true
restart: always
environment:
- RABBITMQ_DEFAULT_USER=rabbitmq
- RABBITMQ_DEFAULT_PASS=rabbitmq_Gs123dA
networks:
- xpack
networks:
xpack:
driver: bridge
ipam:
driver: default
config:
- subnet: 172.101.0.0/24
+1 -1
View File
@@ -9,7 +9,7 @@
!.yarn/plugins
!.yarn/releases
!.yarn/versions
/pnpm-lock.yaml
# testing
/coverage
-57
View File
@@ -1,57 +0,0 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: false,
// Enable SSR
output: "standalone",
// Optimize images
images: {
domains: [],
unoptimized: false, // Enable image optimization for SSR
},
// Webpack configuration
webpack: (config) => {
return config;
},
// Redirect configuration
async redirects() {
return [];
},
async rewrites() {
return [
// {
// source: "/api/:path*",
// destination: `${process.env.NEXT_PUBLIC_API_URL || "http://127.0.0.1:8001"}/api/:path*`,
// },
{
source: "/uploads/:path*",
destination: `${
process.env.NEXT_PUBLIC_API_URL || "http://127.0.0.1:8001"
}/uploads/:path*`,
},
];
},
// Headers for better performance
async headers() {
return [
{
source: "/(.*)",
headers: [
{
key: "X-Content-Type-Options",
value: "nosniff",
},
{
key: "X-XSS-Protection",
value: "1; mode=block",
},
],
},
];
},
};
module.exports = nextConfig;
+41
View File
@@ -1,10 +1,15 @@
import type { NextConfig } from "next";
const nextConfig: NextConfig = {
reactStrictMode: false,
output: "standalone",
experimental: {
optimizePackageImports: ["@nextui-org/react"],
},
transpilePackages: ["@nextui-org/react", "@nextui-org/theme"],
images: {
remotePatterns: [
{
@@ -12,6 +17,42 @@ const nextConfig: NextConfig = {
hostname: "**",
},
],
unoptimized: false,
},
// Redirect configuration
async redirects() {
return [];
},
async rewrites() {
return [
{
source: "/uploads/:path*",
destination: `${
process.env.NEXT_PUBLIC_API_URL || "http://127.0.0.1:8001"
}/uploads/:path*`,
},
];
},
// Headers for better performance
async headers() {
return [
{
source: "/(.*)",
headers: [
{
key: "X-Content-Type-Options",
value: "nosniff",
},
{
key: "X-XSS-Protection",
value: "1; mode=block",
},
],
},
];
},
};
+7 -6
View File
@@ -16,6 +16,7 @@
"dependencies": {
"@hookform/resolvers": "^3.3.4",
"@iconify/react": "^5.0.2",
"@internationalized/date": "^3.10.1",
"@nextui-org/react": "^2.6.11",
"@nextui-org/theme": "^2.4.5",
"@tailwindcss/typography": "^0.5.16",
@@ -32,9 +33,9 @@
"immer": "^10.0.3",
"lottie-react": "^2.4.1",
"lucide-react": "^0.475.0",
"next": "^15.3.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"next": "^16.1.5",
"react": "^19.1.4",
"react-dom": "^19.1.4",
"react-hook-form": "^7.49.3",
"react-hot-toast": "^2.4.1",
"react-hover-video-player": "^10.0.2",
@@ -49,12 +50,12 @@
},
"devDependencies": {
"@types/node": "^20.11.0",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@types/three": "^0.177.0",
"autoprefixer": "^10.4.17",
"eslint": "^8.56.0",
"eslint-config-next": "15.0.3",
"eslint-config-next": "16.1.5",
"postcss": "^8.4.33",
"tailwindcss": "^3.4.17",
"typescript": "^5.3.3"
-15888
View File
File diff suppressed because it is too large. Load diff
+32 -7
View File
@@ -328,7 +328,7 @@
"Current Balance": "Current Balance",
"User recharged successfully": "User recharged successfully",
"Please enter a valid amount": "Please enter a valid amount",
"Minimum recharge amount is $1": "Minimum recharge amount is $1",
"Minimum recharge amount is ¥1": "Minimum recharge amount is ¥1",
"User not selected": "User not selected",
"Recharge failed": "Recharge failed",
"Network error, please try again": "Network error, please try again",
@@ -380,7 +380,6 @@
"Enter your password": "Enter your password",
"Confirm your password": "Confirm your password",
"Passwords do not match": "Passwords do not match",
"Password must be at least 8 characters": "Password must be at least 8 characters",
"Registration successful": "Registration successful",
"Registration failed": "Registration failed",
"Email already exists": "Email already exists",
@@ -484,7 +483,6 @@
"Enter server ID": "Enter server ID",
"Modifying the ID will affect the MCP access URL. Please modify with caution.": "Modifying the ID will affect the MCP access URL. Please modify with caution.",
"You have modified the Server ID. This will affect the MCP access URL and may break existing integrations. Are you sure you want to continue?": "You have modified the Server ID. This will affect the MCP access URL and may break existing integrations. Are you sure you want to continue?",
"The header name for the API key (e.g., X-API-Key, Authorization)": "The header name for the API key (e.g., X-API-Key, Authorization)",
"Enter API key": "Enter API key",
"Enter bearer token": "Enter bearer token",
@@ -509,7 +507,7 @@
"API Key Header Name": "API Key Header Name",
"Secret Key format is incorrect, should start with sk_": "Secret Key format is incorrect, should start with sk_",
"Webhook Secret format is incorrect, should start with whsec_": "Webhook Secret format is incorrect, should start with whsec_",
"Password must be at least 8 characters long": "Password must be at least 8 characters long",
"Password must be at least 6 characters long": "Password must be at least 6 characters long",
"OAuth 2.0 Client Secret (optional, for server-side verification)": "OAuth 2.0 Client Secret (optional, for server-side verification)",
"Authorized redirect URI configured in Google Cloud Console": "Authorized redirect URI configured in Google Cloud Console",
"Webhook signing secret for verifying Stripe events": "Webhook signing secret for verifying Stripe events",
@@ -774,7 +772,7 @@
"Re-enter new password": "Re-enter new password",
"Confirm new password": "Confirm new password",
"New password and confirm password do not match": "New password and confirm password do not match",
"New password must be at least 8 characters long": "New password must be at least 8 characters long",
"New password must be at least 6 characters long": "New password must be at least 6 characters long",
"New password and confirm password must be the same": "New password and confirm password must be the same",
"New Password": "New Password",
"Confirm New Password": "Confirm New Password",
@@ -877,5 +875,32 @@
"Email is required": "Email is required",
"No servers available": "No servers available",
"(Deleted)": "(Deleted)",
"Transport Type": "Transport Type"
}
"Transport Type": "Transport Type",
"Server ID must be less than 255 characters": "Server ID must be less than 255 characters",
"Server Name must be less than 255 characters": "Server Name must be less than 255 characters",
"API Endpoint must be a valid HTTP/HTTPS URL": "API Endpoint must be a valid HTTP/HTTPS URL",
"Server ID is required": "Server ID is required",
"Short description is required": "Short description is required",
"Auth Key Name": "Auth Key Name",
"Search by email": "Search by email",
"Search by service name": "Search by service name",
"Select Date Range": "Select Date Range",
"Resource group name \"{{name}}\" is reserved and cannot be used": "Resource group name \"{{name}}\" is reserved and cannot be used",
"Resource group name \"{{name}}\" already exists": "Resource group name \"{{name}}\" already exists",
"Auth key name \"{{name}}\" already exists": "Auth key name \"{{name}}\" already exists",
"Start date must be before end date": "Start date must be before end date",
"Start date cannot be earlier than 30 days ago": "Start date cannot be earlier than 30 days ago",
"Resource Groups": "Resource Groups",
"Daily call limit per user": "Daily call limit per user",
"Max calls per user per day (Beijing time). Leave blank or 0 for unlimited": "Max calls per user per day (Beijing time). Leave blank or 0 for unlimited",
"e.g. 50": "e.g. 50",
"Free Call Limits": "Free Call Limits",
"Global daily call cap for free services": "Global daily call cap for free services",
"Platform-wide daily call limit per user": "Platform-wide daily call limit per user",
"Applies to every free service, leave blank or 0 for unlimited": "Applies to every free service, leave blank or 0 for unlimited",
"If a service also has its own limit, the smaller number wins": "If a service also has its own limit, the smaller number wins",
"Example 100": "Example 100",
"Enter a non-negative integer": "Enter a non-negative integer",
"Free call limit saved": "Free call limit saved",
"Failed to save free call limit": "Failed to save free call limit"
}
+103 -7
View File
@@ -300,6 +300,7 @@
"Overview and analytics": "概览和分析",
"Manage MCP servers and API tools": "管理MCP服务及API工具",
"Manage registered users": "管理注册用户",
"Manage resource groups": "管理资源组",
"View user recharge history": "查看用户充值历史",
"Configure payment channels": "配置支付渠道",
"Platform basic configuration": "平台基础配置",
@@ -329,7 +330,7 @@
"Current Balance": "当前余额",
"User recharged successfully": "用户充值成功",
"Please enter a valid amount": "请输入有效金额",
"Minimum recharge amount is $1": "最低充值金额为 $1",
"Minimum recharge amount is ¥1": "最低充值金额为 ¥1",
"User not selected": "未选择用户",
"Recharge failed": "充值失败",
"Network error, please try again": "网络错误,请重试",
@@ -381,7 +382,6 @@
"Enter your password": "请输入密码",
"Confirm your password": "请确认密码",
"Passwords do not match": "密码不匹配",
"Password must be at least 8 characters": "密码至少需要8个字符",
"Registration successful": "注册成功",
"Registration failed": "注册失败",
"Email already exists": "邮箱已存在",
@@ -485,7 +485,6 @@
"Enter server ID": "输入服务器ID",
"Modifying the ID will affect the MCP access URL. Please modify with caution.": "修改ID会影响MCP的访问地址,需要谨慎修改。",
"You have modified the Server ID. This will affect the MCP access URL and may break existing integrations. Are you sure you want to continue?": "您已修改了服务器ID。这将影响MCP访问地址,可能会破坏现有的集成。您确定要继续吗?",
"The header name for the API key (e.g., X-API-Key, Authorization)": "API密钥的头部名称(例如:X-API-Key, Authorization)",
"Enter API key": "输入API密钥",
"Enter bearer token": "输入Bearer令牌",
@@ -510,7 +509,7 @@
"API Key Header Name": "API密钥头部名称",
"Secret Key format is incorrect, should start with sk_": "密钥格式不正确,应以sk_开头",
"Webhook Secret format is incorrect, should start with whsec_": "Webhook密钥格式不正确,应以whsec_开头",
"Password must be at least 8 characters long": "密码至少需要8个字符",
"Password must be at least 6 characters long": "密码至少需要6个字符",
"OAuth 2.0 Client Secret (optional, for server-side verification)": "OAuth 2.0 客户端密钥(可选,用于服务端验证)",
"Authorized redirect URI configured in Google Cloud Console": "在Google Cloud Console中配置的授权重定向URI",
"Webhook signing secret for verifying Stripe events": "用于验证Stripe事件的Webhook签名密钥",
@@ -625,6 +624,8 @@
"MCP Config": "MCP配置",
"Copy full config": "复制完整配置",
"Analytics": "分析",
"Resource Group": "资源组",
"Manage Your Resource Groups": "管理您的资源组",
"Times": "次",
"No analytics data available": "无可用分析数据",
"Delete Auth Key": "删除认证密钥",
@@ -776,7 +777,7 @@
"Re-enter new password": "重新输入新密码",
"Confirm new password": "确认新密码",
"New password and confirm password do not match": "新密码和确认密码不匹配",
"New password must be at least 8 characters long": "新密码至少需要8个字符",
"New password must be at least 6 characters long": "新密码至少需要6个字符",
"New password and confirm password must be the same": "新密码和确认密码必须相同",
"New Password": "新密码",
"Confirm New Password": "确认新密码",
@@ -879,5 +880,100 @@
"Email is required": "邮箱为必填项",
"No servers available": "没有可用服务",
"(Deleted)": "(已删除)",
"Transport Type": "传输方式"
}
"Transport Type": "传输方式",
"Server ID must be less than 255 characters": "Server ID 必须少于255个字符",
"Server Name must be less than 255 characters": "Server Name 必须少于255个字符",
"API Endpoint must be a valid HTTP/HTTPS URL": "API Endpoint 必须是一个有效的HTTP/HTTPS URL",
"Server ID is required": "Server ID 为必填项",
"Short description is required": "简短描述为必填项",
"Add": "添加",
"Add to Groups": "添加到资源组",
"Group Name": "资源组名称",
"No resource groups available": "没有可用资源组",
"Failed to load group services": "加载资源组服务失败",
"Resource group deleted successfully": "资源组删除成功",
"Added Time": "添加时间",
"No services in this group": "此资源组没有服务",
"Open Resource Group Page": "打开资源组页面",
"Remove": "删除",
"Confirm Remove": "确认删除",
"Are you sure you want to remove this \"{{name}}\" mcp server from \"{{groupName}}\" resource group?": "您确定要从 \"{{groupName}}\" 资源组中移除 \"{{name}}\" MCP 服务吗?",
"Users associated with this resource group will not be able to call the removed MCP server": "与该资源组关联的用户将无法调用已移除的 MCP 服务",
"You don't have permission to access this MCP server.": "您没有权限访问此 MCP 服务。",
"Failed to load resource groups": "加载资源组失败",
"Failed to delete resource group": "删除资源组失败",
"Failed to add service to group": "添加服务到资源组失败",
"Resource group created successfully": "资源组创建成功",
"Resource group updated successfully": "资源组更新成功",
"Services added successfully": "服务添加成功",
"Service removed successfully": "服务移除成功",
"Select resource group": "选择资源组",
"Manage your resource group. Each user has a resource group and can only access resources within their resource group": "管理您的资源组。每个用户都有一个资源组,并且只能访问其资源组内的资源",
"Please select a group to view services": "请选择一个资源组来查看服务",
"Are you sure you want to remove this \"{{name}}\" Resource Group?": "您确定要删除这个 \"{{name}}\" 资源组吗?",
"The bound users have been transferred to the following resource group": "与该资源组关联的用户已转移至以下资源组",
"Service Name": "服务名称",
"Group List": "资源组列表",
"No groups found": "没有找到资源组",
"No more groups": "没有更多资源组",
"Are you sure you want to delete this item? This action cannot be undone.": "您确定要删除这个项目吗?此操作无法撤销。",
"Create New Resource Group": "创建新资源组",
"Edit Resource Group": "编辑资源组",
"Edit Resource Group Name": "编辑资源组名称",
"Set as default": "设置为默认",
"Automatically bind default resource groups when adding users": "添加用户时自动绑定默认资源组",
"Add MCP Server": "添加 MCP 服务",
"No MCP services available": "没有可用的 MCP 服务",
"Resource Groups": "资源组",
"Resource Group Name": "资源组名称",
"Failed to remove service from group": "从资源组中移除服务失败",
"Failed to update resource group": "更新资源组失败",
"Failed to create resource group": "创建资源组失败",
"Failed to fetch simple mcp services": "获取简易MCP服务失败",
"Failed to fetch group services": "获取资源组服务失败",
"Failed to update user resource group": "更新用户资源组失败",
"Failed to load simple resource groups": "获取简易资源组失败",
"Failed to load resource group detail": "获取资源组详情失败",
"Resource Group Detail": "资源组详情",
"Current display time is UTC time": "当前显示时间为UTC时间",
"View Resource Group Detail": "查看资源组详情",
"Configure tags bar display": "配置标签栏显示",
"Failed to load orders": "加载订单失败",
"Transaction Time": "交易时间",
"All": "全部",
"Purchase": "消费",
"No orders found": "无订单",
"Account Balance": "账户余额",
"View your balance and transaction history": "查看您的余额和交易历史",
"Display tags bar": "显示标签栏",
"Front end displays tags bar and allows users to filter products based on tags.": "前端显示标签栏,允许用户根据标签过滤产品。",
"Tags Bar": "标签栏",
"Auth Key Name": "认证密钥名称",
"Search by email": "按邮箱搜索",
"Search by service name": "按服务名称搜索",
"Select Date Range": "选择日期范围",
"Resource group name \"{{name}}\" is reserved and cannot be used": "资源组名称 \"{{name}}\" 是保留名称,不能使用",
"Resource group name \"{{name}}\" already exists": "资源组名称 \"{{name}}\" 已存在",
"Auth key name \"{{name}}\" already exists": "认证密钥 \"{{name}}\" 已存在",
"Start date must be before end date": "开始日期必须早于结束日期",
"Start date cannot be earlier than 30 days ago": "开始日期不能早于30天前",
"Daily call limit per user": "每用户每日调用上限",
"Max calls per user per day (Beijing time). Leave blank or 0 for unlimited": "每个用户每天最多调用次数(北京时间)。留空或填 0 表示不限",
"e.g. 50": "如 50",
"Free Call Limits": "免费调用限制",
"Global daily call cap for free services": "免费服务的全局每日调用上限",
"Platform-wide daily call limit per user": "全站每用户每日调用上限",
"Applies to every free service, leave blank or 0 for unlimited": "对所有免费服务生效,留空或填 0 表示不限",
"If a service also has its own limit, the smaller number wins": "若单个服务也设置了上限,两者取更小值",
"Example 100": "如 100",
"Enter a non-negative integer": "请输入非负整数",
"Free call limit saved": "免费调用上限已保存",
"Failed to save free call limit": "保存免费调用上限失败",
"Publish MCP Service": "发布 MCP 服务",
"Submit your own MCP service": "提交你的 MCP 服务并上架市场",
"My Submissions": "我的提交记录",
"No submissions yet": "还没有提交记录",
"Pending Review": "待审核",
"Approved": "已通过",
"Rejected": "已拒绝"
}
+19 -2
View File
@@ -67,9 +67,26 @@ export interface AdminAnalyticsResponse
/**
* Get admin analytics data
* Headers: { Authorization: string }
* @param start_time - Start time timestamp (seconds)
* @param end_time - End time timestamp (seconds)
*/
export async function getAdminAnalytics(): Promise<AdminAnalyticsResponse> {
return fetchAdminAPI<AdminAnalyticsData>("/api/admin/stats/analytics", {
export async function getAdminAnalytics(
start_time?: number,
end_time?: number
): Promise<AdminAnalyticsResponse> {
const params = new URLSearchParams();
if (start_time !== undefined) {
params.append('start', start_time.toString());
}
if (end_time !== undefined) {
params.append('end', end_time.toString());
}
const url = `/api/admin/stats/analytics${params.toString() ? `?${params.toString()}` : ''}`;
return fetchAdminAPI<AdminAnalyticsData>(url, {
method: "GET",
}) as unknown as AdminAnalyticsResponse;
}
+305
View File
@@ -0,0 +1,305 @@
import { SimpleMcpService } from "@/components/resource-group/AddMcpServerModal";
import { GroupService } from "@/components/resource-group/GroupServiceTable";
import { fetchAdminAPI } from "@/rpc/admin-api";
import { toast } from "react-hot-toast";
import i18n from "@/shared/lib/i18n";
export interface ResourceGroupResponse {
id: string;
name: string;
description: string;
is_default: boolean;
service_count: number;
create_at: string;
}
export interface ResourceGroupDetailResponse {
id: string;
name: string;
description: string;
is_default: boolean;
update_at: number;
create_at: string;
}
export interface ResourceGroupListResponse {
data: ResourceGroupResponse[];
total: number;
page: number;
page_size: number;
}
export interface GroupServiceListResponse {
data: GroupService[];
total: number;
page: number;
page_size: number;
}
export interface SimpleMcpServiceListResponse {
data: SimpleMcpService[];
total: number;
page: number;
page_size: number;
}
export const fetchResourceGroupDetail = async (groupId: string): Promise<ResourceGroupDetailResponse | null> => {
try {
const response = await fetchAdminAPI<ResourceGroupDetailResponse>(`/api/resource_group/info?id=${groupId}`);
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to load resource group detail"));
return null;
}
return response.data || null;
} catch (error) {
console.error("Error fetching resource group detail:", error);
return null;
}
};
/**
* 获取资源组列表
*/
export const fetchResourceGroups = async (page: number, page_size: number, keyword: string): Promise<ResourceGroupListResponse> => {
try {
const response = await fetchAdminAPI<ResourceGroupResponse[]>(`/api/resource_group/list?page=${page}&page_size=${page_size}&keyword=${keyword}`);
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to load resource groups"));
return {
data: [],
total: 0,
page,
page_size,
};
}
return {
data: response.data || [],
total: response.page?.total || 0,
page: response.page?.page || page,
page_size: response.page?.page_size || page_size,
};
} catch (error) {
console.error("Error fetching auth keys:", error);
return {
data: [],
total: 0,
page,
page_size,
};
}
};
/**
* 获取简易资源组列表
*/
export const fetchSimpleResourceGroups = async (): Promise<{ id: string, name: string }[]> => {
try {
const response = await fetchAdminAPI<{ id: string, name: string }[]>(`/api/resource_group/list/simple`);
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to load simple resource groups"));
return []
}
return response.data || []
} catch (error) {
console.error("Error fetching auth keys:", error);
return []
}
};
/**
* 修改用户资源组
*/
export const updateUserResourceGroup = async (userId: string, resourceGroupId: string): Promise<boolean> => {
try {
const response = await fetchAdminAPI<boolean>(`/api/user_manager/resource_group`, {
method: "PUT",
body: { user_id: userId, resource_group: resourceGroupId } as unknown as BodyInit,
});
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to update user resource group"));
return false;
}
return true;
} catch (error) {
console.error("Error updating user resource group:", error);
return false
}
};
/**
* 获取指定资源组下的服务列表
*/
export const fetchGroupServices = async (id: string,page: number, page_size: number, keyword: string): Promise<GroupServiceListResponse> => {
try {
const response = await fetchAdminAPI<GroupService[]>(`/api/resource_group/service/list?id=${id}&page=${page}&page_size=${page_size}&keyword=${keyword}`);
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to fetch group services"));
return {
data: [],
total: 0,
page,
page_size,
};
}
return {
data: response.data || [],
total: response.page?.total || 0,
page: response.page?.page || page,
page_size: response.page?.page_size || page_size,
};
} catch (error) {
console.error("Error fetching auth keys:", error);
return {
data: [],
total: 0,
page,
page_size,
};
}
};
/**
* 获取简易指定资源组下的服务列表
*/
export const fetchSimpleMcpServices = async (id: string): Promise<SimpleMcpService[]> => {
try {
const response = await fetchAdminAPI<SimpleMcpService[]>(`/api/resource_group/service/list/unbind?id=${id}`);
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to fetch simple mcp services"));
return []
}
return response.data || []
} catch (error) {
console.error("Error fetching auth keys:", error);
return []
}
};
/**
* 创建资源组
*/
export const createResourceGroup = async (name: string, isDefault: boolean): Promise<{success: boolean, id: string}> => {
try {
const response = await fetchAdminAPI<{id: string}>(`/api/resource_group`, {
method: "POST",
body: { name: name, is_default: isDefault } as unknown as BodyInit,
});
if (!response.success) {
const errorMsg = response.error_message
if (errorMsg?.endsWith('already exists')) {
toast.error(i18n.t(errorMsg, { name: name }));
} else if(errorMsg?.endsWith('cannot be used')) {
toast.error(i18n.t(errorMsg, { name: name }));
} else {
toast.error(errorMsg || i18n.t("Failed to create resource group"));
}
return {
success: false,
id: "",
};
}
return {
success: true,
id: response.data?.id || "",
};
} catch {
return {
success: false,
id: "",
};
}
};
/**
* 更新资源组
*/
export const updateResourceGroup = async (
groupId: string,
name: string,
isDefault: boolean
): Promise<boolean> => {
try {
const response = await fetchAdminAPI<boolean>(`/api/resource_group?id=${groupId}`, {
method: "PUT",
body: { name: name, is_default: isDefault } as unknown as BodyInit,
});
if (!response.success) {
const errorMsg = response.error_message
if (errorMsg?.endsWith('already exists')) {
toast.error(i18n.t(errorMsg, { name: name }));
} else if(errorMsg?.endsWith('cannot be used')) {
toast.error(i18n.t(errorMsg, { name: name }));
} else {
toast.error(errorMsg || i18n.t("Failed to update resource group"));
}
return false;
}
return true;
} catch {
return false
}
};
/**
* 删除资源组
*/
export const deleteResourceGroup = async (
groupId: string,
transferToGroupId: string
): Promise<boolean> => {
try {
const response = await fetchAdminAPI<boolean>(`/api/resource_group?id=${groupId}&migrate_id=${transferToGroupId}`, {
method: "DELETE"
});
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to delete resource group"));
return false;
}
return true;
} catch {
return false
}
};
/**
* 从资源组中移除服务
*/
export const removeServiceFromGroup = async (
groupId: string,
serviceIds: string[]
): Promise<boolean> => {
try {
const response = await fetchAdminAPI<boolean>(`/api/resource_group/service?id=${groupId}`, {
method: "DELETE",
body: { services: serviceIds } as unknown as BodyInit,
});
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to remove service from group"));
return false;
}
return true;
} catch {
return false
}
};
/**
* 添加服务到资源组
*/
export const addServiceToGroup = async (
groupId: string,
services: string[]
): Promise<boolean> => {
try {
const response = await fetchAdminAPI<boolean>(`/api/resource_group/service?id=${groupId}`, {
method: "PUT",
body: { services: services } as unknown as BodyInit,
});
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to add service to group"));
return false;
}
return true;
} catch {
return false
}
};
+1 -1
View File
@@ -12,7 +12,7 @@ export async function revalidatePlatformConfig() {
revalidatePath("/", "layout");
// Revalidate host-specific cache tag
revalidateTag(`platform-config-${host}`);
revalidateTag(`platform-config-${host}`, 'max');
console.info(
`Platform config cache revalidated for host: platform-config-${host}`
@@ -0,0 +1,7 @@
"use client";
import React from "react";
import { SubmissionsManagement } from "@/components/console/SubmissionsManagement";
export default function AdminSubmissionsPage() {
return <SubmissionsManagement />;
}
+7 -6
View File
@@ -1,13 +1,14 @@
input::placeholder,
textarea::placeholder {
--nextui-foreground-500: 240 5.03% 64.9%;
}
/* Import theme styles */
@import "../styles/themes.css";
@tailwind base;
@tailwind components;
@tailwind utilities;
/* Import theme styles */
@import "../styles/themes.css";
input::placeholder,
textarea::placeholder {
--nextui-foreground-500: 240 5.03% 64.9%;
}
html,
body {
+2 -2
View File
@@ -27,12 +27,12 @@ export default async function RootLayout({
const platformConfig = await getCachedPlatformConfig();
return (
<html lang="en" suppressHydrationWarning data-color-mode="light">
<html lang="zh-CN" suppressHydrationWarning data-color-mode="light">
<head>
<script
dangerouslySetInnerHTML={{
__html: `
window.localStorage.setItem("i18nextLng", "${platformConfig?.platform?.language || "en"}");
window.localStorage.setItem("i18nextLng", "${platformConfig?.platform?.language || "zh-CN"}");
`,
}}
/>
+260
View File
@@ -0,0 +1,260 @@
"use client";
import React, { useEffect, useState } from "react";
import { fetchAPI } from "@/shared/rpc/common-function";
import { useSharedStore } from "@/shared/store/share";
type SubType = "mcp";
type SubRecord = {
id: string;
type: string;
name: string;
status: string;
created_at?: string | null;
review_note?: string | null;
};
const TYPE_LABEL: Record<string, string> = {
mcp: "MCP 服务",
};
const STATUS_LABEL: Record<string, { text: string; cls: string }> = {
pending: { text: "待审核", cls: "bg-yellow-100 text-yellow-800" },
approved: { text: "已通过", cls: "bg-green-100 text-green-800" },
rejected: { text: "已拒绝", cls: "bg-red-100 text-red-700" },
};
export default function SubmitPage() {
// 网页登录态存在 zustand store(XPack_Shared),localStorage["user_token"] 只有扩展侧栏才会写,
// 用 store 判断才不会把已登录用户误判为未登录
const user_token = useSharedStore((s: any) => s.user_token);
const type: SubType = "mcp";
const [name, setName] = useState("");
const [desc, setDesc] = useState("");
const [file, setFile] = useState<File | null>(null);
const [baseUrl, setBaseUrl] = useState("");
const [serviceType, setServiceType] = useState("openapi");
const [tags, setTags] = useState("");
const [chargeType, setChargeType] = useState<"free" | "paid">("free");
const [price, setPrice] = useState("");
const [freeDailyLimit, setFreeDailyLimit] = useState("");
const [msg, setMsg] = useState<{ ok: boolean; text: string } | null>(null);
const [submitting, setSubmitting] = useState(false);
const [subs, setSubs] = useState<SubRecord[]>([]);
const [loggedIn, setLoggedIn] = useState<boolean | null>(null);
const loadSubs = async () => {
if (typeof window === "undefined") return;
try {
const d = await fetchAPI<{ success: boolean; data?: SubRecord[] }>(
"/api/submission/submissions",
{ method: "GET" }
);
if (d?.success && Array.isArray(d.data)) {
setLoggedIn(true);
setSubs(d.data);
return;
}
} catch {
/* 网络异常按未登录处理,不影响提交表单 */
}
setLoggedIn(false);
setSubs([]);
};
useEffect(() => {
loadSubs();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
setMsg(null);
if (typeof window !== "undefined" && !user_token) {
setMsg({ ok: false, text: "请先登录后再提交(右上角登录)" });
return;
}
if (type === "mcp" && !baseUrl.trim()) {
setMsg({ ok: false, text: "MCP 服务必须填写服务地址 base_url" });
return;
}
setSubmitting(true);
try {
const fd = new FormData();
fd.append("type", type);
fd.append("name", name);
if (desc) fd.append("description", desc);
if (file) fd.append("file", file);
if (type === "mcp") {
fd.append("base_url", baseUrl.trim());
fd.append("service_type", serviceType);
if (tags.trim()) fd.append("tags", tags.trim());
fd.append("charge_type", chargeType);
if (chargeType === "paid" && price) fd.append("price", price);
if (chargeType === "free" && freeDailyLimit) fd.append("free_daily_limit", freeDailyLimit);
}
const data = await fetchAPI<{ success: boolean; error_message?: string; data?: { id: string; status: string } }>(
"/api/submission/submission",
{ method: "POST", body: fd }
);
if (data?.success) {
setMsg({ ok: true, text: "提交成功,等待管理员审核。审核通过后将自动上架到市场。" });
setName(""); setDesc(""); setFile(null); setBaseUrl(""); setTags("");
loadSubs();
} else {
setMsg({ ok: false, text: data?.error_message || "提交失败,请稍后重试" });
}
} catch (err) {
setMsg({ ok: false, text: "提交失败:" + (err as Error).message });
} finally {
setSubmitting(false);
}
};
const inputCls = "border p-2 w-full rounded";
return (
<div className="max-w-xl mx-auto p-6">
<div className="flex items-center justify-between mb-4">
<h1 className="text-2xl font-bold">上传 MCP 服务</h1>
</div>
<form onSubmit={handleSubmit} className="space-y-4">
<input value={name} onChange={(e) => setName(e.target.value)} placeholder="名称" className={inputCls} required />
<textarea value={desc} onChange={(e) => setDesc(e.target.value)} placeholder="描述" className={inputCls} rows={3} />
{type === "mcp" && (
<div className="space-y-3 border rounded p-3 bg-gray-50">
<div>
<label className="block text-sm font-medium mb-1">服务地址 base_url *</label>
<input
value={baseUrl}
onChange={(e) => setBaseUrl(e.target.value)}
placeholder="http://192.168.1.10:8020"
className={inputCls}
required
/>
</div>
<div>
<label className="block text-sm font-medium mb-1">服务类型</label>
<select value={serviceType} onChange={(e) => setServiceType(e.target.value)} className={inputCls}>
<option value="openapi">openapi(HTTP 接口)</option>
</select>
</div>
<div>
<label className="block text-sm font-medium mb-1">标签(逗号分隔)</label>
<input value={tags} onChange={(e) => setTags(e.target.value)} placeholder="工具, 搜索, 免费" className={inputCls} />
</div>
<div>
<label className="block text-sm font-medium mb-1">计费方式</label>
<select
value={chargeType}
onChange={(e) => setChargeType(e.target.value as "free" | "paid")}
className={inputCls}
>
<option value="free">免费</option>
<option value="paid">按次付费</option>
</select>
</div>
{chargeType === "paid" ? (
<div>
<label className="block text-sm font-medium mb-1">单价(元/次)</label>
<input
type="number" step="0.01" min="0"
value={price}
onChange={(e) => setPrice(e.target.value)}
placeholder="0.10"
className={inputCls}
/>
</div>
) : (
<div>
<label className="block text-sm font-medium mb-1">每日免费次数(留空 = 不限)</label>
<input
type="number" min="1"
value={freeDailyLimit}
onChange={(e) => setFreeDailyLimit(e.target.value)}
placeholder="100"
className={inputCls}
/>
</div>
)}
<div>
<label className="block text-sm font-medium mb-1">
OpenAPI 规范文件(.json,用于自动生成工具列表)
</label>
<input type="file" onChange={(e) => setFile(e.target.files?.[0] || null)} className={inputCls} />
<p className="text-xs text-gray-500 mt-1">
上传后审核通过会自动生成工具;不上传则上架后需在服务管理里手动添加工具。
</p>
</div>
</div>
)}
<button
type="submit"
disabled={submitting}
className="bg-blue-600 text-white px-4 py-2 rounded disabled:opacity-50"
>
{submitting ? "提交中..." : "提交"}
</button>
</form>
{msg && (
<pre className={`mt-4 text-sm whitespace-pre-wrap ${msg.ok ? "text-green-700" : "text-red-600"}`}>
{msg.text}
</pre>
)}
{loggedIn === false && (
<p className="mt-6 text-sm text-gray-500">
登录后可提交服务并查看审核状态。
</p>
)}
{loggedIn && (
<div className="mt-8 border rounded p-4 bg-white">
<h2 className="text-lg font-semibold mb-3">我的提交记录</h2>
{subs.length === 0 ? (
<p className="text-sm text-gray-500">还没有提交记录</p>
) : (
<ul className="space-y-2">
{subs.map((s) => {
const st = STATUS_LABEL[s.status] || {
text: s.status,
cls: "bg-gray-100 text-gray-600",
};
return (
<li key={s.id} className="border rounded p-3 text-sm">
<div className="flex items-center justify-between gap-2">
<span className="font-medium truncate">{s.name}</span>
<span
className={`px-2 py-0.5 rounded text-xs whitespace-nowrap ${st.cls}`}
>
{st.text}
</span>
</div>
<div className="text-xs text-gray-500 mt-1 flex flex-wrap gap-x-4">
<span>{TYPE_LABEL[s.type] || s.type}</span>
{s.created_at && (
<span>{new Date(s.created_at).toLocaleString("zh-CN")}</span>
)}
</div>
{s.review_note && (
<div className="text-xs text-orange-600 mt-1">
审核备注:{s.review_note}
</div>
)}
</li>
);
})}
</ul>
)}
</div>
)}
</div>
);
}
@@ -48,8 +48,8 @@ export const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
return;
}
if (newPassword.length < 8) {
toast.error(t("Password must be at least 8 characters long"));
if (newPassword.length < 6) {
toast.error(t("Password must be at least 6 characters long"));
return;
}
@@ -73,7 +73,7 @@ export const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
newPassword.trim() !== "" &&
confirmPassword.trim() !== "" &&
newPassword === confirmPassword &&
newPassword.length >= 8;
newPassword.length >= 6;
return (
<Modal isOpen={isOpen} onClose={handleClose} size="md">
@@ -90,7 +90,7 @@ export const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
type={showNewPassword ? "text" : "password"}
value={newPassword}
onChange={(e) => setNewPassword(e.target.value)}
description={t("Password must be at least 8 characters long")}
description={t("Password must be at least 6 characters long")}
endContent={
<button
type="button"
@@ -14,12 +14,12 @@ const formSchema = z.object({
.string()
.min(1, "Password is required")
.max(100, "Password is too long")
.min(8, "Password must be at least 8 characters"),
.min(6, "Password must be at least 6 characters"),
confirmPassword: z
.string()
.min(1, "Confirm password is required")
.max(100, "Confirm password is too long")
.min(8, "Confirm password must be at least 8 characters"),
.min(6, "Confirm password must be at least 6 characters"),
});
type FormData = z.infer<typeof formSchema>;
@@ -61,7 +61,7 @@ export const AdminConfigForm: React.FC<AdminConfigFormProps> = ({ onSave }) => {
{...field}
label={t("Administrator Password")}
placeholder={t("Enter administrator password")}
description={t("Password must be at least 8 characters long")}
description={t("Password must be at least 6 characters long")}
isInvalid={!!errors.password}
errorMessage={errors.password?.message}
type={showPassword ? "text" : "password"}
+133 -10
View File
@@ -10,7 +10,9 @@ import {
Listbox,
ListboxItem,
Skeleton,
DateRangePicker
} from "@nextui-org/react";
import { parseDate } from "@internationalized/date";
import { useTranslation } from "@/shared/lib/useTranslation";
import {
LineChart,
@@ -60,9 +62,9 @@ const transformToChartData = (
userRegDay?.stats_day || payDay?.stats_day || callDay?.stats_day;
const formattedDate = rawDate
? new Date(rawDate).toLocaleDateString("en-US", {
month: "short",
day: "numeric",
})
month: "short",
day: "numeric",
})
: `Day ${i + 1}`;
chartData.push({
@@ -99,12 +101,114 @@ const ConsoleStats: React.FC = () => {
);
const [loading, setLoading] = useState(true);
// Fetch analytics data on component mount
// 日期范围状态 - 默认最近30天
const [dateRange, setDateRange] = useState<any>(() => {
const today = new Date();
const thirtyDaysAgo = new Date();
thirtyDaysAgo.setDate(today.getDate() - 29);
// 格式化为 YYYY-MM-DD
const formatDate = (date: Date) => {
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
};
return {
start: parseDate(formatDate(thirtyDaysAgo)),
end: parseDate(formatDate(today)),
};
});
// 计算最早可选日期(30天前)
const minValue = useMemo(() => {
const date = new Date();
date.setDate(date.getDate() - 30);
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
return parseDate(`${year}-${month}-${day}`);
}, []);
// 计算最大可选日期(今天)
const maxValue = useMemo(() => {
const date = new Date();
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
return parseDate(`${year}-${month}-${day}`);
}, []);
// 校验:开始日期必须早于结束日期,且不能早于30天前
const dateValidation = useMemo(() => {
if (!dateRange?.start || !dateRange?.end) {
return { isInvalid: false, error: "" };
}
const start = dateRange.start;
const end = dateRange.end;
const minDate = minValue;
// 检查开始日期是否早于30天前
const isStartTooEarly =
start.year < minDate.year ||
(start.year === minDate.year && start.month < minDate.month) ||
(start.year === minDate.year && start.month === minDate.month && start.day < minDate.day);
if (isStartTooEarly) {
return {
isInvalid: true,
error: t("Start date cannot be earlier than 30 days ago")
};
}
// 检查开始日期是否晚于结束日期
const isEndBeforeStart =
start.year > end.year ||
(start.year === end.year && start.month > end.month) ||
(start.year === end.year && start.month === end.month && start.day >= end.day);
if (isEndBeforeStart) {
return {
isInvalid: true,
error: t("Start date must be before end date")
};
}
return { isInvalid: false, error: "" };
}, [dateRange, minValue, t]);
// 错误消息
const errorMessage = dateValidation.error;
const isInvalidDateRange = dateValidation.isInvalid;
// Fetch analytics data on component mount and when date range changes
useEffect(() => {
const fetchData = async () => {
if (!dateRange?.start || !dateRange?.end) return;
// 如果日期范围无效,不发送请求
if (isInvalidDateRange) {
setLoading(false);
return;
}
try {
setLoading(true);
const response = await getAdminAnalytics();
// parseDate 返回的对象有 year, month, day 属性
const start = dateRange.start;
const end = dateRange.end;
// 转换日期为时间戳(秒)
const startDateTime = new Date(start.year, start.month - 1, start.day, 0, 0, 0);
const startTime = Math.floor(startDateTime.getTime() / 1000);
const endDateTime = new Date(end.year, end.month - 1, end.day, 23, 59, 59);
const endTime = Math.floor(endDateTime.getTime() / 1000);
const response = await getAdminAnalytics(startTime, endTime);
if (response.success) {
setAnalyticsData(response.data);
@@ -113,14 +217,15 @@ const ConsoleStats: React.FC = () => {
response.error_message || "Failed to load analytics data"
);
}
} catch (err) {
} catch {
toast.error("Failed to load analytics data");
} finally {
setLoading(false);
}
};
fetchData();
}, []);
}, [dateRange, isInvalidDateRange]);
// Transform API data to chart format
const chartData = useMemo<ChartDataItem[]>(() => {
@@ -128,9 +233,9 @@ const ConsoleStats: React.FC = () => {
return transformToChartData(analyticsData);
}, [analyticsData]);
// Format revenue as currency (USD by default)
const formatCurrency = (value: number, currency: string = "USD") =>
new Intl.NumberFormat("en-US", { style: "currency", currency }).format(
// Format revenue as currency (CNY by default)
const formatCurrency = (value: number, currency: string = "CNY") =>
new Intl.NumberFormat("zh-CN", { style: "currency", currency }).format(
value
);
if (loading) {
@@ -156,6 +261,24 @@ const ConsoleStats: React.FC = () => {
return (
<div className="space-y-6">
{/* 日期范围选择器 */}
<div className="flex justify-end">
<DateRangePicker
label={t("Select Date Range")}
value={dateRange}
onChange={setDateRange}
minValue={minValue}
maxValue={maxValue}
isInvalid={isInvalidDateRange}
errorMessage={errorMessage}
onKeyDown={(e) => e.preventDefault()}
onKeyUp={(e) => e.preventDefault()}
className="w-[250px]"
visibleMonths={2}
granularity="day"
/>
</div>
{/* Charts with Tabs */}
<Card shadow="none" className="border-1">
<CardHeader className="p-0 flex items-center justify-between">
+34 -4
View File
@@ -12,7 +12,7 @@ import UserManagement from "@/components/user-management/UserManagement";
import RevenueManagement from "@/components/revenue-management/RevenueManagement";
import ConsoleSidebar from "./Sidebar";
import { withComponentInjection } from "@/shared/hooks/useComponentInjection";
import { DollarSign, Home, ServerIcon, Users } from "lucide-react";
import { Boxes, DollarSign, Home, Inbox, ServerIcon, Users } from "lucide-react";
import OnboardingWelcome, { REQUIRED_TASK_KEYS } from "./OnboardingWelcome";
import ConsoleStats from "./ConsoleStats";
import SystemSettingsModal from "./SystemSettingsModal";
@@ -23,6 +23,8 @@ import {
TaskStatusEnum,
updateAdminOnboardingTasks,
} from "@/api/onboard.api";
import ResourceGroupManagement from "../resource-group/resourceGroup";
import { SubmissionsManagement } from "./SubmissionsManagement";
const ConsoleContent: React.FC = () => {
const { t } = useTranslation();
@@ -36,9 +38,13 @@ const ConsoleContent: React.FC = () => {
const tabFromUrl = searchParams.get("tab") as TabKey;
if (
tabFromUrl &&
["mcp-services", "user-management", "revenue-management"].includes(
tabFromUrl
)
[
"mcp-services",
"user-management",
"revenue-management",
"resource-group",
"submissions",
].includes(tabFromUrl)
) {
return tabFromUrl;
}
@@ -68,12 +74,24 @@ const ConsoleContent: React.FC = () => {
label: t("MCP"),
description: t("Manage MCP servers and API tools"),
},
{
key: TabKey.SUBMISSIONS,
icon: <Inbox size={18} />,
label: t("Submissions"),
description: t("Review user submissions and publish to marketplace"),
},
{
key: TabKey.USER_MANAGEMENT,
icon: <Users size={18} />,
label: t("User"),
description: t("Manage registered users"),
},
{
key: TabKey.RESOURCE_GROUP,
icon: <Boxes size={18} />,
label: t("Resource Group"),
description: t("Manage resource groups"),
},
{
key: TabKey.REVENUE_MANAGEMENT,
icon: <DollarSign size={18} />,
@@ -206,6 +224,12 @@ const ConsoleContent: React.FC = () => {
switch (activeTab) {
case TabKey.MCP_SERVICES:
return <MCPServicesManagement />;
case TabKey.SUBMISSIONS:
return (
<div className="h-full overflow-auto">
<SubmissionsManagement />
</div>
);
case TabKey.USER_MANAGEMENT:
return (
<div className="h-full overflow-auto">
@@ -218,6 +242,12 @@ const ConsoleContent: React.FC = () => {
<RevenueManagement />
</div>
);
case TabKey.RESOURCE_GROUP:
return (
<div className="h-full overflow-auto">
<ResourceGroupManagement />
</div>
);
default:
return showOnboarding ? (
<OnboardingWelcome
@@ -4,6 +4,7 @@ import React from "react";
import { StripeConfigForm } from "../payment/StripeConfigForm";
import { AlipayConfigForm } from "../payment/AlipayConfigForm";
import { WechatConfigForm } from "../payment/WechatConfigForm";
import { EpayConfigForm } from "../payment/EpayConfigForm";
import { usePaymentChannelManagement } from "@/hooks/usePaymentChannelManagement";
interface PaymentChannelsContentProps {
@@ -17,12 +18,15 @@ export const PaymentChannelsContent: React.FC<PaymentChannelsContentProps> = ({
stripeConfig,
alipayConfig,
wechatConfig,
epayConfig,
isWechatSaving,
isStripeSaving,
isAlipaySaving,
isEpaySaving,
saveStripeConfig,
saveAlipayConfig,
saveWechatConfig,
saveEpayConfig,
enableChannel,
disableChannel,
} = usePaymentChannelManagement();
@@ -38,6 +42,15 @@ export const PaymentChannelsContent: React.FC<PaymentChannelsContentProps> = ({
isLoading={isStripeSaving}
labelPlacement={labelPlacement}
/>
{/* epay (易支付) configuration */}
<EpayConfigForm
config={epayConfig}
onSave={saveEpayConfig}
onEnable={enableChannel}
onDisable={disableChannel}
isLoading={isEpaySaving}
labelPlacement={labelPlacement}
/>
{/* coming soon */}
{/* alipay configuration */}
{/* <AlipayConfigForm
@@ -0,0 +1,173 @@
"use client";
import React, { useEffect, useState } from "react";
import { fetchAdminAPI } from "@/rpc/admin-api";
interface Metadata {
base_url?: string;
service_type?: string;
tags?: string;
charge_type?: string;
price?: number;
free_daily_limit?: number | null;
published_service_id?: string;
}
interface Submission {
id: string;
user_id: string;
type: string;
name: string;
description?: string;
file_path?: string;
metadata_json?: Metadata | null;
status: string;
created_at?: string;
review_note?: string;
}
const statusColor: Record<string, string> = {
pending: "bg-yellow-100 text-yellow-800",
approved: "bg-green-100 text-green-800",
rejected: "bg-red-100 text-red-800",
};
export function SubmissionsManagement() {
const [subs, setSubs] = useState<Submission[]>([]);
const [filter, setFilter] = useState<string>("");
const [loading, setLoading] = useState(false);
const [error, setError] = useState("");
const [rejectNote, setRejectNote] = useState<Record<string, string>>({});
const load = async () => {
setLoading(true);
setError("");
try {
const qs = filter ? `?status=${filter}` : "";
// fetchAdminAPI<T> already returns the { success, error_message, data } envelope
const response = await fetchAdminAPI<Submission[]>(
`/api/submission/admin/submissions${qs}`
);
if (response?.success === false) {
setError(response.error_message || "加载失败");
setSubs([]);
} else if (response?.data) {
setSubs(response.data);
} else {
setSubs([]);
}
} catch (err) {
setError("加载失败:" + (err as Error).message);
setSubs([]);
} finally {
setLoading(false);
}
};
useEffect(() => { load(); }, [filter]);
const act = async (id: string, action: "approve" | "reject") => {
const body: RequestInit =
action === "approve"
? { method: "PUT" }
: {
method: "PUT",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ note: rejectNote[id] || "" }),
};
await fetchAdminAPI(`/api/submission/admin/submission/${id}/${action}`, body);
load();
};
return (
<div className="max-w-6xl mx-auto p-6">
<div className="flex items-center justify-between mb-4">
<h1 className="text-2xl font-bold">投稿审核</h1>
<select value={filter} onChange={(e) => setFilter(e.target.value)} className="border p-2">
<option value="">全部</option>
<option value="pending">待审核</option>
<option value="approved">已通过</option>
<option value="rejected">已拒绝</option>
</select>
</div>
{error && <div className="mb-4 p-3 bg-red-50 text-red-700 rounded">{error}</div>}
{loading && <div className="mb-4 text-gray-500">加载中...</div>}
{!loading && !error && subs.length === 0 && (
<div className="mb-4 text-gray-500">暂无提交记录</div>
)}
<div className="space-y-4">
{subs.map((s) => {
const meta = s.metadata_json || {};
return (
<div key={s.id} className="border rounded p-4 space-y-2">
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
<span className="font-semibold">{s.name}</span>
<span className="px-2 py-0.5 rounded text-xs">{s.type}</span>
<span className={`px-2 py-0.5 rounded text-xs ${statusColor[s.status] || "bg-gray-100"}`}>{s.status}</span>
</div>
<span className="text-sm text-gray-500">{s.created_at?.slice(0, 19).replace("T", " ")}</span>
</div>
{s.description && <p className="text-sm text-gray-700">{s.description}</p>}
{s.type === "mcp" && (meta.base_url || meta.tags || meta.charge_type) && (
<div className="text-sm text-gray-600 bg-gray-50 rounded p-2 space-y-1">
{meta.base_url && <div>服务地址:<code className="text-xs">{meta.base_url}</code></div>}
{meta.tags && <div>标签:{meta.tags}</div>}
<div>
计费:
{meta.charge_type === "paid"
? `按次付费 ¥${meta.price ?? 0}/次`
: `免费${meta.free_daily_limit ? `(每日 ${meta.free_daily_limit} 次)` : "(不限次)"}`}
</div>
{meta.published_service_id && (
<div className="text-green-700">
已上架市场,服务 ID:<code className="text-xs">{meta.published_service_id}</code>
</div>
)}
</div>
)}
{s.file_path && (
<div className="text-sm text-gray-500">
附件:<code className="text-xs">{s.file_path}</code>
</div>
)}
{s.review_note && (
<div className="text-sm text-gray-600">审核备注:{s.review_note}</div>
)}
{s.status === "pending" ? (
<div className="space-y-2">
<input
value={rejectNote[s.id] || ""}
onChange={(e) => setRejectNote({ ...rejectNote, [s.id]: e.target.value })}
placeholder="拒绝原因(可选)"
className="border p-2 w-full text-sm"
/>
<div className="flex gap-2">
<button
onClick={() => act(s.id, "approve")}
className="bg-green-600 text-white px-3 py-1 rounded text-sm"
>
通过(自动上架)
</button>
<button
onClick={() => act(s.id, "reject")}
className="bg-red-600 text-white px-3 py-1 rounded text-sm"
>
拒绝
</button>
</div>
</div>
) : null}
</div>
);
})}
</div>
</div>
);
}
@@ -26,6 +26,7 @@ import {
Captions,
Code,
CreditCard,
Gauge,
GhostIcon,
GlobeIcon,
LockIcon,
@@ -34,6 +35,7 @@ import {
Palette,
SquareMenu,
TableOfContents,
Tags,
Trello,
XIcon,
} from "lucide-react";
@@ -161,6 +163,12 @@ const SystemSettingsModal: React.FC<SystemSettingsModalProps> = ({
icon: <SquareMenu size={16} />,
description: "Configure site navigation and menus",
},
{
key: SettingModalTab.TAGS_BAR,
label: "Tags Bar",
icon: <Tags size={16} />,
description: "Configure tags bar display",
},
{
key: SettingModalTab.FAQ,
label: "FAQ",
@@ -174,6 +182,12 @@ const SystemSettingsModal: React.FC<SystemSettingsModalProps> = ({
icon: <CreditCard size={16} />,
description: "Configure payment channels",
},
{
key: SettingModalTab.FREE_QUOTA,
label: "Free Call Limits",
icon: <Gauge size={16} />,
description: "Global daily call cap for free services",
},
{
key: SettingModalTab.XPACK_EXPLORE,
label: "XPack Explore",
@@ -240,6 +254,7 @@ const SystemSettingsModal: React.FC<SystemSettingsModalProps> = ({
items: groupItems([
SettingModalTab.THEME,
SettingModalTab.NAVIGATION,
SettingModalTab.TAGS_BAR,
SettingModalTab.FAQ,
]),
},
@@ -248,6 +263,7 @@ const SystemSettingsModal: React.FC<SystemSettingsModalProps> = ({
title: "Business",
items: groupItems([
SettingModalTab.PAYMENT,
SettingModalTab.FREE_QUOTA,
SettingModalTab.XPACK_EXPLORE,
]),
},
@@ -31,6 +31,8 @@ import { AdminConfig, EmailConfig } from "@/types/system";
import { LoginSettingsContent } from "./LoginSettingsContent";
import { EmailConfigForm } from "@/components/system-setting/EmailConfigForm";
import { LanguageSetting } from "@/components/system-setting/LanguageSetting";
import { FreeQuotaSettings } from "@/components/system-setting/FreeQuotaSettings";
import { TagsBarSetting } from "../system-setting/TagsBarSetting";
interface SystemSettingsRightContentProps {
filteredKeys: string[];
@@ -201,6 +203,13 @@ const SystemSettingsRightContent: React.FC<SystemSettingsRightContentProps> = ({
/>
)}
{section.key === "tagsBar" && (
<TagsBarSetting
isEnabled={!!platformConfig.tag_bar_display}
onSave={onSavePlatformConfig}
/>
)}
{section.key === "faq" && (
<FaqSettings
onSave={saveFaqConfig}
@@ -213,6 +222,8 @@ const SystemSettingsRightContent: React.FC<SystemSettingsRightContentProps> = ({
<PaymentChannelsContent labelPlacement="outside" />
)}
{section.key === "free-quota" && <FreeQuotaSettings />}
{section.key === "xpack-explore" && (
<ExplorePanel
isEnabled={!!platformConfig.is_showcased}
@@ -5,9 +5,11 @@ export enum SettingModalTab {
BRANDING = "branding",
THEME = "theme",
PAYMENT = "payment",
FREE_QUOTA = "free-quota",
CODE_INJECTION = "code-injection",
XPACK_EXPLORE = "xpack-explore",
NAVIGATION = "navigation",
TAGS_BAR = "tagsBar",
FAQ = "faq",
CHANGE_PASSWORD = "change-password",
EMAIL_LOGIN_SETTINGS = "email-login-settings",
@@ -7,11 +7,13 @@ import { useTranslation } from "@/shared/lib/useTranslation";
interface CustomDomainPanelProps {
domain: string;
setDomain: (domain: string) => void;
onValidationChange?: (isValid: boolean) => void;
}
const CustomDomainPanel: React.FC<CustomDomainPanelProps> = ({
domain,
setDomain,
onValidationChange,
}) => {
const { t } = useTranslation();
const [validationError, setValidationError] = useState<string | undefined>();
@@ -24,7 +26,7 @@ const CustomDomainPanel: React.FC<CustomDomainPanelProps> = ({
// Basic domain format validation ,like www.example.com
const domainRegex =
/(?=.{1,255}$)(?:(?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,}/;
/^(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,})$/;
if (!domainRegex.test(value)) {
return t("Please enter a valid domain");
}
@@ -34,6 +36,17 @@ const CustomDomainPanel: React.FC<CustomDomainPanelProps> = ({
const handleBlur = () => {
const error = validateDomain(domain);
setValidationError(error);
// 通知父组件校验状态
onValidationChange?.(!error);
};
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value;
setDomain(value);
// 实时校验
const error = validateDomain(value);
setValidationError(error);
onValidationChange?.(!error);
};
return (
@@ -48,7 +61,7 @@ const CustomDomainPanel: React.FC<CustomDomainPanelProps> = ({
label={t("Domain")}
placeholder={t("Enter your full domain name (e.g., www.example.com)")}
value={domain}
onChange={(e) => setDomain(e.target.value)}
onChange={handleChange}
onBlur={handleBlur}
isInvalid={!!validationError}
errorMessage={validationError}
@@ -36,6 +36,8 @@ const DomainActivationPanel: React.FC<DomainActivationPanelProps> = ({
const { t } = useTranslation();
const [isLoading, setIsLoading] = useState(false);
const [domain, setDomain] = useState(config.domain || "");
const [isValidDomain, setIsValidDomain] = useState(false);
const handleActivate = async () => {
setIsLoading(true);
try {
@@ -54,7 +56,11 @@ const DomainActivationPanel: React.FC<DomainActivationPanelProps> = ({
<ModalContent>
<ModalHeader>{t("Set Custom Domain")}</ModalHeader>
<ModalBody className="flex flex-col gap-4">
<CustomDomainPanel domain={domain} setDomain={setDomain} />
<CustomDomainPanel
domain={domain}
setDomain={setDomain}
onValidationChange={setIsValidDomain}
/>
<DNSRecordsPanel
cnameTarget={`${config.subdomain || ""}${process.env.NEXT_PUBLIC_DOMAIN_HOST || ""}`}
apexATarget={config.cname_a_ip}
@@ -67,7 +73,7 @@ const DomainActivationPanel: React.FC<DomainActivationPanelProps> = ({
</h3>
<Button
color="primary"
isDisabled={!domain}
isDisabled={!domain || !isValidDomain}
isLoading={isLoading}
onPress={handleActivate}
size="sm"
@@ -64,7 +64,12 @@ export const APIKeyModal = ({
if (!response.success) {
console.error("Error creating auth key:", response.error_message);
toast.error(t("Failed to create auth key"));
const errorMsg = response.error_message
if (errorMsg?.endsWith('already exists')) {
toast.error(t(errorMsg, { name: keyName }));
} else {
toast.error(t("Failed to create auth key"));
}
return;
}
@@ -79,7 +84,12 @@ export const APIKeyModal = ({
if (!response.success) {
console.error("Error updating auth key:", response.error_message);
toast.error(t("Failed to update auth key"));
const errorMsg = response.error_message
if (errorMsg?.endsWith('already exists')) {
toast.error(t(errorMsg, { name: keyName }));
} else {
toast.error(t("Failed to update auth key"));
}
return;
}
@@ -90,6 +100,7 @@ export const APIKeyModal = ({
toast.success(t("Auth key updated successfully"));
onClose();
}
setName('')
} catch (error) {
console.error("Error creating/updating auth key:", error);
toast.error(t("Failed to create/update auth key"));
@@ -0,0 +1,388 @@
"use client";
import React, { useState, useCallback, useRef, useEffect } from "react";
import {
Table,
TableHeader,
TableColumn,
TableBody,
TableRow,
TableCell,
Button,
Pagination,
Tooltip,
Spinner,
Chip,
Dropdown,
DropdownTrigger,
DropdownMenu,
DropdownItem,
} from "@nextui-org/react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { Calendar, HelpCircle, Filter } from "lucide-react";
import { fetchAPI } from "@/shared/rpc/common-function";
import i18n from "@/shared/lib/i18n";
import { toast } from "react-hot-toast";
import { fetchAdminAPI } from "@/rpc/admin-api";
export interface OrderItem {
id: string;
amount: string;
balance: string;
order_id: string;
// 支付类型,stripe默认值
payment_type: string;
// 支付状态,0=未支付,1=已支付,2=支付失败
payment_state: number;
description: string;
// 充值时间
create_at: string;
// 交易时间,确认订单时间,只有充值完成后才有
confirm_at: string;
// 订单类型,充值(recharge),消费(purchase),退款(refund),冲正(reversal)
order_type: string;
}
interface AccountBalanceTableProps {
userId?: string;
source?: "client" | "admin";
}
const AccountBalanceTable: React.FC<AccountBalanceTableProps> = ({ userId, source }) => {
const { t } = useTranslation();
const [items, setItems] = useState<OrderItem[]>([]);
const [loading, setLoading] = useState(false);
const [pagination, setPagination] = useState({
page: 1,
pageSize: 10,
total: 0,
});
const [selectedType, setSelectedType] = useState<string>("all");
const [selectedStatus, setSelectedStatus] = useState<string>("all");
const resourceGroupsParams = useRef({
page: 1,
pageSize: 10,
keyword: "",
orderType: "",
status: "",
});
const pages = Math.ceil(pagination.total / pagination.pageSize);
const currentPage = Number(pagination.page);
const fetchOrders = useCallback(
async (
page: number,
page_size: number,
order_type?: string,
status?: string
): Promise<{ data: OrderItem[]; total: number; page: number; page_size: number }> => {
try {
const params = new URLSearchParams({
page: page.toString(),
page_size: page_size.toString(),
});
if (order_type) params.append("order_type", order_type);
if (status) params.append("status", status);
if (userId) params.append("user_id", userId);
// 根据是否有 userId 来决定使用哪个 API
const apiUrl = userId
? `/api/order/list/by_user?${params.toString()}`
: `/api/user/order/list?${params.toString()}`;
const response = source === "client" ? await fetchAPI<OrderItem[]>(apiUrl) : await fetchAdminAPI<OrderItem[]>(apiUrl);
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to load orders"));
return {
data: [],
total: 0,
page,
page_size,
};
}
return {
data: response.data || [],
total: response.page?.total || 0,
page: response.page?.page || page,
page_size: response.page?.page_size || page_size,
};
} catch (error) {
console.error("Error fetching orders:", error);
return {
data: [],
total: 0,
page,
page_size,
};
}
},
[userId]
);
const loadOrders = useCallback(
async (
page: number = 1,
pageSize: number = 10,
keyword: string = "",
orderType: string = "",
status: string = ""
) => {
setLoading(true);
try {
const response = await fetchOrders(
page,
pageSize,
orderType || undefined,
status || undefined
);
setItems(response.data);
setPagination({
page: response.page,
pageSize: response.page_size,
total: response.total,
});
resourceGroupsParams.current = {
page: response.page,
pageSize: response.page_size,
keyword,
orderType,
status,
};
} catch (error) {
console.error(t("Failed to load orders"), error);
} finally {
setLoading(false);
}
},
[fetchOrders]
);
const formatDate = (dateString: string) => {
return (
<div className="flex items-center gap-1">
<Calendar className="w-3 h-3 text-gray-500" />
<span className="text-sm text-gray-600">
{new Date(dateString).toLocaleString()}
</span>
</div>
);
};
// 格式化金额,带正负号和人民币符号
const formatAmount = (amount: string | number): string => {
const numAmount = typeof amount === 'string' ? parseFloat(amount) : amount;
if (isNaN(numAmount)) return '¥0.00';
const absAmount = Math.abs(numAmount).toFixed(2);
if (numAmount > 0) {
return `+¥${absAmount}`;
} else if (numAmount < 0) {
return `-¥${absAmount}`;
}
return `¥${absAmount}`;
};
// 格式化余额,只显示人民币符号,不带正负号
const formatBalance = (balance: string | number): string => {
const numBalance = typeof balance === 'string' ? parseFloat(balance) : balance;
if (isNaN(numBalance)) return '¥0.00';
return `¥${Math.abs(numBalance).toFixed(2)}`;
};
const getStatusColor = (status: number) => {
switch (status) {
case 1:
return "success";
case 2:
return "danger";
default:
return "warning";
}
};
const onPageChange = (page: number) => {
const { pageSize, orderType, status } = resourceGroupsParams.current;
loadOrders(page, pageSize, "", orderType, status);
};
const handleTypeChange = (value: string) => {
setSelectedType(value);
const orderType = value === "all" ? "" : value;
const { status } = resourceGroupsParams.current;
loadOrders(1, pagination.pageSize, "", orderType, status);
};
const handleStatusChange = (value: string) => {
setSelectedStatus(value);
const status = value === "all" ? "" : value;
const { orderType } = resourceGroupsParams.current;
loadOrders(1, pagination.pageSize, "", orderType, status);
};
useEffect(() => {
loadOrders(1, 10, "");
}, [loadOrders]);
return (
<div className="space-y-4">
<Table
aria-label="Orders table"
classNames={{
wrapper: "min-h-[400px]",
}}
removeWrapper
>
<TableHeader>
<TableColumn>
<div className="flex items-center gap-1">
<span>{t("Transaction Time")}</span>
</div>
</TableColumn>
<TableColumn>
<div className="flex items-center gap-2">
<span>{t("Type")}</span>
<Dropdown>
<DropdownTrigger>
<Button
isIconOnly
size="sm"
variant="light"
aria-label="Filter by type"
>
<Filter
className={`w-4 h-4 ${
selectedType !== "all" ? "text-primary" : ""
}`}
/>
</Button>
</DropdownTrigger>
<DropdownMenu
aria-label="Type filter"
selectionMode="single"
selectedKeys={[selectedType]}
onSelectionChange={(keys) => {
const selected = Array.from(keys)[0] as string;
handleTypeChange(selected);
}}
>
<DropdownItem key="all">{t("All")}</DropdownItem>
<DropdownItem key="recharge">{t("Recharge")}</DropdownItem>
<DropdownItem key="purchase">{t("Purchase")}</DropdownItem>
</DropdownMenu>
</Dropdown>
</div>
</TableColumn>
<TableColumn>{t("Description")}</TableColumn>
<TableColumn>{t("Amount")}</TableColumn>
<TableColumn>{t("Balance")}</TableColumn>
<TableColumn>
<div className="flex items-center gap-2">
<span>{t("Status")}</span>
<Dropdown>
<DropdownTrigger>
<Button
isIconOnly
size="sm"
variant="light"
aria-label="Filter by status"
>
<Filter
className={`w-4 h-4 ${
selectedStatus !== "all" ? "text-primary" : ""
}`}
/>
</Button>
</DropdownTrigger>
<DropdownMenu
aria-label="Status filter"
selectionMode="single"
selectedKeys={[selectedStatus]}
onSelectionChange={(keys) => {
const selected = Array.from(keys)[0] as string;
handleStatusChange(selected);
}}
>
<DropdownItem key="all">{t("All")}</DropdownItem>
<DropdownItem key="0">{t("Pending")}</DropdownItem>
<DropdownItem key="1">{t("Completed")}</DropdownItem>
<DropdownItem key="2">{t("Failed")}</DropdownItem>
</DropdownMenu>
</Dropdown>
</div>
</TableColumn>
</TableHeader>
<TableBody
items={items}
isLoading={loading}
loadingContent={<Spinner />}
emptyContent={t("No orders found")}
>
{(order) => (
<TableRow key={order.id}>
<TableCell>{formatDate(order.payment_state === 0 ? order.create_at : order.confirm_at)}</TableCell>
<TableCell>
<span
className={
order.order_type === "recharge"
? "text-green-500"
: "text-red-500"
}
>
{
order.order_type === "recharge" ? t("Recharge") : t("Purchase")
}
</span>
</TableCell>
<TableCell>{order.description}</TableCell>
<TableCell>
<span
className={
order.order_type === "recharge"
? "text-green-500"
: "text-red-500"
}
>
{formatAmount(order.amount)}
</span>
</TableCell>
<TableCell>{formatBalance(order.balance)}</TableCell>
<TableCell>
<Chip
className="capitalize"
color={getStatusColor(order.payment_state)}
size="sm"
variant="flat"
>
{t(
order.payment_state === 1
? "Completed"
: order.payment_state === 2
? "Failed"
: "Pending"
)}
</Chip>
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
{pages > 1 && (
<div className="flex w-full justify-center">
<Pagination
showControls
color="primary"
variant="light"
page={currentPage}
total={pages}
onChange={onPageChange}
/>
</div>
)}
</div>
);
};
export default AccountBalanceTable;
@@ -53,6 +53,10 @@ const OverviewPage: React.FC = () => {
useEffect(() => {
fetchApiKeys();
if (sessionStorage.getItem('create_new_authorization')) {
handleNewKey();
sessionStorage.removeItem('create_new_authorization');
}
}, []);
// create new auth key
+25 -5
View File
@@ -11,8 +11,9 @@ import { formatCurrency } from "@/shared/utils/currency";
// Import dashboard content components
import DashboardOverview from "@/components/dashboard/DashboardOverview";
import WalletManagement from "@/components/wallet/WalletManagement";
import { Home, Key, Wallet } from "lucide-react";
import { Avatar, Card, CardBody, Button, Divider } from "@nextui-org/react";
import UserAccountBalance from "@/components/dashboard/UserAccountBalance";
import { Home, Key, Wallet, Rocket } from "lucide-react";
import { Avatar, Card, CardBody, Button, Divider, Link } from "@nextui-org/react";
import { RechargeModal } from "@/shared/components/modal/RechargeModal";
import { useTranslation } from "@/shared/lib/useTranslation";
import { ChangePasswordModal } from "@/components/common/ChangePasswordModal";
@@ -41,7 +42,7 @@ const DashboardContent: React.FC = () => {
const [isRechargeModalOpen, setIsRechargeModalOpen] = useState(false);
const getInitialTab = (): TabKey => {
const tabFromUrl = searchParams.get("tab") as TabKey;
if (tabFromUrl && [TabKey.OVERVIEW, TabKey.WALLET].includes(tabFromUrl)) {
if (tabFromUrl && [TabKey.OVERVIEW, TabKey.WALLET, TabKey.USER_ACCOUNT].includes(tabFromUrl)) {
return tabFromUrl;
}
return TabKey.OVERVIEW;
@@ -91,9 +92,20 @@ const DashboardContent: React.FC = () => {
label: "Dashboard",
description: "Manage your integration and auth key",
},
{
key: "publish-service",
icon: <Rocket className="w-5 h-5" />,
label: "Publish MCP Service",
description: "Submit your own MCP service",
},
];
const handleTabNavigate = (tab: TabKey | string) => {
// 发布 MCP 服务:跳转到独立提交页
if (tab === "publish-service") {
router.push("/submit");
return;
}
setActiveTab(tab as TabKey);
// update url params
if (tab === TabKey.OVERVIEW) {
@@ -158,8 +170,15 @@ const DashboardContent: React.FC = () => {
<Wallet size={16} />
<span>
{t("Balance: {{amount}}", {
amount: formatCurrency(user?.wallet?.balance || 0),
})}
amount: "",
}).replace("{{amount}}", "")}
<Link
href="#"
className="text-xs cursor-pointer"
onPress={() => handleTabNavigate(TabKey.USER_ACCOUNT)}
>
{formatCurrency(user?.wallet?.balance || 0)}
</Link>
</span>
</div>
@@ -187,6 +206,7 @@ const DashboardContent: React.FC = () => {
{activeTab === TabKey.WALLET && (
<WalletManagement onRecharge={() => setIsRechargeModalOpen(true)} />
)}
{activeTab === TabKey.USER_ACCOUNT && <UserAccountBalance />}
</div>
</div>
@@ -0,0 +1,23 @@
"use client";
import React from "react";
import { useTranslation } from "@/shared/lib/useTranslation";
import DashboardDemoContent from "@/shared/components/DashboardDemoContent";
import AccountBalanceTable from "./AccountBalanceTable";
const UserAccountBalance: React.FC = () => {
const { t } = useTranslation();
return (
<DashboardDemoContent
title={t("Account Balance")}
description={t("View your balance and transaction history")}
>
<div className="space-y-6 w-full">
<AccountBalanceTable source="client" />
</div>
</DashboardDemoContent>
);
};
export default UserAccountBalance;
+41 -4
View File
@@ -4,12 +4,19 @@ import React, { useState, useEffect } from "react";
import { useRouter } from "next/navigation";
import { HeroSection } from "../../shared/components/marketplace/HeroSection";
import { ServiceListSection } from "@/shared/components/marketplace/ServiceListSection";
import { TagFilter } from "@/shared/components/marketplace/TagFilter";
import { ServiceData } from "@/shared/types/marketplace";
import { fetchServices } from "@/services/marketplaceService";
import { Spinner } from "@nextui-org/react";
import { ThemeType } from "@/shared/types/system";
interface MarketplaceMainProps {
initialServices: ServiceData[];
availableTags: string[];
isTagBarDisplay: boolean;
selectedTag: string;
setSelectedTag: (tag: string) => void;
currentTheme: ThemeType;
initialTotal: number;
initialPage: number;
initialSearch: string;
@@ -19,6 +26,11 @@ interface MarketplaceMainProps {
export const MarketplaceMain: React.FC<MarketplaceMainProps> = ({
initialServices,
availableTags,
isTagBarDisplay,
selectedTag,
setSelectedTag,
currentTheme,
initialTotal,
initialPage,
initialSearch,
@@ -33,16 +45,18 @@ export const MarketplaceMain: React.FC<MarketplaceMainProps> = ({
const [total, setTotal] = useState(initialTotal);
const [loading, setLoading] = useState(false);
// load services data
const loadServices = async (page: number, search: string) => {
const loadServices = async (page: number, search: string, tag: string = "ALL") => {
try {
setLoading(true);
const result = await fetchServices({
page,
page_size: pageSize,
keyword: search,
// 如果需要,可以在这里添加tag参数传递给API
tag: tag !== "ALL" ? tag : undefined,
});
setServices(result.data.services);
setTotal(result.page.total);
setCurrentPage(page);
@@ -79,13 +93,20 @@ export const MarketplaceMain: React.FC<MarketplaceMainProps> = ({
// when page number changes, reload
const handlePageChange = (page: number) => {
updateURL(page, searchQuery);
loadServices(page, searchQuery);
loadServices(page, searchQuery, selectedTag);
};
// handle search submit
const handleSearch = () => {
updateURL(1, searchQuery);
loadServices(1, searchQuery);
loadServices(1, searchQuery, selectedTag);
};
// handle tag change
const handleTagChange = (tag: string) => {
setSelectedTag(tag);
setCurrentPage(1);
loadServices(1, searchQuery, tag);
};
// if there is an error, show error message
@@ -102,9 +123,25 @@ export const MarketplaceMain: React.FC<MarketplaceMainProps> = ({
{/* Hero Section */}
<HeroSection
searchQuery={searchQuery}
isTagBarDisplay={isTagBarDisplay}
onSearchChange={setSearchQuery}
onSearch={handleSearch}
/>
{/* filter section */}
{
isTagBarDisplay && (
<>
<TagFilter
theme={currentTheme}
tags={availableTags}
selectedTag={selectedTag}
onTagChange={handleTagChange}
maxWidthPercent={80}
/>
</>
)
}
{/* Server List Section */}
{loading ? (
@@ -1,6 +1,6 @@
"use client";
import React, { useState, useCallback, useEffect } from "react";
import React, { useState, useCallback, useEffect, useRef } from "react";
import { useSearchParams } from "next/navigation";
import { useMCPServicesList } from "@/hooks/useMCPServicesList";
import { MCPService, MCPServiceFormData } from "@/shared/types/mcp-service";
@@ -12,6 +12,8 @@ import { DeleteConfirmModal } from "@/shared/components/modal/DeleteConfirmModal
import DashboardDemoContent from "@/shared/components/DashboardDemoContent";
import { ServiceTable } from "@/shared/components/mcp-services/ServiceTable";
import { OpenAPIGeneratorModal } from "@/shared/components/mcp-services/OpenAPIGeneratorModal";
import { Input } from "@nextui-org/react";
import { Search } from "lucide-react";
type ViewMode = "list" | "edit" | "create";
@@ -30,9 +32,24 @@ export const MCPServicesManagement: React.FC = () => {
toggleServiceStatus,
parseOpenAPIDocument,
loadServices,
setSearchTerm,
setStatusFilter,
} = useMCPServicesList();
const [addServiceType, setAddServiceType] = useState<string | null>(null);
// 搜索相关状态
const [searchValue, setSearchValue] = useState('');
const searchTimerRef = useRef<NodeJS.Timeout | null>(null);
// 清理定时器
useEffect(() => {
return () => {
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
};
}, []);
// Get initial state from URL
const getInitialViewMode = (): ViewMode => {
const mode = searchParams.get("mode") as ViewMode;
@@ -190,6 +207,26 @@ export const MCPServicesManagement: React.FC = () => {
setServiceToDelete(null);
}, []);
// 处理搜索 - 使用防抖
const handleSearchChange = useCallback((value: string) => {
setSearchValue(value);
// 清除之前的定时器
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
// 设置新的定时器,500ms 后触发搜索
searchTimerRef.current = setTimeout(() => {
setSearchTerm(value);
}, 500);
}, [setSearchTerm]);
// 处理状态筛选
const handleStatusFilterChange = useCallback((status: string) => {
setStatusFilter(status);
}, [setStatusFilter]);
// Render edit page if in edit/create mode
if (viewMode === "edit" || viewMode === "create") {
return (
@@ -214,8 +251,27 @@ export const MCPServicesManagement: React.FC = () => {
)}
>
<div className="space-y-6 w-full">
{/* comming soon:Filters and Actions */}
<ServiceFiltersBar onAddService={handleCreateService} />
{/* Filters and Actions */}
<div className="flex justify-between items-center gap-4">
<ServiceFiltersBar onAddService={handleCreateService} />
{/* 搜索框 - 右侧 */}
<Input
isClearable
className="w-full sm:max-w-[400px]"
placeholder={t('Search by service name')}
startContent={<Search className="w-4 h-4" />}
value={searchValue}
onClear={() => {
setSearchValue('');
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
setSearchTerm('');
}}
onValueChange={handleSearchChange}
/>
</div>
{/* Servers Table */}
<ServiceTable
@@ -226,6 +282,7 @@ export const MCPServicesManagement: React.FC = () => {
onDelete={handleDeleteService}
onToggleStatus={handleToggleStatus}
onPageChange={onPageChange}
onStatusFilterChange={handleStatusFilterChange}
/>
{/* Modals */}
@@ -17,6 +17,7 @@ import { ToolsTab } from "@/shared/components/mcp-services/ToolsTab";
import { OpenAPIGeneratorModal } from "@/shared/components/mcp-services/OpenAPIGeneratorModal";
import { ChargeType } from "@/shared/types/marketplace";
import { withComponentInjection } from "@/shared/hooks/useComponentInjection";
import ResourceGroup from "@/shared/components/mcp-services/ResourceGroup";
const _DefaultFormData: MCPServiceFormData = {
id: "",
@@ -29,11 +30,72 @@ const _DefaultFormData: MCPServiceFormData = {
auth_token: "",
charge_type: ChargeType.Free,
price: "",
free_daily_limit: "",
enabled: 0,
tags: [],
apis: [],
};
// Helper function to validate URL
const isValidUrl = (url: string) => {
if (!url) return false;
try {
const parsed = new URL(url);
return parsed.protocol === "http:" || parsed.protocol === "https:";
} catch {
return false;
}
};
// Helper function to validate domain format (allow domain or IP address including LAN IPs)
const isValidDomain = (url: string) => {
if (!url) return false;
try {
const parsed = new URL(url);
const hostname = parsed.hostname;
// Allow IPv4 addresses (including private/lan IPs like 192.168.x.x, 10.x.x.x, 172.x.x.x)
const ipv4Regex = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
if (ipv4Regex.test(hostname)) return true;
// Allow IPv6 (simplified)
if (hostname.includes(":")) return true;
// Domain format
const domainRegex = /^(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,})$/;
return domainRegex.test(hostname);
} catch {
return false;
}
};
const validateServiceForm = (data: MCPServiceFormData, t: any) => {
const errors: Record<string, string> = {};
if (!data.slug_name?.trim()) {
errors.slug_name = t("Server ID is required");
} else if (data.slug_name.length > 255) {
errors.slug_name = t("Server ID must be less than 255 characters");
}
if (!data.name?.trim()) {
errors.name = t("Server name is required");
} else if (data.name.length > 255) {
errors.name = t("Server Name must be less than 255 characters");
}
if (!data.base_url?.trim()) {
errors.base_url = t("API Endpoint is required");
} else if (!isValidUrl(data.base_url)) {
errors.base_url = t("API Endpoint must be a valid HTTP/HTTPS URL");
} else if (!isValidDomain(data.base_url)) {
errors.base_url = t("API Endpoint must contain a valid domain name");
}
if (!data.short_description?.trim()) {
errors.short_description = t("Short description is required");
}
return errors;
};
interface ServiceEditPageProps {
serviceId?: string;
onSave: (data: MCPServiceFormData, isDraft?: boolean) => void;
@@ -59,6 +121,9 @@ const BaseServiceEditPage: React.FC<ServiceEditPageProps> = ({
getServiceDetail,
clearServiceDetail,
parseOpenAPIDocumentForUpdate,
fetchMCPResourceGroups,
deleteResourceGroup,
addServiceToGroup,
updateLoading,
} = useMCPServiceDetail();
const [isSaving, setIsSaving] = useState(false);
@@ -193,24 +258,41 @@ const BaseServiceEditPage: React.FC<ServiceEditPageProps> = ({
}
};
// Helper function to validate price string
const isValidPrice = (priceStr: string | undefined): boolean => {
if (!priceStr || priceStr.trim() === "") {
return false;
}
const numValue = parseFloat(priceStr);
return !isNaN(numValue) && numValue >= 0;
};
const validationErrors = validateServiceForm(formData, t);
const isFormValid = () => {
const hasBasicInfo =
formData.name.trim() &&
formData.short_description?.trim() &&
formData.slug_name?.trim() &&
formData.base_url?.trim();
if (Object.keys(validationErrors).length > 0) {
return false;
}
// if free, no need to validate price
if (formData.charge_type === ChargeType.Free) {
return hasBasicInfo;
return true;
}
// if PerCall, validate price
if (formData.charge_type === ChargeType.PerCall) {
return isValidPrice(formData.price);
}
// if PerToken, validate both input and output token prices
if (formData.charge_type === ChargeType.PerToken) {
return (
isValidPrice(formData.input_token_price) &&
isValidPrice(formData.output_token_price)
);
}
// if paid, need to validate price
return (
hasBasicInfo &&
formData.price !== undefined &&
formData.price.trim() !== ""
);
return formData.price !== undefined && formData.price.trim() !== "";
};
return (
@@ -299,6 +381,7 @@ const BaseServiceEditPage: React.FC<ServiceEditPageProps> = ({
onInputChange={handleInputChange}
onAddTag={handleAddTag}
onRemoveTag={handleRemoveTag}
errors={validationErrors}
/>
</div>
<div className="w-[400px] max-w-[1/2]">
@@ -324,6 +407,16 @@ const BaseServiceEditPage: React.FC<ServiceEditPageProps> = ({
/>
</div>
</Tab>
<Tab key="ResourceGroups" title={t("Resource Groups")}>
<div className="pt-2 h-full">
<ResourceGroup
formData={formData}
deleteResourceGroup={deleteResourceGroup}
fetchMCPResourceGroups={fetchMCPResourceGroups}
addServiceToGroup={addServiceToGroup}
/>
</div>
</Tab>
</Tabs>
)}
@@ -0,0 +1,234 @@
"use client";
import React, { useEffect, useState } from "react";
import { Input, Button, AccordionItem, Accordion, Switch } from "@nextui-org/react";
import { Eye, EyeOff } from "lucide-react";
import { EpayChannelConfig } from "@/types/payment";
import { useTranslation } from "@/shared/lib/useTranslation";
interface EpayConfigFormProps {
config: EpayChannelConfig;
onSave: (config: EpayChannelConfig) => void;
onEnable: (channelId: string) => Promise<boolean>;
onDisable: (channelId: string) => Promise<boolean>;
isLoading?: boolean;
labelPlacement?: "outside" | "inside";
}
export const EpayConfigForm: React.FC<EpayConfigFormProps> = ({
config,
onSave,
onEnable,
onDisable,
isLoading = false,
labelPlacement = "inside",
}) => {
const { t } = useTranslation();
const [formData, setFormData] = useState<EpayChannelConfig>(config);
const [showKey, setShowKey] = useState(false);
useEffect(() => {
setFormData(config);
}, [config]);
const handleInputChange = (field: keyof EpayChannelConfig, value: string | boolean) => {
setFormData((prev) => ({ ...prev, [field]: value }));
};
const handleEnableDisable = async (value: boolean) => {
const result = value ? await onEnable("epay") : await onDisable("epay");
if (result) {
setFormData((prev) => ({ ...prev, is_enabled: value }));
}
};
const handleSave = () => onSave(formData);
const isFormValid =
!!formData?.gateway?.trim() && !!formData?.pid?.trim() && !!formData?.key?.trim();
const panelContent = () => (
<>
<div className={`flex flex-col gap-4 ${formData.is_enabled ? "" : "hidden"}`}>
<Input
label={t("Gateway URL")}
placeholder="https://pay.example.com"
description={t("Epay gateway base address, no trailing slash")}
value={formData.gateway || ""}
onChange={(e) => handleInputChange("gateway", e.target.value)}
isRequired
autoComplete="off"
isDisabled={!formData.is_enabled}
labelPlacement="outside"
/>
<Input
label={t("Merchant ID (pid)")}
placeholder={t("Enter Merchant ID")}
description={t("Numeric merchant id issued by the epay platform")}
value={formData.pid || ""}
onChange={(e) => handleInputChange("pid", e.target.value)}
isRequired
autoComplete="off"
isDisabled={!formData.is_enabled}
labelPlacement="outside"
/>
<Input
label={t("Merchant Key (key)")}
placeholder={t("Enter Merchant Key")}
description={t("Used to sign requests and verify notifications, 32 characters")}
value={formData.key || ""}
onChange={(e) => handleInputChange("key", e.target.value)}
type={showKey ? "text" : "password"}
isRequired
autoComplete="off"
isDisabled={!formData.is_enabled}
labelPlacement="outside"
endContent={
<button
type="button"
onClick={() => setShowKey(!showKey)}
className="focus:outline-none"
>
{showKey ? (
<EyeOff className="w-4 h-4 text-gray-400" />
) : (
<Eye className="w-4 h-4 text-gray-400" />
)}
</button>
}
/>
<div className="flex flex-col gap-1">
<label className="text-sm font-medium">{t("Payment Method")}</label>
<select
className="w-full px-3 py-2 text-sm border border-gray-300 rounded-md bg-white focus:outline-none focus:ring-2 focus:ring-primary-500 disabled:opacity-50 disabled:cursor-not-allowed"
value={formData.pay_type || ""}
disabled={!formData.is_enabled}
onChange={(e) => handleInputChange("pay_type", e.target.value)}
>
<option value="">{t("Let customer choose at checkout")}</option>
<option value="alipay">{t("Alipay")}</option>
<option value="wxpay">{t("WeChat Pay")}</option>
<option value="qqpay">{t("QQ Wallet")}</option>
</select>
<span className="text-xs text-gray-500">
{t("Leave empty to show the gateway cashier with all methods")}
</span>
</div>
<Input
label={t("Exchange Rate")}
placeholder="1"
description={t(
"CNY charged per 1 balance unit. Default 1 means 1:1. e.g. 7 means a $10 recharge bills ¥70"
)}
value={String(formData.exchange_rate ?? 1)}
onChange={(e) => handleInputChange("exchange_rate", e.target.value)}
type="number"
min="0"
step="0.01"
autoComplete="off"
isDisabled={!formData.is_enabled}
labelPlacement="outside"
/>
<Input
label={t("Notify URL (optional)")}
placeholder={t("Auto derived from the site URL when empty")}
description={t(
"Async payment notification address that the gateway can reach from the internet"
)}
value={formData.notify_url || ""}
onChange={(e) => handleInputChange("notify_url", e.target.value)}
autoComplete="off"
isDisabled={!formData.is_enabled}
labelPlacement="outside"
/>
<Input
label={t("Return URL (optional)")}
placeholder={t("Auto derived when empty")}
description={t("Page opened after the customer finishes paying")}
value={formData.return_url || ""}
onChange={(e) => handleInputChange("return_url", e.target.value)}
autoComplete="off"
isDisabled={!formData.is_enabled}
labelPlacement="outside"
/>
</div>
{formData.is_enabled && (
<div className="flex gap-3 py-4">
<Button
color="primary"
variant="solid"
onPress={handleSave}
isLoading={isLoading}
isDisabled={!isFormValid}
size="sm"
>
{t("Save")}
</Button>
</div>
)}
</>
);
if (labelPlacement === "outside") {
return (
<div className="flex flex-col gap-4">
<div className="flex items-center justify-between p-4 bg-gray-50 rounded-lg">
<div className="flex flex-col gap-1">
<span className="text-sm font-medium">{t("Enable Epay Payment")}</span>
<span className="text-xs text-gray-500">
{t("Alipay / WeChat Pay through your own epay gateway")}
</span>
</div>
<Switch
isSelected={formData.is_enabled || false}
onValueChange={handleEnableDisable}
color="primary"
size="sm"
/>
</div>
{panelContent()}
</div>
);
}
return (
<Accordion
variant="splitted"
itemClasses={{ base: "shadow-none border-1" }}
defaultExpandedKeys={["epay-config"]}
className="px-0"
>
<AccordionItem
key="epay-config"
title={
<div className="flex flex-col justify-between">
<div className="flex items-center justify-between w-full">
<div>
<h3 className="text-lg font-semibold">{t("Epay Configuration")}</h3>
<p className="text-sm text-gray-500">
{t("Configure your epay (Epay) gateway")}
</p>
</div>
<Switch
isSelected={formData.is_enabled || false}
onValueChange={handleEnableDisable}
size="sm"
/>
</div>
</div>
}
>
{panelContent()}
</AccordionItem>
</Accordion>
);
};
export default EpayConfigForm;
@@ -66,8 +66,8 @@ export const StripeConfigForm: React.FC<StripeConfigFormProps> = ({
onSave(formData);
};
const isFormValid =
formData.secret.trim() !== "" && formData.webhook_secret.trim() !== "";
const isFormValid =
formData?.secret?.trim() !== "" && formData?.webhook_secret?.trim() !== "";
const panelContent = () => {
return (
@@ -0,0 +1,175 @@
import {
Button,
Modal,
ModalBody,
ModalContent,
ModalFooter,
ModalHeader,
Table,
TableHeader,
TableColumn,
TableBody,
TableRow,
TableCell,
Chip,
Spinner,
} from "@nextui-org/react";
import { useState, useEffect, useCallback } from "react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { ChargeType } from "@/shared/types/marketplace";
import { fetchSimpleMcpServices } from "@/api/resourceGroup.api";
import { Price } from "@/shared/components/marketplace/Price";
interface AddMcpServerModalProps {
isOpen: boolean;
onClose: () => void;
onSaveMcpServer: (serverIds: string[]) => Promise<void>;
id: string;
}
export interface SimpleMcpService {
id: string;
name: string;
base_url: string;
charge_type: ChargeType;
price: string;
enabled: boolean;
input_token_price?: string;
output_token_price?: string;
}
export const AddMcpServerModal: React.FC<AddMcpServerModalProps> = ({
isOpen,
onClose,
onSaveMcpServer,
id,
}) => {
const { t } = useTranslation();
const [isLoading, setIsLoading] = useState(false);
const [loading, setLoading] = useState(false);
const [services, setServices] = useState<SimpleMcpService[]>([]);
const [selectedKeys, setSelectedKeys] = useState<Set<string>>(new Set());
// 加载服务列表
const loadServices = useCallback(async (id: string) => {
setLoading(true);
try {
const response = await fetchSimpleMcpServices(id);
setServices(response);
} catch (error) {
console.error("Failed to load MCP services:", error);
} finally {
setLoading(false);
}
}, []);
// 当模态框打开时加载数据
useEffect(() => {
if (isOpen) {
setSelectedKeys(new Set());
loadServices(id);
}
}, [isOpen, loadServices]);
// 处理保存
const handleSave = async () => {
const serverIds = typeof selectedKeys === 'string' && selectedKeys === 'all' ? services.map((service) => service.id) : Array.from(selectedKeys);
if (serverIds.length === 0) {
return;
}
setIsLoading(true);
try {
await onSaveMcpServer(serverIds);
onClose();
} finally {
setIsLoading(false);
}
};
return (
<Modal isOpen={isOpen} onClose={onClose} size="5xl" scrollBehavior="inside">
<ModalContent>
{() => (
<>
<ModalHeader className="flex flex-col gap-1">
{t("Add MCP Server")}
</ModalHeader>
<ModalBody>
<Table
aria-label="MCP services selection table"
selectionMode="multiple"
selectedKeys={selectedKeys}
onSelectionChange={(keys) => setSelectedKeys(keys as Set<string>)}
removeWrapper
classNames={{
wrapper: "min-h-[400px]",
}}
>
<TableHeader>
<TableColumn>{t("Service Name")}</TableColumn>
<TableColumn>{t("API Endpoint")}</TableColumn>
<TableColumn>{t("Status")}</TableColumn>
<TableColumn>{t("Pricing")}</TableColumn>
</TableHeader>
<TableBody
items={services}
isLoading={loading}
loadingContent={<Spinner />}
emptyContent={t("No MCP services available")}
>
{(service) => (
<TableRow key={service.id}>
<TableCell>
<span className="text-sm">{service.name}</span>
</TableCell>
<TableCell>
<span className="text-sm">{service.base_url}</span>
</TableCell>
<TableCell>
<Chip
className="capitalize"
color={service.enabled ? "success" : "danger"}
size="sm"
variant="flat"
>
{t(service.enabled ? "Published" : "Unpublished")}
</Chip>
</TableCell>
<TableCell>
<Price
price={service.price}
charge_type={service.charge_type}
input_token_price={service.input_token_price}
output_token_price={service.output_token_price}
/>
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</ModalBody>
<ModalFooter>
<Button
color="danger"
variant="light"
onPress={onClose}
isDisabled={isLoading}
>
{t("Close")}
</Button>
<Button
color="primary"
onPress={handleSave}
isLoading={isLoading}
isDisabled={selectedKeys.size === 0}
>
{t("Add")}
</Button>
</ModalFooter>
</>
)}
</ModalContent>
</Modal>
);
};
@@ -0,0 +1,105 @@
import { Button, Input, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader, Switch } from "@nextui-org/react"
import { useState, useEffect } from "react";
import { useTranslation } from "@/shared/lib/useTranslation";
interface AddServerModalProps {
isOpen: boolean;
onClose: () => void;
name: string;
id: string;
onSaveServer: (name: string, isDefault: boolean) => Promise<void>;
type: "add" | "edit";
isDefault: boolean;
}
export const AddServerModal: React.FC<AddServerModalProps> = ({
isOpen,
onClose,
name,
id,
onSaveServer,
type,
isDefault,
}) => {
const { t } = useTranslation();
const [serverName, setServerName] = useState(name);
const [isEnabledState, setIsEnabledState] = useState(isDefault);
const [isLoading, setIsLoading] = useState(false);
// 当 name prop 或 isOpen 变化时,更新内部状态
useEffect(() => {
if (isOpen) {
setServerName(name);
setIsEnabledState(isDefault);
setIsLoading(false); // 重置 loading 状态
}
}, [name, isOpen, isDefault]);
// 处理保存
const handleSave = async () => {
setIsLoading(true);
try {
await onSaveServer(serverName, isEnabledState);
} finally {
setIsLoading(false);
}
};
return (
<Modal isOpen={isOpen} onClose={onClose} size="2xl">
<ModalContent>
{() => (
<>
<ModalHeader className="flex flex-col gap-1">
{type === "add" ? t("Create New Resource Group") : t("Edit Resource Group")}
</ModalHeader>
<ModalBody>
{
!['allow-all', 'deny-all'].includes(id) && <>
<Input
label={t("Resource Group Name")}
value={serverName}
placeholder={t("Edit Resource Group Name")}
onChange={(e) => setServerName(e.target.value)}
maxLength={255}
/>
</>
}
<div className="flex items-center justify-between p-4 bg-gray-50 rounded-lg">
<div className="flex flex-col gap-1">
<span className="text-sm font-medium">
{t("Set as default")}
</span>
<span className="text-xs text-gray-500">
{t("Automatically bind default resource groups when adding users")}
</span>
</div>
<Switch
isSelected={isEnabledState || false}
onValueChange={setIsEnabledState}
color="primary"
size="sm"
/>
</div>
</ModalBody>
<ModalFooter>
<Button
color="danger"
variant="light"
onPress={onClose}
isDisabled={isLoading}
>
{t("Cancel")}
</Button>
<Button
color="primary"
onPress={handleSave}
isLoading={isLoading}
>
{t("Save")}
</Button>
</ModalFooter>
</>
)}
</ModalContent>
</Modal>
)
}
@@ -0,0 +1,94 @@
"use client";
import React, { useState } from "react";
import {
Modal,
ModalContent,
ModalHeader,
ModalBody,
ModalFooter,
Button,
Alert,
} from "@nextui-org/react";
import { useTranslation } from "@/shared/lib/useTranslation";
interface DeleteServerModalProps {
isOpen: boolean;
onClose: () => void;
onConfirm: () => void | Promise<void>;
title?: string | React.ReactNode;
description?: string | React.ReactNode;
alertDescription?: string;
customAlertContent?: React.ReactNode;
}
export const DeleteServerModal: React.FC<DeleteServerModalProps> = ({
isOpen,
onClose,
onConfirm,
title,
description,
alertDescription,
customAlertContent,
}) => {
const { t } = useTranslation();
const [isLoading, setIsLoading] = useState(false);
const handleConfirm = async () => {
setIsLoading(true);
try {
await onConfirm();
} finally {
setIsLoading(false);
}
};
const defaultTitle = t("Confirm Delete");
const defaultDescription = t("Are you sure you want to delete this item? This action cannot be undone.");
const defaultAlertDescription= t("This action cannot be undone.");
return (
<Modal isOpen={isOpen} onClose={onClose} size="xl">
<ModalContent>
{() => (
<>
<ModalHeader className="flex flex-col gap-1">
{title || defaultTitle}
</ModalHeader>
<ModalBody>
<div className="space-y-4">
{/* Description */}
<div className="text-default-600">
{description || defaultDescription}
</div>
{/* Warning message */}
<Alert title={alertDescription || defaultAlertDescription} color="danger" classNames={{mainWrapper: "w-[calc(100%-60px)]"}}>
{customAlertContent && customAlertContent}
</Alert>
</div>
</ModalBody>
<ModalFooter>
<Button
color="default"
variant="light"
onPress={onClose}
isDisabled={isLoading}
>
{t("Cancel")}
</Button>
<Button
color="danger"
onPress={handleConfirm}
isLoading={isLoading}
>
{t("Remove")}
</Button>
</ModalFooter>
</>
)}
</ModalContent>
</Modal >
);
};
export default DeleteServerModal;
@@ -0,0 +1,162 @@
"use client";
import React, { useRef, useCallback, useEffect } from "react";
import { Button, Card, CardBody, CardHeader, Chip, Divider, Listbox, ListboxItem, Spinner } from "@nextui-org/react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { Plus } from "lucide-react";
// 资源组类型定义
export interface ResourceGroup {
id: string;
name: string;
description?: string;
isDefault?: boolean;
serviceCount?: number;
createdAt?: string;
}
interface GroupListProps {
groups: ResourceGroup[];
selectedGroup: ResourceGroup | null;
onSelectGroup: (group: ResourceGroup) => void;
onCreateGroup: () => void;
onLoadMore?: () => void;
hasMore?: boolean;
loading?: boolean;
shouldScrollToTop?: boolean;
onScrolledToTop?: () => void;
}
const GroupList: React.FC<GroupListProps> = ({
groups,
selectedGroup,
onSelectGroup,
onCreateGroup,
onLoadMore,
hasMore = false,
loading = false,
shouldScrollToTop = false,
onScrolledToTop,
}) => {
const { t } = useTranslation();
const scrollRef = useRef<HTMLDivElement>(null);
const observerRef = useRef<IntersectionObserver | null>(null);
const loadMoreTriggerRef = useRef<HTMLDivElement>(null);
const hasLoadedMoreRef = useRef(false);
// 使用 IntersectionObserver 监听滚动到底部
const handleObserver = useCallback(
(entries: IntersectionObserverEntry[]) => {
const [target] = entries;
if (target.isIntersecting && hasMore && !loading && onLoadMore) {
hasLoadedMoreRef.current = true; // 标记已触发过加载更多
onLoadMore();
}
},
[hasMore, loading, onLoadMore]
);
useEffect(() => {
const element = loadMoreTriggerRef.current;
if (!element || !onLoadMore) return;
// 创建 IntersectionObserver
observerRef.current = new IntersectionObserver(handleObserver, {
root: scrollRef.current,
rootMargin: "100px", // 提前 100px 触发加载
threshold: 0.1,
});
observerRef.current.observe(element);
return () => {
if (observerRef.current && element) {
observerRef.current.unobserve(element);
}
};
}, [handleObserver, onLoadMore]);
// 监听 shouldScrollToTop 变化,滚动到顶部
useEffect(() => {
if (shouldScrollToTop && scrollRef.current) {
scrollRef.current.scrollTo({ top: 0, behavior: 'smooth' });
// 通知父组件已完成滚动
onScrolledToTop?.();
}
}, [shouldScrollToTop, onScrolledToTop]);
return (
<div className="min-w-[300px] w-[300px] bg-default-100/50 h-full">
<Card shadow="none"
radius="none"
className="bg-transparent flex flex-col h-full">
<CardHeader className="flex justify-between items-center px-6 py-4">
<h2 className="text-xl font-semibold text-gray-900">{t("Group List")}</h2>
<Button
size="sm"
color="primary"
startContent={<Plus size={16} />}
onPress={onCreateGroup}
>
{t("New")}
</Button>
</CardHeader>
<Divider />
<CardBody className="flex-grow p-0">
<div ref={scrollRef} className="overflow-y-auto h-full px-4 py-4">
<Listbox
aria-label="Group list"
items={groups || []}
emptyContent={loading ? <></> : <div className="flex items-center justify-center h-full">{t("No groups found")}</div>}
selectionMode="single"
selectedKeys={selectedGroup ? [selectedGroup.id] : []}
onSelectionChange={(keys) => {
const selectedId = Array.from(keys)[0];
const selectedKey = (groups || []).find(
(k) => k.id === selectedId
);
if (selectedKey) onSelectGroup(selectedKey);
}}
itemClasses={{
title: "text-md font-medium",
base: "bg-white p-6 transition-colors border-1 data-[selected=true]:focus:bg-primary-50 data-[selected=true]:data-[hover=true]:bg-primary-50 data-[selected=true]:border-primary-500 data-[selected=true]:bg-primary-50 data-[hover=true]:bg-default/50 data-[selectable=true]:focus:bg-default/50 [&>span]:w-full",
}}
classNames={{
list: "gap-4",
}}
hideSelectedIcon
>
{(group) => (
<ListboxItem key={group.id} textValue={group.name}>
<div className="flex items-center gap-2 w-full overflow-hidden">
<span className="truncate flex-1 min-w-0">{group.name}</span>
{group.isDefault && (
<Chip size="sm" color="warning" variant="flat" className="shrink-0 ml-auto">
{t("Default")}
</Chip>
)}
</div>
</ListboxItem>
)}
</Listbox>
{/* 加载更多触发器 */}
{onLoadMore && (
<div ref={loadMoreTriggerRef} className="py-4 flex justify-center">
{loading && hasMore && (
<Spinner size="sm" color="primary" />
)}
{!hasMore && groups.length > 0 && hasLoadedMoreRef.current && (
<p className="text-sm text-default-400">{t("No more groups")}</p>
)}
</div>
)}
</div>
</CardBody>
</Card>
</div>
);
};
export default GroupList;
@@ -0,0 +1,252 @@
"use client";
import React, { useEffect, useState, useMemo } from "react";
import {
Button,
Card,
Chip,
Table,
TableHeader,
TableColumn,
TableBody,
TableRow,
TableCell,
Tooltip,
Spinner,
Divider,
CardHeader,
CardBody,
Pagination,
} from "@nextui-org/react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { Plus, Trash2, Edit2 } from "lucide-react";
import { Price } from "@/shared/components/marketplace/Price";
import { ChargeType } from "@/shared/types/marketplace";
import { fetchResourceGroupDetail, ResourceGroupDetailResponse } from "@/api/resourceGroup.api";
import { useSearchParams } from "next/navigation";
// 组内服务类型定义
export interface GroupService {
id: string;
name: string;
base_url: string;
charge_type: ChargeType;
price: string;
enabled: boolean;
slug_name?: string;
input_token_price?: string;
output_token_price?: string;
}
interface GroupServiceTableProps {
groupId?: string; // 可选,因为可能从 URL 获取
services: GroupService[];
loading?: boolean;
pagination: {
page: number;
pageSize: number;
total: number;
};
onPageChange: (page: number) => void;
onAddService: () => void;
onRemoveService: (serviceId: string) => void;
onEditGroup: (groupId: string) => void;
onDeleteGroup: (groupId: string) => void;
refreshTrigger?: number; // 用于触发刷新
}
const GroupServiceTable: React.FC<GroupServiceTableProps> = ({
groupId: propGroupId,
services,
loading = false,
pagination,
onPageChange,
onAddService,
onRemoveService,
onEditGroup,
onDeleteGroup,
refreshTrigger,
}) => {
const { t } = useTranslation();
const searchParams = useSearchParams();
const pages = Math.ceil(pagination.total / pagination.pageSize);
const currentPage = pagination.page;
const [resourceGroupDetail, setResourceGroupDetail] = useState<ResourceGroupDetailResponse | null>(null);
// 优先使用 props 传入的 groupId,如果没有则从 URL 参数获取
const urlGroupId = searchParams.get('groupId');
const currentGroupId = propGroupId || urlGroupId || null;
// 使用 useMemo 计算 showOptions,确保响应式更新
const showOptions = useMemo(() => {
if (!resourceGroupDetail) return false;
return !['allow-all', 'deny-all'].includes(resourceGroupDetail.id);
}, [resourceGroupDetail]);
const getResourceGroup = async (groupId: string) => {
const response = await fetchResourceGroupDetail(groupId);
if (response) {
setResourceGroupDetail(response);
}
}
useEffect(() => {
if (currentGroupId) {
getResourceGroup(currentGroupId);
}
}, [currentGroupId, refreshTrigger]); // 当 refreshTrigger 变化时也会刷新
return (
<>
<Card className="flex-1" radius="none" shadow="sm">
<CardHeader className="px-6 py-4">
<div className="flex justify-between items-center w-full">
<h2 className="text-xl font-semibold text-gray-900 truncate" title={resourceGroupDetail?.name}>
{resourceGroupDetail?.name}
</h2>
<div className="flex gap-2 h-[32px]">
{currentGroupId && <>
<Button
isIconOnly
size="sm"
variant="bordered"
onPress={() => onEditGroup(currentGroupId)}
>
<Edit2 size={18} />
</Button></>
}
{showOptions && currentGroupId && <>
<Button
isIconOnly
size="sm"
variant="bordered"
color="danger"
onPress={() => onDeleteGroup(currentGroupId)}
>
<Trash2 size={18} />
</Button></>
}
</div>
</div>
</CardHeader>
<Divider />
<CardBody className="px-6 py-6">
{
showOptions && (<>
<div className="flex flex-col sm:flex-row gap-4 mb-6">
<div className="flex-1">
<Button
color="primary"
onPress={onAddService}
startContent={<Plus size={16} />}
size="sm"
>
{t("Add Server")}
</Button>
</div>
<div className="flex gap-2"></div>
</div>
</>)
}
<Table
key={`table-${showOptions}`}
aria-label="Group services table"
removeWrapper
classNames={{
wrapper: "min-h-[400px]",
}}
bottomContent={
pages > 1 ? (
<div className="flex w-full justify-center">
<Pagination
showControls
variant="light"
color="primary"
page={currentPage}
total={pages}
onChange={onPageChange}
/>
</div>
) : null
}
>
<TableHeader>
<TableColumn>{t("Service Name")}</TableColumn>
<TableColumn>{t("API Endpoint")}</TableColumn>
<TableColumn>{t("Status")}</TableColumn>
<TableColumn>{t("Pricing")}</TableColumn>
<TableColumn className={showOptions ? "w-20" : "hidden"}>{t("Actions")}</TableColumn>
</TableHeader>
<TableBody
items={services}
isLoading={loading}
loadingContent={<Spinner />}
emptyContent={t("No services in this group")}
>
{(service) => {
// 在渲染函数内部使用 showOptions,确保使用最新值
const cellClassName = showOptions ? "" : "hidden";
return (
<TableRow key={service.id}>
<TableCell>
<span className="text-sm">{service.name}</span>
</TableCell>
<TableCell>
<span className="text-sm">{service.base_url}</span>
</TableCell>
<TableCell>
<Chip
className="capitalize"
color={service.enabled ? "success" : "danger"}
size="sm"
variant="flat"
>
{t(service.enabled ? "Published" : "Unpublished")}
</Chip>
</TableCell>
<TableCell>
<div className="flex flex-col gap-1">
<Price
price={service.price}
charge_type={service.charge_type}
input_token_price={service.input_token_price}
output_token_price={service.output_token_price}
/>
</div>
</TableCell>
<TableCell className={cellClassName}>
<Tooltip
content={t("Remove")}
color="danger"
closeDelay={0}
disableAnimation
>
<Button
isIconOnly
size="sm"
variant="light"
color="danger"
onPress={() => onRemoveService(service.id)}
>
<Trash2 className="w-4 h-4" />
</Button>
</Tooltip>
</TableCell>
</TableRow>
);
}}
</TableBody>
</Table>
</CardBody>
</Card>
</>
);
};
export default GroupServiceTable;
@@ -0,0 +1,354 @@
"use client";
import React, { useState, useEffect } from "react";
import { useTranslation } from "@/shared/lib/useTranslation";
import DashboardDemoContent from "@/shared/components/DashboardDemoContent";
import GroupList, { ResourceGroup } from "./GroupList";
import GroupServiceTable, { GroupService } from "./GroupServiceTable";
import { AddServerModal } from "./AddServerModal";
import { DeleteServerModal } from "./DeleteServerModal";
import { Divider, Select, SelectItem } from "@nextui-org/react";
import { useResourceGroups } from "@/hooks/useResourceGroups";
import { AddMcpServerModal } from "./AddMcpServerModal";
import toast from "react-hot-toast";
const ResourceGroupManagement: React.FC = () => {
const { t } = useTranslation();
// 使用自定义 Hook 管理资源组
const {
groups,
simpleResourceGroups,
loadSimpleResourceGroups,
groupServices,
serviceTablePagination,
serviceTableParams,
loading,
servicesLoading,
hasMore,
shouldScrollToTop,
setShouldScrollToTop,
loadGroupServices,
loadMoreGroups,
handleServicePageChange,
handleAddServiceToGroup,
handleCreateGroup: createGroup,
handleUpdateGroup: updateGroup,
handleDeleteGroup: deleteGroup,
handleRemoveService: removeService,
} = useResourceGroups();
// 当前选中的资源组
const [selectedGroup, setSelectedGroup] = useState<ResourceGroup | null>(null);
// 删除组确认模态框
const [isDeleteGroupModalOpen, setIsDeleteGroupModalOpen] = useState(false);
const [groupToDelete, setGroupToDelete] = useState<ResourceGroup | null>(null);
const [transferToGroupId, setTransferToGroupId] = useState<string | null>(null);
const [simpleResourceGroupsLoading, setSimpleResourceGroupsLoading] = useState(false);
// 删除服务确认模态框
const [isDeleteServiceModalOpen, setIsDeleteServiceModalOpen] = useState(false);
const [serviceToDelete, setServiceToDelete] = useState<GroupService | null>(null);
// 创建/编辑组模态框
const [isGroupModalOpen, setIsGroupModalOpen] = useState(false);
const [editingGroup, setEditingGroup] = useState<ResourceGroup | null>(null);
// 添加 MCP 服务模态框
const [isAddMcpServerModalOpen, setIsAddMcpServerModalOpen] = useState(false);
// 刷新触发器,用于触发 GroupServiceTable 刷新
const [refreshTrigger, setRefreshTrigger] = useState(0);
const [newGroupId, setNewGroupId] = useState<string | null>(null);
/**
* 保存 MCP 服务
* @param serverIds 服务ID列表
* @returns 是否保存成功
*/
const handleSaveMcpServer = async (serverIds: string[]) => {
if (!selectedGroup) return;
const success = await handleAddServiceToGroup(selectedGroup.id, serverIds);
if (success) {
setIsAddMcpServerModalOpen(false);
await loadGroupServices(selectedGroup.id, 1, serviceTableParams.current.pageSize, serviceTableParams.current.keyword);
}
};
// 初始化选中第一个组,或在滚动到顶部时选中第一个
useEffect(() => {
if (groups.length > 0 && (shouldScrollToTop || !selectedGroup)) {
const index = shouldScrollToTop && newGroupId ? groups.findIndex((group) => group.id === newGroupId) : 0;
setSelectedGroup(groups[index]);
loadGroupServices(groups[index].id);
}
}, [groups, selectedGroup, loadGroupServices, shouldScrollToTop]);
// 选择组
const handleSelectGroup = (group: ResourceGroup) => {
setSelectedGroup(group);
loadGroupServices(group.id);
};
// 创建新组
const handleCreateGroup = () => {
setEditingGroup(null);
setIsGroupModalOpen(true);
};
// 保存组(创建或编辑)
const handleSaveGroup = async (name: string, isDefault: boolean) => {
// 去除首尾空格
const trimmedName = name.trim();
let success = false;
if (editingGroup) {
// 编辑现有组
success = await updateGroup(editingGroup.id, trimmedName, isDefault);
if (success && selectedGroup?.id === editingGroup.id) {
setSelectedGroup({ ...selectedGroup, name: trimmedName, isDefault });
// 触发 GroupServiceTable 刷新
setRefreshTrigger(prev => prev + 1);
}
} else {
// 创建新组
const newGroupId = await createGroup(trimmedName, isDefault);
success = !!newGroupId;
if (newGroupId) {
setNewGroupId(newGroupId);
}
}
if (success) {
setIsGroupModalOpen(false);
setEditingGroup(null);
}
};
// 编辑组
const handleEditGroup = (groupId: string) => {
const group = groups.find((g) => g.id === groupId);
if (group) {
setEditingGroup(group);
setIsGroupModalOpen(true);
}
};
// 删除组
const handleDeleteGroup = async (groupId: string) => {
const group = groups.find((g) => g.id === groupId);
if (group) {
setSimpleResourceGroupsLoading(true);
const simpleResourceGroups = await loadSimpleResourceGroups();
setTransferToGroupId(simpleResourceGroups.filter((group) => group.id !== groupId)[0].id);
setSimpleResourceGroupsLoading(false);
setGroupToDelete(group);
setIsDeleteGroupModalOpen(true);
}
};
// 确认删除组
const handleConfirmDeleteGroup = async () => {
if (groupToDelete && transferToGroupId) {
// 在删除前找到要选中的目标组
let targetGroup: ResourceGroup | null = null;
if (selectedGroup?.id === groupToDelete.id) {
const currentIndex = groups.findIndex((g) => g.id === groupToDelete.id);
if (currentIndex !== -1) {
// 优先选择上一个,如果没有上一个则选择下一个
if (currentIndex > 0) {
targetGroup = groups[currentIndex - 1];
} else if (currentIndex < groups.length - 1) {
targetGroup = groups[currentIndex + 1];
}
// 如果既没有上一个也没有下一个(只有一个元素),targetGroup 保持为 null
}
}
const success = await deleteGroup(groupToDelete.id, transferToGroupId);
if (success) {
// 等待列表刷新后选中目标组
setTimeout(() => {
if (groups.length === 0) {
// 删除后没有任何资源组了
setSelectedGroup(null);
} else if (targetGroup) {
// 在新列表中找到目标组(因为列表已经刷新了)
const newTarget = groups.find((g) => g.id === targetGroup.id);
if (newTarget) {
setSelectedGroup(newTarget);
loadGroupServices(newTarget.id);
} else {
// 如果目标组不存在了,选择第一个
setSelectedGroup(groups[0]);
loadGroupServices(groups[0].id);
}
} else if (selectedGroup?.id === groupToDelete.id) {
// 如果删除的是当前选中的组,且没有找到目标组(理论上不应该发生)
setSelectedGroup(groups[0]);
loadGroupServices(groups[0].id);
}
// 如果删除的不是当前选中的组,保持原有选中状态
}, 200);
setIsDeleteGroupModalOpen(false);
setGroupToDelete(null);
setTransferToGroupId(null);
}
}
};
// 添加服务到组
const handleAddService = () => {
setIsAddMcpServerModalOpen(true);
};
// 从组中移除服务
const handleRemoveService = (serviceId: string) => {
const service = groupServices.find((s) => s.id === serviceId);
if (service) {
setServiceToDelete(service);
setIsDeleteServiceModalOpen(true);
}
};
// 确认删除服务
const handleConfirmDeleteService = async () => {
if (serviceToDelete && selectedGroup) {
const success = await removeService(selectedGroup.id, serviceToDelete.id);
if (success) {
setIsDeleteServiceModalOpen(false);
setServiceToDelete(null);
await loadGroupServices(selectedGroup.id, 1, serviceTableParams.current.pageSize, serviceTableParams.current.keyword);
}
}
};
return (
<DashboardDemoContent
title={t("Resource Group")}
description={t("Manage your resource group. Each user has a resource group and can only access resources within their resource group")}
>
<div className="flex border-1 border-gray-200 rounded-lg items-stretch overflow-hidden h-full">
{/* 左侧组列表 */}
<GroupList
groups={groups}
selectedGroup={selectedGroup}
onSelectGroup={handleSelectGroup}
onCreateGroup={handleCreateGroup}
onLoadMore={loadMoreGroups}
hasMore={hasMore}
loading={loading}
shouldScrollToTop={shouldScrollToTop}
onScrolledToTop={() => setShouldScrollToTop(false)}
/>
<Divider orientation="vertical" className="h-auto" />
{/* 右侧服务列表 */}
{selectedGroup ? (
<GroupServiceTable
groupId={selectedGroup.id}
services={groupServices}
loading={servicesLoading}
pagination={serviceTablePagination}
onPageChange={(page) => handleServicePageChange(selectedGroup.id, page)}
onAddService={handleAddService}
onRemoveService={handleRemoveService}
onEditGroup={handleEditGroup}
onDeleteGroup={handleDeleteGroup}
refreshTrigger={refreshTrigger}
/>
) : (
<div className="flex-1 flex items-center justify-center text-default-400">
{t("Please select a group to view services")}
</div>
)}
</div>
{/* 删除资源组模态框 */}
<DeleteServerModal
isOpen={isDeleteGroupModalOpen}
onClose={() => {
setIsDeleteGroupModalOpen(false);
setGroupToDelete(null);
setTransferToGroupId(null);
}}
onConfirm={handleConfirmDeleteGroup}
title={t("Confirm Remove")}
description={t(
'Are you sure you want to remove this "{{name}}" Resource Group?',
{
name: groupToDelete?.name || "",
}
)}
alertDescription={t("The bound users have been transferred to the following resource group")}
customAlertContent={<div className="w-full mt-[10px]">
<Select
placeholder={t("Select resource group")}
isLoading={simpleResourceGroupsLoading}
selectedKeys={transferToGroupId ? [transferToGroupId] : simpleResourceGroups.length > 0 ? [simpleResourceGroups.filter((group) => group.id !== groupToDelete?.id)[0].id] : []}
onSelectionChange={(keys) => {
const selectedKey = Array.from(keys)[0] as string;
if (selectedKey) {
setTransferToGroupId(selectedKey);
}
}}
labelPlacement="outside"
>
{simpleResourceGroups.filter((group) => group.id !== groupToDelete?.id).map((group) => (
<SelectItem key={group.id} value={group.id}>
{group.name}
</SelectItem>
))}
</Select>
</div>}
/>
{/* 删除服务模态框 */}
<DeleteServerModal
isOpen={isDeleteServiceModalOpen}
onClose={() => {
setIsDeleteServiceModalOpen(false);
setServiceToDelete(null);
}}
onConfirm={handleConfirmDeleteService}
title={t("Confirm Remove")}
description={t(
'Are you sure you want to remove this "{{name}}" mcp server from "{{groupName}}" resource group?',
{
name: serviceToDelete?.name || "",
groupName: selectedGroup?.name || "",
}
)}
alertDescription={t("Users associated with this resource group will not be able to call the removed MCP server")}
/>
{/* 创建/编辑组模态框 */}
<AddServerModal
isOpen={isGroupModalOpen}
onClose={() => {
setIsGroupModalOpen(false);
setEditingGroup(null);
}}
name={editingGroup?.name || ""}
id={editingGroup?.id || ""}
isDefault={editingGroup?.isDefault || false}
onSaveServer={handleSaveGroup}
type={editingGroup ? "edit" : "add"}
/>
<AddMcpServerModal
id={selectedGroup?.id || ""}
isOpen={isAddMcpServerModalOpen}
onClose={() => {
setIsAddMcpServerModalOpen(false);
}}
onSaveMcpServer={handleSaveMcpServer}
/>
</DashboardDemoContent>
);
};
export default ResourceGroupManagement;
@@ -1,13 +1,52 @@
"use client";
import React from "react";
import React, { useState, useRef, useEffect } from "react";
import { RevenueTable } from "./RevenueTable";
import DashboardDemoContent from "@/shared/components/DashboardDemoContent";
import { useRevenueManagement } from "@/hooks/useRevenueManagement";
import { Input } from "@nextui-org/react";
import { Search } from "lucide-react";
import { useTranslation } from "@/shared/lib/useTranslation";
const RevenueManagement: React.FC = () => {
const { t } = useTranslation();
// use custom hook to manage revenue data
const { records, loading, pagination, setPage } = useRevenueManagement();
const {
records,
loading,
pagination,
setPage,
setSearch,
setPaymentType,
setSort
} = useRevenueManagement();
const [searchValue, setSearchValue] = useState('');
const searchTimerRef = useRef<NodeJS.Timeout | null>(null);
// 清理定时器
useEffect(() => {
return () => {
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
};
}, []);
// 处理搜索 - 使用防抖
const handleSearchChange = (value: string) => {
setSearchValue(value);
// 清除之前的定时器
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
// 设置新的定时器,500ms 后触发搜索
searchTimerRef.current = setTimeout(() => {
setSearch(value);
}, 500);
};
return (
<DashboardDemoContent
@@ -15,13 +54,24 @@ const RevenueManagement: React.FC = () => {
description="Monitor platform revenue and view user recharge history"
>
<div className="space-y-6 w-full">
{/* comming soon:Filters */}
{/* <RevenueFiltersBar
searchQuery={searchQuery}
onSearchChange={setSearch}
statusFilter={statusFilter}
onStatusChange={setStatus}
/> */}
{/* 搜索框 - 右上角 */}
<div className="flex justify-end items-center gap-4">
<Input
isClearable
className="w-full sm:max-w-[400px]"
placeholder={t('Search by email')}
startContent={<Search className="w-4 h-4" />}
value={searchValue}
onClear={() => {
setSearchValue('');
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
setSearch('');
}}
onValueChange={handleSearchChange}
/>
</div>
{/* Revenue Table */}
<RevenueTable
@@ -29,6 +79,8 @@ const RevenueManagement: React.FC = () => {
loading={loading}
pagination={pagination}
onPageChange={setPage}
onPaymentTypeChange={setPaymentType}
onSortChange={setSort}
/>
</div>
</DashboardDemoContent>
@@ -1,6 +1,6 @@
"use client";
import React from 'react';
import React, { useState } from 'react';
import {
Table,
TableHeader,
@@ -10,11 +10,17 @@ import {
TableCell,
Pagination,
Chip,
Spinner
Spinner,
Tooltip,
Dropdown,
DropdownTrigger,
DropdownMenu,
DropdownItem,
Button
} from '@nextui-org/react';
import { useTranslation } from '@/shared/lib/useTranslation';
import { PaymentState, RevenueRecord } from '@/types/revenue';
import { Calendar, CreditCard } from 'lucide-react';
import { Calendar, CreditCard, HelpCircle, Filter, ArrowUpDown, ArrowUp, ArrowDown } from 'lucide-react';
import { formatCurrency } from '@/shared/utils/currency';
interface RevenueTableProps {
@@ -26,6 +32,8 @@ interface RevenueTableProps {
total: number;
};
onPageChange: (page: number) => void;
onPaymentTypeChange?: (paymentType: string) => void;
onSortChange?: (field: string | undefined, order: 'asc' | 'desc' | undefined) => void;
}
export const RevenueTable: React.FC<RevenueTableProps> = ({
@@ -33,8 +41,12 @@ export const RevenueTable: React.FC<RevenueTableProps> = ({
loading = false,
pagination,
onPageChange,
onPaymentTypeChange,
onSortChange,
}) => {
const { t } = useTranslation();
const [selectedPaymentType, setSelectedPaymentType] = useState('all');
const [sortState, setSortState] = useState<'none' | 'desc' | 'asc'>('none');
const pages = Math.ceil(pagination.total / pagination.pageSize);
const currentPage = pagination.page;
@@ -91,6 +103,35 @@ export const RevenueTable: React.FC<RevenueTableProps> = ({
);
};
// 处理付款方式筛选
const handlePaymentTypeChange = (type: string) => {
setSelectedPaymentType(type);
onPaymentTypeChange?.(type);
};
// 处理排序
const handleSortClick = () => {
let newSortState: 'none' | 'desc' | 'asc';
if (sortState === 'none') {
newSortState = 'desc';
onSortChange?.('amount', 'desc');
} else if (sortState === 'desc') {
newSortState = 'asc';
onSortChange?.('amount', 'asc');
} else {
newSortState = 'none';
onSortChange?.(undefined, undefined);
}
setSortState(newSortState);
};
// 获取排序图标
const getSortIcon = () => {
if (sortState === 'desc') return <ArrowDown className="w-4 h-4" />;
if (sortState === 'asc') return <ArrowUp className="w-4 h-4" />;
return <ArrowUpDown className="w-4 h-4" />;
};
if (loading) {
return (
<div className="flex justify-center items-center h-64">
@@ -121,9 +162,68 @@ export const RevenueTable: React.FC<RevenueTableProps> = ({
>
<TableHeader>
<TableColumn>{t('Account (Email)')}</TableColumn>
<TableColumn>{t('Recharge Amount')}</TableColumn>
<TableColumn>{t('Recharge Time')}</TableColumn>
<TableColumn>{t('Payment Method')}</TableColumn>
<TableColumn>
<div className="flex items-center gap-2">
<span>{t('Recharge Amount')}</span>
<Button
isIconOnly
size="sm"
variant="light"
onPress={handleSortClick}
className="min-w-unit-6 w-6 h-6"
>
{getSortIcon()}
</Button>
</div>
</TableColumn>
<TableColumn>
<div className="flex items-center gap-1">
<span>{t('Recharge Time')}</span>
<Tooltip
content={t("Current display time is UTC time")}
color="default"
closeDelay={0}
disableAnimation
>
<HelpCircle className="w-4 h-4" />
</Tooltip>
</div>
</TableColumn>
<TableColumn>
<div className="flex items-center gap-2">
<span>{t('Payment Method')}</span>
<Dropdown>
<DropdownTrigger>
<Button
isIconOnly
size="sm"
variant="light"
aria-label="Filter by payment method"
className="min-w-unit-6 w-6 h-6"
>
<Filter
className={`w-4 h-4 ${
selectedPaymentType !== 'all' ? 'text-primary' : ''
}`}
/>
</Button>
</DropdownTrigger>
<DropdownMenu
aria-label="Payment method filter"
selectionMode="single"
selectedKeys={[selectedPaymentType]}
onSelectionChange={(keys) => {
const selected = Array.from(keys)[0] as string;
handlePaymentTypeChange(selected);
}}
>
<DropdownItem key="all">{t('All')}</DropdownItem>
<DropdownItem key="stripe">Stripe</DropdownItem>
<DropdownItem key="platform">Platform</DropdownItem>
</DropdownMenu>
</Dropdown>
</div>
</TableColumn>
<TableColumn>{t('Transaction ID')}</TableColumn>
<TableColumn>{t('Status')}</TableColumn>
</TableHeader>
@@ -45,7 +45,7 @@ export const AdminConfigForm: React.FC<AdminConfigFormProps> = ({
formData.username.trim() !== "" &&
formData.password?.trim() !== "" &&
formData.password === confirmPassword &&
formData.password?.length >= 8;
formData.password?.length >= 6;
const passwordsMatch = formData.password === confirmPassword;
@@ -86,7 +86,7 @@ export const AdminConfigForm: React.FC<AdminConfigFormProps> = ({
<Input
label={t("Administrator Password")}
placeholder={t("Enter administrator password")}
description={t("Password must be at least 8 characters long")}
description={t("Password must be at least 6 characters long")}
value={formData.password}
onChange={(e) => handleInputChange("password", e.target.value)}
type={showPassword ? "text" : "password"}
@@ -106,13 +106,13 @@ export const AdminConfigForm: React.FC<AdminConfigFormProps> = ({
isRequired
autoComplete="new-password"
color={
formData.password?.length > 0 && formData.password?.length < 8
formData.password?.length > 0 && formData.password?.length < 6
? "danger"
: "default"
}
errorMessage={
formData.password?.length > 0 && formData.password?.length < 8
? t("Password must be at least 8 characters")
formData.password?.length > 0 && formData.password?.length < 6
? t("Password must be at least 6 characters")
: ""
}
/>
@@ -0,0 +1,111 @@
"use client";
import React, { useEffect, useState } from "react";
import { Button, Input } from "@nextui-org/react";
import { fetchAdminAPI } from "@/rpc/admin-api";
import { useTranslation } from "@/shared/lib/useTranslation";
import toast from "react-hot-toast";
interface FreeQuotaResponse {
free_global_daily_limit: number | null;
}
/**
* Platform-wide daily call cap for free services.
*
* Stored in sys_config under free_global_daily_limit. The billing service takes
* the smaller of this value and any per-service limit, so a service with no
* limit of its own still inherits this one.
*/
export const FreeQuotaSettings: React.FC = () => {
const { t } = useTranslation();
const [value, setValue] = useState<string>("");
const [loading, setLoading] = useState<boolean>(true);
const [saving, setSaving] = useState<boolean>(false);
useEffect(() => {
let mounted = true;
(async () => {
const res = await fetchAdminAPI<FreeQuotaResponse>(
"/api/sysconfig/free-quota",
{ method: "GET" }
);
if (!mounted) return;
if (res.success) {
const n = res.data?.free_global_daily_limit;
setValue(n && n > 0 ? String(n) : "");
} else if (res.error_message) {
toast.error(res.error_message);
}
setLoading(false);
})();
return () => {
mounted = false;
};
}, []);
const handleSave = async () => {
const raw = value.trim();
let payload: number | null = null;
if (raw !== "") {
const n = Number(raw);
if (!Number.isInteger(n) || n < 0) {
toast.error(t("Enter a non-negative integer"));
return;
}
payload = n;
}
setSaving(true);
const res = await fetchAdminAPI<FreeQuotaResponse>(
"/api/sysconfig/free-quota",
{ method: "PUT", body: { free_global_daily_limit: payload } as unknown as BodyInit }
);
setSaving(false);
if (res.success) {
const n = res.data?.free_global_daily_limit;
setValue(n && n > 0 ? String(n) : "");
toast.success(t("Free call limit saved"));
} else {
toast.error(res.error_message || t("Failed to save free call limit"));
}
};
return (
<div className="space-y-4">
<Input
type="number"
min={0}
step={1}
labelPlacement="outside"
label={t("Platform-wide daily call limit per user")}
placeholder={t("Example 100")}
value={value}
isDisabled={loading || saving}
onValueChange={setValue}
description={t(
"Applies to every free service, leave blank or 0 for unlimited"
)}
/>
<p className="text-xs text-default-400">
{t("If a service also has its own limit, the smaller number wins")}
</p>
<div className="flex gap-3 py-4">
<Button
color="primary"
variant="solid"
onPress={handleSave}
isLoading={saving}
size="sm"
>
{t("Save")}
</Button>
</div>
</div>
);
};
export default FreeQuotaSettings;
@@ -0,0 +1,51 @@
"use client";
import React from "react";
import { Switch } from "@nextui-org/react";
import { useTranslation } from "@/shared/lib/useTranslation";
export type TagsBarSettingConfig = {
tag_bar_display: boolean;
};
interface TagsBarSettingProps {
isEnabled: boolean;
onSave: (config: TagsBarSettingConfig) => void;
}
export const TagsBarSetting: React.FC<TagsBarSettingProps> = ({
isEnabled,
onSave,
}) => {
const { t } = useTranslation();
return (
<div className="space-y-4">
<div className="flex flex-col gap-4">
{/* showcase in xpack */}
<div className="flex items-center justify-between p-4 bg-gray-50 rounded-lg">
<div className="flex flex-col gap-1">
<span className="text-sm font-medium">
{t("Display tags bar")}
</span>
<span className="text-xs text-gray-500">
{t(
"Front end displays tags bar and allows users to filter products based on tags."
)}
</span>
</div>
<Switch
isSelected={isEnabled}
onValueChange={(value) => {
onSave({
tag_bar_display: value
});
}}
color="primary"
size="sm"
/>
</div>
</div>
</div>
);
};
@@ -18,6 +18,7 @@ import { useTranslation } from "react-i18next";
import { sanitizeMCPServerName } from "@/shared/utils/mcp";
import { useNavigationItems } from "@/shared/providers/ConfigProvider";
import { withComponentInjection } from "@/shared/hooks/useComponentInjection";
import { useSharedStore } from "@/shared/store/share";
interface ProductDetailThemeSelectorProps {
product: ServiceData;
@@ -36,8 +37,13 @@ const BasicProductDetailThemeSelector: React.FC<
platformConfig.mcp_server_prefix || process.env.NEXT_PUBLIC_MCP_URL || "";
const [url, setUrl] = useState<string>("");
const [mcpName, setMcpName] = useState<string>("");
const [can_invoke, setCanInvoke] = useState<boolean>(false);
const [visitor, setVisitor] = useState<boolean>(false);
const { t } = useTranslation();
const configNavigation = useNavigationItems() || NavigationItems;
// 使用 Zustand hook 正确订阅 user 状态
const user = useSharedStore((state) => state.user);
const navigationItems = [
...configNavigation,
@@ -56,6 +62,24 @@ const BasicProductDetailThemeSelector: React.FC<
useEffect(() => {
setMcpName(sanitizeMCPServerName(product.name));
}, [product.name]);
useEffect(() => {
if (user) {
if (user?.allow_all) {
setCanInvoke(true)
} else {
const serviceId = product.id
const allowIds = user.service_ids
if (!allowIds?.includes(serviceId)) {
setCanInvoke(false)
} else {
setCanInvoke(true)
}
}
} else {
setCanInvoke(true);
setVisitor(true);
}
}, [user, product.id]);
const getCodeContent = () => {
return `{
"mcpServers": {
@@ -82,6 +106,8 @@ const BasicProductDetailThemeSelector: React.FC<
case Theme.MODERN:
return (
<ModernDetail
can_invoke={can_invoke}
visitor={visitor}
product={product}
breadcrumbs={breadcrumbs}
url={url}
@@ -93,6 +119,8 @@ const BasicProductDetailThemeSelector: React.FC<
case Theme.CLASSIC:
return (
<ClassicDetail
can_invoke={can_invoke}
visitor={visitor}
product={product}
breadcrumbs={breadcrumbs}
url={url}
@@ -104,6 +132,8 @@ const BasicProductDetailThemeSelector: React.FC<
case Theme.CREATIVE:
return (
<CreativeDetail
can_invoke={can_invoke}
visitor={visitor}
product={product}
breadcrumbs={breadcrumbs}
url={url}
@@ -115,6 +145,8 @@ const BasicProductDetailThemeSelector: React.FC<
case Theme.TEMU:
return (
<TemuDetail
can_invoke={can_invoke}
visitor={visitor}
product={product}
breadcrumbs={breadcrumbs}
url={url}
@@ -131,6 +163,8 @@ const BasicProductDetailThemeSelector: React.FC<
<main className="flex-1">
<ProductDetailClient
product={product}
can_invoke={can_invoke}
visitor={visitor}
mcpName={mcpName}
url={url}
/>
@@ -9,7 +9,7 @@ import { Home as ClassicHome } from "./classic/Home";
import { Home as CreativeHome } from "./creative/Home";
import { Home as TemuHome } from "./temu/Home";
import { ServiceData } from "@/shared/types/marketplace";
import { fetchServices } from "@/services/marketplaceService";
import { fetchServices, fetchTagsList } from "@/services/marketplaceService";
import { Navigation } from "@/shared/components/Navigation";
import { MarketplaceMain } from "../marketplace/Main";
import { Footer } from "@/shared/components/Footer";
@@ -53,18 +53,36 @@ export const ThemeSelector: React.FC<ThemeSelectorProps> = ({
const [currentPage, setCurrentPage] = useState(initialPage);
const [total, setTotal] = useState(initialTotal);
const [loading, setLoading] = useState(false);
const isTagBarDisplay = platformConfig.tag_bar_display || false;
// 可用的标签列表(这里可以从API获取或配置)
const [availableTags, setAvailableTags] = useState<string[]>([]);
const [selectedTag, setSelectedTag] = useState("ALL");
// search suggestion
const searchSuggestions = ["Search MCP servers"];
useEffect(() => {
const loadTagsList = async () => {
const tags = await fetchTagsList();
setAvailableTags(tags);
};
loadTagsList();
}, []);
// handle tag change
const handleTagChange = (tag: string) => {
setSelectedTag(tag);
setCurrentPage(1);
loadServices(1, searchQuery, tag);
};
// loading service data
const loadServices = async (page: number, search: string) => {
const loadServices = async (page: number, search: string, tag: string = "ALL") => {
try {
setLoading(true);
const result = await fetchServices({
page,
page_size: pageSize,
keyword: search,
tag: tag !== "ALL" ? tag : undefined,
});
setServices(result.data.services);
@@ -103,13 +121,13 @@ export const ThemeSelector: React.FC<ThemeSelectorProps> = ({
// page change handler
const handlePageChange = (page: number) => {
updateURL(page, searchQuery);
loadServices(page, searchQuery);
loadServices(page, searchQuery, selectedTag);
};
// search submit handler
const handleSearch = () => {
updateURL(1, searchQuery);
loadServices(1, searchQuery);
loadServices(1, searchQuery, selectedTag);
};
// search input change handler
@@ -122,6 +140,11 @@ export const ThemeSelector: React.FC<ThemeSelectorProps> = ({
case Theme.MODERN:
return (
<ModernHome
currentTheme={currentTheme}
selectedTag={selectedTag}
handleTagChange={handleTagChange}
isTagBarDisplay={isTagBarDisplay}
availableTags={availableTags}
searchQuery={searchQuery}
services={services}
currentPage={currentPage}
@@ -139,6 +162,11 @@ export const ThemeSelector: React.FC<ThemeSelectorProps> = ({
case Theme.CLASSIC:
return (
<ClassicHome
currentTheme={currentTheme}
selectedTag={selectedTag}
handleTagChange={handleTagChange}
isTagBarDisplay={isTagBarDisplay}
availableTags={availableTags}
searchQuery={searchQuery}
services={services}
currentPage={currentPage}
@@ -156,6 +184,11 @@ export const ThemeSelector: React.FC<ThemeSelectorProps> = ({
case Theme.CREATIVE:
return (
<CreativeHome
currentTheme={currentTheme}
selectedTag={selectedTag}
handleTagChange={handleTagChange}
isTagBarDisplay={isTagBarDisplay}
availableTags={availableTags}
searchQuery={searchQuery}
services={services}
currentPage={currentPage}
@@ -173,6 +206,11 @@ export const ThemeSelector: React.FC<ThemeSelectorProps> = ({
case Theme.TEMU:
return (
<TemuHome
currentTheme={currentTheme}
selectedTag={selectedTag}
handleTagChange={handleTagChange}
isTagBarDisplay={isTagBarDisplay}
availableTags={availableTags}
searchQuery={searchQuery}
services={services}
currentPage={currentPage}
@@ -194,6 +232,11 @@ export const ThemeSelector: React.FC<ThemeSelectorProps> = ({
<Navigation items={navigationItems} />
<main className="flex-1">
<MarketplaceMain
currentTheme={currentTheme}
selectedTag={selectedTag}
setSelectedTag={setSelectedTag}
isTagBarDisplay={isTagBarDisplay}
availableTags={availableTags}
initialServices={services}
initialTotal={total}
initialPage={currentPage}
@@ -16,6 +16,8 @@ import { NavigationItem } from "@/shared/components/Navigation";
import { ServerConfig } from "@/shared/components/marketplace/ServerConfig";
interface DetailProps {
can_invoke?: boolean;
visitor?: boolean;
product: ServiceData;
breadcrumbs?: {
link: string;
@@ -30,6 +32,8 @@ interface DetailProps {
}
export const Detail: React.FC<DetailProps> = ({
can_invoke,
visitor,
product,
url,
mcpName,
@@ -216,6 +220,8 @@ export const Detail: React.FC<DetailProps> = ({
</div>
{/* Code Snippet */}
<ServerConfig
can_invoke={can_invoke}
visitor={visitor}
mcpName={mcpName}
url={url}
className="w-full max-w-2xl"
+33 -6
View File
@@ -24,11 +24,18 @@ import { Footer } from "./Footer";
import { Navigation } from "./Navigation";
import { NavigationItem } from "@/shared/components/Navigation";
import { Faq } from "@/components/marketplace/Faq";
import { TagFilter } from "@/shared/components/marketplace/TagFilter";
import { ThemeType } from "@/shared/types/system";
interface HomeProps {
// 状态
searchQuery: string;
services: ServiceData[];
isTagBarDisplay: boolean;
availableTags: string[];
selectedTag: string;
handleTagChange: (tag: string) => void;
currentTheme: ThemeType;
currentPage: number;
total: number;
pageSize: number;
@@ -50,6 +57,11 @@ interface HomeProps {
export const Home: React.FC<HomeProps> = ({
searchQuery,
services,
isTagBarDisplay,
availableTags,
selectedTag,
handleTagChange,
currentTheme,
currentPage,
total,
pageSize,
@@ -83,9 +95,9 @@ export const Home: React.FC<HomeProps> = ({
<h1 className="text-4xl lg:text-5xl font-bold mb-6 text-slate-800">
{t(
platformConfig.headline ||
platformConfig.name ||
_DefaultPlatformConfig.headline ||
""
platformConfig.name ||
_DefaultPlatformConfig.headline ||
""
)}
</h1>
@@ -93,8 +105,8 @@ export const Home: React.FC<HomeProps> = ({
<p className="text-xl text-gray-600 max-w-3xl mx-auto leading-relaxed">
{t(
platformConfig.subheadline ||
_DefaultPlatformConfig.subheadline ||
""
_DefaultPlatformConfig.subheadline ||
""
)}
</p>
</div>
@@ -140,6 +152,21 @@ export const Home: React.FC<HomeProps> = ({
</div>
</div>
{/* filter section */}
{
isTagBarDisplay && (
<div className="pt-10">
<TagFilter
theme={currentTheme}
tags={availableTags}
selectedTag={selectedTag}
onTagChange={handleTagChange}
maxWidthPercent={80}
/>
</div>
)
}
{/* Server List Section */}
{loading ? (
<div className="mx-auto h-[200px] flex items-center justify-center">
@@ -148,7 +175,7 @@ export const Home: React.FC<HomeProps> = ({
</div>
</div>
) : (
<div className="bg-gray-50 py-16">
<div className={`bg-gray-50 ${isTagBarDisplay ? 'py-10' : 'py-16'}`}>
<div className="mx-auto px-6 max-w-7xl">
{/* Server Grid */}
<div className="flex flex-wrap justify-center gap-4 mb-12">
@@ -1,6 +1,6 @@
"use client";
import React from "react";
import React, { useState, useEffect } from "react";
import { Button } from "@nextui-org/react";
import { useTranslation } from "react-i18next";
@@ -8,6 +8,7 @@ import { DynamicLogo } from "@/shared/components/DynamicLogo";
import { useAuth } from "@/shared/lib/useAuth";
import { NavigationItem } from "@/shared/components/Navigation";
import Link from "next/link";
import { useSharedStore } from "@/shared/store/share";
interface NavigationProps {
items?: NavigationItem[];
@@ -17,6 +18,13 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
const { t } = useTranslation();
const { handleLogin } = useAuth();
const [userToken, setUserToken] = useState<string | null>(null);
useEffect(() => {
const userToken = useSharedStore?.getState?.().user_token
setUserToken(userToken);
}, []);
return (
<div className="fixed top-0 left-0 right-0 z-50">
{/* Classic Header */}
@@ -26,21 +34,27 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
<DynamicLogo alt="Platform Logo" className="h-[32px] text-white" />
</div>
<div className="flex space-x-2">
<Button
onPress={handleLogin}
variant="light"
className="hidden sm:block text-white text-sm px-4 py-1 rounded-sm font-medium"
size="sm"
>
<b className="text-md"> {t("Sign In")}</b>
</Button>
{
!userToken && (
<>
<Button
onPress={handleLogin}
variant="light"
className="hidden sm:block text-white text-sm px-4 py-1 rounded-sm font-medium"
size="sm"
>
<b className="text-md"> {t("Sign In")}</b>
</Button>
</>
)
}
<Button
color="primary"
className="bg-red-600 hover:bg-red-700 text-white text-sm px-4 py-1 rounded-sm font-medium"
size="sm"
onPress={handleLogin}
>
{t("Get Started")}
{userToken ? t("Dashboard") : t("Get Started")}
</Button>
</div>
</div>
@@ -15,6 +15,8 @@ import { NavigationItem } from "@/shared/components/Navigation";
import { ServerConfig } from "@/shared/components/marketplace/ServerConfig";
interface DetailProps {
can_invoke?: boolean;
visitor?: boolean;
product: ServiceData;
breadcrumbs?: {
link: string;
@@ -29,6 +31,8 @@ interface DetailProps {
}
export const Detail: React.FC<DetailProps> = ({
can_invoke,
visitor,
product,
breadcrumbs,
url,
@@ -176,6 +180,8 @@ export const Detail: React.FC<DetailProps> = ({
</div>
{/* Code Snippet */}
<ServerConfig
can_invoke={can_invoke}
visitor={visitor}
mcpName={mcpName}
url={url}
className="w-full max-w-2xl"
@@ -24,11 +24,18 @@ import { Footer } from "./Footer";
import { Navigation } from "./Navigation";
import { NavigationItem } from "@/shared/components/Navigation";
import { Faq } from "@/components/marketplace/Faq";
import { TagFilter } from "@/shared/components/marketplace/TagFilter";
import { ThemeType } from "@/shared/types/system";
interface HomeProps {
// 状态
searchQuery: string;
services: ServiceData[];
isTagBarDisplay: boolean;
availableTags: string[];
selectedTag: string;
handleTagChange: (tag: string) => void;
currentTheme: ThemeType;
currentPage: number;
total: number;
pageSize: number;
@@ -50,6 +57,11 @@ interface HomeProps {
export const Home: React.FC<HomeProps> = ({
searchQuery,
services,
isTagBarDisplay,
availableTags,
selectedTag,
handleTagChange,
currentTheme,
currentPage,
total,
pageSize,
@@ -102,9 +114,9 @@ export const Home: React.FC<HomeProps> = ({
<span className="bg-clip-text text-transparent bg-gradient-to-r from-pink-600 via-red-500 to-orange-600">
{t(
platformConfig.headline ||
platformConfig.name ||
_DefaultPlatformConfig.headline ||
""
platformConfig.name ||
_DefaultPlatformConfig.headline ||
""
)}
</span>
</h1>
@@ -113,8 +125,8 @@ export const Home: React.FC<HomeProps> = ({
<p className="text-lg font-medium max-w-3xl mx-auto leading-relaxed text-gray-700">
{t(
platformConfig.subheadline ||
_DefaultPlatformConfig.subheadline ||
""
_DefaultPlatformConfig.subheadline ||
""
)}
</p>
</div>
@@ -166,6 +178,21 @@ export const Home: React.FC<HomeProps> = ({
</div>
</div>
{/* filter section */}
{
isTagBarDisplay && (
<>
<TagFilter
theme={currentTheme}
tags={availableTags}
selectedTag={selectedTag}
onTagChange={handleTagChange}
maxWidthPercent={80}
/>
</>
)
}
{/* Creative Server List Section */}
{loading ? (
<div className="relative z-10 mx-auto h-[200px] flex items-center justify-center">
@@ -177,7 +204,7 @@ export const Home: React.FC<HomeProps> = ({
</div>
) : (
<div className="relative z-10">
<div className="relative mx-auto px-6 py-16 max-w-8xl">
<div className={`relative mx-auto px-6 ${isTagBarDisplay ? 'py-12' : 'py-16'} max-w-8xl`}>
{/* Creative Server Grid */}
<div className="flex flex-wrap justify-center gap-4 mb-12">
{services.map((service, index) => {
@@ -1,6 +1,6 @@
"use client";
import React from "react";
import React, { useEffect } from "react";
import { Button } from "@nextui-org/react";
import { useTranslation } from "react-i18next";
import Link from "next/link";
@@ -16,6 +16,7 @@ import { ArrowRightIcon } from "lucide-react";
import { DynamicLogo } from "@/shared/components/DynamicLogo";
import { useAuth } from "@/shared/lib/useAuth";
import { NavigationItem } from "@/shared/components/Navigation";
import { useSharedStore } from "@/shared/store/share";
interface NavigationProps {
items?: NavigationItem[];
@@ -26,6 +27,13 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
const { handleLogin } = useAuth();
const [isMenuOpen, setIsMenuOpen] = useState(false);
const [userToken, setUserToken] = useState<string | null>(null);
useEffect(() => {
const userToken = useSharedStore?.getState?.().user_token
setUserToken(userToken);
}, []);
return (
<>
{/* Creative Navigation */}
@@ -65,16 +73,22 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
</NavbarContent>
<NavbarContent justify="end" className="items-center gap-2 sm:gap-4">
<div className="hidden sm:flex gap-2">
<Button onPress={handleLogin} variant="light">
<b className="text-md"> {t("Sign In")}</b>
</Button>
{
!userToken && (
<>
<Button onPress={handleLogin} variant="light">
<b className="text-md"> {t("Sign In")}</b>
</Button>
</>
)
}
<Button
color="primary"
className="bg-gradient-to-r from-pink-500 via-red-500 to-orange-500 hover:from-pink-600 hover:via-red-600 hover:to-orange-600 text-white shadow-lg hover:shadow-xl transition-all duration-300 hover:scale-105 flex items-center justify-center gap-4 pr-1 h-[45px]"
radius="full"
onPress={handleLogin}
>
<b className="text-md">{t("Get Started")}</b>
<b className="text-md">{userToken ? t("Dashboard") : t("Get Started")}</b>
<div className="w-8 h-8 bg-white/20 flex items-center justify-center rounded-full">
<ArrowRightIcon
size={16}
@@ -89,7 +103,7 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
onPress={handleLogin}
size="sm"
>
<b className="text-md">{t("Get Started")}</b>
<b className="text-md">{userToken ? t("Dashboard") : t("Get Started")}</b>
</Button>
</div>
</NavbarContent>
@@ -101,7 +115,7 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
radius="full"
onPress={handleLogin}
>
<b className="text-md">{t("Get Started")}</b>
<b className="text-md">{userToken ? t("Dashboard") : t("Get Started")}</b>
<div className="w-8 h-8 bg-white/20 flex items-center justify-center rounded-full">
<ArrowRightIcon
size={16}
@@ -67,7 +67,7 @@ const DefaultDemo: React.FC = () => {
<span className="bg-blue-100 text-blue-800 px-2 py-1 rounded text-xs">
Beta
</span>
<span className="text-xs text-gray-500">$0.02 /Per Call</span>
<span className="text-xs text-gray-500">¥0.02 /Per Call</span>
</div>
</div>
@@ -79,7 +79,7 @@ const DefaultDemo: React.FC = () => {
<span className="bg-blue-100 text-blue-800 px-2 py-1 rounded text-xs">
Beta
</span>
<span className="text-xs text-gray-500">$0.02 /Per Call</span>
<span className="text-xs text-gray-500">¥0.02 /Per Call</span>
</div>
</div>
@@ -16,6 +16,8 @@ import { NavigationItem } from "@/shared/components/Navigation";
import { ServerConfig } from "@/shared/components/marketplace/ServerConfig";
interface DetailProps {
can_invoke?: boolean;
visitor?: boolean;
product: ServiceData;
breadcrumbs?: {
link: string;
@@ -30,6 +32,8 @@ interface DetailProps {
}
export const Detail: React.FC<DetailProps> = ({
can_invoke,
visitor,
product,
breadcrumbs,
url,
@@ -144,6 +148,8 @@ export const Detail: React.FC<DetailProps> = ({
{/* Code Snippet */}
<ServerConfig
mcpName={mcpName}
can_invoke={can_invoke}
visitor={visitor}
url={url}
className="w-full max-w-2xl"
/>
+33 -6
View File
@@ -26,11 +26,18 @@ import { Navigation } from "./Navigation";
import { Footer } from "./Footer";
import { NavigationItem } from "@/shared/components/Navigation";
import { Faq } from "@/components/marketplace/Faq";
import { TagFilter } from "@/shared/components/marketplace/TagFilter";
import { ThemeType } from "@/shared/types/system";
interface HomeProps {
// 状态
searchQuery: string;
services: ServiceData[];
isTagBarDisplay: boolean;
availableTags: string[];
selectedTag: string;
handleTagChange: (tag: string) => void;
currentTheme: ThemeType;
currentPage: number;
total: number;
pageSize: number;
@@ -52,6 +59,11 @@ interface HomeProps {
export const Home: React.FC<HomeProps> = ({
searchQuery,
services,
isTagBarDisplay,
availableTags,
selectedTag,
handleTagChange,
currentTheme,
currentPage,
total,
pageSize,
@@ -78,7 +90,7 @@ export const Home: React.FC<HomeProps> = ({
<Navigation items={navItems} />
{/* Modern Hero Section */}
<div className="pt-32">
<div className="mx-auto px-6 py-20 max-w-6xl">
<div className={`mx-auto px-6 max-w-6xl ${isTagBarDisplay ? 'py-16' : 'py-20'}`}>
<div className="text-center mb-16">
{/* Modern Icon */}
<div className="flex justify-center mb-8">
@@ -91,9 +103,9 @@ export const Home: React.FC<HomeProps> = ({
<h1 className="text-4xl lg:text-6xl font-bold mb-6 text-gray-900 leading-tight">
{t(
platformConfig.headline ||
platformConfig.name ||
_DefaultPlatformConfig.headline ||
""
platformConfig.name ||
_DefaultPlatformConfig.headline ||
""
)}
</h1>
@@ -101,8 +113,8 @@ export const Home: React.FC<HomeProps> = ({
<p className="text-lg text-gray-600 max-w-2xl mx-auto leading-relaxed">
{t(
platformConfig.subheadline ||
_DefaultPlatformConfig.subheadline ||
""
_DefaultPlatformConfig.subheadline ||
""
)}
</p>
</div>
@@ -145,6 +157,21 @@ export const Home: React.FC<HomeProps> = ({
</div>
</div>
{/* filter section */}
{
isTagBarDisplay && (
<>
<TagFilter
theme={currentTheme}
tags={availableTags}
selectedTag={selectedTag}
onTagChange={handleTagChange}
maxWidthPercent={80}
/>
</>
)
}
<section>
{/* Server List Section */}
{loading ? (
@@ -1,6 +1,6 @@
"use client";
import React from "react";
import React, { useEffect } from "react";
import { Button } from "@nextui-org/react";
import { useTranslation } from "react-i18next";
import Link from "next/link";
@@ -16,6 +16,7 @@ import { ArrowRightIcon } from "lucide-react";
import { DynamicLogo } from "@/shared/components/DynamicLogo";
import { useAuth } from "@/shared/lib/useAuth";
import { NavigationItem } from "@/shared/components/Navigation";
import { useSharedStore } from "@/shared/store/share";
interface NavigationProps {
items?: NavigationItem[];
@@ -25,7 +26,12 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
const { t } = useTranslation();
const { handleLogin } = useAuth();
const [isMenuOpen, setIsMenuOpen] = useState(false);
const [userToken, setUserToken] = useState<string | null>(null);
useEffect(() => {
const userToken = useSharedStore?.getState?.().user_token
setUserToken(userToken);
}, []);
return (
<>
{/* Modern Navigation */}
@@ -61,16 +67,22 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
</NavbarContent>
<NavbarContent justify="end" className="items-center gap-2 sm:gap-4">
<div className="hidden sm:flex gap-2">
<Button onPress={handleLogin} variant="light">
<b className="text-md"> {t("Sign In")}</b>
</Button>
{
!userToken && (
<>
<Button onPress={handleLogin} variant="light">
<b className="text-md"> {t("Sign In")}</b>
</Button>
</>
)
}
<Button
color="primary"
className="bg-gradient-to-r from-blue-500 to-purple-600 text-white hover:from-blue-600 hover:to-purple-700 flex items-center justify-center gap-4 pr-1 h-[45px] shadow-lg"
radius="full"
onPress={handleLogin}
>
<b className="text-md">{t("Get Started")}</b>
<b className="text-md">{userToken ? t("Dashboard") : t("Get Started")}</b>
<div className="w-8 h-8 bg-white/20 flex items-center justify-center rounded-full">
<ArrowRightIcon
size={16}
@@ -85,7 +97,7 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
onPress={handleLogin}
size="sm"
>
<b className="text-md">{t("Get Started")}</b>
<b className="text-md">{userToken ? t("Dashboard") : t("Get Started")}</b>
</Button>
</div>
</NavbarContent>
@@ -97,7 +109,7 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
radius="full"
onPress={handleLogin}
>
<b className="text-md">{t("Get Started")}</b>
<b className="text-md">{userToken ? t("Dashboard") : t("Get Started")}</b>
<div className="w-8 h-8 bg-white/20 flex items-center justify-center rounded-full">
<ArrowRightIcon
size={16}
+2 -2
View File
@@ -68,7 +68,7 @@ const TemuDemo: React.FC = () => {
</p>
</div>
<div className="flex items-center justify-between">
<span className="text-xs font-bold text-orange-600">$9.99</span>
<span className="text-xs font-bold text-orange-600">¥9.99</span>
<div className="flex items-center gap-1">
<Star className="w-2 h-2 text-yellow-400 fill-current" />
<span className="text-xs text-gray-500">4.8</span>
@@ -87,7 +87,7 @@ const TemuDemo: React.FC = () => {
</p>
</div>
<div className="flex items-center justify-between">
<span className="text-xs font-bold text-orange-600">$14.99</span>
<span className="text-xs font-bold text-orange-600">¥14.99</span>
<div className="flex items-center gap-1">
<Star className="w-2 h-2 text-yellow-400 fill-current" />
<span className="text-xs text-gray-500">4.9</span>
@@ -15,6 +15,8 @@ import { NavigationItem } from "@/shared/components/Navigation";
import { ServerConfig } from "@/shared/components/marketplace/ServerConfig";
interface DetailProps {
can_invoke?: boolean;
visitor?: boolean;
product: ServiceData;
breadcrumbs?: {
link: string;
@@ -29,6 +31,8 @@ interface DetailProps {
}
export const Detail: React.FC<DetailProps> = ({
can_invoke,
visitor,
product,
breadcrumbs,
url,
@@ -163,6 +167,8 @@ export const Detail: React.FC<DetailProps> = ({
<div className="p-6">
{/* Code Snippet */}
<ServerConfig
can_invoke={can_invoke}
visitor={visitor}
mcpName={mcpName}
url={url}
className="w-full max-w-2xl"
+32 -5
View File
@@ -23,11 +23,18 @@ import { Footer } from "./Footer";
import { Navigation } from "./Navigation";
import { NavigationItem } from "@/shared/components/Navigation";
import { Faq } from "@/components/marketplace/Faq";
import { TagFilter } from "@/shared/components/marketplace/TagFilter";
import { ThemeType } from "@/shared/types/system";
interface HomeProps {
// 状态
searchQuery: string;
services: ServiceData[];
isTagBarDisplay: boolean;
availableTags: string[];
selectedTag: string;
handleTagChange: (tag: string) => void;
currentTheme: ThemeType;
currentPage: number;
total: number;
pageSize: number;
@@ -49,6 +56,11 @@ interface HomeProps {
export const Home: React.FC<HomeProps> = ({
searchQuery,
services,
isTagBarDisplay,
availableTags,
selectedTag,
handleTagChange,
currentTheme,
currentPage,
total,
pageSize,
@@ -95,9 +107,9 @@ export const Home: React.FC<HomeProps> = ({
<h1 className="text-4xl lg:text-6xl font-bold mb-6 text-white">
{t(
platformConfig.headline ||
platformConfig.name ||
_DefaultPlatformConfig.headline ||
""
platformConfig.name ||
_DefaultPlatformConfig.headline ||
""
)}
</h1>
@@ -105,8 +117,8 @@ export const Home: React.FC<HomeProps> = ({
<p className="text-xl text-white/90 mb-8 max-w-2xl mx-auto">
{t(
platformConfig.subheadline ||
_DefaultPlatformConfig.subheadline ||
""
_DefaultPlatformConfig.subheadline ||
""
)}
</p>
@@ -139,6 +151,21 @@ export const Home: React.FC<HomeProps> = ({
</div>
</div>
{/* filter section */}
{
isTagBarDisplay && (
<div className="pt-12">
<TagFilter
theme={currentTheme}
tags={availableTags}
selectedTag={selectedTag}
onTagChange={handleTagChange}
maxWidthPercent={80}
/>
</div>
)
}
{/* Products Section */}
<div className="mx-auto px-6 py-12 max-w-7xl">
{/* Section Header */}
@@ -1,6 +1,6 @@
"use client";
import React from "react";
import React, { useEffect } from "react";
import { Button } from "@nextui-org/react";
import { useTranslation } from "react-i18next";
import Link from "next/link";
@@ -16,6 +16,7 @@ import { DynamicLogo } from "@/shared/components/DynamicLogo";
import { useAuth } from "@/shared/lib/useAuth";
import { NavigationItem } from "@/shared/components/Navigation";
import { ArrowRightIcon } from "lucide-react";
import { useSharedStore } from "@/shared/store/share";
interface NavigationProps {
items?: NavigationItem[];
@@ -26,6 +27,13 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
const { handleLogin } = useAuth();
const [isMenuOpen, setIsMenuOpen] = useState(false);
const [userToken, setUserToken] = useState<string | null>(null);
useEffect(() => {
const userToken = useSharedStore?.getState?.().user_token
setUserToken(userToken);
}, []);
return (
<>
{/* Temu Style Navigation */}
@@ -64,15 +72,21 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
</NavbarContent>
<NavbarContent justify="end" className="items-center gap-2 sm:gap-4">
<div className="hidden sm:flex items-center gap-2">
<Button onPress={handleLogin} variant="light">
<b className="text-md"> {t("Sign In")}</b>
</Button>
{
!userToken && (
<>
<Button onPress={handleLogin} variant="light">
<b className="text-md"> {t("Sign In")}</b>
</Button>
</>
)
}
<Button
className="bg-orange-500 hover:bg-orange-600 text-white font-semibold px-6 h-[40px] transition-all duration-200"
radius="md"
onPress={handleLogin}
>
{t("Get Started")}
{userToken ? t("Dashboard") : t("Get Started")}
</Button>
</div>
<div className="sm:hidden">
@@ -81,7 +95,7 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
onPress={handleLogin}
size="sm"
>
{t("Sign In")}
{userToken ? t("Dashboard") : t("Sign In")}
</Button>
</div>
</NavbarContent>
@@ -100,7 +114,7 @@ export const Navigation: React.FC<NavigationProps> = ({ items }) => {
radius="md"
onPress={handleLogin}
>
{t("Sign In")}
{userToken ? t("Dashboard") : t("Sign In")}
</Button>
</NavbarMenuItem>
</NavbarMenu>
@@ -46,7 +46,7 @@ export const AdminRechargeModal: React.FC<AdminRechargeModalProps> = ({
}
if (numAmount < 1) {
setError(t("Minimum recharge amount is $1"));
setError(t("Minimum recharge amount is ¥1"));
return;
}
@@ -102,7 +102,7 @@ export const AdminRechargeModal: React.FC<AdminRechargeModalProps> = ({
onChange={handleAmountChange}
startContent={
<div className="pointer-events-none flex items-center">
<span className="text-default-400 text-small">$</span>
<span className="text-default-400 text-small">¥</span>
</div>
}
isInvalid={!!error}
@@ -0,0 +1,48 @@
"use client";
import React from "react";
import { Button} from "@nextui-org/react";
import { ChevronLeftIcon } from "lucide-react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { withComponentInjection } from "@/shared/hooks/useComponentInjection";
import AccountBalanceTable from "../dashboard/AccountBalanceTable";
interface UserBalanceDetailProps {
userId: string;
userEmail: string;
onCancel: () => void;
}
const BaseUserBalanceDetail: React.FC<UserBalanceDetailProps> = ({
userId,
userEmail,
onCancel,
}) => {
const { t } = useTranslation();
return (
<div className="w-full py-8 h-full flex flex-col">
{/* page title */}
<div className="flex items-center justify-between mb-6 px-8">
<div className="flex items-center gap-3">
<Button isIconOnly onPress={onCancel} variant="flat" size="sm">
<ChevronLeftIcon className="w-5 h-5" />
</Button>
<h1 className="text-2xl font-bold">
{t("Account Balance")}
</h1>
</div>
<div className="flex items-center gap-2">
<span>{t("Email")}: </span>{userEmail || '-'}
</div>
</div>
<div className="px-8">
<AccountBalanceTable userId={userId} source="admin" />
</div>
</div>
);
};
export const UserBalanceDetail = withComponentInjection(
"components/user-management/UserBalanceDetail",
BaseUserBalanceDetail
);
@@ -1,12 +1,17 @@
"use client";
import React, { useState, useCallback } from "react";
import React, { useState, useCallback, useRef, useEffect } from "react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { User } from "@/types/user";
import { UserTable } from "./UserTable";
import { DeleteConfirmModal } from "@/shared/components/modal/DeleteConfirmModal";
import DashboardDemoContent from "@/shared/components/DashboardDemoContent";
import { useUserManagement } from "@/hooks/useUserManagement";
import { UserBalanceDetail } from "./UserBalanceDetail";
import { Input } from "@nextui-org/react";
import { Search } from "lucide-react";
type ViewMode = "list" | "detail";
const UserManagement: React.FC = () => {
const { t } = useTranslation();
@@ -14,11 +19,13 @@ const UserManagement: React.FC = () => {
// use custom hook to manage user data
const {
users,
fetchUsers,
loading,
pagination,
handleDeleteUser,
setPage,
handleRechargeUser,
setSearch,
} = useUserManagement();
// Modal states
@@ -27,6 +34,24 @@ const UserManagement: React.FC = () => {
user: null as User | null,
});
const [viewMode, setViewMode] = useState<ViewMode>('list');
const [selectedUserId, setSelectedUserId] = useState<string | null>(null);
const [selectedUserEmail, setSelectedUserEmail] = useState<string | null>(null);
// 搜索相关状态
const [searchValue, setSearchValue] = useState('');
const searchTimerRef = useRef<NodeJS.Timeout | null>(null);
// 清理定时器
useEffect(() => {
return () => {
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
};
}, []);
const handleDeleteUserClick = useCallback((user: User) => {
setDeleteModal({
isOpen: true,
@@ -34,6 +59,18 @@ const UserManagement: React.FC = () => {
});
}, []);
const handleViewUserBalanceDetail = useCallback((user: User) => {
setSelectedUserId(user.id);
setSelectedUserEmail(user.email);
setViewMode('detail');
}, []);
const handleCloseUserBalanceDetail = useCallback(() => {
setSelectedUserId(null);
setSelectedUserEmail(null);
setViewMode('list');
}, []);
const handleConfirmDelete = useCallback(async () => {
if (deleteModal.user) {
try {
@@ -60,6 +97,31 @@ const UserManagement: React.FC = () => {
[handleRechargeUser]
);
// 处理搜索 - 使用防抖
const handleSearchChange = useCallback((value: string) => {
setSearchValue(value);
// 清除之前的定时器
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
// 设置新的定时器,500ms 后触发搜索
searchTimerRef.current = setTimeout(() => {
setSearch(value);
}, 500);
}, [setSearch]);
if (viewMode === "detail" ) {
return (
<UserBalanceDetail
userId={selectedUserId || ''}
userEmail={selectedUserEmail || ''}
onCancel={handleCloseUserBalanceDetail}
/>
);
}
return (
<DashboardDemoContent
title={t("User")}
@@ -68,10 +130,31 @@ const UserManagement: React.FC = () => {
)}
>
<div className="space-y-6 w-full">
{/* 搜索框 - 右上角 */}
<div className="flex justify-end items-center gap-4">
<Input
isClearable
className="w-full sm:max-w-[400px]"
placeholder={t('Search by email')}
startContent={<Search className="w-4 h-4" />}
value={searchValue}
onClear={() => {
setSearchValue('');
if (searchTimerRef.current) {
clearTimeout(searchTimerRef.current);
}
setSearch('');
}}
onValueChange={handleSearchChange}
/>
</div>
<UserTable
users={users}
fetchUsers={fetchUsers}
loading={loading}
onDelete={handleDeleteUserClick}
viewUserBalanceDetail={handleViewUserBalanceDetail}
onRecharge={handleRecharge}
pagination={pagination}
onPageChange={setPage}
@@ -79,6 +162,7 @@ const UserManagement: React.FC = () => {
</div>
<DeleteConfirmModal
user={deleteModal.user}
isOpen={deleteModal.isOpen}
onClose={handleCloseDeleteModal}
onConfirm={handleConfirmDelete}
@@ -1,6 +1,6 @@
"use client";
import React from "react";
import React, { useCallback, useEffect, useState } from "react";
import {
Table,
TableHeader,
@@ -12,16 +12,24 @@ import {
Pagination,
Tooltip,
Spinner,
Select,
SelectItem,
Link
} from "@nextui-org/react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { User } from "@/types/user";
import { Trash2, CreditCard } from "lucide-react";
import { Trash2, CreditCard, Calendar, HelpCircle } from "lucide-react";
import { AdminRechargeModal } from "@/components/user-management/AdminRechargeModal";
import { fetchSimpleResourceGroups, updateUserResourceGroup } from "@/api/resourceGroup.api";
import toast from "react-hot-toast";
interface UserTableProps {
users: User[];
fetchUsers: () => void;
loading?: boolean;
onDelete: (user: User) => void;
viewUserBalanceDetail: (userId: User) => void;
onRecharge: (id: string, amount: number) => Promise<boolean>;
pagination: {
page: number;
@@ -33,7 +41,9 @@ interface UserTableProps {
export const UserTable: React.FC<UserTableProps> = ({
users,
fetchUsers,
loading = false,
viewUserBalanceDetail,
onDelete,
onRecharge,
pagination,
@@ -51,6 +61,9 @@ export const UserTable: React.FC<UserTableProps> = ({
const [isRechargeModalOpen, setIsRechargeModalOpen] = React.useState(false);
const [selectedUser, setSelectedUser] = React.useState<User | null>(null);
const [simpleResourceGroups, setSimpleResourceGroups] = useState<{ id: string, name: string }[]>([]);
const [groupsLoading, setGroupsLoading] = useState(true);
const handleDelete = React.useCallback(
(user: User) => {
onDelete(user);
@@ -68,7 +81,45 @@ export const UserTable: React.FC<UserTableProps> = ({
setSelectedUser(null);
}, []);
if (loading && users.length === 0) {
// 加载简易资源组列表
const loadSimpleResourceGroups = useCallback(async () => {
setGroupsLoading(true);
try {
const data = await fetchSimpleResourceGroups();
setSimpleResourceGroups(data);
} catch (error) {
console.error("Failed to load simple resource groups:", error);
} finally {
setGroupsLoading(false);
}
}, []);
const changeResourceGroup = async (user: User, resourceGroupId: string) => {
const success = await updateUserResourceGroup(user.id, resourceGroupId);
if (success) {
toast.success(t("Resource group updated successfully"));
fetchUsers();
}
}
const formatDate = (dateString: string) => {
return (
<div className="flex items-center gap-1">
<Calendar className="w-3 h-3 text-gray-500" />
<span className="text-sm text-gray-600">
{new Date(dateString).toLocaleString()}
</span>
</div>
);
};
// 初始加载简易资源组列表
useEffect(() => {
loadSimpleResourceGroups();
}, [loadSimpleResourceGroups]);
// 等待用户数据或资源组数据加载
if ((loading && users.length === 0) || groupsLoading) {
return (
<div className="flex justify-center items-center h-64">
<Spinner size="lg" />
@@ -87,9 +138,22 @@ export const UserTable: React.FC<UserTableProps> = ({
>
<TableHeader>
<TableColumn>{t("Email")}</TableColumn>
<TableColumn>{t("Register Date")}</TableColumn>
<TableColumn>{t("Balance")}</TableColumn>
<TableColumn>{t("Actions")}</TableColumn>
<TableColumn width={250}>{t("Resource Group")}</TableColumn>
<TableColumn width={200}>
<div className="flex items-center gap-1">
<span>{t("Register Date")}</span>
<Tooltip
content={t("Current display time is UTC time")}
color="default"
closeDelay={0}
disableAnimation
>
<HelpCircle className="w-4 h-4" />
</Tooltip>
</div>
</TableColumn>
<TableColumn width={120}>{t("Balance")}</TableColumn>
<TableColumn width={100}>{t("Actions")}</TableColumn>
</TableHeader>
<TableBody
items={items}
@@ -102,8 +166,38 @@ export const UserTable: React.FC<UserTableProps> = ({
<TableCell>
<span className="text-sm">{user.email}</span>
</TableCell>
<TableCell>{user.created_at || "-"}</TableCell>
<TableCell>{user.balance.toFixed(2) || "-"}</TableCell>
<TableCell>
<Select
items={simpleResourceGroups}
placeholder={t("Select resource group")}
selectedKeys={user.group_id ? [user.group_id] : []}
onSelectionChange={(keys) => {
const selectedKey = Array.from(keys)[0] as string;
if (selectedKey) {
changeResourceGroup(user, selectedKey);
}
}}
size="sm"
className="max-w-[250px]"
aria-label={t("Select resource group")}
>
{(group) => (
<SelectItem key={group.id} value={group.id}>
{group.name}
</SelectItem>
)}
</Select>
</TableCell>
<TableCell>{formatDate(user.created_at)}</TableCell>
<TableCell>
<Link
href="#"
className="text-xs cursor-pointer"
onPress={() => viewUserBalanceDetail(user)}
>
{user.balance.toFixed(2) || "-"}
</Link>
</TableCell>
<TableCell>
<div className="relative flex items-center gap-2">
+43 -1
View File
@@ -3,8 +3,13 @@
import { useState, useCallback } from "react";
import { MCPService } from "@/shared/types/mcp-service";
import {
GetMCPResourceGroupsParams,
getMCPServiceDetail,
parseOpenAPIDocumentForUpdate as parseOpenAPIDocumentForUpdateAPI,
fetchMCPResourceGroups as fetchMCPResourceGroupsAPI,
deleteResourceGroup as deleteResourceGroupAPI,
addServiceToGroup as addServiceToGroupAPI,
fetchUnboundResourceGroups as fetchUnboundResourceGroupsAPI,
} from "@/services/mcpService";
export const useMCPServiceDetail = () => {
@@ -81,7 +86,7 @@ export const useMCPServiceDetail = () => {
} else {
throw new Error(
response.error_message ||
"Failed to parse OpenAPI document for update"
"Failed to parse OpenAPI document for update"
);
}
} catch (err) {
@@ -98,6 +103,40 @@ export const useMCPServiceDetail = () => {
[]
);
/**
* 获取资源组列表
* @param page 页码
* @param page_size 每页条数
* @param keyword 关键词
* @returns 资源组列表
*/
const fetchMCPResourceGroups = useCallback(async (id: string, page: number, page_size: number, keyword: string): Promise<GetMCPResourceGroupsParams> => {
const response = await fetchMCPResourceGroupsAPI(id, page, page_size, keyword);
return response;
}, []);
/**
* 删除资源组
* @param serviceById 服务ID
* @param resourceGroupId 资源组ID
* @returns 是否删除成功
*/
const deleteResourceGroup = useCallback(async (serviceById: string, resourceGroupId: string[]): Promise<boolean> => {
const response = await deleteResourceGroupAPI(serviceById, resourceGroupId);
return response;
}, []);
/**
* 添加服务到资源组
* @param groupId 资源组ID
* @param serverIds 服务ID列表
* @returns 是否添加成功
*/
const addServiceToGroup = useCallback(async (groupId: string, serverIds: string[]): Promise<boolean> => {
const response = await addServiceToGroupAPI(groupId, serverIds);
return response;
}, []);
return {
serviceDetail,
detailLoading,
@@ -107,5 +146,8 @@ export const useMCPServiceDetail = () => {
getServiceDetail,
clearServiceDetail,
parseOpenAPIDocumentForUpdate,
fetchMCPResourceGroups,
deleteResourceGroup,
addServiceToGroup
};
};
+9 -9
View File
@@ -78,15 +78,15 @@ export const useMCPServicesList = () => {
// load servers list when component mount
useEffect(() => {
loadServices(1);
loadServices(1, searchTerm, statusFilter);
}, []); // only execute once when component mount
// pagination
const handlePageChange = useCallback(
(page: number) => {
loadServices(page);
loadServices(page, searchTerm, statusFilter);
},
[loadServices]
[loadServices, searchTerm, statusFilter]
);
// search
@@ -156,7 +156,7 @@ export const useMCPServicesList = () => {
try {
const result = await saveMCPService(data);
if (result) await loadServices(1);
if (result) await loadServices(1, searchTerm, statusFilter);
return result;
} catch (err) {
const errorMessage =
@@ -167,7 +167,7 @@ export const useMCPServicesList = () => {
setLoading(false);
}
},
[loadServices]
[loadServices, searchTerm, statusFilter]
);
// update server
@@ -180,7 +180,7 @@ export const useMCPServicesList = () => {
const formDataWithId = { ...data, id: serviceId };
const result = await saveMCPService(formDataWithId);
if (result) await loadServices(pagination.page);
if (result) await loadServices(pagination.page, searchTerm, statusFilter);
return result;
} catch (err) {
const errorMessage =
@@ -191,7 +191,7 @@ export const useMCPServicesList = () => {
setLoading(false);
}
},
[loadServices, pagination.page]
[loadServices, pagination.page, searchTerm, statusFilter]
);
// delete server
@@ -205,7 +205,7 @@ export const useMCPServicesList = () => {
if (result) {
// reload servers list
await loadServices();
await loadServices(pagination.page, searchTerm, statusFilter);
}
} catch (err) {
const errorMessage =
@@ -216,7 +216,7 @@ export const useMCPServicesList = () => {
setLoading(false);
}
},
[loadServices]
[loadServices, pagination.page, searchTerm, statusFilter]
);
// toggle server status
@@ -4,6 +4,7 @@ import {
StripeConfig,
AlipayConfig,
WechatConfig,
EpayChannelConfig,
PaymentChannelTestResult,
} from "@/types/payment";
import { paymentChannelService } from "@/services/paymentChannelService";
@@ -29,6 +30,14 @@ export const usePaymentChannelManagement = () => {
mch_id: "",
is_enabled: false,
});
const [epayConfig, setEpayConfig] = useState<EpayChannelConfig>({
gateway: "",
pid: "",
key: "",
pay_type: "",
exchange_rate: 1,
is_enabled: false,
});
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
const [testResult, setTestResult] = useState<PaymentChannelTestResult | null>(
@@ -37,6 +46,7 @@ export const usePaymentChannelManagement = () => {
const [isWechatSaving, setIsWechatSaving] = useState(false);
const [isStripeSaving, setIsStripeSaving] = useState(false);
const [isAlipaySaving, setIsAlipaySaving] = useState(false);
const [isEpaySaving, setIsEpaySaving] = useState(false);
// get payment channel list
const fetchChannels = useCallback(async () => {
@@ -69,6 +79,16 @@ export const usePaymentChannelManagement = () => {
} as AlipayConfig);
}
const epayChannel = response.data.find(
(channel) => channel.id === "epay"
);
if (epayChannel) {
setEpayConfig({
...epayChannel.config,
is_enabled: epayChannel.is_enabled,
} as EpayChannelConfig);
}
const wechatChannel = response.data.find(
(channel) => channel.id === "wechat"
);
@@ -184,6 +204,28 @@ export const usePaymentChannelManagement = () => {
}
}, []);
// save epay config
const saveEpayConfig = useCallback(async (config: EpayChannelConfig) => {
setIsEpaySaving(true);
setError(null);
try {
const result = await paymentChannelService.saveEpayConfig(config);
if (result) {
setEpayConfig(config);
return true;
}
return false;
} catch (err) {
const errorMessage =
err instanceof Error ? err.message : "Failed to save epay config";
setError(errorMessage);
return false;
} finally {
setIsEpaySaving(false);
}
}, []);
// save stripe config
const saveStripeConfig = useCallback(async (config: StripeConfig) => {
setIsStripeSaving(true);
@@ -316,6 +358,8 @@ export const usePaymentChannelManagement = () => {
stripeConfig,
alipayConfig,
wechatConfig,
epayConfig,
isEpaySaving,
isWechatSaving,
isStripeSaving,
isAlipaySaving,
@@ -326,6 +370,7 @@ export const usePaymentChannelManagement = () => {
saveStripeConfig,
saveAlipayConfig,
saveWechatConfig,
saveEpayConfig,
testStripeConnection,
testAlipayConnection,
testWechatConnection,
+269
View File
@@ -0,0 +1,269 @@
import { useState, useEffect, useCallback, useRef } from "react";
import { ResourceGroup } from "@/components/resource-group/GroupList";
import { GroupService } from "@/components/resource-group/GroupServiceTable";
import {
fetchResourceGroups,
fetchGroupServices,
createResourceGroup,
updateResourceGroup,
deleteResourceGroup,
removeServiceFromGroup,
fetchSimpleResourceGroups,
addServiceToGroup,
} from "@/api/resourceGroup.api";
import { toast } from "react-hot-toast";
import { useTranslation } from "@/shared/lib/useTranslation";
export const useResourceGroups = () => {
const [groups, setGroups] = useState<ResourceGroup[]>([]);
const [groupServices, setGroupServices] = useState<GroupService[]>([]);
const [loading, setLoading] = useState(false);
const [servicesLoading, setServicesLoading] = useState(false);
const [hasMore, setHasMore] = useState(true);
const [shouldScrollToTop, setShouldScrollToTop] = useState(false);
const { t } = useTranslation();
const [simpleResourceGroups, setSimpleResourceGroups] = useState<{ id: string, name: string }[]>([]);
// 菜单列表(GroupList)的分页和搜索状态
const groupListParams = useRef({
page: 1,
pageSize: 10,
keyword: ""
});
// 服务列表(GroupServiceTable)的分页状态
const [serviceTablePagination, setServiceTablePagination] = useState({
page: 1,
pageSize: 10,
total: 0,
});
const serviceTableParams = useRef({
pageSize: 10,
keyword: ""
});
// 加载资源组列表(支持初始加载和追加加载)
const loadGroups = useCallback(async (page: number, page_size: number, search_keyword: string, append: boolean = false) => {
setLoading(true);
try {
groupListParams.current = {
page,
pageSize: page_size,
keyword: search_keyword
};
const response = await fetchResourceGroups(page, page_size, search_keyword);
const mappedData = response.data.map((item) => ({
id: item.id,
name: item.name,
description: item.description,
isDefault: item.is_default,
serviceCount: item.service_count,
createdAt: item.create_at,
}));
if (append) {
// 追加模式:将新数据追加到现有数据后面
setGroups((prev) => {
const newGroups = [...prev, ...mappedData];
setHasMore(newGroups.length < response.total);
return newGroups;
});
} else {
// 重置模式:替换所有数据
setGroups(mappedData);
setHasMore(mappedData.length < response.total);
}
} finally {
setLoading(false);
}
}, []);
// 加载更多资源组(追加数据)
const loadMoreGroups = useCallback(async () => {
if (loading || !hasMore) return;
const { page, pageSize, keyword } = groupListParams.current;
await loadGroups(page + 1, pageSize, keyword, true);
}, [loading, hasMore, loadGroups]);
// 加载指定组的服务列表(支持分页)
const loadGroupServices = useCallback(async (
groupId: string,
page: number = 1,
pageSize: number = 10,
keyword: string = ""
) => {
setServicesLoading(true);
try {
const response = await fetchGroupServices(groupId, page, pageSize, keyword);
setGroupServices(response.data);
setServiceTablePagination({
page: response.page,
pageSize: response.page_size,
total: response.total,
});
// 保存当前的 pageSize 和 keyword 到 ref
serviceTableParams.current = {
pageSize: response.page_size,
keyword
};
} catch (error) {
console.error(t("Failed to load group services"), error);
} finally {
setServicesLoading(false);
}
}, []);
// 创建资源组
const handleCreateGroup = useCallback(
async (name: string, isDefault: boolean): Promise<string> => {
try {
const result = await createResourceGroup(name, isDefault);
if (!result.success) {
return "";
}
// 创建成功后重新加载列表(重置到第1页)
toast.success(t("Resource group created successfully"));
const { pageSize, keyword } = groupListParams.current;
await loadGroups(1, pageSize, keyword, false);
// 触发滚动到顶部
setShouldScrollToTop(true);
return result.id;
} catch {
return "";
}
},
[loadGroups]
);
// 更新资源组
const handleUpdateGroup = useCallback(
async (groupId: string, name: string, isDefault: boolean): Promise<boolean> => {
try {
const result = await updateResourceGroup(groupId, name, isDefault);
if (!result) {
return false;
}
// 更新成功后重新加载列表(重置到第1页)
const { pageSize, keyword } = groupListParams.current;
await loadGroups(1, pageSize, keyword, false);
toast.success(t("Resource group updated successfully"));
return true;
} catch {
return false;
}
},
[loadGroups]
);
// 删除资源组
const handleDeleteGroup = useCallback(
async (groupId: string, transferToGroupId: string): Promise<boolean> => {
try {
const result = await deleteResourceGroup(groupId, transferToGroupId);
if (!result) {
return false;
}
// 删除成功后重新加载列表(重置到第1页)
const { pageSize, keyword } = groupListParams.current;
await loadGroups(1, pageSize, keyword, false);
toast.success(t("Resource group deleted successfully"));
return true;
} catch {
return false;
}
},
[loadGroups]
);
// 服务列表翻页
const handleServicePageChange = useCallback(
async (groupId: string, page: number) => {
await loadGroupServices(
groupId,
page,
serviceTableParams.current.pageSize,
serviceTableParams.current.keyword
);
},
[loadGroupServices]
);
// 添加服务到组
const handleAddServiceToGroup = useCallback(
async (groupId: string, serviceIds: string[]): Promise<boolean> => {
try {
const success = await addServiceToGroup(groupId, serviceIds);
if (!success) {
return false;
}
toast.success(t("Services added successfully"));
return true;
} catch {
return false;
}
},
[loadGroupServices, serviceTablePagination.page]
);
// 从组中移除服务
const handleRemoveService = useCallback(
async (groupId: string, serviceId: string): Promise<boolean> => {
try {
const success = await removeServiceFromGroup(groupId, [serviceId]);
if (!success) {
return false;
}
toast.success(t("Service removed successfully"));
return true;
} catch {
return false;
}
},
[loadGroupServices, serviceTablePagination.page]
);
// 加载简单资源组列表(用于下拉选择)
const loadSimpleResourceGroups = useCallback(async () => {
try {
const data = await fetchSimpleResourceGroups();
setSimpleResourceGroups(data);
return data
} catch (error) {
console.error("Failed to load simple resource groups:", error);
return []
}
}, []);
// 初始加载
useEffect(() => {
loadGroups(1, 10, "");
}, [loadGroups]);
return {
groups,
simpleResourceGroups,
groupServices,
serviceTablePagination,
serviceTableParams,
loading,
servicesLoading,
hasMore,
shouldScrollToTop,
setShouldScrollToTop,
loadGroups,
loadMoreGroups,
loadGroupServices,
loadSimpleResourceGroups,
handleServicePageChange,
handleAddServiceToGroup,
handleCreateGroup,
handleUpdateGroup,
handleDeleteGroup,
handleRemoveService,
};
};
+23 -1
View File
@@ -14,6 +14,9 @@ export const useRevenueManagement = () => {
const [error, setError] = useState<string | null>(null);
const [searchQuery, setSearchQuery] = useState("");
const [statusFilter, setStatusFilter] = useState("all");
const [paymentTypeFilter, setPaymentTypeFilter] = useState("all"); // 付款方式筛选
const [sortBy, setSortBy] = useState<string | undefined>(undefined); // 排序字段
const [sortOrder, setSortOrder] = useState<'asc' | 'desc' | undefined>(undefined); // 排序顺序
const [pagination, setPagination] = useState<PaginationInfo>({
page: 1,
pageSize: 10,
@@ -30,6 +33,9 @@ export const useRevenueManagement = () => {
page_size: pagination.pageSize,
search: searchQuery,
status: statusFilter === "all" ? undefined : statusFilter,
payment_type: paymentTypeFilter === "all" ? undefined : paymentTypeFilter,
sort_by: sortBy,
sort_order: sortOrder,
});
if (response.success && response.data) {
@@ -52,7 +58,7 @@ export const useRevenueManagement = () => {
} finally {
setLoading(false);
}
}, [pagination.page, pagination.pageSize, searchQuery, statusFilter]);
}, [pagination.page, pagination.pageSize, searchQuery, statusFilter, paymentTypeFilter, sortBy, sortOrder]);
const setSearch = useCallback((search: string) => {
setSearchQuery(search);
@@ -72,6 +78,17 @@ export const useRevenueManagement = () => {
setPagination((prev) => ({ ...prev, pageSize, page: 1 }));
}, []);
const setPaymentType = useCallback((paymentType: string) => {
setPaymentTypeFilter(paymentType);
setPagination((prev) => ({ ...prev, page: 1 })); // reset to first page
}, []);
const setSort = useCallback((field: string | undefined, order: 'asc' | 'desc' | undefined) => {
setSortBy(field);
setSortOrder(order);
setPagination((prev) => ({ ...prev, page: 1 })); // reset to first page
}, []);
// initial load and pagination change
useEffect(() => {
fetchRevenues();
@@ -83,10 +100,15 @@ export const useRevenueManagement = () => {
error,
searchQuery,
statusFilter,
paymentTypeFilter,
sortBy,
sortOrder,
pagination,
fetchRevenues,
setSearch,
setStatus,
setPaymentType,
setSort,
setPage,
setPageSize,
};
@@ -18,7 +18,7 @@ export const useSystemConfigManagement = () => {
const [platformConfig, setPlatformConfig] = useState<PlatformConfig>({
name: "",
logo: "",
currency: "USD",
currency: "CNY",
});
const [platformLoading, setPlatformLoading] = useState(false);
const [platformError, setPlatformError] = useState<string | null>(null);
+26 -1
View File
@@ -17,6 +17,7 @@ interface FetchServicesParams {
page?: number;
page_size?: number;
keyword?: string;
tag?: string;
}
interface ServicesResponseData {
services: ServiceData[];
@@ -42,6 +43,7 @@ export async function fetchServices(
page_size: _BasePageDetail.page_size,
page: _BasePageDetail.page,
keyword: "",
tag: "",
}
): Promise<ServicesResponse> {
// Build query parameters
@@ -50,7 +52,7 @@ export async function fetchServices(
if (params.page_size)
queryParams.append("page_size", params.page_size.toString());
if (params.keyword) queryParams.append("keyword", params.keyword);
if (params.tag) queryParams.append("tag", params.tag);
const response = await fetchAPI<BaseMCPService[]>(
`/api/web/mcp_services${queryParams.toString() ? "?" + queryParams.toString() : ""}`
);
@@ -99,3 +101,26 @@ export async function fetchServiceById(
return convertMcpService([response.data])[0];
}
/**
* Fetch tags list
*/
export async function fetchTagsList(
): Promise<string[] | []> {
const response = await fetchAPI<string[]>(
`/api/web/mcp_tags`,
{
method: "GET",
headers: {
"Content-Type": "application/json",
},
}
);
if (!response.success) {
return [];
}
return response.data || []
}
+107 -5
View File
@@ -1,6 +1,7 @@
import { ApiArrayResponse, ApiObjectResponse } from "@/shared/types";
import { fetchAdminAPI } from "@/rpc/admin-api";
import {
MCPResourceGroupResponse,
MCPService,
MCPServiceFormData,
OpenAPIParseResponse,
@@ -10,15 +11,15 @@ import i18n from "@/shared/lib/i18n";
// MCP server list API response interface
export interface MCPServiceListApiResponse
extends ApiArrayResponse<MCPService> {}
extends ApiArrayResponse<MCPService> { }
// MCP server detail API response interface
export interface MCPServiceDetailApiResponse
extends ApiObjectResponse<MCPService> {}
extends ApiObjectResponse<MCPService> { }
// OpenAPI parse API response interface
export interface OpenAPIParseApiResponse
extends ApiObjectResponse<OpenAPIParseResponse> {}
extends ApiObjectResponse<OpenAPIParseResponse> { }
// get MCP server list params interface
export interface GetMCPServiceListParams {
@@ -28,6 +29,13 @@ export interface GetMCPServiceListParams {
status?: string;
}
export interface GetMCPResourceGroupsParams {
data: MCPResourceGroupResponse[];
total: number;
page: number;
page_size: number;
}
// get MCP server detail params interface
export interface GetMCPServiceDetailParams {
id: string;
@@ -55,8 +63,8 @@ export const getMCPServiceList = async (
const queryParams = new URLSearchParams({
page: params.page.toString(),
page_size: params.page_size.toString(),
...(params.search && { search: params.search }),
...(params.status && { status: params.status }),
...(params.search && { keyword: params.search }),
...(params.status && { filter_status: params.status }),
});
const response = await fetchAdminAPI<MCPService[]>(
@@ -217,3 +225,97 @@ export const parseOpenAPIDocumentForUpdate = async (
return response as ApiObjectResponse<MCPService>;
};
/**
* 获取资源组列表
*/
export const fetchMCPResourceGroups = async (id: string, page: number, page_size: number, keyword: string): Promise<GetMCPResourceGroupsParams> => {
try {
const response = await fetchAdminAPI<MCPResourceGroupResponse[]>(`/api/mcp/service/resource_group/list?id=${id}&page=${page}&page_size=${page_size}&keyword=${keyword}`);
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to load resource groups"));
return {
data: [],
total: 0,
page,
page_size,
};
}
return {
data: response.data || [],
total: response.page?.total || 0,
page: response.page?.page || page,
page_size: response.page?.page_size || page_size,
};
} catch (error) {
console.error("Error fetching auth keys:", error);
return {
data: [],
total: 0,
page,
page_size,
};
}
};
/**
* 获取未加入的资源组
*/
export const fetchUnboundResourceGroups = async (id: string): Promise<{ id: string, name: string }[]> => {
try {
const response = await fetchAdminAPI<{ id: string, name: string }[]>(`/api/mcp/service/resource_group/list/unbind?id=${id}`);
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to load resource groups"));
return [];
}
return response.data || []
} catch (error) {
console.error("Error fetching auth keys:", error);
return []
}
};
/**
* 删除资源组
*/
export const deleteResourceGroup = async (serviceById: string, resourceGroupId: string[]): Promise<boolean> => {
try {
const response = await fetchAdminAPI<boolean>(`/api/mcp/service/resource_group?id=${serviceById}`, {
method: "DELETE",
body: { resource_groups: resourceGroupId } as unknown as BodyInit,
});
if (!response.success) {
toast.error(response?.error_message || i18n.t("Failed to delete resource group"));
return false;
}
return true;
} catch (error) {
console.error("Error fetching auth keys:", error);
return false
}
};
/**
* 添加服务到资源组
*/
export const addServiceToGroup = async (
groupId: string,
services: string[]
): Promise<boolean> => {
try {
const response = await fetchAdminAPI<boolean>(`/api/mcp/service/resource_group?id=${groupId}`, {
method: "PUT",
body: { resource_groups: services } as unknown as BodyInit,
});
if (!response.success) {
toast.error(response?.error_message || i18n.t("Failed to add service to group"));
return false;
}
return true;
} catch (error) {
console.error("Error fetching auth keys:", error);
return false
}
};
@@ -2,6 +2,7 @@ import {
StripeConfig,
AlipayConfig,
WechatConfig,
EpayChannelConfig,
PaymentChannelApiItem,
PaymentChannelListResponse,
PaymentChannelTestResult,
@@ -187,6 +188,11 @@ export class PaymentChannelService {
return this.savePaymentChannelConfig("wechat", config, "WeChat");
}
// Save Epay (易支付) configuration
async saveEpayConfig(config: EpayChannelConfig): Promise<boolean> {
return this.savePaymentChannelConfig("epay", config, "Epay");
}
// Test Alipay connection
async testAlipayConnection(
config: AlipayConfig
+6 -1
View File
@@ -15,6 +15,9 @@ export interface GetRevenueListParams {
user_id?: string;
search?: string;
status?: string;
payment_type?: string; // 付款方式筛选
sort_by?: string; // 排序字段
sort_order?: 'asc' | 'desc'; // 排序顺序
}
/**
@@ -29,8 +32,10 @@ export const getRevenueList = async (
...(params.start_date && { start_date: params.start_date }),
...(params.end_date && { end_date: params.end_date }),
...(params.user_id && { user_id: params.user_id }),
...(params.search && { search: params.search }),
...(params.search && { keyword: params.search }),
...(params.status && { status: params.status }),
...(params.payment_type && { filter_payment_type: params.payment_type }),
...(params.sort_by === 'amount' && params.sort_order && { sort_amount: params.sort_order }),
});
const response = await fetchAdminAPI<RevenueRecord[]>(
+1 -1
View File
@@ -28,7 +28,7 @@ export const getUserList = async (
const queryParams = new URLSearchParams({
page: params.page.toString(),
page_size: params.page_size.toString(),
...(params.search && { search: params.search }),
...(params.search && { keyword: params.search }),
...(params.status && { status: params.status }),
});
+23 -7
View File
@@ -1,6 +1,6 @@
"use client";
import React, { useState } from "react";
import React, { useEffect, useState } from "react";
import {
Navbar,
NavbarContent,
@@ -15,6 +15,7 @@ import { useAuth } from "@/shared/lib/useAuth";
import { ArrowRightIcon } from "lucide-react";
import { DynamicLogo } from "@/shared/components/DynamicLogo";
import Link from "next/link";
import { useSharedStore } from "../store/share";
export type NavigationItem = {
label: string;
href: string;
@@ -45,6 +46,13 @@ function NavigationClient({
const { t } = useTranslation();
const { handleLogin } = useAuth();
const [userToken, setUserToken] = useState<string | null>(null);
useEffect(() => {
const userToken = useSharedStore?.getState?.().user_token
setUserToken(userToken);
}, []);
return (
<>
{/* Main Navigation */}
@@ -97,9 +105,17 @@ function NavigationClient({
{langNode ? (
langNode
) : (
<Button onPress={handleLogin} variant="light">
<b className="text-md"> {t("Sign In")}</b>
</Button>
<>
{
!userToken && (
<>
<Button onPress={handleLogin} variant="light">
<b className="text-md"> {t("Sign In")}</b>
</Button>
</>
)
}
</>
)}
{/* Desktop Auth Button */}
@@ -110,7 +126,7 @@ function NavigationClient({
radius="full"
onPress={onLogin || handleLogin}
>
<b className="text-md"> {t(signinText)}</b>
<b className="text-md"> {userToken ? t("Dashboard") : t(signinText) }</b>
<div className="w-8 h-8 bg-gradient-to-r from-primary to-[#9ab0f2] flex items-center justify-center rounded-full">
<ArrowRightIcon
size={16}
@@ -128,7 +144,7 @@ function NavigationClient({
onPress={onLogin || handleLogin}
size="sm"
>
<b className="text-md"> {t(signinText)}</b>
<b className="text-md"> {userToken ? t("Dashboard") : t(signinText) }</b>
</Button>
</div>
)}
@@ -156,7 +172,7 @@ function NavigationClient({
radius="full"
onPress={onLogin || handleLogin}
>
<b className="text-md"> {t(signinText)}</b>
<b className="text-md"> {userToken ? t("Dashboard") : t(signinText) }</b>
<div className="w-8 h-8 bg-gradient-to-r from-primary to-[#9ab0f2] flex items-center justify-center rounded-full">
<ArrowRightIcon
size={16}
@@ -9,6 +9,7 @@ import {
interface HeroSectionProps {
searchQuery: string;
isTagBarDisplay: boolean;
onSearchChange: (value: string) => void;
onSearch?: () => void;
searchSuggestions?: string[];
@@ -16,6 +17,7 @@ interface HeroSectionProps {
export const HeroSection: React.FC<HeroSectionProps> = ({
searchQuery,
isTagBarDisplay,
onSearchChange,
onSearch,
searchSuggestions = [],
@@ -77,7 +79,7 @@ export const HeroSection: React.FC<HeroSectionProps> = ({
};
return (
<div className="relative overflow-hidden mx-auto p-6 py-24 max-w-7xl">
<div className={`relative overflow-hidden mx-auto p-6 ${isTagBarDisplay ? 'py-12' : 'py-24'} max-w-7xl`}>
<div className="text-center mb-12">
<h1 className="text-5xl lg:text-6xl font-bold mb-6 leading-tight">
{t(
@@ -38,7 +38,7 @@ export const Price: React.FC<PriceProps> = ({
return (
<div className="flex items-center gap-1">
<span className="text-sm font-medium text-green-600">
${priceText.toFixed(2)}
¥{priceText.toFixed(2)}
</span>
<span className="text-xs text-gray-500">/{t("Per Call")}</span>
</div>
@@ -51,14 +51,14 @@ export const Price: React.FC<PriceProps> = ({
<div className="flex items-center gap-1">
<span className="text-gray-600">{t("Input")}:</span>
<span className="font-medium text-green-600">
${inputPrice.toFixed(2)}
¥{inputPrice.toFixed(2)}
</span>
<span className="text-xs text-gray-500">/{t("1M tokens")}</span>
</div>
<div className="flex items-center gap-1">
<span className="text-gray-600">{t("Output")}:</span>
<span className="font-medium text-blue-600">
${outputPrice.toFixed(2)}
¥{outputPrice.toFixed(2)}
</span>
<span className="text-xs text-gray-500">/{t("1M tokens")}</span>
</div>
@@ -1,6 +1,6 @@
"use client";
import React, { useState } from "react";
import React, { useEffect, useState } from "react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { Tabs, Tab, Chip } from "@nextui-org/react";
import { ProductHeader } from "./ProductHeader";
@@ -9,27 +9,40 @@ import { ProductTools } from "./ProductTools";
import { ProductNotFound } from "./ProductNotFound";
import { ServerConfig } from "./ServerConfig";
import { ServiceData } from "@/shared/types/marketplace";
import { useGlobalStore } from "@/shared/store/global";
import { useSharedStore } from "@/shared/store/share";
interface ProductDetailClientProps {
product: ServiceData;
visitor?: boolean;
breadcrumbs?: {
link: string;
name: string;
}[];
mcpName?: string;
url?: string;
can_invoke?: boolean;
innerHeaderNode?: React.ReactNode;
}
export const ProductDetailClient: React.FC<ProductDetailClientProps> = ({
product,
visitor,
breadcrumbs,
mcpName,
url,
can_invoke,
innerHeaderNode,
}) => {
const { t } = useTranslation();
const [getUser] = useGlobalStore((state) => [state.getUser]);
useEffect(() => {
const userToken = useSharedStore?.getState?.().user_token
if (userToken) {
getUser();
}
}, []);
const [activeTab, setActiveTab] = useState("overview");
return (
@@ -69,7 +82,7 @@ export const ProductDetailClient: React.FC<ProductDetailClientProps> = ({
</div>
{/* Right side - Server Config */}
<ServerConfig mcpName={mcpName} url={url} />
<ServerConfig mcpName={mcpName} url={url} can_invoke={can_invoke} visitor={visitor} />
</div>
{/* SEO-friendly: Simple text content for search engines */}
@@ -1,6 +1,6 @@
"use client";
import React, { useState } from "react";
import React, { useCallback, useEffect, useState } from "react";
import { Card, Chip, Button, Select, SelectItem } from "@nextui-org/react";
import { FlipButton } from "@/shared/components/FlipButton";
import { useAuth } from "@/shared/lib/useAuth";
@@ -9,24 +9,92 @@ import { usePlatformConfig } from "@/shared/contexts/PlatformConfigContext";
import { Copy } from "lucide-react";
import { copyToClipboard } from "@/shared/utils/clipboard";
import toast from "react-hot-toast";
import { useSharedStore } from "@/shared/store/share";
import { fetchAPI } from "@/shared/rpc/common-function";
import i18n from "@/shared/lib/i18n";
type apiKeyList = {
name: string;
apikey: string;
create_time: string;
apikey_id: number;
}
interface ServerConfigProps {
mcpName?: string;
url?: string;
className?: string;
can_invoke?: boolean;
visitor?: boolean;
}
type McpType = "sse" | "streamable-http";
// 辅助函数:将 API Key 掩码显示,只保留前2位和后4位
const maskApiKey = (apiKey: string): string => {
if (!apiKey || apiKey.length <= 6) {
return apiKey; // 如果太短就直接返回
}
const prefix = apiKey.slice(0, 2);
const suffix = apiKey.slice(-4);
const maskedLength = apiKey.length - 6;
const masked = '*'.repeat(maskedLength);
return `${prefix}${masked}${suffix}`;
};
export const ServerConfig: React.FC<ServerConfigProps> = ({
mcpName,
url = process.env.NEXT_PUBLIC_MCP_URL,
className = "md:min-w-[40%] w-[40%] max-w-100 mt-12",
can_invoke,
visitor,
}) => {
const { t } = useTranslation();
const { handleLogin } = useAuth();
const { platformConfig } = usePlatformConfig();
const [mcpType, setMcpType] = useState<McpType>("sse");
// API Key List
const [apiKeys, setApiKeys] = useState<{ key: string, label: string }[]>([]);
// Selected API Key
const [selectedApiKey, setSelectedApiKey] = useState<string | null>(null);
// User Token
const [userToken, setUserToken] = useState<string | null>(null);
useEffect(() => {
const fetchData = async () => {
const userToken = useSharedStore?.getState?.().user_token
setUserToken(userToken);
if (userToken) {
const data = await fetchApiKeys()
if (data.length > 0) {
setApiKeys(data.map((item) => ({
key: item.apikey,
label: item.name,
})));
setSelectedApiKey(data[0].apikey)
}
}
}
fetchData();
}, []);
const fetchApiKeys = useCallback(
async (
): Promise<apiKeyList[]> => {
try {
const response = await fetchAPI<apiKeyList[]>('/api/apikey/list');
if (!response.success) {
toast.error(response.error_message || i18n.t("Failed to load api keys"));
return []
}
return response.data || []
} catch (error) {
console.error("Error fetching api keys:", error);
return []
}
},
[]
);
const mcpTypeOptions = [
{ key: "sse", label: "SSE (Server-Sent Events)" },
@@ -36,8 +104,8 @@ export const ServerConfig: React.FC<ServerConfigProps> = ({
const getCodeContent = () => {
const serverUrl =
mcpType === "streamable-http"
? `${url}/streamable-http?authkey={Your-${platformConfig?.name}-Auth-Key}`
: `${url}?authkey={Your-${platformConfig?.name}-Auth-Key}`;
? `${url}/streamable-http?authkey=${selectedApiKey ? selectedApiKey : `{Your-${platformConfig?.name}-Auth-Key}`}`
: `${url}?authkey=${selectedApiKey ? selectedApiKey : `{Your-${platformConfig?.name}-Auth-Key}`}`;
return `{
"mcpServers": {
@@ -59,14 +127,71 @@ export const ServerConfig: React.FC<ServerConfigProps> = ({
}
};
const handleCreateNewAuthorization = () => {
sessionStorage.setItem('create_new_authorization', 'true');
handleLogin()
}
return (
<div className={`min-w-full ${className} flex-shrink-0`}>
<div className="mb-2 mt-1">
<FlipButton
className="w-full rounded-md"
text={t("Sign up to get the auth key")}
onPress={handleLogin}
/>
{
visitor || can_invoke ? <>
{
!userToken ? <>
<FlipButton
className="w-full rounded-md"
text={t("Sign up to get the auth key")}
onPress={handleLogin}
/>
</> : <>
{
apiKeys.length ?
<>
<Select
label={t("Auth Key")}
placeholder={t("Auth Key Name")}
selectedKeys={selectedApiKey ? [selectedApiKey] : []}
onSelectionChange={(keys) => {
const selectedKey = Array.from(keys)[0] as string;
setSelectedApiKey(selectedKey);
}}
className="w-full"
size="sm"
classNames={{
trigger: " bg-black text-white data-[hover=true]:bg-dark-200",
label: "!text-default-200",
value: "!text-white",
popoverContent: "bg-black text-white",
}}
>
{apiKeys.map((option) => (
<SelectItem key={option.key} value={option.key}>
{option.label}
</SelectItem>
))}
</Select>
</>
:
<>
<FlipButton
className="w-full rounded-md"
text={t("Create New Authorization")}
onPress={handleCreateNewAuthorization}
/>
</>
}
</>
}
</> : <>
<div className="w-full rounded-lg bg-[#F3126033] md:pr-2 h-[40px] md:h-[50px] shadow-lg flex items-center justify-center">
<p className="text-[#C20E4D] text-center font-bold text-lg leading-none">
{t("You don't have permission to access this MCP server.")}
</p>
</div>
</>
}
</div>
{/* MCP Type Selection */}
@@ -125,7 +250,7 @@ export const ServerConfig: React.FC<ServerConfigProps> = ({
{mcpType === "streamable-http"
? `${url}/streamable-http?authkey=`
: `${url}?authkey=`}
<span className="text-success">{`{Your-${platformConfig?.name}-Auth-Key}`}</span>
<span className="text-success">{selectedApiKey ? maskApiKey(selectedApiKey) : `{Your-${platformConfig?.name}-Auth-Key}`}</span>
{`"
}
}
@@ -0,0 +1,309 @@
"use client";
import React, { useState, useEffect, useRef } from "react";
import {
Modal,
ModalContent,
ModalHeader,
ModalBody,
ModalFooter,
Button,
} from "@nextui-org/react";
import { Theme, ThemeType } from "@/shared/types/system";
import { useTranslation } from "react-i18next";
interface TagFilterProps {
tags: string[];
theme: ThemeType;
selectedTag: string;
onTagChange: (tag: string) => void;
maxWidthPercent?: number; // 最大宽度百分比,默认80%
}
export const TagFilter: React.FC<TagFilterProps> = ({
tags,
theme,
selectedTag,
onTagChange,
maxWidthPercent = 80,
}) => {
const { t } = useTranslation();
// 是否打开标签筛选弹窗
const [isModalOpen, setIsModalOpen] = useState(false);
// 临时选中的标签
const [tempSelectedTag, setTempSelectedTag] = useState<string | null>(null);
// 可见的标签
const [visibleTags, setVisibleTags] = useState<string[]>(["ALL", ...tags]);
// 是否显示更多按钮
const [showMore, setShowMore] = useState(false);
// 从弹窗选择的额外标签
const [extraTag, setExtraTag] = useState<string | null>(null);
// 容器引用
const containerRef = useRef<HTMLDivElement>(null);
// 标签容器引用
const tagsContainerRef = useRef<HTMLDivElement>(null);
// 根据主题获取颜色配置
const getThemeColors = () => {
switch (theme) {
case Theme.DEFAULT:
case Theme.MODERN:
return {
selected: "bg-[#C8DCFF] text-[#1E40AF]",
unselected: "text-gray-700 hover:bg-gray-200",
shadow: "shadow-lg shadow-[#C8DCFF]/50",
};
case Theme.CLASSIC:
return {
selected: "bg-[#475569] text-white",
unselected: "text-gray-700 hover:bg-gray-200",
shadow: "shadow-lg shadow-[#475569]/50",
};
case Theme.TEMU:
return {
selected: "bg-[#F97316] text-white",
unselected: "text-gray-700 hover:bg-gray-200",
shadow: "shadow-lg shadow-[#F97316]/50",
};
case Theme.CREATIVE:
return {
selected: "to-orange-500 via-red-500 from-pink-500 bg-gradient-to-r text-white",
unselected: "text-gray-700 hover:bg-gray-200",
shadow: "shadow-lg shadow-[#EF5082]/50",
};
default:
return {
selected: "bg-[#C8DCFF] text-[#1E40AF]",
unselected: "text-gray-700 hover:bg-gray-200",
shadow: "shadow-lg shadow-[#C8DCFF]/50",
};
}
};
const themeColors = getThemeColors();
// 计算哪些标签可以显示
useEffect(() => {
const calculateVisibleTags = () => {
if (!containerRef.current) return;
const containerWidth = containerRef.current.offsetWidth;
const maxWidth = (containerWidth * maxWidthPercent) / 100;
// More按钮的宽度(估算)
const moreButtonWidth = 80;
// 创建临时元素来测量标签宽度
const tempDiv = document.createElement("div");
tempDiv.style.position = "absolute";
tempDiv.style.visibility = "hidden";
tempDiv.style.whiteSpace = "nowrap";
tempDiv.className = "px-6 py-2 rounded-full text-sm font-medium";
document.body.appendChild(tempDiv);
let currentWidth = 0;
const visible: string[] = ["ALL"];
let needsMore = false;
// 先计算常规标签
for (const tag of tags) {
if (tag === extraTag) continue; // 跳过额外标签,稍后处理
tempDiv.textContent = tag;
const tagWidth = tempDiv.offsetWidth; // 不加间距
if (currentWidth + tagWidth + moreButtonWidth > maxWidth) {
needsMore = true;
break;
}
currentWidth += tagWidth;
visible.push(tag);
}
// 处理额外标签或当前选中的标签
// 如果当前选中的标签不在可见列表中(除了ALL),需要作为额外标签显示
const tagToShow = extraTag || (selectedTag !== "ALL" && !visible.includes(selectedTag) ? selectedTag : null);
if (tagToShow && tagToShow !== "ALL" && !visible.includes(tagToShow)) {
tempDiv.textContent = tagToShow;
const tagWidth = tempDiv.offsetWidth; // 不加间距
// 检查是否还有空间显示额外标签
if (currentWidth + tagWidth + moreButtonWidth <= maxWidth) {
// 空间足够,直接添加
currentWidth += tagWidth;
visible.push(tagToShow);
} else {
// 空间不够,替换掉最后一个常规标签(保留 ALL)
if (visible.length > 1) {
visible.pop(); // 移除最后一个标签
visible.push(tagToShow); // 添加额外标签
needsMore = true; // 确保显示 More 按钮
}
}
}
document.body.removeChild(tempDiv);
setVisibleTags(visible);
setShowMore(needsMore);
};
// 延迟执行以确保DOM已渲染
setTimeout(calculateVisibleTags, 0);
// 监听窗口大小变化
window.addEventListener("resize", calculateVisibleTags);
return () => window.removeEventListener("resize", calculateVisibleTags);
}, [tags, extraTag, selectedTag, maxWidthPercent]);
const handleTagClick = (tag: string) => {
// 如果点击的是额外标签以外的标签,清除额外标签
if (extraTag && tag !== extraTag) {
setExtraTag(null);
}
onTagChange(tag);
};
const handleModalOpen = () => {
// 打开弹窗时,初始化临时选中的标签为当前选中的标签
setTempSelectedTag(selectedTag);
setIsModalOpen(true);
};
const handleModalConfirm = () => {
if (tempSelectedTag) {
// 如果选择的是 ALL 或者已经在可见标签中的标签,不设置为额外标签
if (tempSelectedTag === "ALL" || visibleTags.includes(tempSelectedTag)) {
setExtraTag(null);
} else {
// 否则设置为额外标签
setExtraTag(tempSelectedTag);
}
onTagChange(tempSelectedTag);
}
setIsModalOpen(false);
};
const handleModalCancel = () => {
setTempSelectedTag(null);
setIsModalOpen(false);
};
const handleModalTagClick = (tag: string) => {
setTempSelectedTag(tag);
};
return (
<>
<div ref={containerRef} className="w-full px-6 py-6">
<div className="mx-auto max-w-7xl text-center">
<div
ref={tagsContainerRef}
className="inline-flex items-center border-1 bg-[#fff] rounded-full transition-all duration-300"
>
{visibleTags.map((tag) => {
const isSelected = selectedTag === tag;
return (
<button
key={tag}
onClick={() => handleTagClick(tag)}
className={`
px-6 py-2 rounded-full text-sm font-medium transition-all duration-200
whitespace-nowrap
${
isSelected
? `${themeColors.selected} ${themeColors.shadow}`
: themeColors.unselected
}
`}
>
{tag}
</button>
);
})}
{showMore && (
<button
onClick={handleModalOpen}
className="px-4 py-2 text-sm font-medium text-blue-500 hover:text-blue-600 transition-colors whitespace-nowrap"
>
More
</button>
)}
</div>
</div>
</div>
{/* More Modal */}
<Modal
isOpen={isModalOpen}
onClose={handleModalCancel}
size="2xl"
scrollBehavior="inside"
>
<ModalContent>
<ModalHeader className="flex flex-col gap-1">
Tag Filter
</ModalHeader>
<ModalBody>
<div className="flex flex-wrap gap-3 py-4">
<button
onClick={() => handleModalTagClick("ALL")}
className={`
px-6 py-2 rounded-full text-sm font-medium transition-all duration-200
${
tempSelectedTag === "ALL"
? "bg-blue-500 text-white shadow-lg shadow-blue-500/50"
: "bg-gray-100 text-gray-700 hover:bg-gray-200"
}
`}
>
ALL
</button>
{tags.map((tag) => {
const isSelected = tempSelectedTag === tag;
return (
<button
key={tag}
onClick={() => handleModalTagClick(tag)}
className={`
px-6 py-2 rounded-full text-sm font-medium transition-all duration-200
${
isSelected
? "bg-blue-500 text-white shadow-lg shadow-blue-500/50"
: "bg-gray-100 text-gray-700 hover:bg-gray-200"
}
`}
>
{tag}
</button>
);
})}
</div>
</ModalBody>
<ModalFooter>
<Button
color="default"
variant="light"
onPress={handleModalCancel}
>
{t("Cancel")}
</Button>
<Button
color="primary"
onPress={handleModalConfirm}
isDisabled={!tempSelectedTag}
>
{t("Confirm")}
</Button>
</ModalFooter>
</ModalContent>
</Modal>
</>
);
};
@@ -13,6 +13,7 @@ interface BasicInfoTabProps {
onInputChange: (field: keyof MCPServiceFormData, value: any) => void;
onAddTag: () => void;
onRemoveTag: (tag: string) => void;
errors?: Record<string, string>;
}
export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
@@ -22,6 +23,7 @@ export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
onInputChange,
onAddTag,
onRemoveTag,
errors,
}) => {
const { t } = useTranslation();
@@ -41,7 +43,9 @@ export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
)}
labelPlacement="outside"
isRequired
errorMessage={t("Server ID is required")}
maxLength={255}
isInvalid={!!errors?.slug_name}
errorMessage={errors?.slug_name || t("Server ID is required")}
/>
<Input
label={t("Server Name")}
@@ -50,7 +54,9 @@ export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
onChange={(e) => onInputChange("name", e.target.value)}
isRequired
labelPlacement="outside"
errorMessage={t("Server name is required")}
maxLength={255}
isInvalid={!!errors?.name}
errorMessage={errors?.name || t("Server name is required")}
/>
<Input
label={t("Short Description")}
@@ -59,7 +65,10 @@ export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
onChange={(e) => onInputChange("short_description", e.target.value)}
isRequired
labelPlacement="outside"
errorMessage={t("Short description is required")}
isInvalid={!!errors?.short_description}
errorMessage={
errors?.short_description || t("Short description is required")
}
/>
<Input
@@ -69,7 +78,8 @@ export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
onChange={(e) => onInputChange("base_url", e.target.value)}
isRequired
labelPlacement="outside"
errorMessage={t("API Endpoint is required")}
isInvalid={!!errors?.base_url}
errorMessage={errors?.base_url || t("API Endpoint is required")}
/>
{/* headers input fields */}
<HeadersManagementSettings
@@ -65,6 +65,27 @@ export const PricingTab: React.FC<PricingTabProps> = ({
</SelectItem>
</Select>
{formData.charge_type === ChargeType.Free && (
<Input
type="number"
min="0"
step="1"
value={
formData.free_daily_limit === null ||
formData.free_daily_limit === undefined
? ""
: String(formData.free_daily_limit)
}
onChange={(e) => onInputChange("free_daily_limit", e.target.value)}
description={t(
"Max calls per user per day (Beijing time). Leave blank or 0 for unlimited"
)}
placeholder={t("e.g. 50")}
label={t("Daily call limit per user")}
labelPlacement="outside"
/>
)}
{formData.charge_type !== ChargeType.Free && (
<>
{formData.charge_type === ChargeType.PerToken ? (
@@ -85,6 +106,7 @@ export const PricingTab: React.FC<PricingTabProps> = ({
</span>
}
labelPlacement="outside"
required
/>
<Input
type="number"
@@ -102,6 +124,7 @@ export const PricingTab: React.FC<PricingTabProps> = ({
</span>
}
labelPlacement="outside"
required
/>
</div>
) : (
@@ -118,6 +141,7 @@ export const PricingTab: React.FC<PricingTabProps> = ({
</span>
}
labelPlacement="outside"
required
/>
)}
</>
@@ -0,0 +1,316 @@
"use client";
import React, { useCallback, useEffect, useRef, useState } from "react";
import {
Button,
Table,
TableHeader,
TableColumn,
TableBody,
TableRow,
TableCell,
Tooltip,
Spinner,
Pagination,
} from "@nextui-org/react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { Calendar, Plus, Trash2, HelpCircle, Eye } from "lucide-react";
import { MCPServiceFormData } from "@/shared/types/mcp-service";
import toast from "react-hot-toast";
import { GetMCPResourceGroupsParams } from "@/services/mcpService";
import DeleteServerModal from "@/components/resource-group/DeleteServerModal";
import { McpAddGroupModal } from "../modal/McpAddGroup";
import ResourceGroupDetailModal from "../modal/ResourceGroupDetailModal";
// 组内服务类型定义
export interface ResourceGroup {
id: string;
name: string;
join_at: string;
}
interface ResourceGroupProps {
deleteResourceGroup: (serviceById: string, resourceGroupId: string[]) => Promise<boolean>;
fetchMCPResourceGroups: (id: string, page: number, page_size: number, keyword: string) => Promise<GetMCPResourceGroupsParams>;
addServiceToGroup: (groupId: string, serverIds: string[]) => Promise<boolean>;
formData: MCPServiceFormData;
}
const ResourceGroup: React.FC<ResourceGroupProps> = ({
deleteResourceGroup,
fetchMCPResourceGroups,
addServiceToGroup,
formData
}) => {
const { t } = useTranslation();
const [resourceGroups, setResourceGroups] = useState<ResourceGroup[]>([]);
const [loading, setLoading] = useState(false);
const [pagination, setPagination] = useState({
page: 1,
pageSize: 10,
total: 0,
});
const resourceGroupsParams = useRef({
page: 1,
pageSize: 10,
keyword: "",
});
const [isDeleteResourceGroupModalOpen, setIsDeleteResourceGroupModalOpen] = useState(false);
const [resourceGroupToDelete, setResourceGroupToDelete] = useState<ResourceGroup | null>(null);
// 资源组详情模态框
const [isResourceGroupDetailModalOpen, setIsResourceGroupDetailModalOpen] = useState(false);
const [resourceGroupDetailId, setResourceGroupDetailId] = useState<string | null>(null);
// 添加 MCP 服务模态框
const [isAddMcpGroupModalOpen, setIsAddMcpGroupModalOpen] = useState(false);
/**
* 加载资源组列表
*/
const loadResourceGroups = useCallback(async (
page: number = 1,
pageSize: number = 10,
keyword: string = ""
) => {
setLoading(true);
try {
const response = await fetchMCPResourceGroups(formData?.id || "", page, pageSize, keyword);
setResourceGroups(response.data);
setPagination({
page: response.page,
pageSize: response.page_size,
total: response.total,
});
// 保存当前的 pageSize 和 keyword 到 ref
resourceGroupsParams.current = {
page: response.page,
pageSize: response.page_size,
keyword
};
} catch (error) {
console.error(t("Failed to load group services"), error);
} finally {
setLoading(false);
}
}, []);
const onAddService = () => {
setIsAddMcpGroupModalOpen(true);
}
const formatDate = (dateString: string) => {
return (
<div className="flex items-center gap-1">
<Calendar className="w-3 h-3 text-gray-500" />
<span className="text-sm text-gray-600">
{new Date(dateString).toLocaleString()}
</span>
</div>
);
};
// 保存 MCP 服务
const handleSaveMcpServer = async (serverIds: string[]) => {
if (!formData?.id) return;
const success = await addServiceToGroup(formData?.id, serverIds);
if (success) {
setIsAddMcpGroupModalOpen(false);
await loadResourceGroups(1, resourceGroupsParams.current.pageSize, resourceGroupsParams.current.keyword);
}
};
/**
* 确认删除资源组
*/
const handleConfirmDeleteResourceGroup = async () => {
const result = await deleteResourceGroup(formData?.id || "", [resourceGroupToDelete?.id || ""]);
if (result) {
loadResourceGroups(1, 10, "");
setIsDeleteResourceGroupModalOpen(false);
setResourceGroupToDelete(null);
toast.success(t("Resource group deleted successfully"));
} else {
setIsDeleteResourceGroupModalOpen(false);
setResourceGroupToDelete(null);
}
}
/**
* 删除资源组
* @param groupId 删除资源组
*/
const onRemoveResourceGroup = async (groupId: string) => {
const group = resourceGroups.find((group) => group.id === groupId);
if (group) {
setResourceGroupToDelete(group);
setIsDeleteResourceGroupModalOpen(true);
}
}
const onPageChange = (page: number) => {
const { pageSize, keyword } = resourceGroupsParams.current;
loadResourceGroups(page, pageSize, keyword);
}
const openResourceGroupPage = (group: ResourceGroup) => {
setResourceGroupDetailId(group.id);
setIsResourceGroupDetailModalOpen(true);
}
useEffect(() => {
loadResourceGroups(1, 10, "");
}, [loadResourceGroups]);
const pages = Math.ceil(pagination.total / pagination.pageSize);
const currentPage = Number(pagination.page);
return (
<>
<div className="space-y-4">
<div className="flex flex-col sm:flex-row gap-4 mb-6">
<div className="flex-1">
<Button
color="primary"
onPress={onAddService}
startContent={<Plus size={16} />}
size="sm"
>
{t("Add to Groups")}
</Button>
</div>
<div className="flex gap-2"></div>
</div>
<Table
aria-label="Group services table"
removeWrapper
classNames={{
wrapper: "min-h-[400px]",
}}
bottomContent={
pages > 1 ? (
<div className="flex w-full justify-center">
<Pagination
showControls
variant="light"
color="primary"
page={currentPage}
total={pages}
onChange={onPageChange}
/>
</div>
) : null
}
>
<TableHeader>
<TableColumn>{t("Group Name")}</TableColumn>
<TableColumn>
<div className="flex items-center gap-1">
<span>{t("Added Time")}</span>
<Tooltip
content={t("Current display time is UTC time")}
color="default"
closeDelay={0}
disableAnimation
>
<HelpCircle className="w-4 h-4" />
</Tooltip>
</div>
</TableColumn>
<TableColumn className="w-20">{t("Actions")}</TableColumn>
</TableHeader>
<TableBody
items={resourceGroups}
isLoading={loading}
loadingContent={<Spinner />}
emptyContent={t("No services in this group")}
>
{(group) => (
<TableRow key={group.id}>
<TableCell>
<span className="text-sm">{group.name}</span>
</TableCell>
<TableCell>
{formatDate(group.join_at)}
</TableCell>
<TableCell>
<div className="relative flex items-center gap-2">
<Tooltip
content={t("View Resource Group Detail")}
color="primary"
closeDelay={0}
disableAnimation
>
<Button
isIconOnly
size="sm"
variant="light"
color="primary"
onPress={() => openResourceGroupPage(group)}
>
<Eye className="w-4 h-4" />
</Button>
</Tooltip>
<Tooltip
content={t("Remove")}
color="danger"
closeDelay={0}
disableAnimation
>
<Button
isIconOnly
size="sm"
variant="light"
color="danger"
onPress={() => onRemoveResourceGroup(group.id)}
>
<Trash2 className="w-4 h-4" />
</Button>
</Tooltip>
</div>
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</div>
{/* 删除服务模态框 */}
<DeleteServerModal
isOpen={isDeleteResourceGroupModalOpen}
onClose={() => {
setIsDeleteResourceGroupModalOpen(false);
setResourceGroupToDelete(null);
}}
onConfirm={handleConfirmDeleteResourceGroup}
title={t("Confirm Remove")}
description={t(
'Are you sure you want to remove this "{{name}}" mcp server from "{{groupName}}" resource group?',
{
name: resourceGroupToDelete?.name || "",
groupName: formData?.name || "",
}
)}
alertDescription={t("Users associated with this resource group will not be able to call the removed MCP server")}
/>
<McpAddGroupModal
id={formData.id || ""}
isOpen={isAddMcpGroupModalOpen}
onClose={() => {
setIsAddMcpGroupModalOpen(false);
}}
onSaveMcpServer={handleSaveMcpServer}
/>
<ResourceGroupDetailModal
groupId={resourceGroupDetailId || ""}
isOpen={isResourceGroupDetailModalOpen}
onClose={() => {
setIsResourceGroupDetailModalOpen(false);
}}
/>
</>
);
};
export default ResourceGroup
@@ -1,6 +1,6 @@
"use client";
import React from "react";
import React, { useState } from "react";
import {
Table,
TableHeader,
@@ -13,10 +13,14 @@ import {
Tooltip,
Pagination,
Spinner,
Dropdown,
DropdownTrigger,
DropdownMenu,
DropdownItem,
} from "@nextui-org/react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { EnabledEnum, MCPService } from "@/shared/types/mcp-service";
import { Trash2, PencilIcon } from "lucide-react";
import { Trash2, PencilIcon, Calendar, Filter } from "lucide-react";
import { Price } from "@/shared/components/marketplace/Price";
import { MdOutlineUnpublished, MdOutlineCheckCircle } from "react-icons/md";
import { withComponentInjection } from "@/shared/hooks/useComponentInjection";
@@ -33,6 +37,7 @@ interface ServiceTableProps {
onDelete: (service: MCPService) => void;
onToggleStatus: (serviceId: string) => void;
onPageChange: (page: number) => void;
onStatusFilterChange?: (status: string) => void;
columns?: string[];
}
@@ -44,9 +49,11 @@ const BaseServiceTable: React.FC<ServiceTableProps> = ({
onDelete,
onToggleStatus,
onPageChange,
onStatusFilterChange,
columns = ["name", "endpoints", "status", "pricing", "actions"],
}) => {
const { t } = useTranslation();
const [selectedStatusFilter, setSelectedStatusFilter] = useState('all');
const pages = Math.ceil(pagination.total / pagination.pageSize);
const currentPage = pagination.page;
@@ -79,6 +86,22 @@ const BaseServiceTable: React.FC<ServiceTableProps> = ({
[onToggleStatus]
);
// 处理状态筛选
const handleStatusFilterChange = React.useCallback((status: string) => {
setSelectedStatusFilter(status);
onStatusFilterChange?.(status);
}, [onStatusFilterChange]);
const formatDate = (dateString: string) => {
return (
<div className="flex items-center gap-1">
<Calendar className="w-3 h-3 text-gray-500" />
<span className="text-sm text-gray-600">
{new Date(dateString).toLocaleString()}
</span>
</div>
);
};
if (loading && services.length === 0) {
return (
<div className="flex justify-center items-center h-64">
@@ -113,10 +136,45 @@ const BaseServiceTable: React.FC<ServiceTableProps> = ({
<TableHeader>
<TableColumn>{t("Service Name")}</TableColumn>
<TableColumn>{t("API Endpoint")}</TableColumn>
<TableColumn>{t("Status")}</TableColumn>
<TableColumn>
<div className="flex items-center gap-2">
<span>{t("Status")}</span>
<Dropdown>
<DropdownTrigger>
<Button
isIconOnly
size="sm"
variant="light"
aria-label="Filter by status"
className="min-w-unit-6 w-6 h-6"
>
<Filter
className={`w-4 h-4 ${
selectedStatusFilter !== 'all' ? 'text-primary' : ''
}`}
/>
</Button>
</DropdownTrigger>
<DropdownMenu
aria-label="Status filter"
selectionMode="single"
selectedKeys={[selectedStatusFilter]}
onSelectionChange={(keys) => {
const selected = Array.from(keys)[0] as string;
handleStatusFilterChange(selected);
}}
>
<DropdownItem key="all">{t('All')}</DropdownItem>
<DropdownItem key="1">{t('Published')}</DropdownItem>
<DropdownItem key="0">{t('Unpublished')}</DropdownItem>
</DropdownMenu>
</Dropdown>
</div>
</TableColumn>
<TableColumn hidden={!columns.includes("pricing")}>
{t("Pricing")}
</TableColumn>
<TableColumn>{t("Created_at")}</TableColumn>
<TableColumn className="w-20">{t("Actions")}</TableColumn>
</TableHeader>
<TableBody
@@ -153,6 +211,7 @@ const BaseServiceTable: React.FC<ServiceTableProps> = ({
/>
</div>
</TableCell>
<TableCell>{formatDate(service.created_at)}</TableCell>
<TableCell>
<div className="relative flex items-center gap-2">
<Tooltip content={t("Edit")} closeDelay={0} disableAnimation>
@@ -12,6 +12,7 @@ import {
Alert,
} from "@nextui-org/react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { User } from "@/types/user";
interface DeleteConfirmModalProps {
isOpen: boolean;
@@ -23,6 +24,7 @@ interface DeleteConfirmModalProps {
requireNameConfirmation?: boolean;
confirmationName?: string;
confirmationPlaceholder?: string;
user?: User | null;
}
export const DeleteConfirmModal: React.FC<DeleteConfirmModalProps> = ({
@@ -35,6 +37,7 @@ export const DeleteConfirmModal: React.FC<DeleteConfirmModalProps> = ({
requireNameConfirmation = false,
confirmationName = "",
confirmationPlaceholder,
user,
}) => {
const { t } = useTranslation();
const [inputValue, setInputValue] = useState("");
@@ -83,7 +86,16 @@ export const DeleteConfirmModal: React.FC<DeleteConfirmModalProps> = ({
<div className="text-default-600">
{description || defaultDescription}
</div>
{user && (
<div className="mb-4 p-3 bg-gray-50 rounded-lg">
<p className="text-sm text-gray-600">
{t("User")}: {user.email}
</p>
<p className="text-sm text-gray-600">
{t("Current Balance")}: ${user.balance.toFixed(2)}
</p>
</div>
)}
{/* Warning message */}
<Alert title={t("This action cannot be undone.")} color="danger" />
@@ -0,0 +1,143 @@
import {
Button,
Modal,
ModalBody,
ModalContent,
ModalFooter,
ModalHeader,
Table,
TableHeader,
TableColumn,
TableBody,
TableRow,
TableCell,
Spinner,
} from "@nextui-org/react";
import { useState, useEffect, useCallback } from "react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { fetchUnboundResourceGroups } from "@/services/mcpService";
interface McpAddGroupModalProps {
isOpen: boolean;
onClose: () => void;
id: string;
onSaveMcpServer: (serverIds: string[]) => Promise<void>;
}
interface ResourceGroup {
id: string;
name: string;
}
export const McpAddGroupModal: React.FC<McpAddGroupModalProps> = ({
isOpen,
onClose,
id,
onSaveMcpServer,
}) => {
const { t } = useTranslation();
const [isLoading, setIsLoading] = useState(false);
const [loading, setLoading] = useState(false);
const [resourceGroups, setResourceGroups] = useState<ResourceGroup[]>([]);
const [selectedKeys, setSelectedKeys] = useState<Set<string>>(new Set());
// 加载服务列表
const loadServices = useCallback(async () => {
setLoading(true);
try {
const response = await fetchUnboundResourceGroups(id);
setResourceGroups(response);
} catch (error) {
console.error("Failed to load resource groups:", error);
} finally {
setLoading(false);
}
}, []);
// 当模态框打开时加载数据
useEffect(() => {
if (isOpen) {
setSelectedKeys(new Set());
loadServices();
}
}, [isOpen, loadServices]);
// 处理保存
const handleSave = async () => {
const serverIds = typeof selectedKeys === 'string' && selectedKeys === 'all' ? resourceGroups.map((group) => group.id) : Array.from(selectedKeys);
if (serverIds.length === 0) {
return;
}
setIsLoading(true);
try {
await onSaveMcpServer(serverIds);
onClose();
} finally {
setIsLoading(false);
}
};
return (
<Modal isOpen={isOpen} onClose={onClose} size="5xl" scrollBehavior="inside">
<ModalContent>
{() => (
<>
<ModalHeader className="flex flex-col gap-1">
{t("Add to Groups")}
</ModalHeader>
<ModalBody>
<Table
aria-label="Resource groups selection table"
selectionMode="multiple"
selectedKeys={selectedKeys}
onSelectionChange={(keys) => setSelectedKeys(keys as Set<string>)}
removeWrapper
classNames={{
wrapper: "min-h-[400px]",
}}
className="[&_td:first-child]:w-[30px] [&_th:first-child]:w-[30px]"
>
<TableHeader>
<TableColumn>{t("Group Name")}</TableColumn>
</TableHeader>
<TableBody
items={resourceGroups}
isLoading={loading}
loadingContent={<Spinner />}
emptyContent={t("No resource groups available")}
>
{(resourceGroup) => (
<TableRow key={resourceGroup.id}>
<TableCell>
<span className="text-sm">{resourceGroup.name}</span>
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</ModalBody>
<ModalFooter>
<Button
color="danger"
variant="light"
onPress={onClose}
isDisabled={isLoading}
>
{t("Close")}
</Button>
<Button
color="primary"
onPress={handleSave}
isLoading={isLoading}
isDisabled={selectedKeys.size === 0}
>
{t("Add")}
</Button>
</ModalFooter>
</>
)}
</ModalContent>
</Modal>
);
};
@@ -33,6 +33,17 @@ export const RechargeModal: React.FC<RechargeModalProps> = ({
paymentChannels[0]?.id || ""
);
// payment channels arrive asynchronously -- fall back to the first one so the
// confirm button is not stuck disabled on a modal opened before they load.
const effectiveChannel = selectedPaymentChannel || paymentChannels[0]?.id || "";
const currencySymbol = effectiveChannel === "epay" ? "¥" : "¥";
const channelLabel = (id: string, name: string) => {
if (id === "epay") return t("Epay (Alipay / WeChat)");
if (id === "stripe") return name || t("Credit Card");
return name || id;
};
const [paymentId, setPaymentId] = useState("");
const [isConfirmOpen, setIsConfirmOpen] = useState(false);
@@ -44,11 +55,11 @@ export const RechargeModal: React.FC<RechargeModalProps> = ({
}
if (numAmount < 1) {
setError(t("Minimum recharge amount is $1"));
setError(t("Minimum recharge amount is ¥1"));
return;
}
if (!selectedPaymentChannel) {
if (!effectiveChannel) {
setError(t("Please select a payment method"));
return;
}
@@ -57,7 +68,9 @@ export const RechargeModal: React.FC<RechargeModalProps> = ({
method: "POST",
body: {
amount: numAmount,
payment_channel: selectedPaymentChannel,
currency: effectiveChannel === "epay" ? "cny" : "usd",
// channel id doubles as the payment method the backend switches on
payment_method: effectiveChannel,
success_url: window.location.origin + "/pay_success",
} as unknown as BodyInit,
});
@@ -128,7 +141,9 @@ export const RechargeModal: React.FC<RechargeModalProps> = ({
onChange={handleAmountChange}
startContent={
<div className="pointer-events-none flex items-center">
<span className="text-default-400 text-small">$</span>
<span className="text-default-400 text-small">
{currencySymbol}
</span>
</div>
}
type="text"
@@ -144,15 +159,13 @@ export const RechargeModal: React.FC<RechargeModalProps> = ({
}
}}
/>
{/**coming soon : select payment channel*/}
{/* {paymentChannels.length > 0 && (
{paymentChannels.length > 1 && (
<div className="space-y-2">
<label className="text-sm font-medium text-default-700">
{t("Payment Method")}
</label>
<RadioGroup
value={selectedPaymentChannel}
value={effectiveChannel}
onValueChange={setSelectedPaymentChannel}
isInvalid={!!error && error.includes("payment method")}
errorMessage={
@@ -165,12 +178,20 @@ export const RechargeModal: React.FC<RechargeModalProps> = ({
>
{paymentChannels.map((channel) => (
<Radio key={channel.id} value={channel.id}>
{channel.name}
{channelLabel(channel.id, channel.name)}
</Radio>
))}
</RadioGroup>
</div>
)} */}
)}
{effectiveChannel === "epay" && (
<p className="text-xs text-default-500">
{t(
"Billed in CNY via your epay gateway (Alipay / WeChat Pay), credited to your balance 1:1"
)}
</p>
)}
</ModalBody>
<ModalFooter>
<Button variant="light" onPress={handleClose}>
@@ -179,7 +200,7 @@ export const RechargeModal: React.FC<RechargeModalProps> = ({
<Button
color="primary"
onPress={handlePurchase}
isDisabled={!selectedPaymentChannel || !amount}
isDisabled={!effectiveChannel || !amount}
>
{t("Confirm")}
</Button>
@@ -0,0 +1,205 @@
"use client";
import React, { useCallback, useEffect, useRef, useState } from "react";
import {
Button,
Card,
Chip,
Table,
TableHeader,
TableColumn,
TableBody,
TableRow,
TableCell,
Tooltip,
Spinner,
Divider,
CardHeader,
CardBody,
Pagination,
ModalContent,
Modal,
ModalHeader,
ModalBody,
} from "@nextui-org/react";
import { useTranslation } from "@/shared/lib/useTranslation";
import { Plus, Trash2, Edit2 } from "lucide-react";
import { Price } from "@/shared/components/marketplace/Price";
import { ChargeType } from "@/shared/types/marketplace";
import { fetchGroupServices, fetchResourceGroupDetail, ResourceGroupDetailResponse } from "@/api/resourceGroup.api";
import { useSearchParams } from "next/navigation";
// 组内服务类型定义
export interface GroupService {
id: string;
name: string;
base_url: string;
charge_type: ChargeType;
price: string;
enabled: boolean;
slug_name?: string;
input_token_price?: string;
output_token_price?: string;
}
interface ResourceGroupDetailModalProps {
groupId?: string; // 可选,因为可能从 URL 获取
isOpen: boolean;
onClose: () => void;
}
const ResourceGroupDetailModal: React.FC<ResourceGroupDetailModalProps> = ({
groupId,
isOpen,
onClose,
}) => {
const { t } = useTranslation();
const [services, setServices] = useState<GroupService[]>([]);
const [serviceTablePagination, setServiceTablePagination] = useState({
page: 1,
pageSize: 10,
total: 0,
});
const serviceTableParams = useRef({
pageSize: 10,
keyword: ""
});
const [pages, setPages] = useState(0);
const [servicesLoading, setServicesLoading] = useState(false);
useEffect(() => {
setPages(Math.ceil(serviceTablePagination.total / serviceTablePagination.pageSize));
}, [serviceTablePagination.total, serviceTablePagination.pageSize]);
// 加载指定组的服务列表(支持分页)
const loadGroupServices = useCallback(async (
groupId: string,
page: number = 1,
pageSize: number = 10,
keyword: string = ""
) => {
setServicesLoading(true);
try {
const response = await fetchGroupServices(groupId, page, pageSize, keyword);
setServices(response.data);
setServiceTablePagination({
page: response.page,
pageSize: response.page_size,
total: response.total,
});
// 保存当前的 pageSize 和 keyword 到 ref
serviceTableParams.current = {
pageSize: response.page_size,
keyword
};
} catch (error) {
console.error(t("Failed to load group services"), error);
} finally {
setServicesLoading(false);
}
}, []);
// 服务列表翻页
const handleServicePageChange = async (page: number) => {
await loadGroupServices(
groupId || "",
page,
serviceTableParams.current.pageSize,
serviceTableParams.current.keyword
);
}
useEffect(() => {
if (isOpen && groupId) {
loadGroupServices(groupId, 1, 10, "");
}
}, [isOpen, groupId, loadGroupServices]);
return (
<Modal isOpen={isOpen} onClose={onClose} size="4xl">
<ModalContent>
{() => (
<>
<ModalHeader className="flex flex-col gap-1">
{t("Resource Group Detail")}
</ModalHeader>
<ModalBody>
<div className="space-y-4">
<Table
aria-label="Group services table"
removeWrapper
classNames={{
wrapper: "min-h-[400px]",
}}
bottomContent={
pages > 1 ? (
<div className="flex w-full justify-center">
<Pagination
showControls
variant="light"
color="primary"
page={serviceTablePagination.page}
total={pages}
onChange={(page) => handleServicePageChange(page)}
/>
</div>
) : null
}
>
<TableHeader>
<TableColumn>{t("Service Name")}</TableColumn>
<TableColumn>{t("API Endpoint")}</TableColumn>
<TableColumn>{t("Status")}</TableColumn>
<TableColumn>{t("Pricing")}</TableColumn>
</TableHeader>
<TableBody
items={services}
isLoading={servicesLoading}
loadingContent={<Spinner />}
emptyContent={t("No services in this group")}
>
{(service) => (
<TableRow key={service.id}>
<TableCell>
<span className="text-sm">{service.name}</span>
</TableCell>
<TableCell>
<span className="text-sm">{service.base_url}</span>
</TableCell>
<TableCell>
<Chip
className="capitalize"
color={service.enabled ? "success" : "danger"}
size="sm"
variant="flat"
>
{t(service.enabled ? "Published" : "Unpublished")}
</Chip>
</TableCell>
<TableCell>
<div className="flex flex-col gap-1">
<Price
price={service.price}
charge_type={service.charge_type}
input_token_price={service.input_token_price}
output_token_price={service.output_token_price}
/>
</div>
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</div>
</ModalBody>
</>
)}
</ModalContent>
</Modal >
);
};
export default ResourceGroupDetailModal;
@@ -14,7 +14,7 @@ import {
export const _DefaultPlatformConfig: PlatformConfig = {
name: "XPack",
logo: "/static/logo/logo.png",
currency: "USD",
currency: "CNY",
language: "en",
website_title: "Connect Your AI Agent to the Real World - XPack",
headline: "Connect Your AI Agent to the Real World",
+2
View File
@@ -14,6 +14,8 @@ export interface User {
user_email: string;
user_name: string;
avatar?: string;
allow_all?: boolean;
service_ids?: string[];
nick_name?: string;
language: NavigatorLanguage | "en" | "zh-CN";
/**
+3
View File
@@ -2,13 +2,16 @@ export enum TabKey {
CONSOLE = "console",
MCP_SERVICES = "mcp-services",
USER_MANAGEMENT = "user-management",
RESOURCE_GROUP = "resource-group",
REVENUE_MANAGEMENT = "revenue-management",
SUBMISSIONS = "submissions",
PAYMENT_CHANNELS = "payment-channels",
LOGIN_SETTINGS = "login-settings",
SYSTEM_SETTINGS = "system-settings",
OVERVIEW = "overview",
WALLET = "wallet",
ACCOUNT = "account",
USER_ACCOUNT = "user-account",
}
export interface SidebarSubItem {
Loaded 100 of 195 files, more files were not shown because too many files have changed in this diff. Show more