Optimize the project structure and introduce DDD design (#394)

projects/app/src/pages/_app.tsx

@@ -4,18 +4,18 @@ import Script from 'next/script';
 import Head from 'next/head';
 import { ChakraProvider, ColorModeScript } from '@chakra-ui/react';
 import Layout from '@/components/Layout';
-import { theme } from '@/constants/theme';
+import { theme } from '@/web/styles/theme';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import NProgress from 'nprogress'; //nprogress module
 import Router from 'next/router';
-import { clientInitData, feConfigs } from '@/store/static';
+import { clientInitData, feConfigs } from '@/web/common/store/static';
 import { appWithTranslation, useTranslation } from 'next-i18next';
-import { getLangStore, setLangStore } from '@/utils/web/i18n';
+import { getLangStore, setLangStore } from '@/web/common/utils/i18n';
 import { useRouter } from 'next/router';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 
 import 'nprogress/nprogress.css';
-import '@/styles/reset.scss';
+import '@/web/styles/reset.scss';
 import { FeConfigsType } from '@/types';
 
 //Binding events.

projects/app/src/pages/_error.tsx

@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { useRouter } from 'next/router';
-import { serviceSideProps } from '@/utils/web/i18n';
-import { useGlobalStore } from '@/store/global';
+import { serviceSideProps } from '@/web/common/utils/i18n';
+import { useGlobalStore } from '@/web/common/store/global';
 import { addLog } from '@/service/utils/tools';
 import { getErrText } from '@/utils/tools';
 

projects/app/src/pages/account/components/BillTable.tsx

@@ -12,16 +12,16 @@ import {
   Button
 } from '@chakra-ui/react';
 import { BillSourceMap } from '@/constants/user';
-import { getUserBills } from '@/api/user';
+import { getUserBills } from '@/web/common/api/bill';
 import type { UserBillType } from '@/types/user';
-import { usePagination } from '@/hooks/usePagination';
-import { useLoading } from '@/hooks/useLoading';
+import { usePagination } from '@/web/common/hooks/usePagination';
+import { useLoading } from '@/web/common/hooks/useLoading';
 import dayjs from 'dayjs';
 import MyIcon from '@/components/Icon';
 import DateRangePicker, { type DateRangeType } from '@/components/DateRangePicker';
 import { addDays } from 'date-fns';
 import dynamic from 'next/dynamic';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import { useTranslation } from 'next-i18next';
 const BillDetail = dynamic(() => import('./BillDetail'));
 

projects/app/src/pages/account/components/Info.tsx

@@ -14,21 +14,21 @@ import {
 } from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
 import { UserUpdateParams } from '@/types/user';
-import { useToast } from '@/hooks/useToast';
-import { useUserStore } from '@/store/user';
+import { useToast } from '@/web/common/hooks/useToast';
+import { useUserStore } from '@/web/support/store/user';
 import { UserType } from '@/types/user';
 import { useQuery } from '@tanstack/react-query';
 import dynamic from 'next/dynamic';
-import { useSelectFile } from '@/hooks/useSelectFile';
-import { compressImg } from '@/utils/web/file';
-import { feConfigs, systemVersion } from '@/store/static';
+import { useSelectFile } from '@/web/common/hooks/useSelectFile';
+import { compressImg } from '@/web/common/utils/file';
+import { feConfigs, systemVersion } from '@/web/common/store/static';
 import { useTranslation } from 'next-i18next';
 import { timezoneList } from '@/utils/user';
 import Loading from '@/components/Loading';
 import Avatar from '@/components/Avatar';
 import MyIcon from '@/components/Icon';
 import MyTooltip from '@/components/MyTooltip';
-import { getLangStore, LangEnum, langMap, setLangStore } from '@/utils/web/i18n';
+import { getLangStore, LangEnum, langMap, setLangStore } from '@/web/common/utils/i18n';
 import { useRouter } from 'next/router';
 import MyMenu from '@/components/MyMenu';
 import MySelect from '@/components/Select';

projects/app/src/pages/account/components/InformTable.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import { Box, Flex, useTheme } from '@chakra-ui/react';
-import { getInforms, readInform } from '@/api/user';
-import { usePagination } from '@/hooks/usePagination';
-import { useLoading } from '@/hooks/useLoading';
+import { getInforms, readInform } from '@/web/support/api/user';
+import { usePagination } from '@/web/common/hooks/usePagination';
+import { useLoading } from '@/web/common/hooks/useLoading';
 import type { informSchema } from '@/types/mongoSchema';
 import { formatTimeToChatTime } from '@/utils/tools';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import MyIcon from '@/components/Icon';
 
 const BillTable = () => {

projects/app/src/pages/account/components/OpenAIAccountModal.tsx

@@ -3,7 +3,7 @@ import { ModalBody, Box, Flex, Input, ModalFooter, Button } from '@chakra-ui/rea
 import MyModal from '@/components/MyModal';
 import { useTranslation } from 'react-i18next';
 import { useForm } from 'react-hook-form';
-import { useRequest } from '@/hooks/useRequest';
+import { useRequest } from '@/web/common/hooks/useRequest';
 import { UserType } from '@/types/user';
 
 const OpenAIAccountModal = ({
@@ -32,7 +32,8 @@ const OpenAIAccountModal = ({
     <MyModal isOpen onClose={onClose} title={t('user.OpenAI Account Setting')}>
       <ModalBody>
         <Box fontSize={'sm'} color={'myGray.500'}>
-          如果你填写了该内容，在线上平台使用 OpenAI Chat 模型不会计费（不包含知识库训练、索引生成）
+          可以填写 OpenAI 的 key，也可以是 OneAPI 的可以。如果你填写了该内容，在线上平台使用 OpenAI
+          Chat 模型不会计费（不包含知识库训练、索引生成）。请注意你的 Key 是否有访问对应模型的权限。
         </Box>
         <Flex alignItems={'center'} mt={5}>
           <Box flex={'0 0 65px'}>API Key:</Box>

projects/app/src/pages/account/components/PayModal.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useCallback } from 'react';
 import { ModalFooter, ModalBody, Button, Input, Box, Grid } from '@chakra-ui/react';
-import { getPayCode, checkPayResult } from '@/api/user';
-import { useToast } from '@/hooks/useToast';
+import { getPayCode, checkPayResult } from '@/web/common/api/bill';
+import { useToast } from '@/web/common/hooks/useToast';
 import { useQuery } from '@tanstack/react-query';
 import { useRouter } from 'next/router';
 import { getErrText } from '@/utils/tools';
@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next';
 import { formatPrice } from '@fastgpt/common/bill/index';
 import Markdown from '@/components/Markdown';
 import MyModal from '@/components/MyModal';
-import { vectorModelList, chatModelList, qaModel } from '@/store/static';
+import { vectorModelList, chatModelList, qaModel } from '@/web/common/store/static';
 
 const PayModal = ({ onClose }: { onClose: () => void }) => {
   const router = useRouter();

projects/app/src/pages/account/components/PayRecordTable.tsx

@@ -11,13 +11,13 @@ import {
   Flex,
   Box
 } from '@chakra-ui/react';
-import { getPayOrders, checkPayResult } from '@/api/user';
+import { getPayOrders, checkPayResult } from '@/web/common/api/bill';
 import { PaySchema } from '@/types/mongoSchema';
 import dayjs from 'dayjs';
 import { useQuery } from '@tanstack/react-query';
 import { formatPrice } from '@fastgpt/common/bill/index';
-import { useToast } from '@/hooks/useToast';
-import { useLoading } from '@/hooks/useLoading';
+import { useToast } from '@/web/common/hooks/useToast';
+import { useLoading } from '@/web/common/hooks/useLoading';
 import MyIcon from '@/components/Icon';
 
 const PayRecordTable = () => {

projects/app/src/pages/account/components/Promotion.tsx

@@ -16,15 +16,15 @@ import {
 } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
 import { useQuery } from '@tanstack/react-query';
-import { getPromotionInitData, getPromotionRecords } from '@/api/user';
-import { useUserStore } from '@/store/user';
-import { useLoading } from '@/hooks/useLoading';
+import { getPromotionInitData, getPromotionRecords } from '@/web/support/api/user';
+import { useUserStore } from '@/web/support/store/user';
+import { useLoading } from '@/web/common/hooks/useLoading';
 
 import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
-import { useCopyData } from '@/hooks/useCopyData';
-import { usePagination } from '@/hooks/usePagination';
-import { PromotionRecordType } from '@/api/response/user';
+import { useCopyData } from '@/web/common/hooks/useCopyData';
+import { usePagination } from '@/web/common/hooks/usePagination';
+import type { PromotionRecordType } from '@/global/support/api/userRes.d';
 import MyIcon from '@/components/Icon';
 import dayjs from 'dayjs';
 

projects/app/src/pages/account/components/UpdatePswModal.tsx

@@ -3,8 +3,8 @@ import { ModalBody, Box, Flex, Input, ModalFooter, Button } from '@chakra-ui/rea
 import MyModal from '@/components/MyModal';
 import { useTranslation } from 'react-i18next';
 import { useForm } from 'react-hook-form';
-import { useRequest } from '@/hooks/useRequest';
-import { updatePasswordByOld } from '@/api/user';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import { updatePasswordByOld } from '@/web/support/api/user';
 
 type FormType = {
   oldPsw: string;

projects/app/src/pages/account/index.tsx

@@ -1,17 +1,17 @@
 import React, { useCallback, useRef } from 'react';
 import { Box, Flex, useTheme } from '@chakra-ui/react';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import { useRouter } from 'next/router';
 import dynamic from 'next/dynamic';
 import { clearToken } from '@/utils/user';
-import { useUserStore } from '@/store/user';
-import { useConfirm } from '@/hooks/useConfirm';
+import { useUserStore } from '@/web/support/store/user';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
 import PageContainer from '@/components/PageContainer';
 import SideTabs from '@/components/SideTabs';
 import Tabs from '@/components/Tabs';
 import UserInfo from './components/Info';
-import { serviceSideProps } from '@/utils/web/i18n';
-import { feConfigs } from '@/store/static';
+import { serviceSideProps } from '@/web/common/utils/i18n';
+import { feConfigs } from '@/web/common/store/static';
 import { useTranslation } from 'react-i18next';
 import Script from 'next/script';
 

projects/app/src/pages/api/app/getChatLogs.ts

@@ -6,7 +6,7 @@ import type { PagingData } from '@/types';
 import { AppLogsListItemType } from '@/types/app';
 import { Types } from 'mongoose';
 import { addDays } from 'date-fns';
-import { GetAppChatLogsParams } from '@/api/request/app';
+import type { GetAppChatLogsParams } from '@/global/core/api/appReq.d';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {

projects/app/src/pages/api/chat/feedback/adminUpdate.ts

@@ -1,7 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, ChatItem } from '@/service/mongo';
-import { AdminUpdateFeedbackParams } from '@/api/request/chat';
+import type { AdminUpdateFeedbackParams } from '@/global/core/api/chatReq.d';
 import { authUser } from '@/service/utils/auth';
 
 /* 初始化我的聊天框，需要身份验证 */

projects/app/src/pages/api/chat/init.ts

@@ -1,7 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { Chat, ChatItem } from '@/service/mongo';
-import type { InitChatResponse } from '@/api/response/chat';
+import type { InitChatResponse } from '@/global/core/api/chatRes.d';
 import { authUser } from '@/service/utils/auth';
 import { ChatItemType } from '@/types/chat';
 import { authApp } from '@/service/utils/auth';

projects/app/src/pages/api/common/bill/createTrainingBill.ts

@@ -3,7 +3,7 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase, Bill } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { BillSourceEnum } from '@/constants/user';
-import { CreateTrainingBillType } from '@/api/common/bill/index.d';
+import { CreateTrainingBillType } from '@/global/common/api/billReq.d';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {

projects/app/src/pages/api/core/ai/agent/createQuestionGuide.ts

@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
-import { CreateQuestionGuideProps } from '@/api/core/ai/agent/type';
+import type { CreateQuestionGuideParams } from '@/global/core/api/aiReq.d';
 import { pushQuestionGuideBill } from '@/service/common/bill/push';
 import { defaultQGModel } from '@/pages/api/system/getInitData';
 import { createQuestionGuide } from '@fastgpt/core/ai/functions/createQuestionGuide';
@@ -10,7 +10,7 @@ import { createQuestionGuide } from '@fastgpt/core/ai/functions/createQuestionGu
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
     await connectToDatabase();
-    const { messages } = req.body as CreateQuestionGuideProps;
+    const { messages } = req.body as CreateQuestionGuideParams;
     const { user } = await authUser({
       req,
       authOutLink: true,

projects/app/src/pages/api/core/dataset/create.ts

@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
-import type { CreateDatasetParams } from '@/api/core/dataset/index.d';
+import type { CreateDatasetParams } from '@/global/core/api/datasetReq.d';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {

projects/app/src/pages/api/core/dataset/data/pushData.ts

@@ -10,7 +10,8 @@ import { startQueue } from '@/service/utils/tools';
 import { getVectorModel } from '@/service/utils/data';
 import { DatasetDataItemType } from '@/types/core/dataset/data';
 import { countPromptTokens } from '@/utils/common/tiktoken';
-import type { PushDataProps, PushDataResponse } from '@/api/core/dataset/data.d';
+import type { PushDataResponse } from '@/global/core/api/datasetRes.d';
+import type { PushDataProps } from '@/global/core/api/datasetReq.d';
 import { authFileIdValid } from '@/service/dataset/auth';
 
 const modeMap = {

projects/app/src/pages/api/core/dataset/data/updateData.ts

@@ -6,11 +6,11 @@ import { withNextCors } from '@/service/utils/tools';
 import { KB, connectToDatabase } from '@/service/mongo';
 import { getVector } from '@/pages/api/openapi/plugin/vector';
 import { PgDatasetTableName } from '@/constants/plugin';
-import type { UpdateDataPrams } from '@/api/core/dataset/data.d';
+import type { UpdateDatasetDataPrams } from '@/global/core/api/datasetReq.d';
 
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {
-    const { dataId, a = '', q = '', kbId } = req.body as UpdateDataPrams;
+    const { dataId, a = '', q = '', kbId } = req.body as UpdateDatasetDataPrams;
 
     if (!dataId) {
       throw new Error('缺少参数');

projects/app/src/pages/api/core/dataset/file/markUsed.ts

@@ -3,7 +3,7 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { GridFSStorage } from '@/service/lib/gridfs';
-import { MarkFileUsedProps } from '@/api/core/dataset/file.d';
+import { MarkFileUsedProps } from '@/global/core/api/datasetReq.d';
 import { Types } from 'mongoose';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {

projects/app/src/pages/api/core/dataset/file/update.ts

@@ -3,7 +3,7 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { GridFSStorage } from '@/service/lib/gridfs';
-import { UpdateFileProps } from '@/api/core/dataset/file.d';
+import { UpdateFileProps } from '@/global/core/api/datasetReq.d';
 import { Types } from 'mongoose';
 import { PgClient } from '@/service/pg';
 import { PgDatasetTableName } from '@/constants/plugin';

projects/app/src/pages/api/core/dataset/searchTest.ts

@@ -6,7 +6,8 @@ import { withNextCors } from '@/service/utils/tools';
 import { getVector } from '../../openapi/plugin/vector';
 import { PgDatasetTableName } from '@/constants/plugin';
 import { KB } from '@/service/mongo';
-import type { SearchTestProps, SearchTestResponseType } from '@/api/core/dataset/index.d';
+import type { SearchTestProps } from '@/global/core/api/datasetReq.d';
+import type { SearchTestResponseType } from '@/global/core/api/datasetRes.d';
 
 export default withNextCors(async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {

projects/app/src/pages/api/core/dataset/update.ts

@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, KB } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
-import type { DatasetUpdateParams } from '@/api/core/dataset/index.d';
+import type { DatasetUpdateParams } from '@/global/core/api/datasetReq.d';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
   try {

projects/app/src/pages/api/plugins/urlFetch.ts

@@ -5,7 +5,7 @@ import { JSDOM } from 'jsdom';
 import { Readability } from '@mozilla/readability';
 import { jsonRes } from '@/service/response';
 import { authUser } from '@/service/utils/auth';
-import type { FetchResultItem } from '@/types/plugin';
+import type { FetchResultItem } from '@/global/common/api/pluginRes.d';
 import { simpleText } from '@/utils/file';
 
 export type UrlFetchResponse = FetchResultItem[];

projects/app/src/pages/api/plusApi/[...path].ts

@@ -1,6 +1,6 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { request } from '@/api/service/request';
+import { request } from '@/service/common/api/request';
 import type { Method } from 'axios';
 import { connectToDatabase } from '@/service/mongo';
 

projects/app/src/pages/api/support/openapi/getKeys.ts

@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, OpenApi } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
-import type { GetApiKeyProps } from '@/api/support/openapi/index.d';
+import type { GetApiKeyProps } from '@/global/support/api/openapiReq.d';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {

projects/app/src/pages/api/support/openapi/postKey.ts

@@ -4,7 +4,7 @@ import { jsonRes } from '@/service/response';
 import { connectToDatabase, OpenApi } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
 import { customAlphabet } from 'nanoid';
-import type { EditApiKeyProps } from '@/api/support/openapi/index.d';
+import type { EditApiKeyProps } from '@/global/support/api/openapiReq.d';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {

projects/app/src/pages/api/support/openapi/putKey.ts

@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, OpenApi } from '@/service/mongo';
 import { authUser } from '@/service/utils/auth';
-import type { EditApiKeyProps } from '@/api/support/openapi/index.d';
+import type { EditApiKeyProps } from '@/global/support/api/openapiReq.d';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   try {

projects/app/src/pages/api/support/outLink/init.ts

@@ -1,7 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, OutLink, User } from '@/service/mongo';
-import type { InitShareChatResponse } from '@/api/response/chat';
+import type { InitShareChatResponse } from '@/global/support/api/outLinkRes.d';
 import { authApp } from '@/service/utils/auth';
 import { HUMAN_ICON } from '@/constants/chat';
 import { getChatModelNameList, getGuideModule } from '@/components/ChatBox/utils';

projects/app/src/pages/api/system/file/readUrl.ts

@@ -28,7 +28,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     });
 
     jsonRes(res, {
-      data: `/api/support/file/read?token=${token}`
+      data: `/api/system/file/read?token=${token}`
     });
   } catch (error) {
     jsonRes(res, {

projects/app/src/pages/api/system/getInitData.ts

@@ -2,20 +2,8 @@ import type { FeConfigsType, SystemEnvType } from '@/types';
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { readFileSync } from 'fs';
-import {
-  type QAModelItemType,
-  type ChatModelItemType,
-  type VectorModelItemType,
-  FunctionModelItemType
-} from '@/types/model';
-
-export type InitDateResponse = {
-  chatModels: ChatModelItemType[];
-  qaModel: QAModelItemType;
-  vectorModels: VectorModelItemType[];
-  feConfigs: FeConfigsType;
-  systemVersion: string;
-};
+import type { InitDateResponse } from '@/global/common/api/systemRes';
+import { type VectorModelItemType, FunctionModelItemType } from '@/types/model';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   if (!global.feConfigs) {

projects/app/src/pages/app/detail/components/AIChatSettingsModal.tsx

@@ -15,8 +15,8 @@ import {
 } from '@chakra-ui/react';
 import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
-import { defaultQuotePrompt, defaultQuoteTemplate } from '@/prompts/core/AIChat';
-import { feConfigs } from '@/store/static';
+import { defaultQuotePrompt, defaultQuoteTemplate } from '@/global/core/prompt/AIChat';
+import { feConfigs } from '@/web/common/store/static';
 
 const AIChatSettingsModal = ({
   onClose,

projects/app/src/pages/app/detail/components/AdEdit/components/ChatTest.tsx

@@ -11,9 +11,9 @@ import React, {
 import { Box, Flex, IconButton } from '@chakra-ui/react';
 import MyIcon from '@/components/Icon';
 import { FlowModuleTypeEnum } from '@/constants/flow';
-import { streamFetch } from '@/api/fetch';
+import { streamFetch } from '@/web/common/api/fetch';
 import MyTooltip from '@/components/MyTooltip';
-import { useUserStore } from '@/store/user';
+import { useUserStore } from '@/web/support/store/user';
 import ChatBox, { type ComponentRef, type StartChatFnProps } from '@/components/ChatBox';
 import { getGuideModule } from '@/components/ChatBox/utils';
 

projects/app/src/pages/app/detail/components/AdEdit/components/ImportSettings.tsx

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { Textarea, Button, ModalBody, ModalFooter } from '@chakra-ui/react';
 import MyModal from '@/components/MyModal';
 import { useTranslation } from 'react-i18next';
-import { useToast } from '@/hooks/useToast';
+import { useToast } from '@/web/common/hooks/useToast';
 import { useFlowStore } from './Provider';
 
 const ImportSettings = ({ onClose }: { onClose: () => void }) => {

projects/app/src/pages/app/detail/components/AdEdit/components/Nodes/NodeChat.tsx

@@ -6,167 +6,23 @@ import Divider from '../modules/Divider';
 import Container from '../modules/Container';
 import RenderInput from '../render/RenderInput';
 import RenderOutput from '../render/RenderOutput';
-import MySelect from '@/components/Select';
-import { chatModelList } from '@/store/static';
-import MySlider from '@/components/Slider';
-import { Box, Button, useDisclosure } from '@chakra-ui/react';
-import { formatPrice } from '@fastgpt/common/bill/index';
-import MyIcon from '@/components/Icon';
-import dynamic from 'next/dynamic';
-import { AIChatProps } from '@/types/core/aiChat';
-import { useFlowStore } from '../Provider';
 
-const AIChatSettingsModal = dynamic(() => import('../../../AIChatSettingsModal'));
+import { useFlowStore } from '../Provider';
 
 const NodeChat = ({ data }: NodeProps<FlowModuleItemType>) => {
   const { moduleId, inputs, outputs } = data;
   const { onChangeNode } = useFlowStore();
 
-  const chatModulesData = useMemo(() => {
-    const obj: Record<string, any> = {};
-    inputs.forEach((item) => {
-      obj[item.key] = item.value;
-    });
-    return obj as AIChatProps;
-  }, [inputs]);
-
-  const {
-    isOpen: isOpenAIChatSetting,
-    onOpen: onOpenAIChatSetting,
-    onClose: onCloseAIChatSetting
-  } = useDisclosure();
-
   return (
     <NodeCard minW={'400px'} {...data}>
       <Divider text="Input" />
       <Container>
-        <RenderInput
-          moduleId={moduleId}
-          flowInputList={inputs}
-          CustomComponent={{
-            model: (inputItem) => {
-              const list = chatModelList.map((item) => {
-                const priceStr = `(${formatPrice(item.price, 1000)}元/1k Tokens)`;
-
-                return {
-                  value: item.model,
-                  label: `${item.name}${priceStr}`
-                };
-              });
-
-              return (
-                <MySelect
-                  width={'100%'}
-                  value={inputItem.value}
-                  list={list}
-                  onchange={(e) => {
-                    onChangeNode({
-                      moduleId,
-                      type: 'inputs',
-                      key: inputItem.key,
-                      value: {
-                        ...inputItem,
-                        value: e
-                      }
-                    });
-
-                    // update max tokens
-                    const model =
-                      chatModelList.find((item) => item.model === e) || chatModelList[0];
-                    if (!model) return;
-
-                    onChangeNode({
-                      moduleId,
-                      type: 'inputs',
-                      key: 'maxToken',
-                      value: {
-                        ...inputs.find((input) => input.key === 'maxToken'),
-                        markList: [
-                          { label: '100', value: 100 },
-                          { label: `${model.contextMaxToken}`, value: model.contextMaxToken }
-                        ],
-                        max: model.contextMaxToken,
-                        value: model.contextMaxToken / 2
-                      }
-                    });
-                  }}
-                />
-              );
-            },
-            maxToken: (inputItem) => {
-              const model = inputs.find((item) => item.key === 'model')?.value;
-              const modelData = chatModelList.find((item) => item.model === model);
-              const maxToken = modelData ? modelData.contextMaxToken : 4000;
-              const markList = [
-                { label: '100', value: 100 },
-                { label: `${maxToken}`, value: maxToken }
-              ];
-              return (
-                <Box pt={5} pb={4} px={2}>
-                  <MySlider
-                    markList={markList}
-                    width={'100%'}
-                    min={inputItem.min || 100}
-                    max={maxToken}
-                    step={inputItem.step || 1}
-                    value={inputItem.value}
-                    onChange={(e) => {
-                      onChangeNode({
-                        moduleId,
-                        type: 'inputs',
-                        key: inputItem.key,
-                        value: {
-                          ...inputItem,
-                          value: e
-                        }
-                      });
-                    }}
-                  />
-                </Box>
-              );
-            },
-            quoteQA: (inputItem) => {
-              return (
-                <Button
-                  variant={'base'}
-                  leftIcon={<MyIcon name={'settingLight'} w={'14px'} />}
-                  onClick={onOpenAIChatSetting}
-                >
-                  引用提示词设置
-                </Button>
-              );
-            }
-          }}
-        />
+        <RenderInput moduleId={moduleId} flowInputList={inputs} />
       </Container>
       <Divider text="Output" />
       <Container>
         <RenderOutput moduleId={moduleId} flowOutputList={outputs} />
       </Container>
-
-      {isOpenAIChatSetting && (
-        <AIChatSettingsModal
-          onClose={onCloseAIChatSetting}
-          onSuccess={(e) => {
-            for (let key in e) {
-              const item = inputs.find((input) => input.key === key);
-              if (!item) continue;
-              onChangeNode({
-                moduleId,
-                type: 'inputs',
-                key,
-                value: {
-                  ...item,
-                  // @ts-ignore
-                  value: e[key]
-                }
-              });
-            }
-            onCloseAIChatSetting();
-          }}
-          defaultData={chatModulesData}
-        />
-      )}
     </NodeCard>
   );
 };

projects/app/src/pages/app/detail/components/AdEdit/components/Nodes/NodeKbSearch.tsx

@@ -1,104 +1,20 @@
 import React, { useMemo } from 'react';
 import { NodeProps } from 'reactflow';
 import { FlowModuleItemType } from '@/types/core/app/flow';
-import { Flex, Box, Button, useTheme, useDisclosure, Grid } from '@chakra-ui/react';
-import { useDatasetStore } from '@/store/dataset';
-import { useQuery } from '@tanstack/react-query';
 import NodeCard from '../modules/NodeCard';
 import Divider from '../modules/Divider';
 import Container from '../modules/Container';
 import RenderInput from '../render/RenderInput';
 import RenderOutput from '../render/RenderOutput';
-import { DatasetSelectModal } from '../../../DatasetSelectModal';
-import type { SelectedDatasetType } from '@/types/core/dataset';
-import Avatar from '@/components/Avatar';
-import { useFlowStore } from '../Provider';
-
-const KBSelect = ({
-  activeKbs = [],
-  onChange
-}: {
-  activeKbs: SelectedDatasetType;
-  onChange: (e: SelectedDatasetType) => void;
-}) => {
-  const theme = useTheme();
-  const { allDatasets, loadAllDatasets } = useDatasetStore();
-  const {
-    isOpen: isOpenKbSelect,
-    onOpen: onOpenKbSelect,
-    onClose: onCloseKbSelect
-  } = useDisclosure();
-
-  const showKbList = useMemo(
-    () => allDatasets.filter((item) => activeKbs.find((kb) => kb.kbId === item._id)),
-    [allDatasets, activeKbs]
-  );
-
-  useQuery(['loadAllDatasets'], loadAllDatasets);
-
-  return (
-    <>
-      <Grid gridTemplateColumns={'1fr 1fr'} gridGap={4}>
-        <Button h={'36px'} onClick={onOpenKbSelect}>
-          选择知识库
-        </Button>
-        {showKbList.map((item) => (
-          <Flex
-            key={item._id}
-            alignItems={'center'}
-            h={'36px'}
-            border={theme.borders.base}
-            px={2}
-            borderRadius={'md'}
-          >
-            <Avatar src={item.avatar} w={'24px'}></Avatar>
-            <Box ml={3} fontWeight={'bold'} fontSize={['md', 'lg', 'xl']}>
-              {item.name}
-            </Box>
-          </Flex>
-        ))}
-      </Grid>
-      <DatasetSelectModal
-        isOpen={isOpenKbSelect}
-        activeKbs={activeKbs}
-        onChange={onChange}
-        onClose={onCloseKbSelect}
-      />
-    </>
-  );
-};
 
 const NodeKbSearch = ({ data }: NodeProps<FlowModuleItemType>) => {
   const { moduleId, inputs, outputs } = data;
-  const { onChangeNode } = useFlowStore();
 
   return (
     <NodeCard minW={'400px'} {...data}>
       <Divider text="Input" />
       <Container>
-        <RenderInput
-          moduleId={moduleId}
-          flowInputList={inputs}
-          CustomComponent={{
-            kbList: ({ key, value, ...props }) => (
-              <KBSelect
-                activeKbs={value}
-                onChange={(e) => {
-                  onChangeNode({
-                    moduleId,
-                    key,
-                    type: 'inputs',
-                    value: {
-                      ...props,
-                      key,
-                      value: e
-                    }
-                  });
-                }}
-              />
-            )
-          }}
-        />
+        <RenderInput moduleId={moduleId} flowInputList={inputs} />
       </Container>
       <Divider text="Output" />
       <Container>

projects/app/src/pages/app/detail/components/AdEdit/components/Nodes/NodeQuestionInput.tsx

@@ -1,24 +1,18 @@
 import React from 'react';
 import { NodeProps } from 'reactflow';
-import { Box } from '@chakra-ui/react';
 import NodeCard from '../modules/NodeCard';
 import { FlowModuleItemType } from '@/types/core/app/flow';
 import Container from '../modules/Container';
-import { SystemInputEnum } from '@/constants/app';
-import { FlowValueTypeEnum } from '@/constants/flow';
-import SourceHandle from '../render/SourceHandle';
+
+import RenderOutput from '../render/RenderOutput';
 
 const QuestionInputNode = ({ data }: NodeProps<FlowModuleItemType>) => {
+  const { moduleId, inputs, outputs } = data;
+
   return (
     <NodeCard minW={'240px'} {...data}>
       <Container borderTop={'2px solid'} borderTopColor={'myGray.200'} textAlign={'end'}>
-        <Box position={'relative'}>
-          用户问题
-          <SourceHandle
-            handleKey={SystemInputEnum.userChatInput}
-            valueType={FlowValueTypeEnum.string}
-          />
-        </Box>
+        <RenderOutput moduleId={moduleId} flowOutputList={outputs} />
       </Container>
     </NodeCard>
   );

projects/app/src/pages/app/detail/components/AdEdit/components/Provider.tsx

@@ -26,7 +26,7 @@ import React, {
 } from 'react';
 import { customAlphabet } from 'nanoid';
 import { appModule2FlowEdge, appModule2FlowNode } from '@/utils/adapt';
-import { useToast } from '@/hooks/useToast';
+import { useToast } from '@/web/common/hooks/useToast';
 import { FlowModuleTypeEnum, FlowValueTypeEnum } from '@/constants/flow';
 import { useTranslation } from 'next-i18next';
 import { AppModuleItemType } from '@/types/app';

projects/app/src/pages/app/detail/components/AdEdit/components/TemplateList.tsx

@@ -3,7 +3,7 @@ import { Box, Flex } from '@chakra-ui/react';
 import { ModuleTemplates } from '@/constants/flow/ModuleTemplate';
 import { FlowModuleItemType, FlowModuleTemplateType } from '@/types/core/app/flow';
 import type { Node } from 'reactflow';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import Avatar from '@/components/Avatar';
 import { FlowModuleTypeEnum } from '@/constants/flow';
 import { useFlowStore } from './Provider';

projects/app/src/pages/app/detail/components/AdEdit/components/modules/NodeCard.tsx

@@ -6,8 +6,8 @@ import type { FlowModuleItemType } from '@/types/core/app/flow';
 import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import { useTranslation } from 'react-i18next';
-import { useEditTitle } from '@/hooks/useEditTitle';
-import { useToast } from '@/hooks/useToast';
+import { useEditTitle } from '@/web/common/hooks/useEditTitle';
+import { useToast } from '@/web/common/hooks/useToast';
 import { useFlowStore } from '../Provider';
 
 type Props = FlowModuleItemType & {

projects/app/src/pages/app/detail/components/AdEdit/components/render/RenderInput.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import type { FlowInputItemType, SelectAppItemType } from '@/types/core/app/flow';
 import {
   Box,
@@ -12,20 +12,31 @@ import {
   Flex,
   useDisclosure,
   Button,
-  useTheme
+  useTheme,
+  Grid
 } from '@chakra-ui/react';
 import { FlowInputItemTypeEnum } from '@/constants/flow';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import dynamic from 'next/dynamic';
+import { useFlowStore } from '../Provider';
+import Avatar from '@/components/Avatar';
 import MySelect from '@/components/Select';
 import MySlider from '@/components/Slider';
 import MyTooltip from '@/components/MyTooltip';
 import TargetHandle from './TargetHandle';
 import MyIcon from '@/components/Icon';
+import { useTranslation } from 'react-i18next';
+import { AIChatProps } from '@/types/core/aiChat';
+import { chatModelList } from '@/web/common/store/static';
+import { formatPrice } from '@fastgpt/common/bill';
+import { useDatasetStore } from '@/web/core/store/dataset';
+import { SelectedDatasetType } from '@/types/core/dataset';
+import { useQuery } from '@tanstack/react-query';
+
 const SetInputFieldModal = dynamic(() => import('../modules/SetInputFieldModal'));
 const SelectAppModal = dynamic(() => import('../../../SelectAppModal'));
-import { useFlowStore } from '../Provider';
-import Avatar from '@/components/Avatar';
+const AIChatSettingsModal = dynamic(() => import('../../../AIChatSettingsModal'));
+const DatasetSelectModal = dynamic(() => import('../../../DatasetSelectModal'));
 
 export const Label = ({
   moduleId,
@@ -145,123 +156,51 @@ const RenderInput = ({
   moduleId: string;
   CustomComponent?: Record<string, (e: FlowInputItemType) => React.ReactNode>;
 }) => {
-  const { onChangeNode } = useFlowStore();
-
+  const sortInputs = useMemo(
+    () => flowInputList.sort((a, b) => (a.key === FlowInputItemTypeEnum.switch ? -1 : 1)),
+    [flowInputList]
+  );
   return (
     <>
-      {flowInputList.map(
+      {sortInputs.map(
         (item) =>
           item.type !== FlowInputItemTypeEnum.hidden && (
             <Box key={item.key} _notLast={{ mb: 7 }} position={'relative'}>
               {!!item.label && <Label moduleId={moduleId} inputKey={item.key} {...item} />}
               <Box mt={2} className={'nodrag'}>
                 {item.type === FlowInputItemTypeEnum.numberInput && (
-                  <NumberInput
-                    defaultValue={item.value}
-                    min={item.min}
-                    max={item.max}
-                    onChange={(e) => {
-                      onChangeNode({
-                        moduleId,
-                        type: 'inputs',
-                        key: item.key,
-                        value: {
-                          ...item,
-                          value: Number(e)
-                        }
-                      });
-                    }}
-                  >
-                    <NumberInputField />
-                    <NumberInputStepper>
-                      <NumberIncrementStepper />
-                      <NumberDecrementStepper />
-                    </NumberInputStepper>
-                  </NumberInput>
+                  <NumberInputRender item={item} moduleId={moduleId} />
                 )}
                 {item.type === FlowInputItemTypeEnum.input && (
-                  <Input
-                    placeholder={item.placeholder}
-                    defaultValue={item.value}
-                    onChange={(e) => {
-                      onChangeNode({
-                        moduleId,
-                        type: 'inputs',
-                        key: item.key,
-                        value: {
-                          ...item,
-                          value: e.target.value
-                        }
-                      });
-                    }}
-                  />
+                  <TextInputRender item={item} moduleId={moduleId} />
                 )}
                 {item.type === FlowInputItemTypeEnum.textarea && (
-                  <Textarea
-                    rows={5}
-                    placeholder={item.placeholder}
-                    resize={'both'}
-                    defaultValue={item.value}
-                    onChange={(e) => {
-                      onChangeNode({
-                        moduleId,
-                        type: 'inputs',
-                        key: item.key,
-                        value: {
-                          ...item,
-                          value: e.target.value
-                        }
-                      });
-                    }}
-                  />
+                  <TextareaRender item={item} moduleId={moduleId} />
                 )}
                 {item.type === FlowInputItemTypeEnum.select && (
-                  <MySelect
-                    width={'100%'}
-                    value={item.value}
-                    list={item.list || []}
-                    onchange={(e) => {
-                      onChangeNode({
-                        moduleId,
-                        type: 'inputs',
-                        key: item.key,
-                        value: {
-                          ...item,
-                          value: e
-                        }
-                      });
-                    }}
-                  />
+                  <SelectRender item={item} moduleId={moduleId} />
                 )}
                 {item.type === FlowInputItemTypeEnum.slider && (
-                  <Box pt={5} pb={4} px={2}>
-                    <MySlider
-                      markList={item.markList}
-                      width={'100%'}
-                      min={item.min || 0}
-                      max={item.max}
-                      step={item.step || 1}
-                      value={item.value}
-                      onChange={(e) => {
-                        onChangeNode({
-                          moduleId,
-                          type: 'inputs',
-                          key: item.key,
-                          value: {
-                            ...item,
-                            value: e
-                          }
-                        });
-                      }}
-                    />
-                  </Box>
+                  <SliderRender item={item} moduleId={moduleId} />
+                )}
+                {item.type === FlowInputItemTypeEnum.selectApp && (
+                  <SelectAppRender item={item} moduleId={moduleId} />
+                )}
+                {item.type === FlowInputItemTypeEnum.quoteList && (
+                  <QuoteListRender inputs={sortInputs} item={item} moduleId={moduleId} />
+                )}
+                {item.type === FlowInputItemTypeEnum.maxToken && (
+                  <MaxTokenRender inputs={sortInputs} item={item} moduleId={moduleId} />
+                )}
+                {item.type === FlowInputItemTypeEnum.selectChatModel && (
+                  <SelectChatModelRender inputs={sortInputs} item={item} moduleId={moduleId} />
+                )}
+                {item.type === FlowInputItemTypeEnum.selectDataset && (
+                  <SelectDatasetRender item={item} moduleId={moduleId} />
                 )}
                 {item.type === FlowInputItemTypeEnum.custom && CustomComponent[item.key] && (
                   <>{CustomComponent[item.key]({ ...item })}</>
                 )}
-                {item.type === FlowInputItemTypeEnum.selectApp && (
-                  <RenderSelectApp app={item} moduleId={moduleId} />
-                )}
               </Box>
             </Box>
           )
@@ -272,7 +211,346 @@ const RenderInput = ({
 
 export default React.memo(RenderInput);
 
-function RenderSelectApp({ app, moduleId }: { app: FlowInputItemType; moduleId: string }) {
+type RenderProps = {
+  inputs?: FlowInputItemType[];
+  item: FlowInputItemType;
+  moduleId: string;
+};
+
+var NumberInputRender = React.memo(function NumberInputRender({ item, moduleId }: RenderProps) {
+  const { onChangeNode } = useFlowStore();
+
+  return (
+    <NumberInput
+      defaultValue={item.value}
+      min={item.min}
+      max={item.max}
+      onChange={(e) => {
+        onChangeNode({
+          moduleId,
+          type: 'inputs',
+          key: item.key,
+          value: {
+            ...item,
+            value: Number(e)
+          }
+        });
+      }}
+    >
+      <NumberInputField />
+      <NumberInputStepper>
+        <NumberIncrementStepper />
+        <NumberDecrementStepper />
+      </NumberInputStepper>
+    </NumberInput>
+  );
+});
+
+var TextInputRender = React.memo(function TextInputRender({ item, moduleId }: RenderProps) {
+  const { onChangeNode } = useFlowStore();
+
+  return (
+    <Input
+      placeholder={item.placeholder}
+      defaultValue={item.value}
+      onChange={(e) => {
+        onChangeNode({
+          moduleId,
+          type: 'inputs',
+          key: item.key,
+          value: {
+            ...item,
+            value: e.target.value
+          }
+        });
+      }}
+    />
+  );
+});
+
+var TextareaRender = React.memo(function TextareaRender({ item, moduleId }: RenderProps) {
+  const { onChangeNode } = useFlowStore();
+
+  return (
+    <Textarea
+      rows={5}
+      placeholder={item.placeholder}
+      resize={'both'}
+      defaultValue={item.value}
+      onChange={(e) => {
+        onChangeNode({
+          moduleId,
+          type: 'inputs',
+          key: item.key,
+          value: {
+            ...item,
+            value: e.target.value
+          }
+        });
+      }}
+    />
+  );
+});
+
+var SelectRender = React.memo(function SelectRender({ item, moduleId }: RenderProps) {
+  const { onChangeNode } = useFlowStore();
+
+  return (
+    <MySelect
+      width={'100%'}
+      value={item.value}
+      list={item.list || []}
+      onchange={(e) => {
+        onChangeNode({
+          moduleId,
+          type: 'inputs',
+          key: item.key,
+          value: {
+            ...item,
+            value: e
+          }
+        });
+      }}
+    />
+  );
+});
+
+var SliderRender = React.memo(function SliderRender({ item, moduleId }: RenderProps) {
+  const { onChangeNode } = useFlowStore();
+
+  return (
+    <Box pt={5} pb={4} px={2}>
+      <MySlider
+        markList={item.markList}
+        width={'100%'}
+        min={item.min || 0}
+        max={item.max}
+        step={item.step || 1}
+        value={item.value}
+        onChange={(e) => {
+          onChangeNode({
+            moduleId,
+            type: 'inputs',
+            key: item.key,
+            value: {
+              ...item,
+              value: e
+            }
+          });
+        }}
+      />
+    </Box>
+  );
+});
+
+var QuoteListRender = React.memo(function QuoteListRender({ inputs = [], moduleId }: RenderProps) {
+  const { onChangeNode } = useFlowStore();
+  const { t } = useTranslation();
+  const chatModulesData = useMemo(() => {
+    const obj: Record<string, any> = {};
+    inputs.forEach((item) => {
+      obj[item.key] = item.value;
+    });
+    return obj as AIChatProps;
+  }, [inputs]);
+
+  const {
+    isOpen: isOpenAIChatSetting,
+    onOpen: onOpenAIChatSetting,
+    onClose: onCloseAIChatSetting
+  } = useDisclosure();
+
+  return (
+    <>
+      <Button
+        variant={'base'}
+        leftIcon={<MyIcon name={'settingLight'} w={'14px'} />}
+        onClick={onOpenAIChatSetting}
+      >
+        {t('app.Quote Prompt Settings')}
+      </Button>
+      {isOpenAIChatSetting && (
+        <AIChatSettingsModal
+          onClose={onCloseAIChatSetting}
+          onSuccess={(e) => {
+            for (let key in e) {
+              const item = inputs.find((input) => input.key === key);
+              if (!item) continue;
+              onChangeNode({
+                moduleId,
+                type: 'inputs',
+                key,
+                value: {
+                  ...item,
+                  //@ts-ignore
+                  value: e[key]
+                }
+              });
+            }
+            onCloseAIChatSetting();
+          }}
+          defaultData={chatModulesData}
+        />
+      )}
+    </>
+  );
+});
+
+var MaxTokenRender = React.memo(function MaxTokenRender({
+  inputs = [],
+  item,
+  moduleId
+}: RenderProps) {
+  const { onChangeNode } = useFlowStore();
+  const model = inputs.find((item) => item.key === 'model')?.value;
+  const modelData = chatModelList.find((item) => item.model === model);
+  const maxToken = modelData ? modelData.contextMaxToken : 4000;
+  const markList = [
+    { label: '100', value: 100 },
+    { label: `${maxToken}`, value: maxToken }
+  ];
+
+  return (
+    <Box pt={5} pb={4} px={2}>
+      <MySlider
+        markList={markList}
+        width={'100%'}
+        min={item.min || 100}
+        max={maxToken}
+        step={item.step || 1}
+        value={item.value}
+        onChange={(e) => {
+          onChangeNode({
+            moduleId,
+            type: 'inputs',
+            key: item.key,
+            value: {
+              ...item,
+              value: e
+            }
+          });
+        }}
+      />
+    </Box>
+  );
+});
+
+var SelectChatModelRender = React.memo(function SelectChatModelRender({
+  inputs = [],
+  item,
+  moduleId
+}: RenderProps) {
+  const { onChangeNode } = useFlowStore();
+
+  const list = chatModelList.map((item) => {
+    const priceStr = `(${formatPrice(item.price, 1000)}元/1k Tokens)`;
+
+    return {
+      value: item.model,
+      label: `${item.name}${priceStr}`
+    };
+  });
+
+  return (
+    <MySelect
+      width={'100%'}
+      value={item.value}
+      list={list}
+      onchange={(e) => {
+        onChangeNode({
+          moduleId,
+          type: 'inputs',
+          key: item.key,
+          value: {
+            ...item,
+            value: e
+          }
+        });
+
+        // update max tokens
+        const model = chatModelList.find((item) => item.model === e) || chatModelList[0];
+        if (!model) return;
+
+        onChangeNode({
+          moduleId,
+          type: 'inputs',
+          key: 'maxToken',
+          value: {
+            ...inputs.find((input) => input.key === 'maxToken'),
+            markList: [
+              { label: '100', value: 100 },
+              { label: `${model.contextMaxToken}`, value: model.contextMaxToken }
+            ],
+            max: model.contextMaxToken,
+            value: model.contextMaxToken / 2
+          }
+        });
+      }}
+    />
+  );
+});
+
+var SelectDatasetRender = React.memo(function SelectDatasetRender({ item, moduleId }: RenderProps) {
+  const { onChangeNode } = useFlowStore();
+
+  const theme = useTheme();
+  const { allDatasets, loadAllDatasets } = useDatasetStore();
+  const {
+    isOpen: isOpenKbSelect,
+    onOpen: onOpenKbSelect,
+    onClose: onCloseKbSelect
+  } = useDisclosure();
+
+  const showKbList = useMemo(() => {
+    const value = item.value as SelectedDatasetType;
+    return allDatasets.filter((dataset) => value.find((kb) => kb.kbId === dataset._id));
+  }, [allDatasets, item.value]);
+
+  useQuery(['loadAllDatasets'], loadAllDatasets);
+
+  return (
+    <>
+      <Grid gridTemplateColumns={'1fr 1fr'} gridGap={4}>
+        <Button h={'36px'} onClick={onOpenKbSelect}>
+          选择知识库
+        </Button>
+        {showKbList.map((item) => (
+          <Flex
+            key={item._id}
+            alignItems={'center'}
+            h={'36px'}
+            border={theme.borders.base}
+            px={2}
+            borderRadius={'md'}
+          >
+            <Avatar src={item.avatar} w={'24px'}></Avatar>
+            <Box ml={3} fontWeight={'bold'} fontSize={['md', 'lg', 'xl']}>
+              {item.name}
+            </Box>
+          </Flex>
+        ))}
+      </Grid>
+      <DatasetSelectModal
+        isOpen={isOpenKbSelect}
+        activeKbs={item.value}
+        onChange={(e) => {
+          onChangeNode({
+            moduleId,
+            key: item.key,
+            type: 'inputs',
+            value: {
+              ...item,
+              value: e
+            }
+          });
+        }}
+        onClose={onCloseKbSelect}
+      />
+    </>
+  );
+});
+
+var SelectAppRender = React.memo(function SelectAppRender({ item, moduleId }: RenderProps) {
   const { onChangeNode, appId } = useFlowStore();
   const theme = useTheme();
 
@@ -282,7 +560,7 @@ function RenderSelectApp({ app, moduleId }: { app: FlowInputItemType; moduleId:
     onClose: onCloseSelectApp
   } = useDisclosure();
 
-  const value = app.value as SelectAppItemType | undefined;
+  const value = item.value as SelectAppItemType | undefined;
 
   return (
     <>
@@ -303,7 +581,7 @@ function RenderSelectApp({ app, moduleId }: { app: FlowInputItemType; moduleId:
 
       {isOpenSelectApp && (
         <SelectAppModal
-          defaultApps={app.value?.id ? [app.value.id] : []}
+          defaultApps={item.value?.id ? [item.value.id] : []}
           filterApps={[appId]}
           onClose={onCloseSelectApp}
           onSuccess={(e) => {
@@ -312,7 +590,7 @@ function RenderSelectApp({ app, moduleId }: { app: FlowInputItemType; moduleId:
               type: 'inputs',
               key: 'app',
               value: {
-                ...app,
+                ...item,
                 value: e[0]
               }
             });
@@ -321,4 +599,4 @@ function RenderSelectApp({ app, moduleId }: { app: FlowInputItemType; moduleId:
       )}
     </>
   );
-}
+});

projects/app/src/pages/app/detail/components/AdEdit/components/render/RenderOutput.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import type { FlowOutputItemType } from '@/types/core/app/flow';
 import { Box, Flex } from '@chakra-ui/react';
 import { FlowOutputItemTypeEnum } from '@/constants/flow';
@@ -9,6 +9,7 @@ import MyIcon from '@/components/Icon';
 import dynamic from 'next/dynamic';
 const SetOutputFieldModal = dynamic(() => import('../modules/SetOutputFieldModal'));
 import { useFlowStore } from '../Provider';
+import { SystemOutputEnum } from '@/constants/app';
 
 const Label = ({
   moduleId,
@@ -127,13 +128,17 @@ const RenderOutput = ({
   moduleId: string;
   flowOutputList: FlowOutputItemType[];
 }) => {
+  const sortOutput = useMemo(
+    () => flowOutputList.sort((a, b) => (a.key === SystemOutputEnum.finish ? -1 : 1)),
+    [flowOutputList]
+  );
   return (
     <>
-      {flowOutputList.map(
+      {sortOutput.map(
         (item) =>
           item.type !== FlowOutputItemTypeEnum.hidden && (
             <Box key={item.key} _notLast={{ mb: 7 }} position={'relative'}>
-              <Label moduleId={moduleId} outputKey={item.key} outputs={flowOutputList} {...item} />
+              <Label moduleId={moduleId} outputKey={item.key} outputs={sortOutput} {...item} />
               <Box mt={FlowOutputItemTypeEnum.answer ? 0 : 2} className={'nodrag'}>
                 {item.type === FlowOutputItemTypeEnum.source && (
                   <SourceHandle handleKey={item.key} valueType={item.valueType} />

projects/app/src/pages/app/detail/components/AdEdit/index.tsx

@@ -10,11 +10,11 @@ import {
 } from '@/constants/flow';
 import { FlowOutputTargetItemType } from '@/types/core/app/flow';
 import { AppModuleItemType } from '@/types/app';
-import { useRequest } from '@/hooks/useRequest';
+import { useRequest } from '@/web/common/hooks/useRequest';
 import type { AppSchema } from '@/types/mongoSchema';
-import { useUserStore } from '@/store/user';
+import { useUserStore } from '@/web/support/store/user';
 import { useTranslation } from 'next-i18next';
-import { useCopyData } from '@/hooks/useCopyData';
+import { useCopyData } from '@/web/common/hooks/useCopyData';
 import dynamic from 'next/dynamic';
 import styles from './index.module.scss';
 import { AppTypeEnum } from '@/constants/app';
@@ -125,6 +125,9 @@ function FlowHeader({ app, onCloseSettings }: Props & {}) {
         if (item.inputs.find((input) => input.required && !input.connected)) {
           return Promise.reject(`【${item.name}】存在未连接的必填输入`);
         }
+        if (item.inputs.find((input) => input.valueCheck && !input.valueCheck(input.value))) {
+          return Promise.reject(`【${item.name}】存在为填写的必填项`);
+        }
       }
 
       return updateAppDetail(app._id, {

projects/app/src/pages/app/detail/components/BasicEdit/index.tsx

@@ -19,18 +19,18 @@ import {
   Text,
   Switch
 } from '@chakra-ui/react';
-import { useUserStore } from '@/store/user';
+import { useUserStore } from '@/web/support/store/user';
 import { useQuery } from '@tanstack/react-query';
 import { QuestionOutlineIcon, SmallAddIcon } from '@chakra-ui/icons';
 import { useForm, useFieldArray } from 'react-hook-form';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import {
   appModules2Form,
   getDefaultAppForm,
   appForm2Modules,
   type EditFormType
 } from '@/utils/app';
-import { chatModelList } from '@/store/static';
+import { chatModelList } from '@/web/common/store/static';
 import { formatPrice } from '@fastgpt/common/bill/index';
 import {
   ChatModelSystemTip,
@@ -39,14 +39,14 @@ import {
   questionGuideTip
 } from '@/constants/flow/ModuleTemplate';
 import { AppModuleItemType, VariableItemType } from '@/types/app';
-import { useRequest } from '@/hooks/useRequest';
-import { useConfirm } from '@/hooks/useConfirm';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { FlowModuleTypeEnum } from '@/constants/flow';
-import { streamFetch } from '@/api/fetch';
+import { streamFetch } from '@/web/common/api/fetch';
 import { useRouter } from 'next/router';
-import { useToast } from '@/hooks/useToast';
+import { useToast } from '@/web/common/hooks/useToast';
 import { AppSchema } from '@/types/mongoSchema';
-import { delModelById } from '@/api/app';
+import { delModelById } from '@/web/core/api/app';
 import { useTranslation } from 'react-i18next';
 import { getGuideModule } from '@/components/ChatBox/utils';
 
@@ -61,7 +61,7 @@ import ChatBox, { type ComponentRef, type StartChatFnProps } from '@/components/
 import { addVariable } from '../VariableEditModal';
 import { KbParamsModal } from '../DatasetSelectModal';
 import { AppTypeEnum } from '@/constants/app';
-import { useDatasetStore } from '@/store/dataset';
+import { useDatasetStore } from '@/web/core/store/dataset';
 
 const VariableEditModal = dynamic(() => import('../VariableEditModal'));
 const InfoModal = dynamic(() => import('../InfoModal'));

projects/app/src/pages/app/detail/components/Charts/TotalUsage.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useRef } from 'react';
 import * as echarts from 'echarts';
-import { useGlobalStore } from '@/store/global';
-import { getAppTotalUsage } from '@/api/app';
+import { useGlobalStore } from '@/web/common/store/global';
+import { getAppTotalUsage } from '@/web/core/api/app';
 import { useQuery } from '@tanstack/react-query';
 import dayjs from 'dayjs';
 import { formatPrice } from '@fastgpt/common/bill/index';

projects/app/src/pages/app/detail/components/DatasetSelectModal.tsx

@@ -15,7 +15,7 @@ import Avatar from '@/components/Avatar';
 import { useForm } from 'react-hook-form';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import type { SelectedDatasetType } from '@/types/core/dataset';
-import { useToast } from '@/hooks/useToast';
+import { useToast } from '@/web/common/hooks/useToast';
 import MySlider from '@/components/Slider';
 import MyTooltip from '@/components/MyTooltip';
 import MyModal from '@/components/MyModal';
@@ -23,8 +23,8 @@ import MyIcon from '@/components/Icon';
 import { KbTypeEnum } from '@/constants/dataset';
 import { useTranslation } from 'react-i18next';
 import { useQuery } from '@tanstack/react-query';
-import { useDatasetStore } from '@/store/dataset';
-import { feConfigs } from '@/store/static';
+import { useDatasetStore } from '@/web/core/store/dataset';
+import { feConfigs } from '@/web/common/store/static';
 import DatasetSelectContainer, { useDatasetSelect } from '@/components/core/dataset/SelectModal';
 
 export type KbParamsType = {
@@ -178,7 +178,7 @@ export const DatasetSelectModal = ({
         </Grid>
         {filterKbList.unSelected.length === 0 && (
           <Flex mt={5} flexDirection={'column'} alignItems={'center'}>
-            <MyIcon name="empty" w={'48px'} h={'48px'} color={'transparent'} />
+            <MyIcon name="empty" w={'48px'} h={'48px'} mt={'20vh'} color={'transparent'} />
             <Box mt={2} color={'myGray.500'}>
               这个目录已经没东西可选了~
             </Box>

projects/app/src/pages/app/detail/components/InfoModal.tsx

@@ -11,12 +11,12 @@ import {
 } from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
 import { AppSchema } from '@/types/mongoSchema';
-import { useToast } from '@/hooks/useToast';
-import { useSelectFile } from '@/hooks/useSelectFile';
-import { compressImg } from '@/utils/web/file';
+import { useToast } from '@/web/common/hooks/useToast';
+import { useSelectFile } from '@/web/common/hooks/useSelectFile';
+import { compressImg } from '@/web/common/utils/file';
 import { getErrText } from '@/utils/tools';
-import { useUserStore } from '@/store/user';
-import { useRequest } from '@/hooks/useRequest';
+import { useUserStore } from '@/web/support/store/user';
+import { useRequest } from '@/web/common/hooks/useRequest';
 import Avatar from '@/components/Avatar';
 import MyModal from '@/components/MyModal';
 

projects/app/src/pages/app/detail/components/Logs.tsx

@@ -15,15 +15,15 @@ import {
 } from '@chakra-ui/react';
 import MyIcon from '@/components/Icon';
 import { useTranslation } from 'next-i18next';
-import { usePagination } from '@/hooks/usePagination';
-import { getAppChatLogs } from '@/api/app';
+import { usePagination } from '@/web/common/hooks/usePagination';
+import { getAppChatLogs } from '@/web/core/api/app';
 import dayjs from 'dayjs';
 import { ChatSourceMap, HUMAN_ICON } from '@/constants/chat';
 import { AppLogsListItemType } from '@/types/app';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import ChatBox, { type ComponentRef } from '@/components/ChatBox';
 import { useQuery } from '@tanstack/react-query';
-import { getInitChatSiteInfo } from '@/api/chat';
+import { getInitChatSiteInfo } from '@/web/core/api/chat';
 import Tag from '@/components/Tag';
 import MyModal from '@/components/MyModal';
 import DateRangePicker, { type DateRangeType } from '@/components/DateRangePicker';

projects/app/src/pages/app/detail/components/OutLink/Share.tsx

@@ -22,25 +22,25 @@ import {
 } from '@chakra-ui/react';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import MyIcon from '@/components/Icon';
-import { useLoading } from '@/hooks/useLoading';
+import { useLoading } from '@/web/common/hooks/useLoading';
 import { useQuery } from '@tanstack/react-query';
 import {
   getShareChatList,
   delShareChatById,
   createShareChat,
   putShareChat
-} from '@/api/support/outLink';
+} from '@/web/support/api/outLink';
 import { formatTimeToChatTime } from '@/utils/tools';
-import { useCopyData } from '@/hooks/useCopyData';
+import { useCopyData } from '@/web/common/hooks/useCopyData';
 import { useForm } from 'react-hook-form';
 import { defaultOutLinkForm } from '@/constants/model';
 import type { OutLinkEditType } from '@/types/support/outLink';
-import { useRequest } from '@/hooks/useRequest';
+import { useRequest } from '@/web/common/hooks/useRequest';
 import { formatPrice } from '@fastgpt/common/bill/index';
 import { OutLinkTypeEnum } from '@/constants/chat';
 import { useTranslation } from 'react-i18next';
-import { useToast } from '@/hooks/useToast';
-import { feConfigs } from '@/store/static';
+import { useToast } from '@/web/common/hooks/useToast';
+import { feConfigs } from '@/web/common/store/static';
 import MyTooltip from '@/components/MyTooltip';
 import MyModal from '@/components/MyModal';
 import dayjs from 'dayjs';

projects/app/src/pages/app/detail/components/SelectAppModal.tsx

@@ -1,12 +1,12 @@
 import React, { useMemo } from 'react';
 import { ModalBody, Flex, Box, useTheme, ModalFooter, Button } from '@chakra-ui/react';
 import MyModal from '@/components/MyModal';
-import { getMyModels } from '@/api/app';
+import { getMyModels } from '@/web/core/api/app';
 import { useQuery } from '@tanstack/react-query';
 import type { SelectAppItemType } from '@/types/core/app/flow';
 import Avatar from '@/components/Avatar';
 import { useTranslation } from 'react-i18next';
-import { useLoading } from '@/hooks/useLoading';
+import { useLoading } from '@/web/common/hooks/useLoading';
 
 const SelectAppModal = ({
   defaultApps = [],

projects/app/src/pages/app/detail/index.tsx

@@ -1,12 +1,12 @@
 import React, { useEffect, useMemo, useCallback } from 'react';
 import { useRouter } from 'next/router';
 import { Box, Flex, IconButton, useTheme } from '@chakra-ui/react';
-import { useUserStore } from '@/store/user';
+import { useUserStore } from '@/web/support/store/user';
 import dynamic from 'next/dynamic';
 import { defaultApp } from '@/constants/model';
-import { useToast } from '@/hooks/useToast';
+import { useToast } from '@/web/common/hooks/useToast';
 import { useQuery } from '@tanstack/react-query';
-import { feConfigs } from '@/store/static';
+import { feConfigs } from '@/web/common/store/static';
 
 import Tabs from '@/components/Tabs';
 import SideTabs from '@/components/SideTabs';
@@ -15,7 +15,7 @@ import MyIcon from '@/components/Icon';
 import PageContainer from '@/components/PageContainer';
 import Loading from '@/components/Loading';
 import BasicEdit from './components/BasicEdit';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 
 const AdEdit = dynamic(() => import('./components/AdEdit'), {
   loading: () => <Loading />

projects/app/src/pages/app/list/component/CreateModal.tsx

@@ -11,17 +11,17 @@ import {
   useTheme,
   Card
 } from '@chakra-ui/react';
-import { useSelectFile } from '@/hooks/useSelectFile';
+import { useSelectFile } from '@/web/common/hooks/useSelectFile';
 import { useForm } from 'react-hook-form';
-import { compressImg } from '@/utils/web/file';
+import { compressImg } from '@/web/common/utils/file';
 import { getErrText } from '@/utils/tools';
-import { useToast } from '@/hooks/useToast';
-import { postCreateApp } from '@/api/app';
+import { useToast } from '@/web/common/hooks/useToast';
+import { postCreateApp } from '@/web/core/api/app';
 import { useRouter } from 'next/router';
 import { appTemplates } from '@/constants/flow/ModuleTemplate';
-import { useGlobalStore } from '@/store/global';
-import { useRequest } from '@/hooks/useRequest';
-import { feConfigs } from '@/store/static';
+import { useGlobalStore } from '@/web/common/store/global';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import { feConfigs } from '@/web/common/store/static';
 import Avatar from '@/components/Avatar';
 import MyTooltip from '@/components/MyTooltip';
 import MyModal from '@/components/MyModal';

projects/app/src/pages/app/list/index.tsx

@@ -10,13 +10,13 @@ import {
   useDisclosure
 } from '@chakra-ui/react';
 import { useRouter } from 'next/router';
-import { useUserStore } from '@/store/user';
+import { useUserStore } from '@/web/support/store/user';
 import { useQuery } from '@tanstack/react-query';
 import { AddIcon } from '@chakra-ui/icons';
-import { delModelById } from '@/api/app';
-import { useToast } from '@/hooks/useToast';
-import { useConfirm } from '@/hooks/useConfirm';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { delModelById } from '@/web/core/api/app';
+import { useToast } from '@/web/common/hooks/useToast';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 import { useTranslation } from 'next-i18next';
 
 import MyIcon from '@/components/Icon';

projects/app/src/pages/appStore/index.tsx

@@ -1,13 +1,13 @@
 import React, { useState, useRef, useCallback } from 'react';
 import { Box, Flex, Card, Grid, Input } from '@chakra-ui/react';
-import { useLoading } from '@/hooks/useLoading';
-import { getShareModelList, triggerModelCollection } from '@/api/app';
-import { usePagination } from '@/hooks/usePagination';
+import { useLoading } from '@/web/common/hooks/useLoading';
+import { getShareModelList, triggerModelCollection } from '@/web/core/api/app';
+import { usePagination } from '@/web/common/hooks/usePagination';
 import type { ShareAppItem } from '@/types/app';
-import { useUserStore } from '@/store/user';
+import { useUserStore } from '@/web/support/store/user';
 import ShareModelList from './components/list';
 import styles from './index.module.scss';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 
 const modelList = () => {
   const { Loading } = useLoading();

projects/app/src/pages/chat/components/ChatHeader.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { Flex, useTheme, Box } from '@chakra-ui/react';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import MyIcon from '@/components/Icon';
 import Tag from '@/components/Tag';
 import Avatar from '@/components/Avatar';

projects/app/src/pages/chat/components/ChatHistorySlider.tsx

@@ -10,16 +10,16 @@ import {
   MenuItem,
   IconButton
 } from '@chakra-ui/react';
-import { useGlobalStore } from '@/store/global';
-import { useEditTitle } from '@/hooks/useEditTitle';
+import { useGlobalStore } from '@/web/common/store/global';
+import { useEditTitle } from '@/web/common/hooks/useEditTitle';
 import { useRouter } from 'next/router';
 import Avatar from '@/components/Avatar';
 import MyTooltip from '@/components/MyTooltip';
 import MyIcon from '@/components/Icon';
 import { useTranslation } from 'react-i18next';
-import { useConfirm } from '@/hooks/useConfirm';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
 import Tabs from '@/components/Tabs';
-import { useUserStore } from '@/store/user';
+import { useUserStore } from '@/web/support/store/user';
 import { useQuery } from '@tanstack/react-query';
 
 type HistoryItemType = {

projects/app/src/pages/chat/components/Empty.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Card, Box, Flex } from '@chakra-ui/react';
-import { useMarkdown } from '@/hooks/useMarkdown';
+import { useMarkdown } from '@/web/common/hooks/useMarkdown';
 import Markdown from '@/components/Markdown';
 import Avatar from '@/components/Avatar';
 

projects/app/src/pages/chat/components/SliderApps.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Flex, Box, IconButton } from '@chakra-ui/react';
 import { useRouter } from 'next/router';
-import { useUserStore } from '@/store/user';
+import { useUserStore } from '@/web/support/store/user';
 import { useQuery } from '@tanstack/react-query';
 import { useTranslation } from 'react-i18next';
 import MyIcon from '@/components/Icon';

projects/app/src/pages/chat/index.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useRef } from 'react';
 import Head from 'next/head';
 import { useRouter } from 'next/router';
-import { getInitChatSiteInfo, delChatRecordById, putChatHistory } from '@/api/chat';
+import { getInitChatSiteInfo, delChatRecordById, putChatHistory } from '@/web/core/api/chat';
 import {
   Box,
   Flex,
@@ -11,12 +11,12 @@ import {
   DrawerContent,
   useTheme
 } from '@chakra-ui/react';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import { useQuery } from '@tanstack/react-query';
-import { streamFetch } from '@/api/fetch';
-import { useChatStore } from '@/store/chat';
-import { useLoading } from '@/hooks/useLoading';
-import { useToast } from '@/hooks/useToast';
+import { streamFetch } from '@/web/common/api/fetch';
+import { useChatStore } from '@/web/core/store/chat';
+import { useLoading } from '@/web/common/hooks/useLoading';
+import { useToast } from '@/web/common/hooks/useToast';
 import { customAlphabet } from 'nanoid';
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 12);
 import type { ChatHistoryItemType } from '@/types/chat';
@@ -29,8 +29,8 @@ import ChatHistorySlider from './components/ChatHistorySlider';
 import SliderApps from './components/SliderApps';
 import ChatHeader from './components/ChatHeader';
 import { getErrText } from '@/utils/tools';
-import { useUserStore } from '@/store/user';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { useUserStore } from '@/web/support/store/user';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 
 const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => {
   const router = useRouter();

projects/app/src/pages/chat/share.tsx

@@ -1,13 +1,13 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import Head from 'next/head';
 import { useRouter } from 'next/router';
-import { initShareChatInfo } from '@/api/support/outLink';
+import { initShareChatInfo } from '@/web/support/api/outLink';
 import { Box, Flex, useDisclosure, Drawer, DrawerOverlay, DrawerContent } from '@chakra-ui/react';
-import { useToast } from '@/hooks/useToast';
-import { useGlobalStore } from '@/store/global';
+import { useToast } from '@/web/common/hooks/useToast';
+import { useGlobalStore } from '@/web/common/store/global';
 import { useQuery } from '@tanstack/react-query';
-import { streamFetch } from '@/api/fetch';
-import { useShareChatStore, defaultHistory } from '@/store/shareChat';
+import { streamFetch } from '@/web/common/api/fetch';
+import { useShareChatStore, defaultHistory } from '@/web/core/store/shareChat';
 import SideBar from '@/components/SideBar';
 import { gptMessage2ChatType } from '@/utils/adapt';
 import { getErrText } from '@/utils/tools';
@@ -19,7 +19,7 @@ import ChatBox, { type ComponentRef, type StartChatFnProps } from '@/components/
 import PageContainer from '@/components/PageContainer';
 import ChatHeader from './components/ChatHeader';
 import ChatHistorySlider from './components/ChatHistorySlider';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 
 const OutLink = ({
   shareId,

projects/app/src/pages/components/Ability.tsx

@@ -1,7 +1,7 @@
 import { Box, Image, BoxProps, Grid, useTheme } from '@chakra-ui/react';
 import React from 'react';
 import { useTranslation } from 'next-i18next';
-import { feConfigs } from '@/store/static';
+import { feConfigs } from '@/web/common/store/static';
 import { MyImage } from '@/components/MyImage';
 
 const Ability = () => {

projects/app/src/pages/components/Choice.tsx

@@ -2,7 +2,7 @@ import { Box, Image, Flex, Grid, useTheme } from '@chakra-ui/react';
 import React from 'react';
 import { useTranslation } from 'next-i18next';
 import MyTooltip from '@/components/MyTooltip';
-import { feConfigs } from '@/store/static';
+import { feConfigs } from '@/web/common/store/static';
 
 const Choice = () => {
   const theme = useTheme();

projects/app/src/pages/components/Footer.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { Box, Flex, useDisclosure } from '@chakra-ui/react';
-import { feConfigs } from '@/store/static';
+import { feConfigs } from '@/web/common/store/static';
 import { useTranslation } from 'react-i18next';
 import Avatar from '@/components/Avatar';
 import { useRouter } from 'next/router';

projects/app/src/pages/components/Hero.tsx

@@ -1,8 +1,8 @@
 import { Box, Flex, Button, Image } from '@chakra-ui/react';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { feConfigs } from '@/store/static';
-import { useGlobalStore } from '@/store/global';
+import { feConfigs } from '@/web/common/store/static';
+import { useGlobalStore } from '@/web/common/store/global';
 import MyIcon from '@/components/Icon';
 import { useRouter } from 'next/router';
 

projects/app/src/pages/components/Navbar.tsx

@@ -1,11 +1,11 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { Flex, Box, type BoxProps, Button, useDisclosure } from '@chakra-ui/react';
-import { feConfigs } from '@/store/static';
+import { feConfigs } from '@/web/common/store/static';
 import { useTranslation } from 'next-i18next';
 import { useRouter } from 'next/router';
 import Avatar from '@/components/Avatar';
 import CommunityModal from '@/components/CommunityModal';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import MyIcon from '@/components/Icon';
 
 const Navbar = () => {

projects/app/src/pages/index.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { Box } from '@chakra-ui/react';
-import { feConfigs } from '@/store/static';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { feConfigs } from '@/web/common/store/static';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 import { useRouter } from 'next/router';
 
 import Navbar from './components/Navbar';

projects/app/src/pages/kb/detail/components/DataCard.tsx

@@ -1,21 +1,20 @@
 import React, { useCallback, useState, useRef, useMemo } from 'react';
 import { Box, Card, IconButton, Flex, Grid, Image, Button } from '@chakra-ui/react';
 import type { PgDataItemType } from '@/types/core/dataset/data';
-import { usePagination } from '@/hooks/usePagination';
-import { getDatasetDataList, delOneDatasetDataById } from '@/api/core/dataset/data';
-import { getFileInfoById } from '@/api/core/dataset/file';
+import { usePagination } from '@/web/common/hooks/usePagination';
+import { getDatasetDataList, delOneDatasetDataById, getFileInfoById } from '@/web/core/api/dataset';
 import { DeleteIcon, RepeatIcon } from '@chakra-ui/icons';
 import { useQuery } from '@tanstack/react-query';
-import { useToast } from '@/hooks/useToast';
+import { useToast } from '@/web/common/hooks/useToast';
 import InputModal, { FormData as InputDataType, RawFileText } from './InputDataModal';
 import { debounce } from 'lodash';
 import { getErrText } from '@/utils/tools';
-import { useConfirm } from '@/hooks/useConfirm';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { useTranslation } from 'react-i18next';
 import { useRouter } from 'next/router';
 import MyIcon from '@/components/Icon';
 import MyInput from '@/components/MyInput';
-import { useLoading } from '@/hooks/useLoading';
+import { useLoading } from '@/web/common/hooks/useLoading';
 import { getFileIcon, getSpecialFileIcon } from '@fastgpt/common/tools/file';
 
 const DataCard = ({ kbId }: { kbId: string }) => {

projects/app/src/pages/kb/detail/components/FileCard.tsx

@@ -12,25 +12,29 @@ import {
   Image,
   MenuButton
 } from '@chakra-ui/react';
-import { getTrainingData } from '@/api/core/dataset/data';
-import { getDatasetFiles, delDatasetFileById, updateDatasetFile } from '@/api/core/dataset/file';
+import {
+  getTrainingData,
+  getDatasetFiles,
+  delDatasetFileById,
+  updateDatasetFile
+} from '@/web/core/api/dataset';
 import { useQuery } from '@tanstack/react-query';
 import { debounce } from 'lodash';
 import { formatFileSize } from '@/utils/tools';
-import { useConfirm } from '@/hooks/useConfirm';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { useTranslation } from 'react-i18next';
 import MyIcon from '@/components/Icon';
 import MyInput from '@/components/MyInput';
 import dayjs from 'dayjs';
-import { useRequest } from '@/hooks/useRequest';
-import { useLoading } from '@/hooks/useLoading';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import { useLoading } from '@/web/common/hooks/useLoading';
 import { FileStatusEnum } from '@/constants/dataset';
 import { useRouter } from 'next/router';
-import { usePagination } from '@/hooks/usePagination';
+import { usePagination } from '@/web/common/hooks/usePagination';
 import type { DatasetFileItemType } from '@/types/core/dataset/file';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import MyMenu from '@/components/MyMenu';
-import { useEditTitle } from '@/hooks/useEditTitle';
+import { useEditTitle } from '@/web/common/hooks/useEditTitle';
 import { datasetSpecialIds } from '@fastgpt/core/dataset/constant';
 import { getFileIcon, getSpecialFileIcon } from '@fastgpt/common/tools/file';
 

projects/app/src/pages/kb/detail/components/Import/Chunk.tsx

@@ -11,8 +11,8 @@ import {
   NumberDecrementStepper,
   Image
 } from '@chakra-ui/react';
-import { useToast } from '@/hooks/useToast';
-import { useConfirm } from '@/hooks/useConfirm';
+import { useToast } from '@/web/common/hooks/useToast';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { useRouter } from 'next/router';
 import { useMutation } from '@tanstack/react-query';
 import { splitText2Chunks } from '@/utils/file';
@@ -25,9 +25,9 @@ import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import { TrainingModeEnum } from '@/constants/plugin';
 import FileSelect, { type FileItemType } from './FileSelect';
-import { useDatasetStore } from '@/store/dataset';
-import { putMarkFilesUsed } from '@/api/core/dataset/file';
-import { chunksUpload } from '@/utils/web/core/dataset';
+import { useDatasetStore } from '@/web/core/store/dataset';
+import { putMarkFilesUsed } from '@/web/core/api/dataset';
+import { chunksUpload } from '@/web/core/utils/dataset';
 
 const fileExtension = '.txt, .doc, .docx, .pdf, .md';
 

projects/app/src/pages/kb/detail/components/Import/CreateFileModal.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'next-i18next';
 import MyModal from '@/components/MyModal';
 import { Box, Input, Textarea, ModalBody, ModalFooter, Button } from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
-import { useRequest } from '@/hooks/useRequest';
+import { useRequest } from '@/web/common/hooks/useRequest';
 
 const CreateFileModal = ({
   onClose,

projects/app/src/pages/kb/detail/components/Import/Csv.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useMemo } from 'react';
 import { Box, Flex, Button, useTheme, Image } from '@chakra-ui/react';
-import { useToast } from '@/hooks/useToast';
-import { useConfirm } from '@/hooks/useConfirm';
+import { useToast } from '@/web/common/hooks/useToast';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { useMutation } from '@tanstack/react-query';
 import { getErrText } from '@/utils/tools';
 import MyIcon from '@/components/Icon';
@@ -9,9 +9,9 @@ import DeleteIcon, { hoverDeleteStyles } from '@/components/Icon/delete';
 import { TrainingModeEnum } from '@/constants/plugin';
 import FileSelect, { type FileItemType } from './FileSelect';
 import { useRouter } from 'next/router';
-import { useDatasetStore } from '@/store/dataset';
-import { putMarkFilesUsed } from '@/api/core/dataset/file';
-import { chunksUpload } from '@/utils/web/core/dataset';
+import { useDatasetStore } from '@/web/core/store/dataset';
+import { putMarkFilesUsed } from '@/web/core/api/dataset';
+import { chunksUpload } from '@/web/core/utils/dataset';
 
 const fileExtension = '.csv';
 

projects/app/src/pages/kb/detail/components/Import/FileSelect.tsx

@@ -1,7 +1,7 @@
 import MyIcon from '@/components/Icon';
-import { useLoading } from '@/hooks/useLoading';
-import { useSelectFile } from '@/hooks/useSelectFile';
-import { useToast } from '@/hooks/useToast';
+import { useLoading } from '@/web/common/hooks/useLoading';
+import { useSelectFile } from '@/web/common/hooks/useSelectFile';
+import { useToast } from '@/web/common/hooks/useToast';
 import { simpleText, splitText2Chunks } from '@/utils/file';
 import {
   uploadFiles,
@@ -10,17 +10,17 @@ import {
   readTxtContent,
   readPdfContent,
   readDocContent
-} from '@/utils/web/file';
+} from '@/web/common/utils/file';
 import { Box, Flex, useDisclosure, type BoxProps } from '@chakra-ui/react';
 import { DragEvent, useCallback, useState } from 'react';
 import { useTranslation } from 'next-i18next';
 import { customAlphabet } from 'nanoid';
 import dynamic from 'next/dynamic';
 import MyTooltip from '@/components/MyTooltip';
-import { FetchResultItem } from '@/types/plugin';
+import type { FetchResultItem } from '@/global/common/api/pluginRes.d';
 import type { DatasetDataItemType } from '@/types/core/dataset/data';
 import { getErrText } from '@/utils/tools';
-import { useDatasetStore } from '@/store/dataset';
+import { useDatasetStore } from '@/web/core/store/dataset';
 import { getFileIcon } from '@fastgpt/common/tools/file';
 
 const UrlFetchModal = dynamic(() => import('./UrlFetchModal'));

projects/app/src/pages/kb/detail/components/Import/Manual.tsx

@@ -1,13 +1,13 @@
 import React, { useState } from 'react';
 import { Box, Textarea, Button, Flex } from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
-import { useToast } from '@/hooks/useToast';
-import { useRequest } from '@/hooks/useRequest';
+import { useToast } from '@/web/common/hooks/useToast';
+import { useRequest } from '@/web/common/hooks/useRequest';
 import { getErrText } from '@/utils/tools';
-import { postData2Dataset } from '@/api/core/dataset/data';
+import { postData2Dataset } from '@/web/core/api/dataset';
 import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
-import { useDatasetStore } from '@/store/dataset';
+import { useDatasetStore } from '@/web/core/store/dataset';
 import { DatasetSpecialIdEnum, datasetSpecialIdMap } from '@fastgpt/core/dataset/constant';
 
 type ManualFormType = { q: string; a: string };

projects/app/src/pages/kb/detail/components/Import/QA.tsx

@@ -1,12 +1,12 @@
 import React, { useState, useCallback, useMemo } from 'react';
 import { Box, Flex, Button, useTheme, Image, Input } from '@chakra-ui/react';
-import { useToast } from '@/hooks/useToast';
-import { useConfirm } from '@/hooks/useConfirm';
+import { useToast } from '@/web/common/hooks/useToast';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { useMutation } from '@tanstack/react-query';
 import { splitText2Chunks } from '@/utils/file';
 import { getErrText } from '@/utils/tools';
 import { formatPrice } from '@fastgpt/common/bill/index';
-import { qaModel } from '@/store/static';
+import { qaModel } from '@/web/common/store/static';
 import MyIcon from '@/components/Icon';
 import CloseIcon from '@/components/Icon/close';
 import DeleteIcon, { hoverDeleteStyles } from '@/components/Icon/delete';
@@ -15,10 +15,10 @@ import { QuestionOutlineIcon, InfoOutlineIcon } from '@chakra-ui/icons';
 import { TrainingModeEnum } from '@/constants/plugin';
 import FileSelect, { type FileItemType } from './FileSelect';
 import { useRouter } from 'next/router';
-import { putMarkFilesUsed } from '@/api/core/dataset/file';
-import { Prompt_AgentQA } from '@/prompts/core/agent';
+import { putMarkFilesUsed } from '@/web/core/api/dataset';
+import { Prompt_AgentQA } from '@/global/core/prompt/agent';
 import { replaceVariable } from '@/utils/common/tools/text';
-import { chunksUpload } from '@/utils/web/core/dataset';
+import { chunksUpload } from '@/web/core/utils/dataset';
 
 const fileExtension = '.txt, .doc, .docx, .pdf, .md';
 

projects/app/src/pages/kb/detail/components/Import/UrlFetchModal.tsx

@@ -2,9 +2,9 @@ import React, { useRef } from 'react';
 import { useTranslation } from 'next-i18next';
 import MyModal from '@/components/MyModal';
 import { Box, Button, ModalBody, ModalFooter, Textarea } from '@chakra-ui/react';
-import type { FetchResultItem } from '@/types/plugin';
-import { useRequest } from '@/hooks/useRequest';
-import { fetchUrls } from '@/api/plugins/common';
+import type { FetchResultItem } from '@/global/common/api/pluginRes.d';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import { postFetchUrls } from '@/web/common/api/plugin';
 
 const UrlFetchModal = ({
   onClose,
@@ -20,7 +20,7 @@ const UrlFetchModal = ({
     mutationFn: async () => {
       const val = Dom.current?.value || '';
       const urls = val.split('\n').filter((e) => e);
-      const res = await fetchUrls(urls);
+      const res = await postFetchUrls(urls);
 
       onSuccess(res);
       onClose();

projects/app/src/pages/kb/detail/components/Info.tsx

@@ -9,13 +9,13 @@ import React, {
 import { useRouter } from 'next/router';
 import { Box, Flex, Button, FormControl, IconButton, Input } from '@chakra-ui/react';
 import { QuestionOutlineIcon, DeleteIcon } from '@chakra-ui/icons';
-import { delDatasetById, putDatasetById } from '@/api/core/dataset';
-import { useSelectFile } from '@/hooks/useSelectFile';
-import { useToast } from '@/hooks/useToast';
-import { useDatasetStore } from '@/store/dataset';
-import { useConfirm } from '@/hooks/useConfirm';
+import { delDatasetById, putDatasetById } from '@/web/core/api/dataset';
+import { useSelectFile } from '@/web/common/hooks/useSelectFile';
+import { useToast } from '@/web/common/hooks/useToast';
+import { useDatasetStore } from '@/web/core/store/dataset';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { UseFormReturn } from 'react-hook-form';
-import { compressImg } from '@/utils/web/file';
+import { compressImg } from '@/web/common/utils/file';
 import type { DatasetItemType } from '@/types/core/dataset';
 import Avatar from '@/components/Avatar';
 import Tag from '@/components/Tag';

projects/app/src/pages/kb/detail/components/InputDataModal.tsx

@@ -5,8 +5,8 @@ import {
   postData2Dataset,
   putDatasetDataById,
   delOneDatasetDataById
-} from '@/api/core/dataset/data';
-import { useToast } from '@/hooks/useToast';
+} from '@/web/core/api/dataset';
+import { useToast } from '@/web/common/hooks/useToast';
 import { getErrText } from '@/utils/tools';
 import MyIcon from '@/components/Icon';
 import MyModal from '@/components/MyModal';
@@ -15,11 +15,11 @@ import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import { useQuery } from '@tanstack/react-query';
 import { DatasetDataItemType } from '@/types/core/dataset/data';
 import { useTranslation } from 'react-i18next';
-import { useDatasetStore } from '@/store/dataset';
-import { getFileAndOpen } from '@/utils/web/file';
+import { useDatasetStore } from '@/web/core/store/dataset';
+import { getFileAndOpen } from '@/web/common/utils/file';
 import { datasetSpecialIdMap, datasetSpecialIds } from '@fastgpt/core/dataset/constant';
 import { strIsLink } from '@fastgpt/common/tools/str';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 
 export type FormData = { dataId?: string } & DatasetDataItemType;
 

projects/app/src/pages/kb/detail/components/Test.tsx

@@ -1,19 +1,18 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { Box, Textarea, Button, Flex, useTheme, Grid, Progress } from '@chakra-ui/react';
-import { useDatasetStore } from '@/store/dataset';
+import { useDatasetStore } from '@/web/core/store/dataset';
 import type { SearchTestItemType } from '@/types/core/dataset';
-import { getDatasetDataItemById } from '@/api/core/dataset/data';
+import { getDatasetDataItemById, postSearchText } from '@/web/core/api/dataset';
 import MyIcon from '@/components/Icon';
-import { useRequest } from '@/hooks/useRequest';
+import { useRequest } from '@/web/common/hooks/useRequest';
 import { formatTimeToChatTime } from '@/utils/tools';
 import InputDataModal, { type FormData } from './InputDataModal';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import { getErrText } from '@/utils/tools';
-import { useToast } from '@/hooks/useToast';
+import { useToast } from '@/web/common/hooks/useToast';
 import { customAlphabet } from 'nanoid';
 import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
-import { postSearchText } from '@/api/core/dataset';
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 12);
 
 const Test = ({ kbId }: { kbId: string }) => {

projects/app/src/pages/kb/detail/index.tsx

@@ -1,12 +1,12 @@
 import React, { useCallback, useEffect, useRef } from 'react';
 import { useRouter } from 'next/router';
 import { Box, Flex, IconButton, useTheme } from '@chakra-ui/react';
-import { useToast } from '@/hooks/useToast';
+import { useToast } from '@/web/common/hooks/useToast';
 import { useForm } from 'react-hook-form';
 import { useQuery } from '@tanstack/react-query';
 import { DatasetItemType } from '@/types/core/dataset';
 import { getErrText } from '@/utils/tools';
-import { useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/web/common/store/global';
 import { type ComponentRef } from './components/Info';
 import Tabs from '@/components/Tabs';
 import dynamic from 'next/dynamic';
@@ -15,16 +15,15 @@ import SideTabs from '@/components/SideTabs';
 import PageContainer from '@/components/PageContainer';
 import Avatar from '@/components/Avatar';
 import Info from './components/Info';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 import { useTranslation } from 'react-i18next';
-import { getTrainingQueueLen } from '@/api/core/dataset/data';
-import { delDatasetEmptyFiles } from '@/api/core/dataset/file';
+import { getTrainingQueueLen, delDatasetEmptyFiles } from '@/web/core/api/dataset';
 import MyTooltip from '@/components/MyTooltip';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
-import { feConfigs } from '@/store/static';
+import { feConfigs } from '@/web/common/store/static';
 import Script from 'next/script';
 import FileCard from './components/FileCard';
-import { useDatasetStore } from '@/store/dataset';
+import { useDatasetStore } from '@/web/core/store/dataset';
 
 const DataCard = dynamic(() => import('./components/DataCard'), {
   ssr: false

projects/app/src/pages/kb/list/component/CreateModal.tsx

@@ -1,19 +1,19 @@
 import React, { useCallback, useState, useRef } from 'react';
 import { Box, Flex, Button, ModalHeader, ModalFooter, ModalBody, Input } from '@chakra-ui/react';
-import { useSelectFile } from '@/hooks/useSelectFile';
+import { useSelectFile } from '@/web/common/hooks/useSelectFile';
 import { useForm } from 'react-hook-form';
-import { compressImg } from '@/utils/web/file';
+import { compressImg } from '@/web/common/utils/file';
 import { getErrText } from '@/utils/tools';
-import { useToast } from '@/hooks/useToast';
+import { useToast } from '@/web/common/hooks/useToast';
 import { useRouter } from 'next/router';
-import { useGlobalStore } from '@/store/global';
-import { useRequest } from '@/hooks/useRequest';
+import { useGlobalStore } from '@/web/common/store/global';
+import { useRequest } from '@/web/common/hooks/useRequest';
 import Avatar from '@/components/Avatar';
 import MyTooltip from '@/components/MyTooltip';
 import MyModal from '@/components/MyModal';
-import { postCreateDataset } from '@/api/core/dataset';
-import type { CreateDatasetParams } from '@/api/core/dataset/index.d';
-import { vectorModelList } from '@/store/static';
+import { postCreateDataset } from '@/web/core/api/dataset';
+import type { CreateDatasetParams } from '@/global/core/api/datasetReq.d';
+import { vectorModelList } from '@/web/common/store/static';
 import MySelect from '@/components/Select';
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import Tag from '@/components/Tag';

projects/app/src/pages/kb/list/component/EditFolderModal.tsx

@@ -2,8 +2,8 @@ import React, { useMemo, useRef } from 'react';
 import { ModalFooter, ModalBody, Input, Button } from '@chakra-ui/react';
 import MyModal from '@/components/MyModal';
 import { useTranslation } from 'react-i18next';
-import { useRequest } from '@/hooks/useRequest';
-import { postCreateDataset, putDatasetById } from '@/api/core/dataset';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import { postCreateDataset, putDatasetById } from '@/web/core/api/dataset';
 import { FolderAvatarSrc, KbTypeEnum } from '@/constants/dataset';
 
 const EditFolderModal = ({

projects/app/src/pages/kb/list/component/MoveModal.tsx

@@ -17,8 +17,8 @@ import MyIcon from '@/components/Icon';
 import { KbTypeEnum } from '@/constants/dataset';
 import { useTranslation } from 'react-i18next';
 import { useQuery } from '@tanstack/react-query';
-import { getDatasets, putDatasetById, getDatasetPaths } from '@/api/core/dataset';
-import { useRequest } from '@/hooks/useRequest';
+import { getDatasets, putDatasetById, getDatasetPaths } from '@/web/core/api/dataset';
+import { useRequest } from '@/web/common/hooks/useRequest';
 
 const MoveModal = ({
   onClose,

projects/app/src/pages/kb/list/index.tsx

@@ -10,25 +10,29 @@ import {
   Image
 } from '@chakra-ui/react';
 import { useRouter } from 'next/router';
-import { useDatasetStore } from '@/store/dataset';
+import { useDatasetStore } from '@/web/core/store/dataset';
 import PageContainer from '@/components/PageContainer';
-import { useConfirm } from '@/hooks/useConfirm';
+import { useConfirm } from '@/web/common/hooks/useConfirm';
 import { AddIcon } from '@chakra-ui/icons';
 import { useQuery } from '@tanstack/react-query';
-import { delDatasetById, getDatasetPaths, putDatasetById } from '@/api/core/dataset';
-import { exportDatasetData } from '@/api/core/dataset/data';
+import {
+  delDatasetById,
+  getDatasetPaths,
+  putDatasetById,
+  exportDatasetData
+} from '@/web/core/api/dataset';
 import { useTranslation } from 'react-i18next';
 import Avatar from '@/components/Avatar';
 import MyIcon from '@/components/Icon';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 import dynamic from 'next/dynamic';
 import { FolderAvatarSrc, KbTypeEnum } from '@/constants/dataset';
 import Tag from '@/components/Tag';
 import MyMenu from '@/components/MyMenu';
-import { useRequest } from '@/hooks/useRequest';
-import { useGlobalStore } from '@/store/global';
-import { useEditTitle } from '@/hooks/useEditTitle';
-import { feConfigs } from '@/store/static';
+import { useRequest } from '@/web/common/hooks/useRequest';
+import { useGlobalStore } from '@/web/common/store/global';
+import { useEditTitle } from '@/web/common/hooks/useEditTitle';
+import { feConfigs } from '@/web/common/store/static';
 
 const CreateModal = dynamic(() => import('./component/CreateModal'), { ssr: false });
 const EditFolderModal = dynamic(() => import('./component/EditFolderModal'), { ssr: false });

projects/app/src/pages/login/components/ForgetPasswordForm.tsx

@@ -2,11 +2,11 @@ import React, { useState, Dispatch, useCallback } from 'react';
 import { FormControl, Box, Input, Button, FormErrorMessage, Flex } from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
 import { PageTypeEnum } from '../../../constants/user';
-import { postFindPassword } from '@/api/user';
-import { useSendCode } from '@/hooks/useSendCode';
-import type { ResLogin } from '@/api/response/user';
-import { useToast } from '@/hooks/useToast';
-import { feConfigs } from '@/store/static';
+import { postFindPassword } from '@/web/support/api/user';
+import { useSendCode } from '@/web/support/hooks/useSendCode';
+import type { ResLogin } from '@/global/support/api/userRes.d';
+import { useToast } from '@/web/common/hooks/useToast';
+import { feConfigs } from '@/web/common/store/static';
 
 interface Props {
   setPageType: Dispatch<`${PageTypeEnum}`>;

projects/app/src/pages/login/components/LoginForm.tsx

@@ -3,11 +3,11 @@ import { FormControl, Flex, Input, Button, FormErrorMessage, Box, Link } from '@
 import { useForm } from 'react-hook-form';
 import { useRouter } from 'next/router';
 import { OAuthEnum, PageTypeEnum } from '@/constants/user';
-import { postLogin } from '@/api/user';
-import type { ResLogin } from '@/api/response/user';
-import { useToast } from '@/hooks/useToast';
-import { feConfigs } from '@/store/static';
-import { useGlobalStore } from '@/store/global';
+import { postLogin } from '@/web/support/api/user';
+import type { ResLogin } from '@/global/support/api/userRes';
+import { useToast } from '@/web/common/hooks/useToast';
+import { feConfigs } from '@/web/common/store/static';
+import { useGlobalStore } from '@/web/common/store/global';
 import MyIcon from '@/components/Icon';
 import { customAlphabet } from 'nanoid';
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 8);

projects/app/src/pages/login/components/RegisterForm.tsx

@@ -2,14 +2,13 @@ import React, { useState, Dispatch, useCallback } from 'react';
 import { FormControl, Box, Input, Button, FormErrorMessage, Flex } from '@chakra-ui/react';
 import { useForm } from 'react-hook-form';
 import { PageTypeEnum } from '@/constants/user';
-import { postRegister } from '@/api/user';
-import { useSendCode } from '@/hooks/useSendCode';
-import type { ResLogin } from '@/api/response/user';
-import { useToast } from '@/hooks/useToast';
-import { useRouter } from 'next/router';
-import { postCreateApp } from '@/api/app';
+import { postRegister } from '@/web/support/api/user';
+import { useSendCode } from '@/web/support/hooks/useSendCode';
+import type { ResLogin } from '@/global/support/api/userRes';
+import { useToast } from '@/web/common/hooks/useToast';
+import { postCreateApp } from '@/web/core/api/app';
 import { appTemplates } from '@/constants/flow/ModuleTemplate';
-import { feConfigs } from '@/store/static';
+import { feConfigs } from '@/web/common/store/static';
 
 interface Props {
   loginSuccess: (e: ResLogin) => void;

projects/app/src/pages/login/index.tsx

@@ -2,16 +2,16 @@ import React, { useState, useCallback, useEffect } from 'react';
 import styles from './index.module.scss';
 import { Box, Flex, Image, useDisclosure } from '@chakra-ui/react';
 import { PageTypeEnum } from '@/constants/user';
-import { useGlobalStore } from '@/store/global';
-import type { ResLogin } from '@/api/response/user';
+import { useGlobalStore } from '@/web/common/store/global';
+import type { ResLogin } from '@/global/support/api/userRes.d';
 import { useRouter } from 'next/router';
-import { useUserStore } from '@/store/user';
-import { useChatStore } from '@/store/chat';
+import { useUserStore } from '@/web/support/store/user';
+import { useChatStore } from '@/web/core/store/chat';
 import LoginForm from './components/LoginForm';
 import dynamic from 'next/dynamic';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 import { setToken } from '@/utils/user';
-import { feConfigs } from '@/store/static';
+import { feConfigs } from '@/web/common/store/static';
 import CommunityModal from '@/components/CommunityModal';
 import Script from 'next/script';
 const RegisterForm = dynamic(() => import('./components/RegisterForm'));

projects/app/src/pages/login/provider.tsx

@@ -1,14 +1,14 @@
 import React, { useCallback, useEffect } from 'react';
 import { useRouter } from 'next/router';
-import { useGlobalStore } from '@/store/global';
-import { ResLogin } from '@/api/response/user';
-import { useChatStore } from '@/store/chat';
-import { useUserStore } from '@/store/user';
+import { useGlobalStore } from '@/web/common/store/global';
+import type { ResLogin } from '@/global/support/api/userRes.d';
+import { useChatStore } from '@/web/core/store/chat';
+import { useUserStore } from '@/web/support/store/user';
 import { setToken } from '@/utils/user';
-import { oauthLogin } from '@/api/user';
-import { useToast } from '@/hooks/useToast';
+import { oauthLogin } from '@/web/support/api/user';
+import { useToast } from '@/web/common/hooks/useToast';
 import Loading from '@/components/Loading';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 import { useQuery } from '@tanstack/react-query';
 import { getErrText } from '@/utils/tools';
 

projects/app/src/pages/tools/index.tsx

@@ -3,8 +3,8 @@ import { Box, Flex } from '@chakra-ui/react';
 import { ChevronRightIcon } from '@chakra-ui/icons';
 import MyIcon from '@/components/Icon';
 import { useRouter } from 'next/router';
-import { feConfigs } from '@/store/static';
-import { serviceSideProps } from '@/utils/web/i18n';
+import { feConfigs } from '@/web/common/store/static';
+import { serviceSideProps } from '@/web/common/utils/i18n';
 import { useTranslation } from 'react-i18next';
 
 const Tools = () => {