diff --git a/docSite/content/zh-cn/docs/development/upgrading/498.md b/docSite/content/zh-cn/docs/development/upgrading/498.md index 72d85313a..c5c1898cd 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/498.md +++ b/docSite/content/zh-cn/docs/development/upgrading/498.md @@ -28,4 +28,5 @@ weight: 792 2. 打开知识库搜索参数后,重排选项自动被打开。 3. LLM json_schema 模式 API 请求格式错误。 4. 重新训练时,图片过期索引未成功清除,导致图片会丢失。 +5. 重新训练权限问题。 diff --git a/packages/global/common/system/config/constants.ts b/packages/global/common/system/config/constants.ts index 01296c22e..0be8d6346 100644 --- a/packages/global/common/system/config/constants.ts +++ b/packages/global/common/system/config/constants.ts @@ -1,7 +1,8 @@ export enum SystemConfigsTypeEnum { fastgpt = 'fastgpt', fastgptPro = 'fastgptPro', - systemMsgModal = 'systemMsgModal' + systemMsgModal = 'systemMsgModal', + license = 'license' } export const SystemConfigsTypeMap = { @@ -13,5 +14,8 @@ export const SystemConfigsTypeMap = { }, [SystemConfigsTypeEnum.systemMsgModal]: { label: 'systemMsgModal' + }, + [SystemConfigsTypeEnum.license]: { + label: 'license' } }; diff --git a/packages/service/common/middle/entry.ts b/packages/service/common/middle/entry.ts index f45750388..e2bbb4c53 100644 --- a/packages/service/common/middle/entry.ts +++ b/packages/service/common/middle/entry.ts @@ -1,5 +1,5 @@ import { jsonRes } from '../response'; -import type { NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from 'next'; import { withNextCors } from './cors'; import { type ApiRequestProps } from '../../type/next'; import { addLog } from '../system/log'; @@ -9,14 +9,21 @@ export type NextApiHandler = ( res: NextApiResponse ) => unknown | Promise; -export const NextEntry = ({ beforeCallback = [] }: { beforeCallback?: Promise[] }) => { +export const NextEntry = ({ + beforeCallback = [] +}: { + beforeCallback?: ((req: NextApiRequest, res: NextApiResponse) => Promise)[]; +}) => { return (...args: NextApiHandler[]): NextApiHandler => { return async function api(req: ApiRequestProps, res: NextApiResponse) { const start = Date.now(); addLog.debug(`Request start ${req.url}`); try { - await Promise.all([withNextCors(req, res), ...beforeCallback]); + await Promise.all([ + withNextCors(req, res), + ...beforeCallback.map((item) => item(req, res)) + ]); let response = null; for await (const handler of args) { diff --git a/packages/service/package.json b/packages/service/package.json index 6e69f4a0b..d6bdd1e8d 100644 --- a/packages/service/package.json +++ b/packages/service/package.json @@ -8,7 +8,7 @@ "@xmldom/xmldom": "^0.8.10", "@zilliz/milvus2-sdk-node": "2.4.2", "axios": "^1.8.2", - "bullmq": "^5.44.0", + "bullmq": "^5.52.2", "chalk": "^5.3.0", "cheerio": "1.0.0-rc.12", "cookie": "^0.7.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a3ef9a121..01f57aa86 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -191,8 +191,8 @@ importers: specifier: ^1.8.2 version: 1.8.4 bullmq: - specifier: ^5.44.0 - version: 5.44.0 + specifier: ^5.52.2 + version: 5.52.2 chalk: specifier: ^5.3.0 version: 5.4.1 @@ -4193,8 +4193,8 @@ packages: buffer@6.0.3: resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==} - bullmq@5.44.0: - resolution: {integrity: sha512-OnEtkuXyrUx2Jm5BpH92+ttrobblBdCbkhOe3OoR0hxZuAilI3mPWlwELslhfImRpDv8rK+C/0/VK7I8f3xIig==} + bullmq@5.52.2: + resolution: {integrity: sha512-fK/dKIv8ymyys4K+zeNEPA+yuYWzRPmBWUmwIMz8DvYekadl8VG19yUx94Na0n0cLAi+spdn3a/+ufkYK7CBUg==} bundle-n-require@1.1.2: resolution: {integrity: sha512-bEk2jakVK1ytnZ9R2AAiZEeK/GxPUM8jvcRxHZXifZDMcjkI4EG/GlsJ2YGSVYT9y/p/gA9/0yDY8rCGsSU6Tg==} @@ -13902,7 +13902,7 @@ snapshots: base64-js: 1.5.1 ieee754: 1.2.1 - bullmq@5.44.0: + bullmq@5.52.2: dependencies: cron-parser: 4.9.0 ioredis: 5.6.0 @@ -15142,7 +15142,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0)(eslint@8.56.0): + eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0)(eslint@8.56.0))(eslint@8.56.0): dependencies: debug: 3.2.7 optionalDependencies: @@ -15153,7 +15153,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0)(eslint@8.57.1): + eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: @@ -15175,7 +15175,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0)(eslint@8.56.0) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.56.0)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0)(eslint@8.56.0))(eslint@8.56.0) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 @@ -15204,7 +15204,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0)(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.9.0(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 diff --git a/projects/app/src/pageComponents/dataset/detail/DataCard.tsx b/projects/app/src/pageComponents/dataset/detail/DataCard.tsx index cac3b3ed2..570cb5acf 100644 --- a/projects/app/src/pageComponents/dataset/detail/DataCard.tsx +++ b/projects/app/src/pageComponents/dataset/detail/DataCard.tsx @@ -140,25 +140,27 @@ const DataCard = () => { )} - {datasetDetail.type !== 'websiteDataset' && !!collection?.chunkSize && ( - - )} + {datasetDetail.type !== 'websiteDataset' && + !!collection?.chunkSize && + collection.permission?.hasWritePer && ( + + )} {canWrite && (