4.6.4 (#588)

packages/service/common/api/plusRequest.ts

@@ -70,7 +70,7 @@ 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) {
+  if (global.systemEnv && !global.systemEnv?.pluginBaseUrl) {
     return Promise.reject('该功能为商业版特有...');
   }
 

packages/service/common/file/image/schema.ts

@@ -8,6 +8,10 @@ const ImageSchema = new Schema({
     ref: TeamCollectionName,
     required: true
   },
+  createTime: {
+    type: Date,
+    default: () => new Date()
+  },
   binary: {
     type: Buffer
   },
@@ -25,7 +29,10 @@ try {
   console.log(error);
 }
 
-export const MongoImage: Model<{ teamId: string; binary: Buffer; metadata?: Record<string, any> }> =
-  models['image'] || model('image', ImageSchema);
+export const MongoImage: Model<{
+  teamId: string;
+  binary: Buffer;
+  metadata?: { fileId?: string };
+}> = models['image'] || model('image', ImageSchema);
 
 MongoImage.syncIndexes();

packages/service/common/mongo/controller.ts

@@ -1,26 +0,0 @@
-/* add logger */
-export const addLog = {
-  info: (msg: string, obj?: Record<string, any>) => {
-    global.logger?.info(msg, { meta: obj });
-  },
-  error: (msg: string, error?: any) => {
-    global.logger?.error(msg, {
-      meta: {
-        stack: error?.stack,
-        ...(error?.config && {
-          config: {
-            headers: error.config.headers,
-            url: error.config.url,
-            data: error.config.data
-          }
-        }),
-        ...(error?.response && {
-          response: {
-            status: error.response.status,
-            statusText: error.response.statusText
-          }
-        })
-      }
-    });
-  }
-};

packages/service/common/mongo/init.ts

@@ -1,6 +1,4 @@
 import mongoose from './index';
-import { createLogger, format, transports } from 'winston';
-import 'winston-mongodb';
 
 /**
  * connect MongoDB and init data
@@ -36,7 +34,6 @@ export async function connectMongo({
     });
 
     console.log('mongo connected');
-    initLogger();
 
     afterHook && (await afterHook());
   } catch (error) {
@@ -45,35 +42,3 @@ export async function connectMongo({
     global.mongodb = undefined;
   }
 }
-
-function initLogger() {
-  global.logger = createLogger({
-    transports: [
-      new transports.MongoDB({
-        db: process.env.MONGODB_URI as string,
-        collection: 'server_logs',
-        options: {
-          useUnifiedTopology: true
-        },
-        cappedSize: 500000000,
-        tryReconnect: true,
-        metaKey: 'meta',
-        format: format.combine(format.timestamp(), format.json())
-      }),
-      new transports.Console({
-        format: format.combine(
-          format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
-          format.printf((info) => {
-            if (info.level === 'error') {
-              console.log(info.meta);
-              return `[${info.level.toLocaleUpperCase()}]: ${[info.timestamp]}: ${info.message}`;
-            }
-            return `[${info.level.toLocaleUpperCase()}]: ${[info.timestamp]}: ${info.message}${
-              info.meta ? `: ${JSON.stringify(info.meta)}` : ''
-            }`;
-          })
-        )
-      })
-    ]
-  });
-}

packages/service/common/mongo/type.d.ts

@@ -3,5 +3,4 @@ import type { Logger } from 'winston';
 
 declare global {
   var mongodb: Mongoose | undefined;
-  var logger: Logger;
 }

packages/service/common/pg/index.ts

@@ -171,9 +171,10 @@ export async function initPg() {
           tmb_id VARCHAR(50) NOT NULL,
           dataset_id VARCHAR(50) NOT NULL,
           collection_id VARCHAR(50) NOT NULL,
-          data_id VARCHAR(50) NOT NULL
+          data_id VARCHAR(50) NOT NULL,
+          createTime TIMESTAMP DEFAULT CURRENT_TIMESTAMP
       );
-      CREATE INDEX IF NOT EXISTS vector_index ON ${PgDatasetTableName} USING hnsw (vector vector_ip_ops) WITH (m = 24, ef_construction = 64);
+      CREATE INDEX IF NOT EXISTS vector_index ON ${PgDatasetTableName} USING hnsw (vector vector_ip_ops) WITH (m = 32, ef_construction = 64);
     `);
 
     console.log('init pg successful');

packages/service/common/response/index.ts

@@ -1,7 +1,7 @@
 import type { NextApiResponse } from 'next';
 import { sseResponseEventEnum } from './constant';
 import { proxyError, ERROR_RESPONSE, ERROR_ENUM } from '@fastgpt/global/common/error/errorCode';
-import { addLog } from '../mongo/controller';
+import { addLog } from '../system/log';
 import { clearCookie } from '../../support/permission/controller';
 
 export interface ResponseType<T = any> {

packages/service/common/system/config/controller.ts

@@ -0,0 +1,15 @@
+import { SystemConfigsTypeEnum } from '@fastgpt/global/common/system/config/constants';
+import { MongoSystemConfigs } from './schema';
+import { FeConfigsType } from '@fastgpt/global/common/system/types';
+
+export const getFastGPTFeConfig = async () => {
+  const res = await MongoSystemConfigs.findOne({
+    type: SystemConfigsTypeEnum.fastgpt
+  }).sort({
+    createTime: -1
+  });
+
+  const config: FeConfigsType = res?.value?.FeConfig || {};
+
+  return config;
+};

packages/service/common/system/config/schema.ts

@@ -19,14 +19,15 @@ const systemConfigSchema = new Schema({
     type: Date,
     default: () => new Date()
   }
-})
+});
 
 try {
   systemConfigSchema.index({ createTime: -1 }, { expireAfterSeconds: 90 * 24 * 60 * 60 });
+  systemConfigSchema.index({ type: 1 });
 } catch (error) {
   console.log(error);
 }
 
-export const MongoSystemConfigs: Model<SystemConfigsType>=
+export const MongoSystemConfigs: Model<SystemConfigsType> =
   models[collectionName] || model(collectionName, systemConfigSchema);
-  MongoSystemConfigs.syncIndexes();
+MongoSystemConfigs.syncIndexes();

packages/service/common/system/log.ts

@@ -0,0 +1,66 @@
+import dayjs from 'dayjs';
+
+/* add logger */
+export const addLog = {
+  log(level: 'info' | 'warn' | 'error', msg: string, obj: Record<string, any> = {}) {
+    console.log(
+      `[${level.toLocaleUpperCase()}] ${dayjs().format(
+        'YYYY-MM-DD HH:mm:ss'
+      )} ${msg}: ${JSON.stringify(obj)}`
+    );
+
+    const lokiUrl = process.env.LOKI_LOG_URL as string;
+    if (!lokiUrl) return;
+
+    try {
+      fetch(lokiUrl, {
+        method: 'POST',
+        headers: {
+          'Content-type': 'application/json'
+        },
+        body: JSON.stringify({
+          streams: [
+            {
+              stream: {
+                level
+              },
+              values: [
+                [
+                  `${Date.now() * 1000000}`,
+                  JSON.stringify({
+                    message: msg,
+                    ...obj
+                  })
+                ]
+              ]
+            }
+          ]
+        })
+      });
+    } catch (error) {}
+  },
+  info(msg: string, obj?: Record<string, any>) {
+    this.log('info', msg, obj);
+  },
+  warn(msg: string, obj?: Record<string, any>) {
+    this.log('warn', msg, obj);
+  },
+  error(msg: string, error?: any) {
+    this.log('error', msg, {
+      stack: error?.stack,
+      ...(error?.config && {
+        config: {
+          headers: error.config.headers,
+          url: error.config.url,
+          data: error.config.data
+        }
+      }),
+      ...(error?.response && {
+        response: {
+          status: error.response.status,
+          statusText: error.response.statusText
+        }
+      })
+    });
+  }
+};