Extraction schema (#398)

projects/app/src/service/common/api/plugins.ts

@@ -1,15 +0,0 @@
-import { POST } from './request';
-
-export const postTextCensor = (data: { text: string }) =>
-  POST<{ code?: number; message: string }>('/plugins/censor/text_baidu', data)
-    .then((res) => {
-      if (res?.code === 5000) {
-        return Promise.reject(res);
-      }
-    })
-    .catch((err) => {
-      if (err?.code === 5000) {
-        return Promise.reject(err.message);
-      }
-      return Promise.resolve('');
-    });

projects/app/src/service/common/api/request.ts

@@ -1,120 +0,0 @@
-import axios, { Method, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
-
-interface ConfigType {
-  headers?: { [key: string]: string };
-  hold?: boolean;
-  timeout?: number;
-}
-interface ResponseDataType {
-  code: number;
-  message: string;
-  data: any;
-}
-
-/**
- * 请求开始
- */
-function requestStart(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig {
-  if (config.headers) {
-    config.headers.rootkey = process.env.ROOT_KEY;
-  }
-
-  return config;
-}
-
-/**
- * 请求成功,检查请求头
- */
-function responseSuccess(response: AxiosResponse<ResponseDataType>) {
-  return response;
-}
-/**
- * 响应数据检查
- */
-function checkRes(data: ResponseDataType) {
-  if (data === undefined) {
-    console.log('error->', data, 'data is empty');
-    return Promise.reject('服务器异常');
-  } else if (data?.code && (data.code < 200 || data.code >= 400)) {
-    return Promise.reject(data);
-  }
-  return data.data;
-}
-
-/**
- * 响应错误
- */
-function responseError(err: any) {
-  if (!err) {
-    return Promise.reject({ message: '未知错误' });
-  }
-  if (typeof err === 'string') {
-    return Promise.reject({ message: err });
-  }
-
-  if (err?.response?.data) {
-    return Promise.reject(err?.response?.data);
-  }
-  return Promise.reject(err);
-}
-
-/* 创建请求实例 */
-const instance = axios.create({
-  timeout: 60000, // 超时时间
-  headers: {
-    'content-type': 'application/json'
-  }
-});
-
-/* 请求拦截 */
-instance.interceptors.request.use(requestStart, (err) => Promise.reject(err));
-/* 响应拦截 */
-instance.interceptors.response.use(responseSuccess, (err) => Promise.reject(err));
-
-export function request(url: string, data: any, config: ConfigType, method: Method): any {
-  if (!global.systemEnv?.pluginBaseUrl) {
-    return Promise.reject('商业版插件加载中...');
-  }
-
-  /* 去空 */
-  for (const key in data) {
-    if (data[key] === null || data[key] === undefined) {
-      delete data[key];
-    }
-  }
-
-  return instance
-    .request({
-      baseURL: global.systemEnv.pluginBaseUrl,
-      url,
-      method,
-      data: ['POST', 'PUT'].includes(method) ? data : null,
-      params: !['POST', 'PUT'].includes(method) ? data : null,
-      ...config // 用户自定义配置，可以覆盖前面的配置
-    })
-    .then((res) => checkRes(res.data))
-    .catch((err) => responseError(err));
-}
-
-/**
- * api请求方式
- * @param {String} url
- * @param {Any} params
- * @param {Object} config
- * @returns
- */
-export function GET<T>(url: string, params = {}, config: ConfigType = {}): Promise<T> {
-  return request(url, params, config, 'GET');
-}
-
-export function POST<T>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
-  return request(url, data, config, 'POST');
-}
-
-export function PUT<T>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
-  return request(url, data, config, 'PUT');
-}
-
-export function DELETE<T>(url: string, data = {}, config: ConfigType = {}): Promise<T> {
-  return request(url, data, config, 'DELETE');
-}

projects/app/src/service/common/bill/push.ts

@@ -1,4 +1,5 @@
-import { Bill, User, OutLink } from '@/service/mongo';
+import { Bill } from '@/service/mongo';
+import { MongoUser } from '@fastgpt/support/user/schema';
 import { BillSourceEnum } from '@/constants/user';
 import { getModel } from '@/service/utils/data';
 import { ChatHistoryItemResType } from '@/types/chat';
@@ -10,7 +11,7 @@ import { defaultQGModel } from '@/pages/api/system/getInitData';
 async function createBill(data: CreateBillType) {
   try {
     await Promise.all([
-      User.findByIdAndUpdate(data.userId, {
+      MongoUser.findByIdAndUpdate(data.userId, {
         $inc: { balance: -data.total }
       }),
       Bill.create(data)
@@ -50,7 +51,7 @@ async function concatBill({
           }
         }
       ),
-      User.findByIdAndUpdate(userId, {
+      MongoUser.findByIdAndUpdate(userId, {
         $inc: { balance: -total }
       })
     ]);
@@ -177,12 +178,12 @@ export const pushQuestionGuideBill = ({ tokens, userId }: { tokens: number; user
   const total = qgModel.price * tokens;
   createBill({
     userId,
-    appName: '问题指引',
+    appName: '下一步指引',
     total,
     source: BillSourceEnum.fastgpt,
     list: [
       {
-        moduleName: '问题指引',
+        moduleName: '下一步指引',
         amount: total,
         model: qgModel.name,
         tokenLen: tokens

projects/app/src/service/common/bill/schema.ts

@@ -1,4 +1,5 @@
-import { Schema, model, models, Model } from 'mongoose';
+import { connectionMongo, type Model } from '@fastgpt/common/mongo';
+const { Schema, model, models } = connectionMongo;
 import { BillSchema as BillType } from '@/types/common/bill';
 import { BillSourceMap } from '@/constants/user';
 

projects/app/src/service/common/ipLimit/schema.ts

@@ -1,24 +0,0 @@
-import { Schema, model, models, Model } from 'mongoose';
-import type { IpLimitSchemaType } from '@/types/common/ipLimit';
-
-const IpLimitSchema = new Schema({
-  eventId: {
-    type: String,
-    required: true
-  },
-  ip: {
-    type: String,
-    required: true
-  },
-  account: {
-    type: Number,
-    default: 0
-  },
-  lastMinute: {
-    type: Date,
-    default: () => new Date()
-  }
-});
-
-export const IpLimit: Model<IpLimitSchemaType> =
-  models['ip_limit'] || model('ip_limit', IpLimitSchema);