4.6.7-alpha commit (#743)

Co-authored-by: Archer <545436317@qq.com>
Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

projects/app/src/pages/api/support/user/account/loginByPassword.ts

@@ -10,7 +10,7 @@ import { UserStatusEnum } from '@fastgpt/global/support/user/constant';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     await connectToDatabase();
-    const { username, password, tmbId = '' } = req.body as PostLoginProps;
+    const { username, password } = req.body as PostLoginProps;
 
     if (!username || !password) {
       throw new Error('缺少参数');
@@ -40,7 +40,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       throw new Error('密码错误');
     }
 
-    const userDetail = await getUserDetail({ tmbId, userId: user._id });
+    const userDetail = await getUserDetail({
+      tmbId: user?.lastLoginTmbId,
+      userId: user._id
+    });
+
+    MongoUser.findByIdAndUpdate(user._id, {
+      lastLoginTmbId: userDetail.team.tmbId
+    });
 
     const token = createJWT(userDetail);
     setCookie(res, token);

projects/app/src/pages/api/support/user/team/limit/datasetSizeLimit.ts

@@ -0,0 +1,37 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { authCert } from '@fastgpt/service/support/permission/auth/common';
+import { checkDatasetLimit } from '@fastgpt/service/support/permission/limit/dataset';
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+  try {
+    await connectToDatabase();
+    const { size } = req.query as {
+      size: string;
+    };
+
+    // 凭证校验
+    const { teamId } = await authCert({ req, authToken: true });
+
+    if (!size) {
+      return jsonRes(res);
+    }
+
+    const numberSize = Number(size);
+
+    await checkDatasetLimit({
+      teamId,
+      freeSize: global.feConfigs?.subscription?.datasetStoreFreeSize,
+      insertLen: numberSize
+    });
+
+    jsonRes(res);
+  } catch (err) {
+    res.status(500);
+    jsonRes(res, {
+      code: 500,
+      error: err
+    });
+  }
+}

projects/app/src/pages/api/support/wallet/bill/createTrainingBill.ts

@@ -1,29 +1,32 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@fastgpt/service/common/response';
 import { connectToDatabase } from '@/service/mongo';
-import { authCert } from '@fastgpt/service/support/permission/auth/common';
 import { BillSourceEnum } from '@fastgpt/global/support/wallet/bill/constants';
 import { CreateTrainingBillProps } from '@fastgpt/global/support/wallet/bill/api.d';
 import { getQAModel, getVectorModel } from '@/service/core/ai/model';
 import { createTrainingBill } from '@fastgpt/service/support/wallet/bill/controller';
+import { authDataset } from '@fastgpt/service/support/permission/auth/dataset';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     await connectToDatabase();
-    const { name, vectorModel, agentModel } = req.body as CreateTrainingBillProps;
+    const { name, datasetId } = req.body as CreateTrainingBillProps;
 
-    const { teamId, tmbId } = await authCert({ req, authToken: true, authApiKey: true });
-
-    const vectorModelData = getVectorModel(vectorModel);
-    const agentModelData = getQAModel(agentModel);
+    const { teamId, tmbId, dataset } = await authDataset({
+      req,
+      authToken: true,
+      authApiKey: true,
+      datasetId,
+      per: 'w'
+    });
 
     const { billId } = await createTrainingBill({
       teamId,
       tmbId,
       appName: name,
       billSource: BillSourceEnum.training,
-      vectorModel: vectorModelData.name,
-      agentModel: agentModelData.name
+      vectorModel: getVectorModel(dataset.vectorModel).name,
+      agentModel: getQAModel(dataset.agentModel).name
     });
 
     jsonRes<string>(res, {