From 37a6293f5e10c05bf3eccde2b9c00e355877ea3f Mon Sep 17 00:00:00 2001
From: archer <545436317@qq.com>
Date: Sat, 5 Aug 2023 11:51:40 +0800
Subject: [PATCH] fix: config

---
 admin/service/schema.js                       | 20 ----------------
 client/.gitignore                             |  2 +-
 client/data/config.json                       |  8 +++----
 client/src/hooks/useSendCode.ts               |  4 ++--
 client/src/pages/_app.tsx                     |  8 +++----
 .../pages/api/openapi/text/sensitiveCheck.ts  |  4 ----
 client/src/pages/api/system/getInitData.ts    |  9 +++-----
 client/src/pages/index.tsx                    | 23 ++++++++-----------
 client/src/service/mongo.ts                   |  3 +--
 client/src/store/static.ts                    |  6 -----
 client/src/types/index.d.ts                   | 19 +++++++++++----
 11 files changed, 39 insertions(+), 67 deletions(-)

diff --git a/admin/service/schema.js b/admin/service/schema.js
index edeac05ef..20b6da864 100644
--- a/admin/service/schema.js
+++ b/admin/service/schema.js
@@ -95,27 +95,7 @@ const appSchema = new mongoose.Schema({
   updateTime: Date
 });
 
-const SystemSchema = new mongoose.Schema({
-  vectorMaxProcess: {
-    type: Number,
-    default: 10
-  },
-  qaMaxProcess: {
-    type: Number,
-    default: 10
-  },
-  pgIvfflatProbe: {
-    type: Number,
-    default: 10
-  },
-  sensitiveCheck: {
-    type: Boolean,
-    default: false
-  }
-});
-
 export const App = mongoose.models['app'] || mongoose.model('app', appSchema);
 export const Kb = mongoose.models['kb'] || mongoose.model('kb', kbSchema);
 export const User = mongoose.models['user'] || mongoose.model('user', UserSchema);
 export const Pay = mongoose.models['pay'] || mongoose.model('pay', paySchema);
-export const System = mongoose.models['system'] || mongoose.model('system', SystemSchema);
diff --git a/client/.gitignore b/client/.gitignore
index f65f54be0..51d4b9a6f 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -29,4 +29,4 @@ platform.json
 testApi/
 local/
 .husky/
