Commit Graph

5287 Commits

Author SHA1 Message Date
huangzhenpc
1f22d05270 fix: SMS 验证码使用纯数字,兼容 UniSMS 通用模板
UniSMS 通用模板要求 code 为纯数字,原来用 UUID 截取会包含字母。
新增 GenerateNumericCode 函数,SMS 验证码专用。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-27 16:49:22 +08:00
huangzhenpc
aabdb90bab feat: UniSMS 支持简易模式(不填 AccessKey Secret)
当 AccessKey Secret 为空时只传 AccessKeyId,走无签名简易模式;
填写了 Secret 则走 HMAC 签名模式。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-27 15:45:28 +08:00
huangzhenpc
35cea22a4d fix: pricing 页面默认显示模型原始价格,不乘分组倍率
选择"全部分组"时 groupRatio 固定为 1,只展示 model_ratio 本身的价格。
选择具体分组时仍按分组倍率计算。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-27 14:15:44 +08:00
huangzhenpc
656ac88fa1 fix: 修复兑换码搜索中已使用兑换码搜索不到的问题
将 SearchRedemptions 的 Count 和 Find 拆成独立查询链,
避免 GORM 事务中共用 query 对象导致 Count() 污染查询状态。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-09 17:19:13 +08:00
nosqli
0bfb5a5ec0 fix: move cacheRead/cacheWriteSum to outer scope to fix build error
Variables were defined inside if block but referenced outside in gopool.Go closure.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-08 19:20:28 +08:00
nosqli
5339b43f92 feat(dashboard): split cache tokens into read and write
Display cache read tokens and cache write (creation) tokens separately
in the stats panel instead of a single combined cache number.

Shows:
  输入 X | 输出 Y
  缓存读取 X | 缓存创建 Y

Backend: QuotaData now has cache_read_tokens and cache_write_tokens
fields instead of single cache_tokens. GORM AutoMigrate adds new columns.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-08 17:57:10 +08:00
nosqli
f6a7587263 feat(redemption): support searching by redemption code (key)
Search now matches against id, name, and the redemption code (key field)
using prefix matching. Updated placeholder text and i18n translations.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-08 17:11:50 +08:00
nosqli
b739a02d71 feat(dashboard): show token breakdown (input/output/cache) in stats panel
Dashboard "统计Tokens" card now displays total tokens including cache tokens,
with a subtitle showing the breakdown: Input | Output | Cache.

Backend changes:
- QuotaData struct gains prompt_tokens, completion_tokens, cache_tokens fields
- RecordConsumeLog extracts cache tokens from Other map (cache_tokens,
  cache_creation_tokens, cache_creation_tokens_5m/1h)
- token_used now includes cache tokens in the total
- GetAllQuotaDates query includes new sum columns

