4.8.14 test (#3164)

* perf: match base 64 image

* perf: register plugins
This commit is contained in:
Archer
2024-11-15 10:35:04 +08:00
committed by GitHub
parent f699061dea
commit 58745f8c35
9 changed files with 76 additions and 44 deletions

View File

@@ -1,4 +1,4 @@
import { getSystemPluginCb, getSystemPlugins } from '@/service/core/app/plugin';
import { getSystemPluginCb } from '@/service/core/app/plugin';
import { initSystemConfig } from '.';
import { createDatasetTrainingMongoWatch } from '@/service/core/dataset/training/utils';
import { MongoSystemConfigs } from '@fastgpt/service/common/system/config/schema';
@@ -29,7 +29,7 @@ const refetchSystemPlugins = () => {
changeStream.on('change', async (change) => {
setTimeout(() => {
try {
getSystemPlugins(true);
getSystemPluginCb(true);
} catch (error) {}
}, 5000);
});

View File

@@ -11,7 +11,8 @@ const getCommercialPlugins = () => {
return GET<SystemPluginTemplateItemType[]>('/core/app/plugin/getSystemPlugins');
};
export const getSystemPlugins = async (refresh = false) => {
if (isProduction && global.systemPlugins && !refresh) return cloneDeep(global.systemPlugins);
if (isProduction && global.systemPlugins && global.systemPlugins.length > 0 && !refresh)
return cloneDeep(global.systemPlugins);
try {
if (!global.systemPlugins) {
@@ -22,8 +23,6 @@ export const getSystemPlugins = async (refresh = false) => {
addLog.info(`Load system plugin successfully: ${global.systemPlugins.length}`);
getSystemPluginCb();
return cloneDeep(global.systemPlugins);
} catch (error) {
//@ts-ignore
@@ -56,16 +55,22 @@ const getCommercialCb = async () => {
{}
);
};
export const getSystemPluginCb = async () => {
if (isProduction && global.systemPluginCb) return global.systemPluginCb;
export const getSystemPluginCb = async (refresh = false) => {
if (
isProduction &&
global.systemPluginCb &&
Object.keys(global.systemPluginCb).length > 0 &&
!refresh
)
return global.systemPluginCb;
try {
global.systemPluginCb = {};
await getSystemPlugins();
global.systemPluginCb = FastGPTProUrl ? await getCommercialCb() : await getCommunityCb();
return global.systemPluginCb;
} catch (error) {
//@ts-ignore
global.systemPluginCb = undefined;
return Promise.reject(error);
}
};

View File

@@ -12,7 +12,7 @@ import { startMongoWatch } from './common/system/volumnMongoWatch';
import { startTrainingQueue } from './core/dataset/training/utils';
import { systemStartCb } from '@fastgpt/service/common/system/tools';
import { addLog } from '@fastgpt/service/common/system/log';
import { getSystemPlugins } from './core/app/plugin';
import { getSystemPluginCb } from './core/app/plugin';
/**
* This function is equivalent to the entry to the service
@@ -34,7 +34,7 @@ export function connectToDatabase() {
//init system configinit vector databaseinit root user
await Promise.all([getInitConfig(), initVectorStore(), initRootUser()]);
getSystemPlugins();
getSystemPluginCb();
startMongoWatch();
// cron
startCron();