-data/config.json.local
\ No newline at end of file
+data/*.local
\ No newline at end of file
diff --git a/client/data/config.json b/client/data/config.json
index ae5732e5f..6a5617237 100644
--- a/client/data/config.json
+++ b/client/data/config.json
@@ -5,15 +5,14 @@
     "show_appStore": false,
     "show_userDetail": false,
     "show_git": true,
+    "beianText": "",
     "systemTitle": "FastAI",
     "authorText": "Made by FastAI Team."
   },
   "SystemParams": {
-    "beianText": "",
     "vectorMaxProcess": 15,
     "qaMaxProcess": 15,
-    "pgIvfflatProbe": 20,
-    "sensitiveCheck": false
+    "pgIvfflatProbe": 20
   },
   "ChatModels": [
     {
@@ -63,5 +62,6 @@
       "name": "Embedding-2",
       "price": 0.2
     }
-  ]
+  ],
+  "plugins": {}
 }
diff --git a/client/src/hooks/useSendCode.ts b/client/src/hooks/useSendCode.ts
index 8bb9de2e8..d20c2d234 100644
--- a/client/src/hooks/useSendCode.ts
+++ b/client/src/hooks/useSendCode.ts
@@ -4,7 +4,7 @@ import { UserAuthTypeEnum } from '@/constants/common';
 let timer: any;
 import { useToast } from './useToast';
 import { getClientToken } from '@/utils/plugin/google';
-import { googleClientVerKey } from '@/store/static';
+import { feConfigs } from '@/store/static';
 
 export const useSendCode = () => {
   const { toast } = useToast();
@@ -27,7 +27,7 @@ export const useSendCode = () => {
         await sendAuthCode({
           username,
           type,
-          googleToken: await getClientToken(googleClientVerKey)
+          googleToken: await getClientToken(feConfigs.googleClientVerKey)
         });
         setCodeCountDown(60);
         timer = setInterval(() => {
diff --git a/client/src/pages/_app.tsx b/client/src/pages/_app.tsx
index ff86649bd..0131731b3 100644
--- a/client/src/pages/_app.tsx
+++ b/client/src/pages/_app.tsx
@@ -37,15 +37,15 @@ function App({ Component, pageProps }: AppProps) {
   const { i18n } = useTranslation();
 
   const [googleClientVerKey, setGoogleVerKey] = useState<string>();
-  const [baiduTongji, setBaiduTongji] = useState<string>();
+  const [baiduTongjiUrl, setBaiduTongjiUrl] = useState<string>();
 
   useEffect(() => {
     (async () => {
       const {
-        systemEnv: { googleClientVerKey, baiduTongji }
+        feConfigs: { googleClientVerKey, baiduTongjiUrl }
       } = await clientInitData();
       setGoogleVerKey(googleClientVerKey);
-      setBaiduTongji(baiduTongji);
+      setBaiduTongjiUrl(baiduTongjiUrl);
     })();
   }, []);
 
@@ -69,7 +69,7 @@ function App({ Component, pageProps }: AppProps) {
       <Script src="/js/qrcode.min.js" strategy="lazyOnload"></Script>
       <Script src="/js/pdf.js" strategy="lazyOnload"></Script>
       <Script src="/js/html2pdf.bundle.min.js" strategy="lazyOnload"></Script>
-      {baiduTongji && <Script src={baiduTongji} strategy="lazyOnload"></Script>}
+      {baiduTongjiUrl && <Script src={baiduTongjiUrl} strategy="lazyOnload"></Script>}
       {googleClientVerKey && (
         <>
           <Script
diff --git a/client/src/pages/api/openapi/text/sensitiveCheck.ts b/client/src/pages/api/openapi/text/sensitiveCheck.ts
index 7966aa0b4..521cc567d 100644
--- a/client/src/pages/api/openapi/text/sensitiveCheck.ts
+++ b/client/src/pages/api/openapi/text/sensitiveCheck.ts
@@ -28,10 +28,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 }
 
 export async function sensitiveCheck({ input }: Props) {
-  if (!global.systemEnv.sensitiveCheck) {
-    return Promise.resolve('');
-  }
-
   const response = await axios({
     ...axiosConfig(),
     method: 'POST',
diff --git a/client/src/pages/api/system/getInitData.ts b/client/src/pages/api/system/getInitData.ts
index 2de80228a..839ce6e43 100644
--- a/client/src/pages/api/system/getInitData.ts
+++ b/client/src/pages/api/system/getInitData.ts
@@ -1,4 +1,4 @@
-import type { FeConfigsType, SystemEnvType } from '@/types';
+import type { FeConfigsType } from '@/types';
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { readFileSync } from 'fs';
@@ -12,7 +12,6 @@ export type InitDateResponse = {
   chatModels: ChatModelItemType[];
   qaModels: QAModelItemType[];
   vectorModels: VectorModelItemType[];
-  systemEnv: SystemEnvType;
   feConfigs: FeConfigsType;
 };
 
@@ -22,7 +21,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   }
   jsonRes<InitDateResponse>(res, {
     data: {
-      systemEnv: global.systemEnv,
       feConfigs: global.feConfigs,
       chatModels: global.chatModels,
       qaModels: global.qaModels,
@@ -34,8 +32,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 const defaultSystemEnv = {
   vectorMaxProcess: 15,
   qaMaxProcess: 15,
-  pgIvfflatProbe: 20,
-  sensitiveCheck: false
+  pgIvfflatProbe: 20
 };
 const defaultFeConfigs = {
   show_emptyChat: true,
@@ -102,7 +99,7 @@ export async function getInitConfig() {
     global.vectorModels = res.VectorModels || defaultVectorModels;
   } catch (error) {
     setDefaultData();
-    console.log('get init config error, set default');
+    console.log('get init config error, set default', error);
   }
 }
 
diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx
index 184adbfb0..8021166cb 100644
--- a/client/src/pages/index.tsx
+++ b/client/src/pages/index.tsx
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';
 import { Card, Box, Link, Flex, Image, Button } from '@chakra-ui/react';
 import { useRouter } from 'next/router';
 import { useGlobalStore } from '@/store/global';
-import { beianText } from '@/store/static';
 import { feConfigs } from '@/store/static';
 import { serviceSideProps } from '@/utils/i18n';
 import { useTranslation } from 'next-i18next';
@@ -215,19 +214,17 @@ const Home = () => {
         </Flex>
       </Flex>
 
-      {feConfigs?.authorText && (
-        <Box w={'100%'} mt={'100vh'} px={[5, 10]} pb={[5, 10]}>
-          <Card p={5} mt={4} textAlign={'center'}>
-            {beianText && (
-              <Link href="https://beian.miit.gov.cn/" target="_blank">
-                {beianText}
-              </Link>
-            )}
+      <Box w={'100%'} mt={'100vh'} px={[5, 10]} pb={[5, 10]}>
+        <Card p={5} mt={4} textAlign={'center'}>
+          {feConfigs?.beianText && (
+            <Link href="https://beian.miit.gov.cn/" target="_blank">
+              {feConfigs.beianText}
+            </Link>
+          )}
 
-            <Box>{feConfigs?.authorText}</Box>
-          </Card>
-        </Box>
-      )}
+          {feConfigs?.authorText && <Box>{feConfigs?.authorText}</Box>}
+        </Card>
+      </Box>
     </Flex>
   );
 };
diff --git a/client/src/service/mongo.ts b/client/src/service/mongo.ts
index 74d6e7429..35936173b 100644
--- a/client/src/service/mongo.ts
+++ b/client/src/service/mongo.ts
@@ -22,8 +22,7 @@ export async function connectToDatabase(): Promise<void> {
   global.systemEnv = {
     vectorMaxProcess: 10,
     qaMaxProcess: 10,
-    pgIvfflatProbe: 10,
-    sensitiveCheck: false
+    pgIvfflatProbe: 10
   };
   global.sendInformQueue = [];
   global.sendInformQueueLen = 0;
diff --git a/client/src/store/static.ts b/client/src/store/static.ts
index 7a54b2963..2b757c009 100644
--- a/client/src/store/static.ts
+++ b/client/src/store/static.ts
@@ -8,9 +8,6 @@ import { getInitData } from '@/api/system';
 import { delay } from '@/utils/tools';
 import { FeConfigsType } from '@/types';
 
-export let beianText: string | undefined;
-export let googleClientVerKey: string | undefined;
-export let baiduTongji: string | undefined;
 export let chatModelList: ChatModelItemType[] = [];
 export let qaModelList: QAModelItemType[] = [];
 export let vectorModelList: VectorModelItemType[] = [];
@@ -26,9 +23,6 @@ export const clientInitData = async (): Promise<InitDateResponse> => {
     qaModelList = res.qaModels;
     vectorModelList = res.vectorModels;
     feConfigs = res.feConfigs;
-    beianText = res.systemEnv?.beianText;
-    googleClientVerKey = res.systemEnv?.googleClientVerKey;
-    baiduTongji = res.systemEnv?.baiduTongji;
 
     return res;
   } catch (error) {
diff --git a/client/src/types/index.d.ts b/client/src/types/index.d.ts
index 289d83057..c14bb13cd 100644
--- a/client/src/types/index.d.ts
+++ b/client/src/types/index.d.ts
@@ -21,16 +21,23 @@ export type FeConfigsType = {
   show_git?: boolean;
   systemTitle?: string;
   authorText?: string;
-};
-export type SystemEnvType = {
   beianText?: string;
   googleClientVerKey?: string;
+  baiduTongjiUrl?: string;
+};
+export type SystemEnvType = {
   googleServiceVerKey?: string;
-  baiduTongji?: string;
   vectorMaxProcess: number;
   qaMaxProcess: number;
   pgIvfflatProbe: number;
-  sensitiveCheck: boolean;
+};
+type PluginItemType = {
+  url: string;
+  auth: string;
+};
+export type PluginType = {
+  authCode?: PluginItemType;
+  moderationsCheck?: PluginItemType;
 };
 
 declare global {
@@ -42,11 +49,13 @@ declare global {
   var OpenAiEncMap: Tiktoken;
   var sendInformQueue: (() => Promise<void>)[];
   var sendInformQueueLen: number;
+
+  var feConfigs: FeConfigsType;
   var systemEnv: SystemEnvType;
+  var;
   var chatModels: ChatModelItemType[];
   var qaModels: QAModelItemType[];
   var vectorModels: VectorModelItemType[];
-  var feConfigs: FeConfigsType;
 
   interface Window {
     ['pdfjs-dist/build/pdf']: any;