diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java index 071fcf2..16111b4 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java @@ -74,7 +74,9 @@ public class AuthController { HttpServletResponse response ) { AuthService.AuthResult result = authService.login(input.account(), input.password(), meta(request)); - response.addHeader(HttpHeaders.SET_COOKIE, sessionCookie(result.token(), Duration.ofHours(sessionTtlHours)).toString()); + // Keep the browser session cookie ephemeral. The server-side session still + // has its normal TTL, but a closed browser must require a fresh login. + response.addHeader(HttpHeaders.SET_COOKIE, sessionCookie(result.token(), null).toString()); return Map.of("user", result.user()); } @@ -88,7 +90,7 @@ public class AuthController { AuthService.AuthResult result = authService.register( input.invitationCode(), input.account(), input.password(), input.displayName(), meta(request) ); - response.addHeader(HttpHeaders.SET_COOKIE, sessionCookie(result.token(), Duration.ofHours(sessionTtlHours)).toString()); + response.addHeader(HttpHeaders.SET_COOKIE, sessionCookie(result.token(), null).toString()); return ResponseEntity.status(HttpStatus.CREATED).body(Map.of("user", result.user())); } @@ -155,13 +157,13 @@ public class AuthController { } private ResponseCookie sessionCookie(String value, Duration maxAge) { - return ResponseCookie.from(SESSION_COOKIE, value) + var builder = ResponseCookie.from(SESSION_COOKIE, value) .httpOnly(true) .secure(secureCookie) .sameSite("Lax") - .path("/") - .maxAge(maxAge) - .build(); + .path("/"); + if (maxAge != null) builder.maxAge(maxAge); + return builder.build(); } public static String sessionToken(HttpServletRequest request) { diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java b/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java index 41ce7fb..5b4fda9 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/catalog/CatalogService.java @@ -473,7 +473,12 @@ public class CatalogService { model.put("inputTypes", readList(resultSet.getString("input_types"))); model.put("outputTypes", readList(resultSet.getString("output_types"))); model.put("capabilities", readMap(resultSet.getString("capabilities"))); - putIfNotNull(model, "pricing", readOptionalMap(resultSet.getString("pricing"))); + Map pricing = readOptionalMap(resultSet.getString("pricing")); + putIfNotNull(model, "pricing", pricing); + model.put("pricingConfigured", pricing != null + && "CNY / 1M tokens".equals(String.valueOf(pricing.get("unit"))) + && pricing.get("input") != null + && pricing.get("output") != null); putIfNotNull(model, "priority", resultSet.getObject("priority")); putIfNotNull(model, "maxConcurrency", resultSet.getObject("max_concurrency")); model.put("status", resultSet.getString("status")); diff --git a/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthPostgresTest.java b/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthPostgresTest.java index a7fa03e..f0d0749 100644 --- a/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthPostgresTest.java +++ b/control-plane-java/src/test/java/com/moyi/controlplane/auth/AuthPostgresTest.java @@ -75,6 +75,7 @@ class AuthPostgresTest { var registered = http.perform(post("/api/auth/register").contentType("application/json").content(json.writeValueAsBytes(registration))) .andExpect(status().isCreated()).andExpect(jsonPath("$.user.role").value("user")) .andExpect(cookie().httpOnly("moyi_session", true)).andExpect(cookie().secure("moyi_session", true)) + .andExpect(cookie().maxAge("moyi_session", -1)) .andReturn().getResponse(); UUID memberId = UUID.fromString(json.readTree(registered.getContentAsString()).get("user").get("id").asText()); Cookie memberCookie = registered.getCookie("moyi_session"); @@ -106,7 +107,7 @@ class AuthPostgresTest { private Cookie login(MockMvc http, String account, String role) throws Exception { return http.perform(post("/api/auth/login").contentType("application/json") .content("{\"account\":\"" + account + "\",\"password\":\"test-password\"}")) - .andExpect(status().isOk()).andExpect(jsonPath("$.user.role").value(role)) + .andExpect(status().isOk()).andExpect(jsonPath("$.user.role").value(role)).andExpect(cookie().maxAge("moyi_session", -1)) .andReturn().getResponse().getCookie("moyi_session"); } } diff --git a/prototype/src/components/CatalogAdmin.vue b/prototype/src/components/CatalogAdmin.vue index 2c5fdf1..e684111 100644 --- a/prototype/src/components/CatalogAdmin.vue +++ b/prototype/src/components/CatalogAdmin.vue @@ -29,7 +29,7 @@ async function remove() { } const channel = reactive({ code: '', name: '', protocol: 'openai-compatible' as CatalogProvider['protocol'], sourceType: 'relay' as CatalogProvider['sourceType'], baseUrl: '', credentialType: 'api-key' as NonNullable, credentialSecret: '', description: '', status: 'active' as CatalogProvider['status'] }) const model = reactive({ publicName: '', modelKey: '', vendorName: '', type: 'text' as LogicalModel['type'], mode: 'sync' as LogicalModel['mode'], description: '', inputTypes: 'text', outputTypes: 'text', status: 'active' as LogicalModel['status'] }) -const group = reactive({ logicalModelId: '', providerId: '', sourceLabel: '', upstreamModel: '', input: '', output: '', cachedInput: '', unit: 'CNY / 1M tokens', discountLabel: '', priority: '100', maxConcurrency: '4', status: 'active' as CatalogModel['status'] }) +const group = reactive({ logicalModelId: '', providerId: '', sourceLabel: '', upstreamModel: '', input: '', output: '', cachedInput: '', unit: 'CNY / 1M tokens', discount: '', discountLabel: '', exchangeRate: '', priceSource: '', listPriceInput: '', listPriceOutput: '', listPriceCachedInput: '', priority: '100', maxConcurrency: '4', status: 'active' as CatalogModel['status'] }) const shownModels = computed(() => models.value.filter(item => `${item.publicName} ${item.vendorName || ''} ${item.modelKey || ''}`.toLowerCase().includes(query.value.toLowerCase()))) const shownChannels = computed(() => channels.value.filter(item => `${item.name} ${item.code}`.toLowerCase().includes(query.value.toLowerCase()))) const { page: modelPage, pageSize: modelPageSize, pagedItems: pagedModels } = usePagination(shownModels) @@ -64,7 +64,7 @@ function editModel(item?: LogicalModel) { } function editGroup(parent: LogicalModel, item?: CatalogModel) { editingId.value = item?.id - Object.assign(group, { logicalModelId: parent.id, providerId: item?.providerId || '', sourceLabel: item?.sourceLabel || '', upstreamModel: item?.upstreamModel || '', input: item?.pricing?.input?.toString() || '', output: item?.pricing?.output?.toString() || '', cachedInput: item?.pricing?.cachedInput?.toString() || '', unit: item?.pricing?.unit || 'CNY / 1M tokens', discountLabel: item?.pricing?.discountLabel || '', priority: String(item?.priority ?? 100), maxConcurrency: String(item?.maxConcurrency ?? 4), status: item?.status || 'active' }) + Object.assign(group, { logicalModelId: parent.id, providerId: item?.providerId || '', sourceLabel: item?.sourceLabel || '', upstreamModel: item?.upstreamModel || '', input: item?.pricing?.input?.toString() || '', output: item?.pricing?.output?.toString() || '', cachedInput: item?.pricing?.cachedInput?.toString() || '', unit: item?.pricing?.unit || 'CNY / 1M tokens', discount: item?.pricing?.discount?.toString() || '', discountLabel: item?.pricing?.discountLabel || '', exchangeRate: item?.pricing?.exchangeRate?.toString() || '', priceSource: item?.pricing?.priceSource || '', listPriceInput: item?.pricing?.listPriceUsd?.input?.toString() || '', listPriceOutput: item?.pricing?.listPriceUsd?.output?.toString() || '', listPriceCachedInput: item?.pricing?.listPriceUsd?.cachedInput?.toString() || '', priority: String(item?.priority ?? 100), maxConcurrency: String(item?.maxConcurrency ?? 4), status: item?.status || 'active' }) editor.value = 'group' } async function save() { @@ -81,7 +81,7 @@ async function save() { await catalogClient.saveDefinition(editingId.value, { ...model, inputTypes: model.inputTypes.split(',').map(s => s.trim()).filter(Boolean), outputTypes: model.outputTypes.split(',').map(s => s.trim()).filter(Boolean) }) } else { if (!group.providerId || !group.sourceLabel.trim() || !group.upstreamModel.trim()) throw new Error('请选择渠道并填写分组名称、上游模型标识') - await catalogClient.saveGroup(editingId.value, { logicalModelId: group.logicalModelId, providerId: group.providerId, sourceLabel: group.sourceLabel, upstreamModel: group.upstreamModel, status: group.status, priority: Number(group.priority), maxConcurrency: Number(group.maxConcurrency), pricing: { input: group.input === '' ? undefined : Number(group.input), output: group.output === '' ? undefined : Number(group.output), cachedInput: group.cachedInput === '' ? undefined : Number(group.cachedInput), unit: group.unit, discountLabel: group.discountLabel.trim() || undefined } }) + await catalogClient.saveGroup(editingId.value, { logicalModelId: group.logicalModelId, providerId: group.providerId, sourceLabel: group.sourceLabel, upstreamModel: group.upstreamModel, status: group.status, priority: Number(group.priority), maxConcurrency: Number(group.maxConcurrency), pricing: { input: group.input === '' ? undefined : Number(group.input), output: group.output === '' ? undefined : Number(group.output), cachedInput: group.cachedInput === '' ? undefined : Number(group.cachedInput), unit: group.unit, discount: group.discount === '' ? undefined : Number(group.discount), discountLabel: group.discountLabel.trim() || undefined, exchangeRate: group.exchangeRate === '' ? undefined : Number(group.exchangeRate), priceSource: group.priceSource.trim() || undefined, listPriceUsd: group.listPriceInput === '' && group.listPriceOutput === '' && group.listPriceCachedInput === '' ? undefined : { input: group.listPriceInput === '' ? undefined : Number(group.listPriceInput), output: group.listPriceOutput === '' ? undefined : Number(group.listPriceOutput), cachedInput: group.listPriceCachedInput === '' ? undefined : Number(group.listPriceCachedInput) } } }) } editor.value = '' await refresh() @@ -152,6 +152,8 @@ async function toggle(kind: 'channel' | 'model' | 'group', item: CatalogProvider + + 输入、输出价格是实际扣费值,单位为 CNY / 1M tokens。折扣只用于向用户展示,不会替代人民币售价;留空表示不展示折扣。 diff --git a/prototype/src/services/catalog.ts b/prototype/src/services/catalog.ts index b424193..8fbff80 100644 --- a/prototype/src/services/catalog.ts +++ b/prototype/src/services/catalog.ts @@ -40,6 +40,7 @@ export interface CatalogModel { priceSource?: string listPriceUsd?: { input?: number; output?: number; cachedInput?: number } } + pricingConfigured?: boolean priority?: number maxConcurrency?: number status: 'active' | 'disabled' diff --git a/prototype/src/types.ts b/prototype/src/types.ts index 6e246fb..765d85a 100644 --- a/prototype/src/types.ts +++ b/prototype/src/types.ts @@ -45,6 +45,7 @@ export interface ModelItem { priceSource?: string listPriceUsd?: { input?: number; output?: number; cachedInput?: number } } + pricingConfigured?: boolean priority?: number maxConcurrency?: number } diff --git a/prototype/src/views/AdminConsole.vue b/prototype/src/views/AdminConsole.vue index 440a7b3..aca46ea 100644 --- a/prototype/src/views/AdminConsole.vue +++ b/prototype/src/views/AdminConsole.vue @@ -220,21 +220,21 @@ function mapModels(items: CatalogModel[], providersList: CatalogProvider[]): Mod @@ -245,7 +245,7 @@ function mapModels(items: CatalogModel[], providersList: CatalogProvider[]): Mod diff --git a/prototype/src/views/AuthView.vue b/prototype/src/views/AuthView.vue index 2b629eb..5ff1b77 100644 --- a/prototype/src/views/AuthView.vue +++ b/prototype/src/views/AuthView.vue @@ -195,7 +195,7 @@ onMounted(async () => { -

登录遇到问题?

+

登录遇到问题?请联系平台管理员处理账号或验证码问题。

diff --git a/prototype/src/views/UserConsole.vue b/prototype/src/views/UserConsole.vue index 2007f15..b3b78d6 100644 --- a/prototype/src/views/UserConsole.vue +++ b/prototype/src/views/UserConsole.vue @@ -212,6 +212,34 @@ const recentTasks = computed(() => tasks.value.slice(0, 3)) const modelTypes: Array<'全部' | ModelType> = ['全部', '文本', '多模态', '图像', '3D', '视频', '音频'] const callModes: Array<'全部' | CallMode> = ['全部', '同步', '流式', '异步'] +function formatUsdPrice(value: number | undefined) { + if (value === undefined || value === null) return '待配置' + return `$${value.toLocaleString('en-US', { maximumFractionDigits: 6 })}` +} + +function standardPriceLabel(model: GalleryModel) { + const pricing = model.groups.find(group => group.pricing?.listPriceUsd)?.pricing + if (!pricing?.listPriceUsd) return '标准价待同步' + return `${formatUsdPrice(pricing.listPriceUsd.input)} 输入 / ${formatUsdPrice(pricing.listPriceUsd.output)} 输出 · USD / 1M` +} + +function groupDiscountLabel(group: ModelItem) { + if (!group.pricingConfigured || !group.pricing) return '价格待配置' + return group.pricing.discountLabel || '折扣待配置' +} + +function groupPriceLabel(group: ModelItem) { + const pricing = group.pricing + if (!group.pricingConfigured || !pricing) return '当前不可调用:价格待配置' + const input = pricing.input === undefined ? '待定' : `¥${pricing.input.toLocaleString('zh-CN', { maximumFractionDigits: 8 })}` + const output = pricing.output === undefined ? '待定' : `¥${pricing.output.toLocaleString('zh-CN', { maximumFractionDigits: 8 })}` + return `${input} 输入 / ${output} 输出 · ${pricing.unit || 'CNY / 1M tokens'}` +} + +function hasCallableGroup(model: GalleryModel) { + return model.groups.some(group => group.pricingConfigured) +} + async function copy(value: string, label: string, target: string) { const result = await copyText(value) copyStates.value[target] = result @@ -248,8 +276,8 @@ async function refreshOverview() { } function tryModel(model: GalleryModel) { - const group = model.groups[0] - if (!group) return emit('notify', '该模型已收录,分组尚未上线,暂时不能调用') + const group = model.groups.find(item => item.pricingConfigured) + if (!group) return emit('notify', '该模型已收录,但分组价格尚未配置,暂时不能调用') activeModel.value = group callMode.value = group.mode selectedModel.value = null @@ -397,7 +425,7 @@ function mapCatalogModels(items: CatalogModel[], providers: Array<{ id: string; ...mapCatalogModel(item), logicalModelId: item.logicalModelId, provider: providerNames.get(item.providerId) || item.providerId, vendorName: item.vendorName, - sourceLabel: item.sourceLabel, pricing: item.pricing, priority: item.priority, maxConcurrency: item.maxConcurrency, + sourceLabel: item.sourceLabel, pricing: item.pricing, pricingConfigured: item.pricingConfigured, priority: item.priority, maxConcurrency: item.maxConcurrency, })) } @@ -563,7 +591,7 @@ async function createProject() { @@ -721,10 +749,10 @@ $env:OPENAI_API_KEY="你的 MOYI 用户 API Key" {{ group.sourceLabel || '默认分组' }}{{ group.provider }} - 输入 {{ group.pricing.input ?? '待定' }} / 输出 {{ group.pricing.output ?? '待定' }} · {{ group.pricing.unit }} - + 标准价:{{ group.pricing?.listPriceUsd ? `${formatUsdPrice(group.pricing.listPriceUsd.input)} 输入 / ${formatUsdPrice(group.pricing.listPriceUsd.output)} 输出 · USD / 1M` : '待同步' }} · {{ groupPriceLabel(group) }} · 对外 {{ groupDiscountLabel(group) }} + - +
任务结果预览
{{ selectedTask.status }}{{ selectedTask.progress }}%
{{ selectedTask.result }}
任务 ID
{{ selectedTask.id }}
模型
{{ selectedTask.model }}
上游通道
{{ selectedTask.provider }}
任务消耗
{{ selectedTask.creditsConsumed }} credits
创建时间
{{ selectedTask.createdAt }}
耗时
{{ selectedTask.duration }}
{{ selectedTask.prompt }}
@@ -748,6 +776,12 @@ $env:OPENAI_API_KEY="你的 MOYI 用户 API Key" .catalog-group-detail small { color: #687378; } .catalog-card h3 { overflow-wrap: anywhere; } .catalog-card .text-link:disabled { color: #8a6b32; cursor: default; } +.model-pricing { display: grid; gap: 6px; margin-top: 10px; padding: 9px 10px; border: 1px solid #ece9f8; border-radius: 8px; color: #687378; background: #faf9ff; font-size: 9px; line-height: 1.55; } +.model-pricing span { display: grid; gap: 2px; } +.model-pricing strong { color: #4c3e87; font-size: 8px; letter-spacing: .03em; } +.model-pricing em { display: block; color: #687378; font-style: normal; } +.drawer-pricing { line-height: 1.6; } +.catalog-group-detail button:disabled { color: #8a6b32; cursor: default; } .request-panel, .response-panel { min-width: 0; } .token-limit { display: grid; gap: 8px; } .response-result > p, .response-content { white-space: pre-wrap; overflow-wrap: anywhere; max-width: 100%; }