chore(channels): drop admin-side available channels view
Remove the admin-side "Available Channels" aggregate view — admins already see full channel configuration (groups, pricing, model mappings) in the channel edit dialog, making a read-only admin aggregate view redundant. The user-side "可用渠道" remains. Backend: - Delete handler/admin/available_channel_handler.go (+ test) - Drop AdminHandlers.AvailableChannel field and wire injection - Remove /admin/channels/available route Frontend: - Delete views/admin/AvailableChannelsView.vue - Drop /admin/available-channels router entry - Strip AvailableChannel types + listAvailable from api/admin/channels.ts
This commit is contained in:
@@ -175,7 +175,6 @@ func initializeApplication(buildInfo handler.BuildInfo) (*Application, error) {
|
||||
digestSessionStore := service.NewDigestSessionStore()
|
||||
channelRepository := repository.NewChannelRepository(db)
|
||||
channelService := service.NewChannelService(channelRepository, groupRepository, apiKeyAuthCacheInvalidator)
|
||||
availableChannelHandler := admin.NewAvailableChannelHandler(channelService)
|
||||
modelPricingResolver := service.NewModelPricingResolver(channelService, billingService)
|
||||
balanceNotifyService := service.ProvideBalanceNotifyService(emailService, settingRepository, accountRepository)
|
||||
gatewayService := service.NewGatewayService(accountRepository, groupRepository, usageLogRepository, usageBillingRepository, userRepository, userSubscriptionRepository, userGroupRateRepository, gatewayCache, configConfig, schedulerSnapshotService, concurrencyService, billingService, rateLimitService, billingCacheService, identityService, httpUpstream, deferredService, claudeTokenProvider, sessionLimitCache, rpmCache, digestSessionStore, settingService, tlsFingerprintProfileService, channelService, modelPricingResolver, balanceNotifyService)
|
||||
@@ -236,7 +235,7 @@ func initializeApplication(buildInfo handler.BuildInfo) (*Application, error) {
|
||||
paymentOrderExpiryService := service.ProvidePaymentOrderExpiryService(paymentService)
|
||||
paymentHandler := admin.NewPaymentHandler(paymentService, paymentConfigService)
|
||||
availableChannelUserHandler := handler.NewAvailableChannelHandler(channelService, apiKeyService)
|
||||
adminHandlers := handler.ProvideAdminHandlers(dashboardHandler, adminUserHandler, groupHandler, accountHandler, adminAnnouncementHandler, dataManagementHandler, backupHandler, oAuthHandler, openAIOAuthHandler, geminiOAuthHandler, antigravityOAuthHandler, proxyHandler, adminRedeemHandler, promoHandler, settingHandler, opsHandler, systemHandler, adminSubscriptionHandler, adminUsageHandler, userAttributeHandler, errorPassthroughHandler, tlsFingerprintProfileHandler, adminAPIKeyHandler, scheduledTestHandler, channelHandler, channelMonitorHandler, channelMonitorRequestTemplateHandler, availableChannelHandler, paymentHandler)
|
||||
adminHandlers := handler.ProvideAdminHandlers(dashboardHandler, adminUserHandler, groupHandler, accountHandler, adminAnnouncementHandler, dataManagementHandler, backupHandler, oAuthHandler, openAIOAuthHandler, geminiOAuthHandler, antigravityOAuthHandler, proxyHandler, adminRedeemHandler, promoHandler, settingHandler, opsHandler, systemHandler, adminSubscriptionHandler, adminUsageHandler, userAttributeHandler, errorPassthroughHandler, tlsFingerprintProfileHandler, adminAPIKeyHandler, scheduledTestHandler, channelHandler, channelMonitorHandler, channelMonitorRequestTemplateHandler, paymentHandler)
|
||||
usageRecordWorkerPool := service.NewUsageRecordWorkerPool(configConfig)
|
||||
userMsgQueueCache := repository.NewUserMsgQueueCache(redisClient)
|
||||
userMessageQueueService := service.ProvideUserMessageQueueService(userMsgQueueCache, rpmCache, configConfig)
|
||||
|
||||
@@ -1,95 +0,0 @@
|
||||
package admin
|
||||
|
||||
import (
|
||||
"github.com/Wei-Shaw/sub2api/internal/pkg/response"
|
||||
"github.com/Wei-Shaw/sub2api/internal/service"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
// AvailableChannelHandler 处理「可用渠道」聚合视图的管理员接口。
|
||||
//
|
||||
// 该视图以只读方式聚合渠道基础信息、关联分组与推导出的支持模型列表(无通配符)。
|
||||
type AvailableChannelHandler struct {
|
||||
channelService *service.ChannelService
|
||||
}
|
||||
|
||||
// NewAvailableChannelHandler 创建 AvailableChannelHandler 实例。
|
||||
func NewAvailableChannelHandler(channelService *service.ChannelService) *AvailableChannelHandler {
|
||||
return &AvailableChannelHandler{channelService: channelService}
|
||||
}
|
||||
|
||||
// availableGroupResponse 响应中的分组概要。
|
||||
type availableGroupResponse struct {
|
||||
ID int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Platform string `json:"platform"`
|
||||
}
|
||||
|
||||
// supportedModelResponse 响应中的支持模型条目。
|
||||
type supportedModelResponse struct {
|
||||
Name string `json:"name"`
|
||||
Platform string `json:"platform"`
|
||||
Pricing *channelModelPricingResponse `json:"pricing"`
|
||||
}
|
||||
|
||||
// availableChannelResponse 管理员视图完整字段集。
|
||||
type availableChannelResponse struct {
|
||||
ID int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
Status string `json:"status"`
|
||||
BillingModelSource string `json:"billing_model_source"`
|
||||
RestrictModels bool `json:"restrict_models"`
|
||||
Groups []availableGroupResponse `json:"groups"`
|
||||
SupportedModels []supportedModelResponse `json:"supported_models"`
|
||||
}
|
||||
|
||||
// availableChannelToAdminResponse 将 service 层的 AvailableChannel 转为管理员 DTO。
|
||||
// 同 package 内复用;也用于构造测试 fixture。
|
||||
func availableChannelToAdminResponse(ch service.AvailableChannel) availableChannelResponse {
|
||||
groups := make([]availableGroupResponse, 0, len(ch.Groups))
|
||||
for _, g := range ch.Groups {
|
||||
groups = append(groups, availableGroupResponse{ID: g.ID, Name: g.Name, Platform: g.Platform})
|
||||
}
|
||||
models := make([]supportedModelResponse, 0, len(ch.SupportedModels))
|
||||
for i := range ch.SupportedModels {
|
||||
m := ch.SupportedModels[i]
|
||||
var pricing *channelModelPricingResponse
|
||||
if m.Pricing != nil {
|
||||
p := pricingToResponse(m.Pricing)
|
||||
pricing = &p
|
||||
}
|
||||
models = append(models, supportedModelResponse{
|
||||
Name: m.Name,
|
||||
Platform: m.Platform,
|
||||
Pricing: pricing,
|
||||
})
|
||||
}
|
||||
return availableChannelResponse{
|
||||
ID: ch.ID,
|
||||
Name: ch.Name,
|
||||
Description: ch.Description,
|
||||
Status: ch.Status,
|
||||
BillingModelSource: ch.BillingModelSource,
|
||||
RestrictModels: ch.RestrictModels,
|
||||
Groups: groups,
|
||||
SupportedModels: models,
|
||||
}
|
||||
}
|
||||
|
||||
// List 列出所有可用渠道(管理员视图)。
|
||||
// GET /api/v1/admin/channels/available
|
||||
func (h *AvailableChannelHandler) List(c *gin.Context) {
|
||||
channels, err := h.channelService.ListAvailable(c.Request.Context())
|
||||
if err != nil {
|
||||
response.ErrorFrom(c, err)
|
||||
return
|
||||
}
|
||||
|
||||
out := make([]availableChannelResponse, 0, len(channels))
|
||||
for _, ch := range channels {
|
||||
out = append(out, availableChannelToAdminResponse(ch))
|
||||
}
|
||||
response.Success(c, gin.H{"items": out})
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
//go:build unit
|
||||
|
||||
package admin
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
|
||||
"github.com/Wei-Shaw/sub2api/internal/service"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestAvailableChannelToAdminResponse_IncludesFullDTO(t *testing.T) {
|
||||
// 管理员视图应包含 id / status / billing_model_source / restrict_models 等
|
||||
// 管理字段;mapper 是纯透传,BillingModelSource 的默认回填由 service 层负责。
|
||||
input := service.AvailableChannel{
|
||||
ID: 42,
|
||||
Name: "ch",
|
||||
Description: "d",
|
||||
Status: service.StatusActive,
|
||||
BillingModelSource: service.BillingModelSourceChannelMapped,
|
||||
RestrictModels: true,
|
||||
Groups: []service.AvailableGroupRef{
|
||||
{ID: 1, Name: "g1", Platform: "anthropic"},
|
||||
},
|
||||
SupportedModels: []service.SupportedModel{
|
||||
{Name: "claude-sonnet-4-6", Platform: "anthropic"},
|
||||
},
|
||||
}
|
||||
|
||||
resp := availableChannelToAdminResponse(input)
|
||||
require.Equal(t, int64(42), resp.ID)
|
||||
require.Equal(t, "ch", resp.Name)
|
||||
require.Equal(t, service.StatusActive, resp.Status)
|
||||
require.Equal(t, service.BillingModelSourceChannelMapped, resp.BillingModelSource)
|
||||
require.True(t, resp.RestrictModels)
|
||||
require.Len(t, resp.Groups, 1)
|
||||
require.Len(t, resp.SupportedModels, 1)
|
||||
|
||||
// JSON 层验证管理字段确实会被序列化。
|
||||
raw, err := json.Marshal(resp)
|
||||
require.NoError(t, err)
|
||||
var decoded map[string]any
|
||||
require.NoError(t, json.Unmarshal(raw, &decoded))
|
||||
for _, key := range []string{"id", "status", "billing_model_source", "restrict_models", "groups", "supported_models"} {
|
||||
_, exists := decoded[key]
|
||||
require.Truef(t, exists, "admin DTO must expose %q", key)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAvailableChannelToAdminResponse_PreservesExplicitBillingSource(t *testing.T) {
|
||||
input := service.AvailableChannel{
|
||||
BillingModelSource: service.BillingModelSourceUpstream,
|
||||
}
|
||||
resp := availableChannelToAdminResponse(input)
|
||||
require.Equal(t, service.BillingModelSourceUpstream, resp.BillingModelSource)
|
||||
}
|
||||
@@ -33,7 +33,6 @@ type AdminHandlers struct {
|
||||
Channel *admin.ChannelHandler
|
||||
ChannelMonitor *admin.ChannelMonitorHandler
|
||||
ChannelMonitorTemplate *admin.ChannelMonitorRequestTemplateHandler
|
||||
AvailableChannel *admin.AvailableChannelHandler
|
||||
Payment *admin.PaymentHandler
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,6 @@ func ProvideAdminHandlers(
|
||||
channelHandler *admin.ChannelHandler,
|
||||
channelMonitorHandler *admin.ChannelMonitorHandler,
|
||||
channelMonitorTemplateHandler *admin.ChannelMonitorRequestTemplateHandler,
|
||||
availableChannelHandler *admin.AvailableChannelHandler,
|
||||
paymentHandler *admin.PaymentHandler,
|
||||
) *AdminHandlers {
|
||||
return &AdminHandlers{
|
||||
@@ -67,7 +66,6 @@ func ProvideAdminHandlers(
|
||||
Channel: channelHandler,
|
||||
ChannelMonitor: channelMonitorHandler,
|
||||
ChannelMonitorTemplate: channelMonitorTemplateHandler,
|
||||
AvailableChannel: availableChannelHandler,
|
||||
Payment: paymentHandler,
|
||||
}
|
||||
}
|
||||
@@ -170,7 +168,6 @@ var ProviderSet = wire.NewSet(
|
||||
admin.NewChannelHandler,
|
||||
admin.NewChannelMonitorHandler,
|
||||
admin.NewChannelMonitorRequestTemplateHandler,
|
||||
admin.NewAvailableChannelHandler,
|
||||
admin.NewPaymentHandler,
|
||||
|
||||
// AdminHandlers and Handlers constructors
|
||||
|
||||
@@ -560,7 +560,6 @@ func registerChannelRoutes(admin *gin.RouterGroup, h *handler.Handlers) {
|
||||
channels := admin.Group("/channels")
|
||||
{
|
||||
channels.GET("", h.Admin.Channel.List)
|
||||
channels.GET("/available", h.Admin.AvailableChannel.List)
|
||||
channels.GET("/model-pricing", h.Admin.Channel.GetModelDefaultPricing)
|
||||
channels.GET("/:id", h.Admin.Channel.GetByID)
|
||||
channels.POST("", h.Admin.Channel.Create)
|
||||
|
||||
@@ -164,42 +164,5 @@ export async function getModelDefaultPricing(model: string): Promise<ModelDefaul
|
||||
return data
|
||||
}
|
||||
|
||||
// --- Available channels (聚合视图:渠道 + 分组 + 支持模型) ---
|
||||
|
||||
export interface AvailableGroupRef {
|
||||
id: number
|
||||
name: string
|
||||
platform: string
|
||||
}
|
||||
|
||||
export interface SupportedModel {
|
||||
name: string
|
||||
platform: string
|
||||
pricing: ChannelModelPricing | null
|
||||
}
|
||||
|
||||
export interface AvailableChannel {
|
||||
id: number
|
||||
name: string
|
||||
description: string
|
||||
status: ChannelStatus
|
||||
billing_model_source: BillingModelSource
|
||||
restrict_models: boolean
|
||||
groups: AvailableGroupRef[]
|
||||
supported_models: SupportedModel[]
|
||||
}
|
||||
|
||||
interface AvailableChannelsResponse {
|
||||
items: AvailableChannel[]
|
||||
}
|
||||
|
||||
/** 列出所有可用渠道(含关联分组与支持模型) */
|
||||
export async function listAvailable(options?: { signal?: AbortSignal }): Promise<AvailableChannel[]> {
|
||||
const { data } = await apiClient.get<AvailableChannelsResponse>('/admin/channels/available', {
|
||||
signal: options?.signal
|
||||
})
|
||||
return data.items
|
||||
}
|
||||
|
||||
const channelsAPI = { list, getById, create, update, remove, getModelDefaultPricing, listAvailable }
|
||||
const channelsAPI = { list, getById, create, update, remove, getModelDefaultPricing }
|
||||
export default channelsAPI
|
||||
|
||||
@@ -370,18 +370,6 @@ const routes: RouteRecordRaw[] = [
|
||||
descriptionKey: 'admin.groups.description'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/admin/available-channels',
|
||||
name: 'AdminAvailableChannels',
|
||||
component: () => import('@/views/admin/AvailableChannelsView.vue'),
|
||||
meta: {
|
||||
requiresAuth: true,
|
||||
requiresAdmin: true,
|
||||
title: 'Available Channels',
|
||||
titleKey: 'admin.availableChannels.title',
|
||||
descriptionKey: 'admin.availableChannels.description'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/admin/channels',
|
||||
redirect: '/admin/channels/pricing'
|
||||
|
||||
@@ -1,164 +0,0 @@
|
||||
<template>
|
||||
<AppLayout>
|
||||
<TablePageLayout>
|
||||
<template #filters>
|
||||
<div class="flex flex-col justify-between gap-4 lg:flex-row lg:items-start">
|
||||
<div class="flex flex-1 flex-wrap items-center gap-3">
|
||||
<div class="relative w-full sm:w-80">
|
||||
<Icon
|
||||
name="search"
|
||||
size="md"
|
||||
class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 dark:text-gray-500"
|
||||
/>
|
||||
<input
|
||||
v-model="searchQuery"
|
||||
type="text"
|
||||
:placeholder="t('admin.availableChannels.searchPlaceholder')"
|
||||
class="input pl-10"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex w-full flex-shrink-0 flex-wrap items-center justify-end gap-3 lg:w-auto">
|
||||
<button
|
||||
@click="loadChannels"
|
||||
:disabled="loading"
|
||||
class="btn btn-secondary"
|
||||
:title="t('common.refresh', 'Refresh')"
|
||||
>
|
||||
<Icon name="refresh" size="md" :class="loading ? 'animate-spin' : ''" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template #table>
|
||||
<AvailableChannelsTable
|
||||
:columns="columns"
|
||||
:rows="filteredChannels"
|
||||
:loading="loading"
|
||||
pricing-key-prefix="admin.availableChannels.pricing"
|
||||
:no-pricing-label="t('admin.availableChannels.noPricing')"
|
||||
:no-models-label="t('admin.availableChannels.noModels')"
|
||||
:empty-label="t('admin.availableChannels.empty')"
|
||||
>
|
||||
<template #empty-groups>{{ t('admin.availableChannels.noGroups') }}</template>
|
||||
|
||||
<template #cell-status="{ row }">
|
||||
<span
|
||||
:class="statusStyleOf(row.status).cls"
|
||||
class="inline-flex items-center rounded px-2 py-0.5 text-xs font-medium"
|
||||
>
|
||||
{{ statusStyleOf(row.status).label }}
|
||||
</span>
|
||||
</template>
|
||||
|
||||
<template #cell-billing_model_source="{ row }">
|
||||
<span class="text-xs text-gray-700 dark:text-gray-300">
|
||||
{{ billingSourceLabelOf(row.billing_model_source) }}
|
||||
</span>
|
||||
</template>
|
||||
</AvailableChannelsTable>
|
||||
</template>
|
||||
</TablePageLayout>
|
||||
</AppLayout>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref } from 'vue'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import AppLayout from '@/components/layout/AppLayout.vue'
|
||||
import TablePageLayout from '@/components/layout/TablePageLayout.vue'
|
||||
import Icon from '@/components/icons/Icon.vue'
|
||||
import AvailableChannelsTable from '@/components/channels/AvailableChannelsTable.vue'
|
||||
import channelsAPI, { type AvailableChannel } from '@/api/admin/channels'
|
||||
import { useAppStore } from '@/stores/app'
|
||||
import { extractApiErrorMessage } from '@/utils/apiError'
|
||||
import {
|
||||
CHANNEL_STATUS_ACTIVE,
|
||||
CHANNEL_STATUS_DISABLED,
|
||||
BILLING_MODEL_SOURCE_REQUESTED,
|
||||
BILLING_MODEL_SOURCE_UPSTREAM,
|
||||
BILLING_MODEL_SOURCE_CHANNEL_MAPPED,
|
||||
type ChannelStatus,
|
||||
type BillingModelSource
|
||||
} from '@/constants/channel'
|
||||
|
||||
const { t } = useI18n()
|
||||
const appStore = useAppStore()
|
||||
|
||||
const channels = ref<AvailableChannel[]>([])
|
||||
const loading = ref(false)
|
||||
const searchQuery = ref('')
|
||||
|
||||
const columns = computed(() => [
|
||||
{ key: 'name', label: t('admin.availableChannels.columns.name') },
|
||||
{ key: 'status', label: t('admin.availableChannels.columns.status') },
|
||||
{ key: 'billing_model_source', label: t('admin.availableChannels.columns.billingSource') },
|
||||
{ key: 'groups', label: t('admin.availableChannels.columns.groups') },
|
||||
{ key: 'supported_models', label: t('admin.availableChannels.columns.supportedModels') }
|
||||
])
|
||||
|
||||
/**
|
||||
* 显示样式:i18n label + Tailwind class,按 ChannelStatus 完整穷举。
|
||||
* Record 键类型强制未来新增 ChannelStatus 成员时 TS 编译失败,避免遗漏分支。
|
||||
*/
|
||||
const statusStyles = computed<Record<ChannelStatus, { label: string; cls: string }>>(() => ({
|
||||
[CHANNEL_STATUS_ACTIVE]: {
|
||||
label: t('admin.availableChannels.statusActive'),
|
||||
cls: 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400'
|
||||
},
|
||||
[CHANNEL_STATUS_DISABLED]: {
|
||||
label: t('admin.availableChannels.statusDisabled'),
|
||||
cls: 'bg-gray-100 text-gray-600 dark:bg-dark-700 dark:text-gray-400'
|
||||
}
|
||||
}))
|
||||
|
||||
/**
|
||||
* BillingModelSource 显式映射:避免将后端 snake_case 字面量直接拼成 i18n key,
|
||||
* 同时在 BillingModelSource 扩展时 TS 编译失败以暴露遗漏。
|
||||
*/
|
||||
const billingSourceLabels = computed<Record<BillingModelSource, string>>(() => ({
|
||||
[BILLING_MODEL_SOURCE_REQUESTED]: t('admin.availableChannels.billingSource.requested'),
|
||||
[BILLING_MODEL_SOURCE_UPSTREAM]: t('admin.availableChannels.billingSource.upstream'),
|
||||
[BILLING_MODEL_SOURCE_CHANNEL_MAPPED]: t('admin.availableChannels.billingSource.channel_mapped')
|
||||
}))
|
||||
|
||||
// 运行时兜底:即便 service 层归一化漏点或后端新增未同步的 enum 值传入,
|
||||
// 也不会触发 undefined.cls 崩溃;统一降级为 "-"。
|
||||
const DEFAULT_STATUS_STYLE = { label: '-', cls: '' }
|
||||
const DEFAULT_BILLING_LABEL = '-'
|
||||
|
||||
function statusStyleOf(status: ChannelStatus | undefined): { label: string; cls: string } {
|
||||
return status ? statusStyles.value[status] : DEFAULT_STATUS_STYLE
|
||||
}
|
||||
|
||||
function billingSourceLabelOf(src: BillingModelSource | undefined): string {
|
||||
return src ? billingSourceLabels.value[src] : DEFAULT_BILLING_LABEL
|
||||
}
|
||||
|
||||
const filteredChannels = computed(() => {
|
||||
const q = searchQuery.value.trim().toLowerCase()
|
||||
if (!q) return channels.value
|
||||
return channels.value.filter((ch) => {
|
||||
if (ch.name.toLowerCase().includes(q)) return true
|
||||
if ((ch.description || '').toLowerCase().includes(q)) return true
|
||||
if (ch.groups.some((g) => g.name.toLowerCase().includes(q))) return true
|
||||
if (ch.supported_models.some((m) => m.name.toLowerCase().includes(q))) return true
|
||||
return false
|
||||
})
|
||||
})
|
||||
|
||||
async function loadChannels() {
|
||||
loading.value = true
|
||||
try {
|
||||
channels.value = await channelsAPI.listAvailable()
|
||||
} catch (err: unknown) {
|
||||
appStore.showError(extractApiErrorMessage(err, t('common.error')))
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(loadChannels)
|
||||
</script>
|
||||
Reference in New Issue
Block a user