V4.8.18 feature (#3565)

* feat: org CRUD (#3380) * feat: add org schema * feat: org manage UI * feat: OrgInfoModal * feat: org tree view * feat: org management * fix: init root org * feat: org permission for app * feat: org support for dataset * fix: disable org role control * styles: opt type signatures * fix: remove unused permission * feat: delete org collaborator * perf: Team org ui (#3499) * perf: org ui * perf: org ui * feat: org auth for app & dataset (#3498) * feat: auth org resource permission * feat: org auth support for app & dataset * perf: org permission check (#3500) * i18n (#3501) * name * i18n * feat: support dataset changeOwner (#3483) * feat: support dataset changeOwner * chore: update dataset change owner api * feat: permission manage UI for org (#3503) * perf: password check;perf: image upload check;perf: sso login check (#3509) * perf: password check * perf: image upload check * perf: sso login check * force show update notification modal & fix login page text (#3512) * fix login page English text * update notification modal * perf: notify account (#3515) * perf(plugin): improve searXNG empty result handling and documentation (#3507) * perf(plugin): improve searXNG empty result handling and documentation * 修改了文档和代码部分无搜索的结果的反馈 * refactor: org pathId (#3516) * optimize payment process (#3517) * feat: support wecom sso (#3518) * feat: support wecom sso * chore: remove unused wecom js-sdk dependency * fix qrcode script (#3520) * fix qrcode script * i18n * perf: full text collection and search code;perf: rename function (#3519) * perf: full text collection and search code * perf: rename function * perf: notify modal * remove invalid code * perf: sso login * perf: pay process * 4.8.18 test (#3524) * perf: remove local token * perf: index * perf: file encoding;perf: leave team code;@c121914yu perf: full text search code (#3528) * perf: text encoding * perf: leave team code * perf: full text search code * fix: http status * perf: embedding search and vector avatar * perf: async read file (#3531) * refactor: team permission manager (#3535) * perf: classify org, group and member * refactor: team per manager * fix: missing functions * 4.8.18 test (#3543) * perf: login check * doc * perf: llm model config * perf: team clb config * fix: MemberModal UI (#3553) * fix: adapt MemberModal title and icon * fix: adapt member modal * fix: search input placeholder * fix: add button text * perf: org permission (#3556) * docs:用户答疑的官方文档补充 (#3540) * docs:用户答疑的官方文档补充 * 问题回答的内容修补 * share link random avatar (#3541) * share link random avatar * fix * delete unused code * share page avatar (#3558) * feat: init 4818 * share page avatar * feat: tmp upgrade code (#3559) * feat: tmp upgrade code * fulltext search test * update action * full text tmp code (#3561) * full text tmp code * fix: init * fix: init * remove tmp code * remove tmp code * 4818-alpha * 4.8.18 test (#3562) * full text tmp code * fix: init * upgrade code * account log * account log * perf: dockerfile * upgrade code * chore: update docs app template submission (#3564) --------- Co-authored-by: a.e. <49438478+I-Info@users.noreply.github.com> Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: Jiangween <145003935+Jiangween@users.noreply.github.com>
2025-01-11 15:15:38 +08:00
parent bb669ca3ff
commit 10d8c56e23
205 changed files with 5305 additions and 2428 deletions
--- a/projects/app/src/pages/api/core/app/create.ts
+++ b/projects/app/src/pages/api/core/app/create.ts
@@ -15,8 +15,8 @@ import { ClientSession } from '@fastgpt/service/common/mongo';
 import { authApp } from '@fastgpt/service/support/permission/app/auth';
 import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
 import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
-import { MongoUser } from '@fastgpt/service/support/user/schema';
 import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
+import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';

 export type CreateAppBody = {
  parentId?: ParentIdType;
@@ -148,6 +148,8 @@ export const onCreateApp = async ({
      );
    }

+    await refreshSourceAvatar(avatar, undefined, session);
+
    return appId;
  };

--- a/projects/app/src/pages/api/core/app/del.ts
+++ b/projects/app/src/pages/api/core/app/del.ts
@@ -18,6 +18,7 @@ import { ClientSession } from '@fastgpt/service/common/mongo';
 import { deleteChatFiles } from '@fastgpt/service/core/chat/controller';
 import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
 import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema';
+import { removeImageByPath } from '@fastgpt/service/common/file/image/controller';

 async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
  const { appId } = req.query as { appId: string };
@@ -57,7 +58,7 @@ export const onDelOneApp = async ({
  const apps = await findAppAndAllChildren({
    teamId,
    appId,
-    fields: '_id'
+    fields: '_id avatar'
  });

  const del = async (session: ClientSession) => {
@@ -109,6 +110,8 @@ export const onDelOneApp = async ({
        },
        { session }
      );
+
+      await removeImageByPath(app.avatar, session);
    }
  };

--- a/projects/app/src/pages/api/core/app/httpPlugin/update.ts
+++ b/projects/app/src/pages/api/core/app/httpPlugin/update.ts
@@ -11,6 +11,7 @@ import { MongoApp } from '@fastgpt/service/core/app/schema';
 import { isEqual } from 'lodash';
 import { onCreateApp } from '../create';
 import { onDelOneApp } from '../del';
+import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';

 export type UpdateHttpPluginBody = {
  appId: string;
@@ -49,13 +50,15 @@ async function handler(req: ApiRequestProps<UpdateHttpPluginBody>, res: NextApiR
    await MongoApp.findByIdAndUpdate(
      appId,
      {
-        name,
-        avatar,
-        intro,
+        ...(name && { name }),
+        ...(avatar && { avatar }),
+        ...(intro !== undefined && { intro }),
        pluginData
      },
      { session }
    );
+
+    await refreshSourceAvatar(avatar, app.avatar, session);
  });
 }

--- a/projects/app/src/pages/api/core/app/list.ts
+++ b/projects/app/src/pages/api/core/app/list.ts
@@ -15,8 +15,9 @@ import { AppDefaultPermissionVal } from '@fastgpt/global/support/permission/app/
 import { authApp } from '@fastgpt/service/support/permission/app/auth';
 import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
 import { replaceRegChars } from '@fastgpt/global/common/string/tools';
-import { getGroupPer } from '@fastgpt/service/support/permission/controller';
+import { concatPer } from '@fastgpt/service/support/permission/controller';
 import { getGroupsByTmbId } from '@fastgpt/service/support/permission/memberGroup/controllers';
+import { getOrgIdSetWithParentByTmbId } from '@fastgpt/service/support/permission/org/controllers';

 export type ListAppBody = {
  parentId?: ParentIdType;
@@ -25,7 +26,7 @@ export type ListAppBody = {
  searchKey?: string;
 };

-/* 
+/*
  获取 APP 列表权限
  1. 校验 folder 权限和获取 team 权限（owner 单独处理）
  2. 获取 team 下所有 app 权限。获取我的所有组。并计算出我所有的app权限。
@@ -60,7 +61,7 @@ async function handler(req: ApiRequestProps<ListAppBody>): Promise<AppListItemTy
  ]);

  // Get team all app permissions
-  const [perList, myGroupMap] = await Promise.all([
+  const [perList, myGroupMap, myOrgSet] = await Promise.all([
    MongoResourcePermission.find({
      resourceType: PerResourceTypeEnum.app,
      teamId,
@@ -77,11 +78,18 @@ async function handler(req: ApiRequestProps<ListAppBody>): Promise<AppListItemTy
        map.set(String(item._id), 1);
      });
      return map;
+    }),
+    getOrgIdSetWithParentByTmbId({
+      teamId,
+      tmbId
    })
  ]);
  // Get my permissions
  const myPerList = perList.filter(
-    (item) => String(item.tmbId) === String(tmbId) || myGroupMap.has(String(item.groupId))
+    (item) =>
+      String(item.tmbId) === String(tmbId) ||
+      myGroupMap.has(String(item.groupId)) ||
+      myOrgSet.has(String(item.orgId))
  );

  const findAppsQuery = (() => {
@@ -151,9 +159,11 @@ async function handler(req: ApiRequestProps<ListAppBody>): Promise<AppListItemTy
          const tmbPer = myPerList.find(
            (item) => String(item.resourceId) === appId && !!item.tmbId
          )?.permission;
-          const groupPer = getGroupPer(
+          const groupPer = concatPer(
            myPerList
-              .filter((item) => String(item.resourceId) === appId && !!item.groupId)
+              .filter(
+                (item) => String(item.resourceId) === appId && (!!item.groupId || !!item.orgId)
+              )
              .map((item) => item.permission)
          );

--- a/projects/app/src/pages/api/core/app/update.ts
+++ b/projects/app/src/pages/api/core/app/update.ts
@@ -22,6 +22,7 @@ import { getResourceClbsAndGroups } from '@fastgpt/service/support/permission/co
 import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
 import { TeamWritePermissionVal } from '@fastgpt/global/support/permission/user/constant';
 import { AppErrEnum } from '@fastgpt/global/common/error/code/app';
+import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';

 export type AppUpdateQuery = {
  appId: string;
@@ -95,6 +96,8 @@ async function handler(req: ApiRequestProps<AppUpdateBody, AppUpdateQuery>) {
      isPlugin: app.type === AppTypeEnum.plugin
    });

+    await refreshSourceAvatar(avatar, app.avatar, session);
+
    return MongoApp.findByIdAndUpdate(
      appId,
      {
--- a/projects/app/src/pages/api/core/chat/outLink/init.ts
+++ b/projects/app/src/pages/api/core/chat/outLink/init.ts
@@ -12,18 +12,16 @@ import { getAppLatestVersion } from '@fastgpt/service/core/app/version/controlle
 import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
 import { NextAPI } from '@/service/middleware/entry';
 import { UserModelSchema } from '@fastgpt/global/support/user/type';
+import { getRandomUserAvatar } from '@fastgpt/global/support/user/utils';

 async function handler(req: NextApiRequest, res: NextApiResponse) {
  let { chatId, shareId, outLinkUid } = req.query as InitOutLinkChatProps;

  // auth link permission
-  const { outLinkConfig, uid, appId } = await authOutLink({ shareId, outLinkUid });
+  const { uid, appId } = await authOutLink({ shareId, outLinkUid });

  // auth app permission
-  const [tmb, chat, app] = await Promise.all([
-    MongoTeamMember.findById(outLinkConfig.tmbId, '_id userId')
-      .populate<{ user: UserModelSchema }>('user', 'avatar')
-      .lean(),
+  const [chat, app] = await Promise.all([
    MongoChat.findOne({ appId, chatId, shareId }).lean(),
    MongoApp.findById(appId).lean()
  ]);
@@ -48,7 +46,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
      chatId,
      appId: app._id,
      title: chat?.title,
-      userAvatar: tmb?.user?.avatar,
+      userAvatar: getRandomUserAvatar(),
      variables: chat?.variables,
      app: {
        chatConfig: getAppChatConfig({
--- a/projects/app/src/pages/api/core/dataset/collection/create/localFile.ts
+++ b/projects/app/src/pages/api/core/dataset/collection/create/localFile.ts
@@ -64,7 +64,6 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>): CreateCo
      path: file.path,
      filename: file.originalname,
      contentType: file.mimetype,
-      encoding: file.encoding,
      metadata: fileMetadata
    });

--- a/projects/app/src/pages/api/core/dataset/create.ts
+++ b/projects/app/src/pages/api/core/dataset/create.ts
@@ -11,6 +11,8 @@ import type { ApiRequestProps } from '@fastgpt/service/type/next';
 import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils';
 import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
 import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
+import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
+import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';

 export type DatasetCreateQuery = {};
 export type DatasetCreateBody = CreateDatasetParams;
@@ -63,19 +65,29 @@ async function handler(
  // check limit
  await checkTeamDatasetLimit(teamId);

-  const { _id } = await MongoDataset.create({
-    ...parseParentIdInMongo(parentId),
-    name,
-    intro,
-    teamId,
-    tmbId,
-    vectorModel,
-    agentModel,
-    avatar,
-    type,
-    apiServer,
-    feishuServer,
-    yuqueServer
+  const datasetId = await mongoSessionRun(async (session) => {
+    const [{ _id }] = await MongoDataset.create(
+      [
+        {
+          ...parseParentIdInMongo(parentId),
+          name,
+          intro,
+          teamId,
+          tmbId,
+          vectorModel,
+          agentModel,
+          avatar,
+          type,
+          apiServer,
+          feishuServer,
+          yuqueServer
+        }
+      ],
+      { session }
+    );
+    await refreshSourceAvatar(avatar, undefined, session);
+
+    return _id;
  });

  pushTrack.createDataset({
@@ -85,6 +97,6 @@ async function handler(
    uid: userId
  });

-  return _id;
+  return datasetId;
 }
 export default NextAPI(handler);
--- a/projects/app/src/pages/api/core/dataset/delete.ts
+++ b/projects/app/src/pages/api/core/dataset/delete.ts
@@ -8,6 +8,7 @@ import { NextAPI } from '@/service/middleware/entry';
 import { OwnerPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
 import { MongoDatasetCollectionTags } from '@fastgpt/service/core/dataset/tag/schema';
+import { removeImageByPath } from '@fastgpt/service/common/file/image/controller';

 async function handler(req: NextApiRequest) {
  const { id: datasetId } = req.query as {
@@ -51,6 +52,10 @@ async function handler(req: NextApiRequest) {
      },
      { session }
    );
+
+    for await (const dataset of datasets) {
+      await removeImageByPath(dataset.avatar, session);
+    }
  });
 }

--- a/projects/app/src/pages/api/core/dataset/list.ts
+++ b/projects/app/src/pages/api/core/dataset/list.ts
@@ -17,7 +17,8 @@ import { ApiRequestProps } from '@fastgpt/service/type/next';
 import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
 import { replaceRegChars } from '@fastgpt/global/common/string/tools';
 import { getGroupsByTmbId } from '@fastgpt/service/support/permission/memberGroup/controllers';
-import { getGroupPer } from '@fastgpt/service/support/permission/controller';
+import { concatPer } from '@fastgpt/service/support/permission/controller';
+import { getOrgIdSetWithParentByTmbId } from '@fastgpt/service/support/permission/org/controllers';

 export type GetDatasetListBody = {
  parentId: ParentIdType;
@@ -50,7 +51,7 @@ async function handler(req: ApiRequestProps<GetDatasetListBody>) {
  ]);

  // Get team all app permissions
-  const [perList, myGroupMap] = await Promise.all([
+  const [perList, myGroupMap, myOrgSet] = await Promise.all([
    MongoResourcePermission.find({
      resourceType: PerResourceTypeEnum.dataset,
      teamId,
@@ -67,10 +68,17 @@ async function handler(req: ApiRequestProps<GetDatasetListBody>) {
        map.set(String(item._id), 1);
      });
      return map;
+    }),
+    getOrgIdSetWithParentByTmbId({
+      teamId,
+      tmbId
    })
  ]);
  const myPerList = perList.filter(
-    (item) => String(item.tmbId) === String(tmbId) || myGroupMap.has(String(item.groupId))
+    (item) =>
+      String(item.tmbId) === String(tmbId) ||
+      myGroupMap.has(String(item.groupId)) ||
+      myOrgSet.has(String(item.orgId))
  );

  const findDatasetQuery = (() => {
@@ -122,9 +130,11 @@ async function handler(req: ApiRequestProps<GetDatasetListBody>) {
          const tmbPer = myPerList.find(
            (item) => String(item.resourceId) === datasetId && !!item.tmbId
          )?.permission;
-          const groupPer = getGroupPer(
+          const groupPer = concatPer(
            myPerList
-              .filter((item) => String(item.resourceId) === datasetId && !!item.groupId)
+              .filter(
+                (item) => String(item.resourceId) === datasetId && (!!item.groupId || !!item.orgId)
+              )
              .map((item) => item.permission)
          );
          return new DatasetPermission({
--- a/projects/app/src/pages/api/core/dataset/update.ts
+++ b/projects/app/src/pages/api/core/dataset/update.ts
@@ -28,6 +28,7 @@ import { DatasetErrEnum } from '@fastgpt/global/common/error/code/dataset';
 import { MongoDatasetTraining } from '@fastgpt/service/core/dataset/training/schema';
 import { MongoDatasetCollection } from '@fastgpt/service/core/dataset/collection/schema';
 import { addDays } from 'date-fns';
+import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';

 export type DatasetUpdateQuery = {};
 export type DatasetUpdateResponse = any;
@@ -144,6 +145,8 @@ async function handler(
      autoSync,
      session
    });
+
+    await refreshSourceAvatar(avatar, dataset.avatar, session);
  };

  await mongoSessionRun(async (session) => {