fix: mongo connection

packages/global/support/user/team/type.d.ts

@@ -32,6 +32,7 @@ export type TeamItemType = {
   role: `${TeamMemberRoleEnum}`;
   status: `${TeamMemberStatusEnum}`;
   canWrite: boolean;
+  maxSize: number;
 };
 
 export type TeamMemberItemType = {

packages/service/common/mongo/init.ts

@@ -1,6 +1,6 @@
 import mongoose from './index';
-import 'winston-mongodb';
 import { createLogger, format, transports } from 'winston';
+import 'winston-mongodb';
 
 /**
  * connect MongoDB and init data
@@ -19,9 +19,6 @@ export async function connectMongo({
   beforeHook && (await beforeHook());
   global.mongodb = mongoose;
 
-  // logger
-  initLogger();
-
   console.log('mongo start connect');
   try {
     mongoose.set('strictQuery', true);
@@ -35,9 +32,11 @@ export async function connectMongo({
     });
 
     console.log('mongo connected');
+    initLogger();
 
     afterHook && (await afterHook());
   } catch (error) {
+    global.mongodb.disconnect();
     console.log('error->', 'mongo connect error', error);
     global.mongodb = undefined;
   }
@@ -73,8 +72,4 @@ function initLogger() {
       })
     ]
   });
-  global.logger.on('error', (err) => {
-    console.log(err);
-    global.mongodb = undefined;
-  });
 }

packages/service/support/user/team/controller.ts

@@ -61,19 +61,22 @@ export async function getTeamInfoByTmbId({
     role: tmb.role,
     status: tmb.status,
     defaultTeam: tmb.defaultTeam,
-    canWrite: tmb.role !== TeamMemberRoleEnum.visitor
+    canWrite: tmb.role !== TeamMemberRoleEnum.visitor,
+    maxSize: tmb.team.maxSize
   };
 }
 export async function createDefaultTeam({
   userId,
   teamName = 'My Team',
   avatar = '/icon/logo.svg',
-  balance = 0
+  balance = 0,
+  maxSize = 5
 }: {
   userId: string;
   teamName?: string;
   avatar?: string;
   balance?: number;
+  maxSize?: number;
 }) {
   const db = connectionMongo.connection.db;
   const Team = db.collection(TeamCollectionName);
@@ -94,7 +97,7 @@ export async function createDefaultTeam({
       name: teamName,
       avatar,
       balance,
-      maxSize: 1,
+      maxSize,
       createTime: new Date()
     });
     await TeamMember.insertOne({

projects/app/next.config.js

@@ -45,7 +45,7 @@ const nextConfig = {
   },
   transpilePackages: ['@fastgpt/*'],
   experimental: {
-    serverComponentsExternalPackages: ['mongoose', 'pg'],
+    serverComponentsExternalPackages: ['mongoose', 'winston', 'winston-mongodb', 'pg'],
     outputFileTracingRoot: path.join(__dirname, '../../')
   }
 };

projects/app/public/locales/en/common.json

@@ -495,6 +495,7 @@
       "Leave Team Failed": "Leave Team Failed",
       "Manage": "Team Manage",
       "Member": "Member",
+      "Over Max Member Tip": "Team max {{max}} people",
       "Personal Team": "Personal",
       "Processing invitations": "Processing invitations",
       "Processing invitations Tips": "You have {{amount}} of team invitations that need to be processed",

projects/app/public/locales/zh/common.json

@@ -495,6 +495,7 @@
       "Leave Team Failed": "离开团队异常",
       "Manage": "团队管理",
       "Member": "成员",
+      "Over Max Member Tip": "团队最多{{max}}人",
       "Personal Team": "个人团队",
       "Processing invitations": "处理邀请",
       "Processing invitations Tips": "你有{{amount}}个需要处理的团队邀请",

projects/app/src/components/support/user/team/TeamManageModal/index.tsx

@@ -42,6 +42,7 @@ import { useLoading } from '@/web/common/hooks/useLoading';
 import { FormDataType, defaultForm } from './EditModal';
 import MyMenu from '@/components/MyMenu';
 import { useConfirm } from '@/web/common/hooks/useConfirm';
+import { useToast } from '@/web/common/hooks/useToast';
 
 const EditModal = dynamic(() => import('./EditModal'));
 const InviteModal = dynamic(() => import('./InviteModal'));
@@ -50,6 +51,7 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
   const theme = useTheme();
   const { t } = useTranslation();
   const { Loading } = useLoading();
+  const { toast } = useToast();
 
   const { ConfirmModal: ConfirmRemoveMemberModal, openConfirm: openRemoveMember } = useConfirm();
   const { ConfirmModal: ConfirmLeaveTeamModal, openConfirm: openLeaveConfirm } = useConfirm({
@@ -257,7 +259,16 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
                   borderRadius={'md'}
                   ml={3}
                   leftIcon={<MyIcon name={'common/inviteLight'} w={'14px'} color={'myBlue.600'} />}
-                  onClick={onOpenInvite}
+                  onClick={() => {
+                    if (userInfo.team.maxSize > members.length) {
+                      toast({
+                        status: 'warning',
+                        title: t('user.team.Over Max Member Tip', { max: userInfo.team.maxSize })
+                      });
+                    } else {
+                      onOpenInvite();
+                    }
+                  }}
                 >
                   {t('user.team.Invite Member')}
                 </Button>

projects/app/src/pages/api/admin/initv46.ts

@@ -32,10 +32,10 @@ import { POST } from '@fastgpt/service/common/api/plusRequest';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
-    const { limit = 50 } = req.body as { limit: number };
+    const { limit = 50, maxSize = 3 } = req.body as { limit: number; maxSize: number };
     await connectToDatabase();
 
-    await initDefaultTeam(limit);
+    await initDefaultTeam(limit, maxSize);
     await initMongoTeamId(limit);
     await initDatasetAndApp();
     await initCollectionFileTeam(limit);
@@ -59,7 +59,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   }
 }
 
-async function initDefaultTeam(limit: number) {
+async function initDefaultTeam(limit: number, maxSize: number) {
   /* init user default Team */
   const users = await MongoUser.find({}, '_id balance');
   console.log('init user default team', users.length);
@@ -79,7 +79,8 @@ async function initDefaultTeam(limit: number) {
     try {
       await createDefaultTeam({
         userId: user._id,
-        balance: user.balance
+        balance: user.balance,
+        maxSize
       });
     } catch (error) {
       console.log(error);

projects/app/src/service/mongo.ts

@@ -53,7 +53,7 @@ async function initRootUser() {
       rootId = _id;
     }
     // init root team
-    await createDefaultTeam({ userId: rootId });
+    await createDefaultTeam({ userId: rootId, maxSize: 1 });
 
     console.log(`root user init:`, {
       username: 'root',