release: 发布 1.2.75 并修复订单与前端交互

修复支付订单取消与回调并发竞态，完善账号、授权、导入、日期范围、密钥、用量和订单页面交互，更新文档站变更日志与构建工具链版本。

Author: Open-Pixel-AI

backend/cmd/server/VERSION

@@ -1 +1 @@
-1.2.74
+1.2.75

backend/internal/service/payment_order_lifecycle.go

@@ -29,6 +29,10 @@ const (
 	checkPaidResultCancelled   = "cancelled"
 )
 
+// ErrPaymentOrderAlreadyPaid indicates that upstream reconciliation found a
+// payment, so cancelling the local order would be unsafe.
+var ErrPaymentOrderAlreadyPaid = infraerrors.Conflict("ORDER_ALREADY_PAID", "order has already been paid and cannot be cancelled")
+
 func (s *PaymentService) checkCancelRateLimit(ctx context.Context, userID int64, cfg *PaymentConfig) error {
 	if !cfg.CancelRateLimitEnabled || cfg.CancelRateLimitMax <= 0 {
 		return nil
@@ -102,7 +106,14 @@ func (s *PaymentService) CancelOrder(ctx context.Context, orderID, userID int64)
 	if o.Status != OrderStatusPending {
 		return "", infraerrors.BadRequest("INVALID_STATUS", "order cannot be cancelled in current status")
 	}
-	return s.cancelCore(ctx, o, OrderStatusCancelled, fmt.Sprintf("user:%d", userID), "user cancelled order")
+	msg, err := s.cancelCore(ctx, o, OrderStatusCancelled, fmt.Sprintf("user:%d", userID), "user cancelled order")
+	if err != nil {
+		return "", err
+	}
+	if msg == checkPaidResultAlreadyPaid {
+		return "", ErrPaymentOrderAlreadyPaid
+	}
+	return msg, nil
 }
 
 func (s *PaymentService) AdminCancelOrder(ctx context.Context, orderID int64) (string, error) {
@@ -113,7 +124,14 @@ func (s *PaymentService) AdminCancelOrder(ctx context.Context, orderID int64) (s
 	if o.Status != OrderStatusPending {
 		return "", infraerrors.BadRequest("INVALID_STATUS", "order cannot be cancelled in current status")
 	}
-	return s.cancelCore(ctx, o, OrderStatusCancelled, "admin", "admin cancelled order")
+	msg, err := s.cancelCore(ctx, o, OrderStatusCancelled, "admin", "admin cancelled order")
+	if err != nil {
+		return "", err
+	}
+	if msg == checkPaidResultAlreadyPaid {
+		return "", ErrPaymentOrderAlreadyPaid
+	}
+	return msg, nil
 }
 
 func (s *PaymentService) cancelCore(ctx context.Context, o *dbent.PaymentOrder, fs, op, ad string) (string, error) {
@@ -164,7 +182,19 @@ func (s *PaymentService) cancelCore(ctx context.Context, o *dbent.PaymentOrder,
 	if err := tx.Commit(); err != nil {
 		return "", fmt.Errorf("commit empty cancel transaction: %w", err)
 	}
-	return checkPaidResultCancelled, nil
+
+	// The conditional update can legitimately affect no rows when a webhook or
+	// expiry worker changes the order between the initial read and this write.
+	// Do not report a successful cancellation unless the persisted state proves
+	// that this transition (or an equivalent one) won.
+	latest, err := s.entClient.PaymentOrder.Get(ctx, o.ID)
+	if err != nil {
+		return "", fmt.Errorf("reload order after empty cancel: %w", err)
+	}
+	if latest.Status == fs {
+		return checkPaidResultCancelled, nil
+	}
+	return "", infraerrors.Conflict("ORDER_STATE_CHANGED", "order status changed before cancellation")
 }
 
 func (s *PaymentService) checkPaid(ctx context.Context, o *dbent.PaymentOrder) string {

backend/internal/service/payment_order_lifecycle_test.go

@@ -10,7 +10,9 @@ import (
 
 	dbent "github.com/Wei-Shaw/sub2api/ent"
 	"github.com/Wei-Shaw/sub2api/ent/enttest"
+	"github.com/Wei-Shaw/sub2api/ent/paymentorder"
 	"github.com/Wei-Shaw/sub2api/internal/payment"
+	infraerrors "github.com/Wei-Shaw/sub2api/internal/pkg/errors"
 	"github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
 	"github.com/stretchr/testify/require"
 
@@ -566,6 +568,51 @@ func TestPaymentOrderQueryReferenceUsesOutTradeNoForOfficialProviders(t *testing
 	}))
 }
 
+func TestCancelCoreReportsConcurrentStateChange(t *testing.T) {
+	ctx := context.Background()
+	client := newPaymentOrderLifecycleTestClient(t)
+	user, err := client.User.Create().
+		SetEmail("cancel-race@example.com").
+		SetPasswordHash("hash").
+		SetUsername("cancel-race-user").
+		Save(ctx)
+	require.NoError(t, err)
+
+	order, err := client.PaymentOrder.Create().
+		SetUserID(user.ID).
+		SetUserEmail(user.Email).
+		SetUserName(user.Username).
+		SetAmount(10).
+		SetPayAmount(10).
+		SetFeeRate(0).
+		SetRechargeCode("CANCEL-RACE").
+		SetOutTradeNo("sub2_cancel_race").
+		SetPaymentType("").
+		SetPaymentTradeNo("").
+		SetOrderType(payment.OrderTypeBalance).
+		SetStatus(OrderStatusPending).
+		SetExpiresAt(time.Now().Add(time.Hour)).
+		SetClientIP("127.0.0.1").
+		SetSrcHost("api.example.com").
+		Save(ctx)
+	require.NoError(t, err)
+
+	loaded, err := client.PaymentOrder.Get(ctx, order.ID)
+	require.NoError(t, err)
+	_, err = client.PaymentOrder.Update().Where(paymentorder.IDEQ(order.ID)).SetStatus(OrderStatusCompleted).Save(ctx)
+	require.NoError(t, err)
+
+	svc := &PaymentService{entClient: client}
+	_, err = svc.cancelCore(ctx, loaded, OrderStatusCancelled, "admin", "admin cancelled order")
+	require.Error(t, err)
+	require.True(t, infraerrors.IsConflict(err))
+	require.Equal(t, "ORDER_STATE_CHANGED", infraerrors.Reason(err))
+
+	reloaded, err := client.PaymentOrder.Get(ctx, order.ID)
+	require.NoError(t, err)
+	require.Equal(t, OrderStatusCompleted, reloaded.Status)
+}
+
 func newPaymentOrderLifecycleTestClient(t *testing.T) *dbent.Client {
 	t.Helper()
 

docs/site/content/docs/operations/changelog.mdx

@@ -3,6 +3,13 @@ title: 更新日志
 description: 按版本记录 Pixel API 的主要功能更新。
 ---
 
+## v1.2.75
+
+- 修复支付订单取消与支付回调并发时的状态竞态：订单状态已被支付流程改变时不再错误返回取消成功，并明确返回状态冲突。
+- 完善账号管理、平台授权、导入和模型选择交互，统一分组名称、平台配置校验与中英文提示。
+- 优化日期范围、密钥、用量和订单页面的筛选、展示与错误处理，补齐对应的前端回归测试。
+- 数据库无新增迁移。
+
 ## v1.2.69
 
 - 账号广场按窗口高度安排筛选栏、卡片和底部分页，减少两侧留白，并按可用空间调整每页卡片数量。

docs/site/package.json

@@ -1,6 +1,7 @@
 {
   "name": "sub2api-docs",
   "version": "0.1.0",
+  "packageManager": "pnpm@10.33.4",
   "private": true,
   "type": "module",
   "scripts": {

frontend/src/components/account/CNProviderSettings.vue

@@ -2,61 +2,118 @@
   <div v-if="isCN" class="space-y-3 rounded-lg border border-gray-200 p-3 dark:border-dark-600">
     <div class="grid gap-3 sm:grid-cols-2">
       <label class="text-sm font-medium text-gray-700 dark:text-gray-300">账号模式
-        <select v-model="local.mode" class="input mt-1"><option value="payg">Pay-as-you-go</option><option value="coding">Coding Plan</option></select>
+        <select v-model="local.mode" class="input mt-1">
+          <option value="payg">API key</option>
+          <option value="coding">Coding Plan</option>
+        </select>
       </label>
       <label class="text-sm font-medium text-gray-700 dark:text-gray-300">API 协议
-        <select v-model="local.protocol" class="input mt-1"><option value="chat_completions">Chat Completions</option><option value="anthropic">Anthropic Messages</option><option v-if="supportsResponses" value="responses">Responses</option><option value="adaptive">Adaptive</option></select>
+        <select v-model="local.protocol" class="input mt-1">
+          <option value="chat_completions">Chat Completions</option>
+          <option value="anthropic">Anthropic Messages</option>
+          <option v-if="supportsResponses" value="responses">Responses</option>
+          <option value="adaptive">Adaptive</option>
+        </select>
       </label>
     </div>
+    <p class="text-xs text-gray-500 dark:text-gray-400">
+      接口地址会根据平台、账号模式和 API 协议自动选择，并锁定为官方地址。
+    </p>
     <template v-if="local.protocol === 'adaptive'">
-      <label v-for="item in adaptiveItems" :key="item.key" class="block text-sm font-medium text-gray-700 dark:text-gray-300">{{ item.label }} base URL
-        <input v-model="local.api_base_urls[item.key]" class="input mt-1" type="url" :placeholder="item.placeholder" />
-      </label>
+      <div v-for="item in adaptiveItems" :key="item.key" class="space-y-1">
+        <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">{{ item.label }} 官方地址</span>
+        <code v-if="isReadOnly" class="block rounded-md bg-gray-50 px-3 py-2 text-xs text-gray-600 break-all dark:bg-dark-700 dark:text-gray-300">{{ item.url }}</code>
+        <input v-else v-model="local.api_base_urls[item.key]" class="input mt-1" type="url" :placeholder="item.url" />
+      </div>
     </template>
-    <label v-else class="block text-sm font-medium text-gray-700 dark:text-gray-300">Base URL
-      <input v-model="local.base_url" class="input mt-1" type="url" :placeholder="defaultBaseUrl" />
-    </label>
+    <div v-else class="space-y-1">
+      <span class="block text-sm font-medium text-gray-700 dark:text-gray-300">官方接口地址</span>
+      <code v-if="isReadOnly" class="block rounded-md bg-gray-50 px-3 py-2 text-xs text-gray-600 break-all dark:bg-dark-700 dark:text-gray-300">{{ defaultBaseUrl }}</code>
+      <input v-else v-model="local.base_url" class="input mt-1" type="url" :placeholder="defaultBaseUrl" />
+    </div>
   </div>
 </template>
 <script setup lang="ts">
 import { computed, reactive, watch } from 'vue'
 import { defaultCNAdaptiveBaseUrls, defaultCNBaseUrl, cnSupportsNativeResponses, type CnAccountMode, type CnApiProtocol, type CnProviderPlatform } from './credentialsBuilder'
-const props = defineProps<{ platform: string; modelValue: { mode: CnAccountMode; protocol: CnApiProtocol; base_url: string; api_base_urls: Record<string, string> } }>()
+const props = withDefaults(defineProps<{ platform: string; modelValue: { mode: CnAccountMode; protocol: CnApiProtocol; base_url: string; api_base_urls: Record<string, string> }; allowCustomBaseUrl?: boolean }>(), {
+  allowCustomBaseUrl: false
+})
 const emit = defineEmits<{ (e: 'update:modelValue', value: typeof props.modelValue): void }>()
 const isCN = computed(() => ['kimi', 'zhipu', 'deepseek', 'minimax', 'qwen'].includes(props.platform))
+const isReadOnly = computed(() => props.allowCustomBaseUrl === false)
+const allowCustomBaseUrl = computed(() => !isReadOnly.value)
 const supportsResponses = computed(() => cnSupportsNativeResponses(props.platform))
 const local = reactive({ mode: props.modelValue.mode, protocol: props.modelValue.protocol, base_url: props.modelValue.base_url, api_base_urls: { ...props.modelValue.api_base_urls } })
 const defaultBaseUrl = computed(() => isCN.value ? defaultCNBaseUrl(props.platform, local.mode, local.protocol) : '')
-const adaptiveItems = computed(() => Object.entries(defaultCNAdaptiveBaseUrls(props.platform as CnProviderPlatform, local.mode)).filter(([key]) => key !== 'responses' || supportsResponses.value).map(([key, placeholder]) => ({ key, label: key === 'chat_completions' ? 'Chat Completions' : key[0].toUpperCase() + key.slice(1), placeholder })))
-watch(() => [local.mode, local.protocol] as const, ([mode, protocol], [previousMode, previousProtocol]) => {
-  const previousDefault = defaultCNBaseUrl(props.platform, previousMode, previousProtocol)
-  if (!local.base_url.trim() || local.base_url === previousDefault) {
-    local.base_url = defaultCNBaseUrl(props.platform, mode, protocol)
+const adaptiveItems = computed(() => Object.entries(defaultCNAdaptiveBaseUrls(props.platform as CnProviderPlatform, local.mode))
+  .filter(([key]) => key !== 'responses' || supportsResponses.value)
+  .map(([key, url]) => ({
+    key,
+    label: key === 'chat_completions' ? 'Chat Completions' : key === 'anthropic' ? 'Anthropic Messages' : 'Responses',
+    url
+  })))
+
+const sameConfig = (left: typeof props.modelValue, right: typeof props.modelValue) =>
+  left.mode === right.mode &&
+  left.protocol === right.protocol &&
+  left.base_url === right.base_url &&
+  JSON.stringify(left.api_base_urls) === JSON.stringify(right.api_base_urls)
+
+const emitConfig = () => {
+  const defaults = defaultCNAdaptiveBaseUrls(props.platform as CnProviderPlatform, local.mode)
+  const isAdaptive = local.protocol === 'adaptive'
+  const officialBaseUrl = isAdaptive ? defaults.chat_completions : defaultCNBaseUrl(props.platform, local.mode, local.protocol)
+  const baseUrl = allowCustomBaseUrl.value ? (local.base_url.trim() || officialBaseUrl) : officialBaseUrl
+  const apiBaseUrls = isAdaptive
+    ? Object.fromEntries(Object.entries(defaults).map(([key, url]) => [key, allowCustomBaseUrl.value ? (local.api_base_urls[key]?.trim() || url) : url]))
+    : {}
+  const nextConfig = {
+    mode: local.mode,
+    protocol: local.protocol,
+    base_url: baseUrl,
+    api_base_urls: apiBaseUrls
   }
-  const previousURLs = defaultCNAdaptiveBaseUrls(props.platform as CnProviderPlatform, previousMode)
-  const nextURLs = defaultCNAdaptiveBaseUrls(props.platform as CnProviderPlatform, mode)
-  for (const key of Object.keys(nextURLs) as Array<keyof typeof nextURLs>) {
-    if (!local.api_base_urls[key] || local.api_base_urls[key] === previousURLs[key]) {
-      local.api_base_urls[key] = nextURLs[key]
-    }
+  if (local.base_url !== nextConfig.base_url) local.base_url = nextConfig.base_url
+  if (JSON.stringify(local.api_base_urls) !== JSON.stringify(nextConfig.api_base_urls)) {
+    local.api_base_urls = nextConfig.api_base_urls
   }
-})
-watch(local, () => emit('update:modelValue', { mode: local.mode, protocol: local.protocol, base_url: local.base_url, api_base_urls: { ...local.api_base_urls } }), { deep: true })
-const sameApiBaseUrls = (left: Record<string, string>, right: Record<string, string>) => {
-  const leftKeys = Object.keys(left)
-  const rightKeys = Object.keys(right)
-  if (leftKeys.length !== rightKeys.length) return false
-  return leftKeys.every((key) => left[key] === right[key])
+  if (!sameConfig(props.modelValue, nextConfig)) emit('update:modelValue', nextConfig)
 }
-watch(() => [props.platform, props.modelValue], () => {
-  const protocol = !cnSupportsNativeResponses(props.platform) && props.modelValue.protocol === 'responses'
+
+watch(() => [local.mode, local.protocol, props.platform] as const, ([mode, protocol], previous) => {
+  if (!cnSupportsNativeResponses(props.platform) && local.protocol === 'responses') {
+    local.protocol = 'chat_completions'
+    return
+  }
+  if (allowCustomBaseUrl.value && previous) {
+    const previousDefault = defaultCNBaseUrl(previous[2], previous[0], previous[1])
+    if (!local.base_url.trim() || local.base_url === previousDefault) {
+      local.base_url = defaultCNBaseUrl(props.platform, mode, protocol)
+    }
+    const previousURLs = defaultCNAdaptiveBaseUrls(previous[2] as CnProviderPlatform, previous[0])
+    const nextURLs = defaultCNAdaptiveBaseUrls(props.platform as CnProviderPlatform, mode)
+    for (const key of Object.keys(nextURLs) as Array<keyof typeof nextURLs>) {
+      if (!local.api_base_urls[key] || local.api_base_urls[key] === previousURLs[key]) {
+        local.api_base_urls[key] = nextURLs[key]
+      }
+    }
+  }
+  emitConfig()
+}, { immediate: true })
+
+watch(local, () => emitConfig(), { deep: true })
+
+watch(() => props.modelValue, (value) => {
+  if (local.mode !== value.mode) local.mode = value.mode
+  const protocol = !cnSupportsNativeResponses(props.platform) && value.protocol === 'responses'
     ? 'chat_completions'
-    : props.modelValue.protocol
-  if (local.mode !== props.modelValue.mode) local.mode = props.modelValue.mode
+    : value.protocol
   if (local.protocol !== protocol) local.protocol = protocol
-  if (local.base_url !== props.modelValue.base_url) local.base_url = props.modelValue.base_url
-  if (!sameApiBaseUrls(local.api_base_urls, props.modelValue.api_base_urls)) {
-    local.api_base_urls = { ...props.modelValue.api_base_urls }
+  if (allowCustomBaseUrl.value) {
+    if (local.base_url !== value.base_url) local.base_url = value.base_url
+    if (JSON.stringify(local.api_base_urls) !== JSON.stringify(value.api_base_urls)) local.api_base_urls = { ...value.api_base_urls }
   }
-}, { deep: true, immediate: true })
+  if (local.protocol === protocol && local.mode === value.mode) emitConfig()
+}, { deep: true })
 </script>

frontend/src/components/account/CreateAccountModal.vue

@@ -1291,6 +1291,7 @@
       <CNProviderSettings
         v-if="isCNPlatform(form.platform)"
         :platform="form.platform"
+        :allow-custom-base-url="false"
         v-model="cnProviderConfig"
       />
 
@@ -4447,6 +4448,15 @@ watch(
       form.type = 'apikey'
       return
     }
+    // 国内平台仅支持 API Key/上游配置。用户范围也必须保持 apikey，
+    // 否则会被误判为 OAuth 并落入默认的 Anthropic 授权流程。
+    if (isCNPlatform(form.platform)) {
+      accountCategory.value = 'apikey'
+      addMethod.value = 'oauth'
+      antigravityAccountType.value = 'oauth'
+      form.type = 'apikey'
+      return
+    }
     if (isUserScope.value) {
       if (accountCategory.value !== 'oauth-based') {
         accountCategory.value = 'oauth-based'
@@ -4485,7 +4495,7 @@ watch(
 watch(
   () => form.platform,
   (newPlatform) => {
-    if (isUserScope.value) {
+    if (isUserScope.value && !isCNPlatform(newPlatform as AccountPlatform)) {
       accountCategory.value = 'oauth-based'
       addMethod.value = 'oauth'
       antigravityAccountType.value = 'oauth'
@@ -5009,7 +5019,7 @@ const resetForm = () => {
   form.name = ''
   form.notes = ''
   form.platform = props.initialPlatform
-  form.type = 'oauth'
+  form.type = isCNPlatform(form.platform) ? 'apikey' : 'oauth'
   form.share_mode = 'private'
   form.account_level = props.initialAccountLevel
   form.credentials = {}
@@ -5020,7 +5030,7 @@ const resetForm = () => {
   form.rate_multiplier = 1
   form.group_ids = []
   form.expires_at = null
-  accountCategory.value = 'oauth-based'
+  accountCategory.value = isCNPlatform(form.platform) ? 'apikey' : 'oauth-based'
   addMethod.value = 'oauth'
   apiKeyBaseUrl.value = 'https://api.anthropic.com'
   apiKeyValue.value = ''

frontend/src/components/account/EditAccountModal.vue

@@ -142,7 +142,7 @@
 
       <!-- API Key fields (only for apikey type) -->
       <div v-if="(!isUserScope || isCNPlatform(account.platform)) && account.type === 'apikey'" class="space-y-4">
-        <CNProviderSettings v-if="isCNPlatform(account.platform)" v-model="editCNConfig" :platform="account.platform" />
+        <CNProviderSettings v-if="isCNPlatform(account.platform)" v-model="editCNConfig" :platform="account.platform" :allow-custom-base-url="false" />
         <div v-if="account.platform !== 'opencode' && !isCNPlatform(account.platform)">
           <label class="input-label">{{ t('admin.accounts.baseUrl') }}</label>
           <input