Frontend changes:
- processRawData accumulates 3 new token counters
- useDashboardData adds 3 new state variables
- useDashboardCharts passes through 3 new setters
- useDashboardStats renders subtitle with token breakdown
- StatsCards renders optional subtitle line
- i18n: added "缓存" translation to all 7 locales

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-08 16:49:24 +08:00
nosqli
534ba17f0c chore: update docker-compose.yml for yxai server deployment
- Rename containers with yxai suffix to avoid conflicts
- Use local Dockerfile build instead of prebuilt image
- Map port 3031:3000
- Simplify configuration for production use

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-06 23:59:00 +08:00
nosqli
835cd8e74b feat: add SMS verification registration with UniSMS provider
- Add phone field to user model with index and helper methods
- Implement SMS provider interface with UniSMS (合一短信) implementation
- Add SMS verification code sending endpoint with rate limiting (1/60s)
- Support SMS registration in Register() (mutually exclusive with email)
- Add SMS configuration to admin settings (provider, keys, signature, template)
- Display phone number in admin user list contact column
- Add i18n translations for all SMS-related messages (zh-CN, en, zh-TW)
- Add Claude Code skills: sync-upstream, migrate-server
- Update CLAUDE.md with git conventions and deployment guide

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-06 23:57:15 +08:00
CaIon
4a4cf0a0df fix: improve multipart form data handling by detecting content type. fix #3007 2026-02-25 12:51:46 +08:00
CaIon
c5365e4b43 feat(middleware): add RouteTag middleware for enhanced logging and routing
- Introduced RouteTag middleware to set route tags for different API endpoints.
- Updated logger to include route tags in log output.
- Applied RouteTag middleware across various routers including API, dashboard, relay, video, and web routers for consistent logging.
2026-02-25 00:11:24 +08:00
CaIon
0da0d80647 fix: handle nil setting in user retrieval from database 2026-02-24 23:46:46 +08:00
Calcium-Ion
aa9e0fe7a8 Merge pull request #3002 from RedwindA/feat/zeroMatchHint
feat(web): add custom-model create hint and i18n translations
2026-02-24 22:05:05 +08:00
RedwindA
79e1daff5a feat(web): add custom-model create hint and i18n translations 2026-02-24 21:44:21 +08:00
CaIon
4c7e65cb24 feat: add comprehensive tests for StreamScannerHandler functionality
- Introduced a new test file for StreamScannerHandler, covering various scenarios including nil inputs, empty bodies, chunk processing, order preservation, and handler failures.
- Enhanced error handling and data processing logic in StreamScannerHandler to improve robustness and performance.
2026-02-24 17:36:08 +08:00
Calcium-Ion
6d03fc828d Merge pull request #2998 from seefs001/fix/pr-2900
Fix/pr 2900
2026-02-24 13:35:05 +08:00
Seefs
af31935102 fix: check oauthUser.Username length 2026-02-24 13:26:19 +08:00
Calcium-Ion
d2553564e0 Merge pull request #2993 from seefs001/feature/user-oauth-detail
feat: move user bindings to dedicated management modal
2026-02-24 13:01:10 +08:00
Seefs
a7c35cd61e Merge pull request #2997 from Caisin/fix/issue-2214-accept-encoding-passthrough
fix: skip Accept-Encoding during header passthrough (#2214)
2026-02-24 12:42:46 +08:00
hekx
98de082804 fix: skip Accept-Encoding during header passthrough (#2214) 2026-02-24 09:58:50 +08:00
Calcium-Ion
0d0f7473d4 Merge pull request #2994 from seefs001/fix/grok-violates-check
fix: violation fee check
2026-02-23 22:03:52 +08:00
Seefs
532691b06b fix: violation fee check 2026-02-23 22:02:59 +08:00
CaIon
0835e15091 fix: enhance data trimming and validation in stream scanner 2026-02-23 17:42:22 +08:00
CaIon
80c213072c fix: improve multipart form data handling in gin context
- Added caching for the original Content-Type header in the parseMultipartFormData function.
- This change ensures that the Content-Type is retrieved from the context if previously set, enhancing performance and consistency.
2026-02-23 16:59:46 +08:00
Seefs
2f4d38fefd refactor: extract binding modal and polish binding management UX 2026-02-23 15:16:22 +08:00
Seefs
9a5f8222bd feat: move user bindings to dedicated management modal 2026-02-23 14:51:55 +08:00
CaIon
016812baa6 feat: implement caching for channel retrieval 2026-02-23 14:11:11 +08:00
Calcium-Ion
d0b35ed60b Merge pull request #2959 from seefs001/fix/gemini-tool-use-token
fix: unify usage mapping and include toolUsePromptTokenCount
2026-02-22 23:35:09 +08:00
Calcium-Ion
4b058b4a1d Merge pull request #2960 from seefs001/feature/minimax-native-claude
feat: minimax native /v1/messages
2026-02-22 23:32:53 +08:00
Calcium-Ion
722b77dc31 Merge pull request #2961 from seefs001/feature/codex-oauth-with-proxy
feat: codex oauth proxy
2026-02-22 23:32:36 +08:00
Calcium-Ion
77838100a6 feat: add missing OpenAI/Claude/Gemini request fields (#2971)
* feat: add missing OpenAI/Claude/Gemini request fields and responses stream options

* fix: skip field filtering when request passthrough is enabled

* fix: include subscription in personal sidebar module controls

* feat: gate Claude inference_geo passthrough behind channel setting and add field docs
2026-02-22 23:31:18 +08:00
Seefs
a01a77fc6f fix: claude affinity cache counter (#2980)
* fix: claude affinity cache counter

* fix: claude affinity cache counter

* fix: stabilize cache usage stats format and simplify modal rendering
2026-02-22 23:30:02 +08:00
CaIon
3b87d31191 feat: add audio preview functionality 2026-02-22 23:23:13 +08:00
CaIon
3b6af5dca3 refactor: clean up unused code and improve error logging in adaptor and mjp modules 2026-02-22 22:11:05 +08:00
CaIon
af2831ce31 feat: add validation for invalid status code entries in channel modal
- Introduced a new function to collect invalid status code entries from the status code mapping.
- Updated the EditChannelModal to display an error message if invalid status codes are detected.
- Enhanced localization files to include new error messages for invalid status codes in multiple languages.
- Removed unused styles from the RiskAcknowledgementModal for cleaner UI.
2026-02-22 21:36:38 +08:00
CaIon
ee414e10c9 feat(mjp): update billing log for failed tasks 2026-02-22 20:34:25 +08:00
Calcium-Ion
3523947aba Merge pull request #2987 from seefs001/feature/channel-retry-warning
Feature/channel retry warning
2026-02-22 20:33:05 +08:00
Seefs
c4c4e5eda6 feat: add localized high-risk status remap guard with optimized modal UX 2026-02-22 20:14:56 +08:00
Seefs
4831bb7b5b feat: guard new 504/524 status remaps with risk confirmation 2026-02-22 20:03:46 +08:00
CaIon
f4dded51ab Update README 2026-02-22 18:24:42 +08:00
CaIon
13ada6484a feat(task): introduce task timeout configuration and cleanup unfinished tasks
- Added TaskTimeoutMinutes constant to configure the timeout duration for asynchronous tasks.
- Implemented sweepTimedOutTasks function to identify and handle unfinished tasks that exceed the timeout limit, marking them as failed and processing refunds if applicable.
- Enhanced task polling loop to include the new timeout handling logic, ensuring timely cleanup of stale tasks.
2026-02-22 17:59:38 +08:00
Calcium-Ion
902661df3f Merge pull request #2985 from QuantumNous/refactor/async-task-merge
refactor: async task
2026-02-22 16:59:56 +08:00
CaIon
48c9b17c26 fix(i18n): remove duplicate task ID translations and clean up unused keys across multiple languages 2026-02-22 16:45:35 +08:00
CaIon
ec5c6b28ea feat(task): add model redirection, per-call billing, and multipart retry fix for async tasks
1. Async task model redirection (aligned with sync tasks):
   - Integrate ModelMappedHelper in RelayTaskSubmit after model name
     determination, populating OriginModelName / UpstreamModelName on RelayInfo.
   - All task adaptors now send UpstreamModelName to upstream providers:
     - Gemini & Vertex: BuildRequestURL uses UpstreamModelName.
     - Doubao & Ali: BuildRequestBody conditionally overwrites body.Model.
     - Vidu, Kling, Hailuo, Jimeng: convertToRequestPayload accepts RelayInfo
       and unconditionally uses info.UpstreamModelName.
     - Sora: BuildRequestBody parses JSON and multipart bodies to replace
       the "model" field with UpstreamModelName.
   - Frontend log visibility: LogTaskConsumption and taskBillingOther now
     emit is_model_mapped / upstream_model_name in the "other" JSON field.
   - Billing safety: RecalculateTaskQuotaByTokens reads model name from
     BillingContext.OriginModelName (via taskModelName) instead of
     task.Data["model"], preventing billing leaks from upstream model names.

2. Per-call billing (TaskPricePatches lifecycle):
   - Rename TaskBillingContext.ModelName → OriginModelName; add PerCallBilling
     bool field, populated from TaskPricePatches at submission time.
   - settleTaskBillingOnComplete short-circuits when PerCallBilling is true,
     skipping both adaptor adjustments and token-based recalculation.
   - Remove ModelName from TaskSubmitResult; use relayInfo.OriginModelName
     consistently in controller/relay.go for billing context and logging.

3. Multipart retry boundary mismatch fix:
   - Root cause: after Sora (or OpenAI audio) rebuilds a multipart body with a
     new boundary and overwrites c.Request.Header["Content-Type"], subsequent
     calls to ParseMultipartFormReusable on retry would parse the cached
     original body with the wrong boundary, causing "NextPart: EOF".
   - Fix: ParseMultipartFormReusable now caches the original Content-Type in
     gin context key "_original_multipart_ct" on first call and reuses it for
     all subsequent parses, making multipart parsing retry-safe globally.
   - Sora adaptor reverted to the standard pattern (direct header set/get),
     which is now safe thanks to the root fix.

4. Tests:
   - task_billing_test.go: update makeTask to use OriginModelName; add
     PerCallBilling settlement tests (skip adaptor adjust, skip token recalc);
     add non-per-call adaptor adjustment test with refund verification.
2026-02-22 16:33:00 +08:00
CaIon
9976b311ef refactor(task): enhance UpdateWithStatus for CAS updates and add integration tests
- Updated UpdateWithStatus method to use Model().Select("*").Updates() for conditional updates, preventing GORM's INSERT fallback.
- Introduced comprehensive integration tests for UpdateWithStatus, covering scenarios for winning and losing CAS updates, as well as concurrent updates.
- Added task_cas_test.go to validate the new behavior and ensure data integrity during concurrent state transitions.
2026-02-22 16:01:19 +08:00
CaIon
5ec4633cb8 refactor(task): add CAS-guarded updates to prevent concurrent billing conflicts
Replace all bare task.Update() (DB.Save) calls with UpdateWithStatus(),
which adds a WHERE status = ? guard to prevent concurrent processes from
overwriting each other's state transitions.

Key changes:

model/task.go:
- Add taskSnapshot struct with Equal() method for change detection
- Add Snapshot() method to capture pre-update state
- Add UpdateWithStatus(fromStatus) using DB.Where().Save() for CAS
  semantics with full-struct save (no explicit field listing needed)

model/midjourney.go:
- Add UpdateWithStatus(fromStatus string) with same CAS pattern

service/task_polling.go (updateVideoSingleTask):
- Snapshot before processing upstream response; skip DB write if unchanged
- Terminal transitions (SUCCESS/FAILURE) use UpdateWithStatus CAS:
  billing/refund only executes if this process wins the transition
- Non-terminal updates also use UpdateWithStatus to prevent overwriting
  a concurrent terminal transition back to IN_PROGRESS
- Defer settleTaskBillingOnComplete to after CAS check (shouldSettle flag)

relay/relay_task.go (tryRealtimeFetch):
- Add snapshot + change detection; use UpdateWithStatus for CAS safety

controller/midjourney.go (UpdateMidjourneyTaskBulk):
- Capture preStatus before mutations; use UpdateWithStatus CAS
- Gate refund (IncreaseUserQuota) on CAS success (won && shouldReturnQuota)

This prevents the multi-instance race condition where:
1. Instance A reads task (IN_PROGRESS), fetches upstream (still IN_PROGRESS)
2. Instance B reads same task, fetches upstream (now SUCCESS), writes SUCCESS
3. Instance A's bare Save() overwrites SUCCESS back to IN_PROGRESS
2026-02-22 16:01:19 +08:00
CaIon
cda540180b refactor(relay): improve channel locking and retry logic in RelayTask
- Enhanced the RelayTask function to utilize a locked channel when available, allowing for better reuse during retries.
- Updated error handling to ensure proper context setup for the selected channel.
- Clarified comments in ResolveOriginTask regarding channel locking and retry behavior.
- Introduced a new field in TaskRelayInfo to store the locked channel object, improving type safety and reducing import cycles.
2026-02-22 16:01:19 +08:00
CaIon
76892e8376 refactor(relay): enhance remix logic for billing context extraction
- Updated the remix handling in ResolveOriginTask to prioritize extracting OtherRatios from the BillingContext of the original task if available.
- Retained the previous logic for extracting seconds and size from task data as a fallback.
- Improved clarity and maintainability of the remix logic by separating the new and old approaches.
2026-02-22 16:01:19 +08:00
CaIon
a920d1f925 refactor(relay): rename RelayTask to RelayTaskFetch and update routing
- Renamed RelayTask function to RelayTaskFetch for clarity.
- Updated routing in relay-router.go and video-router.go to use RelayTaskFetch for fetch operations.
- Enhanced error handling in RelayTaskFetch function.
- Adjusted task data conversion in TaskAdaptor to include task ID.
2026-02-22 16:01:19 +08:00