V4.14.4 features (#6036)

* feat: add query optimize and bill (#6021)

* add query optimize and bill

* perf: query extension

* fix: embe model

* remove log

* remove log

* fix: test

---------

Co-authored-by: xxyyh <2289112474@qq>
Co-authored-by: archer <545436317@qq.com>

* feat: notice (#6013)

* feat: record user's language

* feat: notice points/dataset indexes; support count limit; update docker-compose.yml

* fix: ts error

* feat: send auth code i18n

* chore: dataset notice limit

* chore: adjust

* fix: ts

* fix: countLimit race condition; i18n en-prefix locale fallback to en

---------

Co-authored-by: archer <545436317@qq.com>

* perf: comment

* perf: send inform code

* fix: type error (#6029)

* feat: add ip region for chat logs (#6010)

* feat: add ip region for chat logs

* refactor: use Geolite2.mmdb

* fix: export chat logs

* fix: return location directly

* test: add unit test

* perf: log show ip data

* adjust commercial plans (#6008)

* plan frontend

* plan limit

* coupon

* discount coupon

* fix

* type

* fix audit

* type

* plan name

* legacy plan

* track

* feat: add discount coupon

* fix

* fix discount coupon

* openapi

* type

* type

* env

* api type

* fix

* fix: simple agent plugin input & agent dashboard card (#6034)

* refactor: remove gridfs (#6031)

* fix: replace gridfs multer operations with s3 compatible ops

* wip: s3 features

* refactor: remove gridfs

* fix

* perf: mock test

* doc

* doc

* doc

* fix: test

* fix: s3

* fix: mock s3

* remove invalid config

* fix: init query extension

* initv4144 (#6037)

* chore: initv4144

* fix

* version

* fix: new plans (#6039)

* fix: new plans

* qr modal tip

* fix: buffer raw text filename (#6040)

* fix: initv4144 (#6041)

* fix: pay refresh (#6042)

* fix: migration shell

* rename collection

* clear timerlock

* clear timerlock

* perf: faq

* perf: bill schema

* fix: openapi

* doc

* fix: share var render

* feat: delete dataset queue

* plan usage display (#6043)

* plan usage display

* text

* fix

* fix: ts

* perf: remove invalid code

* perf: init shell

* doc

* perf: rename field

* perf: avatar presign

* init

* custom plan text (#6045)

* fix plans

* fix

* fixed

* computed

---------

Co-authored-by: archer <545436317@qq.com>

* init shell

* plan text & price page back button (#6046)

* init

* index

* delete dataset

* delete dataset

* perf: delete dataset

* init

---------

Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com>
Co-authored-by: xxyyh <2289112474@qq>
Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com>
Co-authored-by: Roy <whoeverimf5@gmail.com>
Co-authored-by: heheer <heheer@sealos.io>
This commit is contained in:
Archer
2025-12-08 01:44:15 +08:00
committed by GitHub
parent 9d72f238c0
commit 2ccb5b50c6
247 changed files with 7342 additions and 3819 deletions
+7 -1
View File
@@ -3,6 +3,7 @@ import { ChatPath } from './core/chat';
import { ApiKeyPath } from './support/openapi';
import { TagsMap } from './tag';
import { PluginPath } from './core/plugin';
import { WalletPath } from './support/wallet';
export const openAPIDocument = createDocument({
openapi: '3.1.0',
@@ -14,7 +15,8 @@ export const openAPIDocument = createDocument({
paths: {
...ChatPath,
...ApiKeyPath,
...PluginPath
...PluginPath,
...WalletPath
},
servers: [{ url: '/api' }],
'x-tagGroups': [
@@ -33,6 +35,10 @@ export const openAPIDocument = createDocument({
{
name: 'ApiKey',
tags: [TagsMap.apiKey]
},
{
name: '支付',
tags: [TagsMap.walletBill, TagsMap.walletDiscountCoupon]
}
]
});
@@ -0,0 +1,96 @@
import { z } from 'zod';
import { ObjectIdSchema } from '../../../../common/type/mongo';
import {
BillTypeEnum,
BillStatusEnum,
BillPayWayEnum
} from '../../../../support/wallet/bill/constants';
import { StandardSubLevelEnum, SubModeEnum } from '../../../../support/wallet/sub/constants';
import { PaginationSchema } from '../../../api';
import { BillSchema } from '../../../../support/wallet/bill/type';
// Bill list
export const BillListQuerySchema = PaginationSchema.safeExtend({
type: z.enum(BillTypeEnum).optional().meta({ description: '订单类型筛选' })
});
export type GetBillListQueryType = z.infer<typeof BillListQuerySchema>;
export const BillListResponseSchema = z.object({
total: z.number(),
list: z.array(BillSchema)
});
export type GetBillListResponseType = z.infer<typeof BillListResponseSchema>;
// Create
export const CreateStandPlanBillSchema = z
.object({
type: z.literal(BillTypeEnum.standSubPlan).meta({ description: '订单类型:标准订阅套餐' }),
level: z.enum(StandardSubLevelEnum).meta({ description: '标准订阅等级' }),
subMode: z.enum(SubModeEnum).meta({ description: '订阅周期' }),
discountCouponId: z.string().optional().meta({ description: '优惠券 ID' })
})
.meta({ description: '标准订阅套餐订单创建参数' });
export const CreateExtractPointsBillSchema = z
.object({
type: z.literal(BillTypeEnum.extraPoints).meta({ description: '订单类型:额外积分' }),
extraPoints: z.int().min(0).meta({ description: '额外积分数量' }),
month: z.int().min(1).max(12).meta({ description: '订阅月数' }),
discountCouponId: z.string().optional().meta({ description: '优惠券 ID(未使用)' })
})
.meta({ description: '额外积分订单创建参数' });
export const CreateExtractDatasetBillSchema = z
.object({
type: z.literal(BillTypeEnum.extraDatasetSub).meta({ description: '订单类型:额外数据集存储' }),
extraDatasetSize: z.int().min(0).meta({ description: '额外数据集大小' }),
month: z.int().min(1).max(12).meta({ description: '订阅月数' }),
discountCouponId: z.string().optional().meta({ description: '优惠券 ID(未使用)' })
})
.meta({ description: '额外数据集存储订单创建参数' });
export const CreateBillPropsSchema = z.discriminatedUnion('type', [
CreateStandPlanBillSchema,
CreateExtractPointsBillSchema,
CreateExtractDatasetBillSchema
]);
export type CreateBillPropsType = z.infer<typeof CreateBillPropsSchema>;
export const UpdatePaymentPropsSchema = z.object({
billId: ObjectIdSchema,
payWay: z.enum(BillPayWayEnum)
});
export type UpdatePaymentPropsType = z.infer<typeof UpdatePaymentPropsSchema>;
export const UpdateBillResponseSchema = z
.object({
qrCode: z.string().optional().meta({ description: '支付二维码 URL' }),
iframeCode: z.string().optional().meta({ description: '支付 iframe 代码' }),
markdown: z.string().optional().meta({ description: 'Markdown 格式的支付信息' })
})
.refine((data) => data.qrCode || data.iframeCode || data.markdown, {
message: 'At least one of qrCode, iframeCode, or markdown must be provided'
});
export type UpdateBillResponseType = z.infer<typeof UpdateBillResponseSchema>;
export const CreateBillResponseSchema = UpdateBillResponseSchema.safeExtend({
billId: z.string().meta({ description: '订单 ID' }),
readPrice: z.number().min(0).meta({ description: '实际支付价格' }),
payment: z.enum(BillPayWayEnum).meta({ description: '支付方式' })
});
export type CreateBillResponseType = z.infer<typeof CreateBillResponseSchema>;
// Check pay result
export const CheckPayResultResponseSchema = z.object({
status: z.enum(BillStatusEnum),
description: z.string().optional()
});
export type CheckPayResultResponseType = z.infer<typeof CheckPayResultResponseSchema>;
// Bill detail
export const BillDetailResponseSchema = BillSchema.safeExtend({
couponName: z.string().optional()
});
export type BillDetailResponseType = z.infer<typeof BillDetailResponseSchema>;
// Cancel bill
export const CancelBillPropsSchema = z.object({
billId: ObjectIdSchema.meta({ description: '订单 ID' })
});
export type CancelBillPropsType = z.infer<typeof CancelBillPropsSchema>;
@@ -0,0 +1,164 @@
import { z } from 'zod';
import type { OpenAPIPath } from '../../../type';
import {
CreateBillPropsSchema,
CreateBillResponseSchema,
UpdatePaymentPropsSchema,
UpdateBillResponseSchema,
CheckPayResultResponseSchema,
BillDetailResponseSchema,
BillListQuerySchema,
CancelBillPropsSchema
} from './api';
import { TagsMap } from '../../../tag';
import { ObjectIdSchema } from '../../../../common/type/mongo';
export const BillPath: OpenAPIPath = {
'/support/wallet/bill/create': {
post: {
summary: '创建订单',
description: '创建订单订单,支持标准订阅套餐、额外积分、额外数据集存储三种类型',
tags: [TagsMap.walletBill],
requestBody: {
content: {
'application/json': {
schema: CreateBillPropsSchema
}
}
},
responses: {
200: {
description: '成功创建订单',
content: {
'application/json': {
schema: CreateBillResponseSchema
}
}
}
}
}
},
'/support/wallet/bill/pay/updatePayment': {
post: {
summary: '更新支付方式',
description: '为未支付的订单更新支付方式,返回新的支付二维码或链接',
tags: [TagsMap.walletBill],
requestBody: {
content: {
'application/json': {
schema: UpdatePaymentPropsSchema
}
}
},
responses: {
200: {
description: '成功更新支付方式',
content: {
'application/json': {
schema: UpdateBillResponseSchema
}
}
}
}
}
},
'/support/wallet/bill/pay/checkPayResult': {
get: {
summary: '检查支付结果',
description: '检查订单的支付状态,用于轮询支付结果',
tags: [TagsMap.walletBill],
requestParams: {
query: z.object({
payId: ObjectIdSchema.meta({
description: '订单 ID'
})
})
},
responses: {
200: {
description: '成功获取支付结果',
content: {
'application/json': {
schema: CheckPayResultResponseSchema
}
}
}
}
}
},
'/support/wallet/bill/detail': {
get: {
summary: '获取订单详情',
description: '根据订单 ID 获取订单详细信息,包括优惠券名称等',
tags: [TagsMap.walletBill],
requestParams: {
query: z.object({
billId: ObjectIdSchema.meta({
description: '订单 ID'
})
})
},
responses: {
200: {
description: '成功获取订单详情',
content: {
'application/json': {
schema: BillDetailResponseSchema.nullable()
}
}
}
}
}
},
'/support/wallet/bill/list': {
post: {
summary: '获取订单列表',
description: '分页获取团队的订单列表,支持按类型筛选',
tags: [TagsMap.walletBill],
requestBody: {
content: {
'application/json': {
schema: BillListQuerySchema
}
}
},
responses: {
200: {
description: '成功获取订单列表',
content: {
'application/json': {
schema: z.object({
list: z.array(BillDetailResponseSchema),
total: z.number().meta({ description: '总数' })
})
}
}
}
}
}
},
'/support/wallet/bill/cancel': {
post: {
summary: '取消订单',
description: '取消未支付的订单,如果使用了优惠券会自动返还',
tags: [TagsMap.walletBill],
requestBody: {
content: {
'application/json': {
schema: CancelBillPropsSchema
}
}
},
responses: {
200: {
description: '成功取消订单',
content: {
'application/json': {
schema: z.null()
}
}
}
}
}
}
};
@@ -0,0 +1,33 @@
import { z } from 'zod';
import { ObjectIdSchema } from '../../../../common/type/mongo';
import {
DiscountCouponStatusEnum,
DiscountCouponTypeEnum
} from '../../../../support/wallet/sub/discountCoupon/constants';
export const DiscountCouponSchema = z.object({
_id: ObjectIdSchema.meta({ description: '优惠券 ID' }),
teamId: ObjectIdSchema.meta({ description: '团队 ID' }),
type: z.enum(Object.values(DiscountCouponTypeEnum)).meta({ description: '优惠券类型' }),
startTime: z.coerce.date().optional().meta({ description: '生效时间' }),
expiredTime: z.coerce.date().meta({ description: '过期时间' }),
usedAt: z.coerce.date().optional().meta({ description: '使用时间' }),
createTime: z.coerce.date().meta({ description: '创建时间' })
});
export type DiscountCouponSchemaType = z.infer<typeof DiscountCouponSchema>;
export const DiscountCouponItemSchema = DiscountCouponSchema.extend({
name: z.string().meta({ description: '优惠券名称' }),
description: z.string().meta({ description: '优惠券描述' }),
discount: z.number().min(0).max(1).meta({ description: '折扣率' }),
iconZh: z.string().meta({ description: '中文图标路径' }),
iconEn: z.string().meta({ description: '英文图标路径' }),
status: z.enum(DiscountCouponStatusEnum).meta({ description: '优惠券状态' }),
billId: ObjectIdSchema.optional().meta({
description: '关联的订单 ID, 被使用后该值存在'
})
});
export const DiscountCouponListResponseSchema = z.array(DiscountCouponItemSchema);
export type DiscountCouponListResponseType = z.infer<typeof DiscountCouponListResponseSchema>;
@@ -0,0 +1,23 @@
import type { OpenAPIPath } from '../../../type';
import { DiscountCouponListResponseSchema } from './api';
import { TagsMap } from '../../../tag';
export const DiscountCouponPath: OpenAPIPath = {
'/support/wallet/discountCoupon/list': {
get: {
summary: '获取优惠券列表',
description: '获取团队的优惠券列表,包括优惠券状态、使用情况等信息',
tags: [TagsMap.walletDiscountCoupon],
responses: {
200: {
description: '成功获取优惠券列表',
content: {
'application/json': {
schema: DiscountCouponListResponseSchema
}
}
}
}
}
}
};
@@ -0,0 +1,8 @@
import type { OpenAPIPath } from '../../type';
import { BillPath } from './bill';
import { DiscountCouponPath } from './discountCoupon';
export const WalletPath: OpenAPIPath = {
...BillPath,
...DiscountCouponPath
};
+3 -1
View File
@@ -6,5 +6,7 @@ export const TagsMap = {
pluginAdmin: '管理员插件管理',
pluginToolAdmin: '管理员系统工具管理',
pluginTeam: '团队插件管理',
apiKey: 'APIKey'
apiKey: 'APIKey',
walletBill: '订单',
walletDiscountCoupon: '优惠券'
};