Extraction schema (#398)

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

@@ -1,29 +1,29 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
+import { MongoUser } from '@fastgpt/support/user/schema';
+import { setCookie } from '@/service/utils/tools';
+import { generateToken } from '@fastgpt/support/user/tools';
 import { connectToDatabase } from '@/service/mongo';
-import { User } from '@/service/models/user';
-import { generateToken, setCookie } from '@/service/utils/tools';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
+    await connectToDatabase();
     const { username, password } = req.body;
 
     if (!username || !password) {
       throw new Error('缺少参数');
     }
 
-    await connectToDatabase();
-
     // 检测用户是否存在
-    const authUser = await User.findOne({
+    const authUser = await MongoUser.findOne({
       username
     });
     if (!authUser) {
       throw new Error('用户未注册');
     }
 
-    const user = await User.findOne({
+    const user = await MongoUser.findOne({
       username,
       password
     });

projects/app/src/pages/api/user/account/paySuccess.ts

@@ -1,11 +1,12 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { TrainingData } from '@/service/mongo';
+import { TrainingData, connectToDatabase } from '@/service/mongo';
 import { startQueue } from '@/service/utils/tools';
-import { authUser } from '@/service/utils/auth';
+import { authUser } from '@fastgpt/support/user/auth';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
+    await connectToDatabase();
     const { userId } = await authUser({ req, authToken: true });
     await unlockTask(userId);
   } catch (error) {}

projects/app/src/pages/api/user/account/tokenLogin.ts

@@ -1,18 +1,17 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
+import { authUser } from '@fastgpt/support/user/auth';
+import { MongoUser } from '@fastgpt/support/user/schema';
 import { connectToDatabase } from '@/service/mongo';
-import { User } from '@/service/models/user';
-import { authUser } from '@/service/utils/auth';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
+    await connectToDatabase();
     const { userId } = await authUser({ req, authToken: true });
 
-    await connectToDatabase();
-
     // 根据 id 获取用户信息
-    const user = await User.findById(userId);
+    const user = await MongoUser.findById(userId);
 
     if (!user) {
       throw new Error('账号异常');

projects/app/src/pages/api/user/account/update.ts

@@ -1,21 +1,20 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { User } from '@/service/models/user';
-import { connectToDatabase } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
+import { MongoUser } from '@fastgpt/support/user/schema';
+import { authUser } from '@fastgpt/support/user/auth';
 import { UserUpdateParams } from '@/types/user';
 import { getAIApi, openaiBaseUrl } from '@fastgpt/core/ai/config';
+import { connectToDatabase } from '@/service/mongo';
 
 /* update user info */
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
+    await connectToDatabase();
     const { avatar, timezone, openaiAccount } = req.body as UserUpdateParams;
 
     const { userId } = await authUser({ req, authToken: true });
 
-    await connectToDatabase();
-
     // auth key
     if (openaiAccount?.key) {
       console.log('auth user openai key', openaiAccount?.key);
@@ -35,7 +34,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     }
 
     // 更新对应的记录
-    await User.updateOne(
+    await MongoUser.updateOne(
       {
         _id: userId
       },

projects/app/src/pages/api/user/account/updatePasswordByOld.ts

@@ -1,24 +1,23 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { User } from '@/service/models/user';
+import { authUser } from '@fastgpt/support/user/auth';
+import { MongoUser } from '@fastgpt/support/user/schema';
 import { connectToDatabase } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
+    await connectToDatabase();
     const { oldPsw, newPsw } = req.body as { oldPsw: string; newPsw: string };
 
     if (!oldPsw || !newPsw) {
       throw new Error('Params is missing');
     }
 
-    await connectToDatabase();
-
     const { userId } = await authUser({ req, authToken: true });
 
     // auth old password
-    const user = await User.findOne({
+    const user = await MongoUser.findOne({
       _id: userId,
       password: oldPsw
     });
@@ -28,7 +27,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     }
 
     // 更新对应的记录
-    await User.findByIdAndUpdate(userId, {
+    await MongoUser.findByIdAndUpdate(userId, {
       password: newPsw
     });
 

projects/app/src/pages/api/user/getBill.ts

@@ -1,13 +1,14 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, Bill } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
+import { Bill, connectToDatabase } from '@/service/mongo';
+import { authUser } from '@fastgpt/support/user/auth';
 import { adaptBill } from '@/utils/adapt';
 import { addDays } from 'date-fns';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
+    await connectToDatabase();
     const {
       pageNum = 1,
       pageSize = 10,
@@ -22,8 +23,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
     const { userId } = await authUser({ req, authToken: true });
 
-    await connectToDatabase();
-
     const where = {
       userId,
       time: {

projects/app/src/pages/api/user/getPayOrders.ts

@@ -1,13 +1,12 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { authUser } from '@/service/utils/auth';
-import { connectToDatabase, Pay } from '@/service/mongo';
+import { authUser } from '@fastgpt/support/user/auth';
+import { Pay, connectToDatabase } from '@/service/mongo';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
-    const { userId } = await authUser({ req, authToken: true });
-
     await connectToDatabase();
+    const { userId } = await authUser({ req, authToken: true });
 
     const records = await Pay.find({
       userId,

projects/app/src/pages/api/user/inform/countUnread.ts

@@ -1,11 +1,12 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, Inform } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
+import { Inform, connectToDatabase } from '@/service/mongo';
+import { authUser } from '@fastgpt/support/user/auth';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
+    await connectToDatabase();
     if (!req.headers.cookie) {
       return jsonRes(res, {
         data: 0
@@ -13,8 +14,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     }
     const { userId } = await authUser({ req, authToken: true });
 
-    await connectToDatabase();
-
     const data = await Inform.countDocuments({
       userId,
       read: false

projects/app/src/pages/api/user/inform/list.ts

@@ -1,11 +1,12 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, Inform } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
+import { Inform, connectToDatabase } from '@/service/mongo';
+import { authUser } from '@fastgpt/support/user/auth';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
+    await connectToDatabase();
     const { userId } = await authUser({ req, authToken: true });
 
     const { pageNum, pageSize = 10 } = req.body as {
@@ -13,8 +14,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       pageSize: number;
     };
 
-    await connectToDatabase();
-
     const [informs, total] = await Promise.all([
       Inform.find({ userId })
         .sort({ time: -1 }) // 按照创建时间倒序排列

projects/app/src/pages/api/user/inform/read.ts

@@ -1,14 +1,13 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, Inform } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
+import { Inform, connectToDatabase } from '@/service/mongo';
+import { authUser } from '@fastgpt/support/user/auth';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
-    const { userId } = await authUser({ req, authToken: true });
-
     await connectToDatabase();
+    const { userId } = await authUser({ req, authToken: true });
 
     const { id } = req.query as { id: string };
 

projects/app/src/pages/api/user/inform/send.ts

@@ -1,10 +1,11 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, Inform, User } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
+import { Inform, connectToDatabase } from '@/service/mongo';
+import { authUser } from '@fastgpt/support/user/auth';
 import { InformTypeEnum } from '@/constants/user';
 import { startSendInform } from '@/service/events/sendInform';
+import { MongoUser } from '@fastgpt/support/user/schema';
 
 export type Props = {
   type: `${InformTypeEnum}`;
@@ -15,9 +16,8 @@ export type Props = {
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
-    await authUser({ req, authRoot: true });
-
     await connectToDatabase();
+    await authUser({ req, authRoot: true });
 
     jsonRes(res, {
       data: await sendInform(req.body),
@@ -62,7 +62,7 @@ export async function sendInform({ type, title, content, userId }: Props) {
     }
 
     // send to all user
-    const users = await User.find({}, '_id');
+    const users = await MongoUser.find({}, '_id');
     await Inform.insertMany(
       users.map(({ _id }) => ({
         type,

projects/app/src/pages/api/user/promotion/getPromotionData.ts

@@ -1,16 +1,17 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { connectToDatabase, User, promotionRecord } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
-import mongoose from 'mongoose';
+import { connectToDatabase, promotionRecord } from '@/service/mongo';
+import { authUser } from '@fastgpt/support/user/auth';
+import mongoose from '@fastgpt/common/mongo';
+import { MongoUser } from '@fastgpt/support/user/schema';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
     await connectToDatabase();
     const { userId } = await authUser({ req, authToken: true });
 
-    const invitedAmount = await User.countDocuments({
+    const invitedAmount = await MongoUser.countDocuments({
       inviterId: userId
     });
 

projects/app/src/pages/api/user/promotion/getPromotions.ts

@@ -1,10 +1,11 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, promotionRecord } from '@/service/mongo';
-import { authUser } from '@/service/utils/auth';
+import { authUser } from '@fastgpt/support/user/auth';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {
+    await connectToDatabase();
     let { pageNum = 1, pageSize = 10 } = req.body as {
       pageNum: number;
       pageSize: number;
@@ -12,8 +13,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
     const { userId } = await authUser({ req, authToken: true });
 
-    await connectToDatabase();
-
     const data = await promotionRecord
       .find(
         {