diff --git a/src/frontend/public/locales/en/bs.json b/src/frontend/public/locales/en/bs.json
index e3b4e9294..4f90ec4eb 100644
--- a/src/frontend/public/locales/en/bs.json
+++ b/src/frontend/public/locales/en/bs.json
@@ -254,7 +254,8 @@
         "file": "File",
         "sizeExceedsLimit": "Size exceeds 50MB",
         "editDictionary": "Edit Dictionary",
-        "exportCodeDialogTip": "Generate code to integrate the workflow into an external application (please make sure to build the skill before opening this page)."
+        "exportCodeDialogTip": "Generate code to integrate the workflow into an external application (please make sure to build the skill before opening this page).",
+        "chunkOverlap": "Chunk Overlap"
     },
     "report": {
         "reportTemplate": "Report Template",
diff --git a/src/frontend/public/locales/zh/bs.json b/src/frontend/public/locales/zh/bs.json
index 9921a83d3..fe742b57d 100644
--- a/src/frontend/public/locales/zh/bs.json
+++ b/src/frontend/public/locales/zh/bs.json
@@ -250,7 +250,8 @@
         "file": "文件",
         "sizeExceedsLimit": "超过50M",
         "editDictionary": "编辑词典",
-        "exportCodeDialogTip": "生成代码，将流程集成到外部应用程序中 (打开此页面前请先build技能)。"
+        "exportCodeDialogTip": "生成代码，将流程集成到外部应用程序中 (打开此页面前请先build技能)。",
+        "chunkOverlap": "切分文本重叠长度"
     },
     "report": {
         "reportTemplate": "报告模板",
diff --git a/src/frontend/src/i18n.js b/src/frontend/src/i18n.js
index 7b8f8657e..9f7be5ec7 100644
--- a/src/frontend/src/i18n.js
+++ b/src/frontend/src/i18n.js
@@ -4,12 +4,16 @@ import {
 } from "react-i18next";
 import Backend from 'i18next-http-backend';
 
+const userLanguage = (localStorage.getItem('language') ||
+    navigator.language ||
+    navigator.userLanguage || 'en').substring(0, 2)
+
 i18n.use(Backend)
     .use(initReactI18next)
     .init({
         partialBundledLanguages: true,
         ns: ['bs'],
-        lng: 'en',
+        lng: userLanguage === 'zh' ? userLanguage : 'en', // 除中文即英文
         backend: {
             loadPath: '/locales/{{lng}}/{{ns}}.json'
         },
diff --git a/src/frontend/src/layout/MainLayout.tsx b/src/frontend/src/layout/MainLayout.tsx
index aee6cf976..d95279a99 100755
--- a/src/frontend/src/layout/MainLayout.tsx
+++ b/src/frontend/src/layout/MainLayout.tsx
@@ -167,6 +167,7 @@ const useLanguage = (user: User) => {
         const ln = language === 'zh' ? 'en' : 'zh'
         setLanguage(ln)
         localStorage.setItem('language-' + user.user_id, ln)
+        localStorage.setItem('language', ln)
         i18next.changeLanguage(ln)
     }
     return {
diff --git a/src/frontend/src/modals/UploadModal/index.tsx b/src/frontend/src/modals/UploadModal/index.tsx
index 03ea12638..714506434 100755
--- a/src/frontend/src/modals/UploadModal/index.tsx
+++ b/src/frontend/src/modals/UploadModal/index.tsx
@@ -21,6 +21,7 @@ export default function UploadModal({ id, accept, open, desc = '', children = nu
     // 符号
     const [symbol, setSymbol] = useState('\\n\\n')
     const chunkType = useRef('smart')
+    const [overlap, setOverlap] = useState('100')
 
     const [progressList, setProgressList] = useState([])
     const progressCountRef = useRef(0)
@@ -68,11 +69,11 @@ export default function UploadModal({ id, accept, open, desc = '', children = nu
     const [loading, setLoading] = useState(false)
     const handleSubmit = async () => {
         const errorList = [];
-        if (!/^\d+$/.test(size)) errorList.push(t('code.setSplitSize'));
+        // if (!/^\d+$/.test(size)) errorList.push(t('code.setSplitSize'));
         if (!filePathsRef.current.length) errorList.push(t('code.selectFileToUpload'));
         if (errorList.length) return setErrorData({ title: t('prompt'), list: errorList });
         setLoading(true);
-        const params = {
+        const params: any = {
             file_path: filePathsRef.current,
             knowledge_id: Number(id),
             auto: true
@@ -87,8 +88,9 @@ export default function UploadModal({ id, accept, open, desc = '', children = nu
                     'b': '\b'
                 }[capture];
             }));
-            params.chunck_size = Number(size);
+            params.chunck_size = Number(/^\d+$/.test(size) ? size : '1000');
             params.auto = false;
+            // params.overlap = /^\d+$/.test(overlap) ? overlap : '100' // 异常值使用默认值
         }
         await subUploadLibFile(params);
         setOpen(false);
@@ -161,7 +163,7 @@ export default function UploadModal({ id, accept, open, desc = '', children = nu
             <h3 className="font-bold text-lg">{t('code.uploadFile')}</h3>
             <p className="py-4">{desc}</p>
             <div className="flex flex-wrap justify-center overflow-y-auto no-scrollbar">
-                <div className="w-[440px]">
+                <div className="w-[460px]">
                     <div {...getRootProps()} className="h-[100px] border border-dashed flex justify-center items-center cursor-pointer">
                         <input {...getInputProps()} />
                         {isDragActive ? <p>{t('code.dropFileHere')}</p> : <p>{t('code.clickOrDragHere')}</p>}
@@ -188,6 +190,8 @@ export default function UploadModal({ id, accept, open, desc = '', children = nu
                                     <Input id="name" value={symbol} onChange={(e) => setSymbol(e.target.value)} placeholder={t('code.delimiterPlaceholder')} className="col-span-3" />
                                     <Label htmlFor="name" className="text-right col-span-2">{t('code.splitLength')}</Label>
                                     <Input id="name" value={size} onChange={(e) => setSize(e.target.value)} placeholder={t('code.splitSizePlaceholder')} className="col-span-3" />
+                                    <Label htmlFor="name" className="text-right col-span-2">{t('code.chunkOverlap')}</Label>
+                                    <Input id="name" value={overlap} onChange={(e) => setOverlap(e.target.value)} placeholder={t('code.chunkOverlap')} className="col-span-3" />
                                 </div>
                             </div>
                         </TabsContent>
diff --git a/src/frontend/src/pages/SkillChatPage/components/ChatMessage.tsx b/src/frontend/src/pages/SkillChatPage/components/ChatMessage.tsx
index a0bf81bec..468a522f6 100644
--- a/src/frontend/src/pages/SkillChatPage/components/ChatMessage.tsx
+++ b/src/frontend/src/pages/SkillChatPage/components/ChatMessage.tsx
@@ -11,6 +11,7 @@ import { CodeBlock } from "../../../modals/formModal/chatMessage/codeBlock";
 import { ChatMessageType } from "../../../types/chat";
 import { downloadFile } from "../../../util/utils";
 import { checkSassUrl } from "./FileView";
+import Thumbs from "./Thumbs";
 
 // 颜色列表
 const colorList = [
@@ -29,6 +30,7 @@ const colorList = [
 
 export const ChatMessage = ({ chat, userName, onSource }: { chat: ChatMessageType, userName: string, onSource: () => void }) => {
     // const { user } = useContext(userContext);
+    console.log('chat :>> ', chat);
 
     const textRef = useRef(null)
     const { t } = useTranslation()
@@ -205,12 +207,14 @@ export const ChatMessage = ({ chat, userName, onSource }: { chat: ChatMessageTyp
             <div className="w-[40px] h-[40px] rounded-full flex items-center justify-center" style={{ background: avatarColor }}><Bot color="#fff" size={28} /></div>
         </div>
         {chat.sender && <div className="chat-header text-gray-400 text-sm">{chat.sender}</div>}
-        <div ref={textRef} className="chat-bubble chat-bubble-info bg-[rgba(240,240,240,0.8)] dark:bg-gray-600 min-h-8">
+        <div ref={textRef} className="chat-bubble chat-bubble-info bg-[rgba(240,240,240,0.8)] dark:bg-gray-600 min-h-8 relative">
             {chat.message.toString() ? mkdown : <span className="loading loading-ring loading-md"></span>}
             {/* @user */}
             {chat.receiver && <p className="text-blue-500 text-sm">@ {chat.receiver.user_name}</p>}
             {/* 光标 */}
             {chat.message.toString() && !chat.end && <div className="animate-cursor absolute w-2 h-5 ml-1 bg-gray-600" style={{ left: cursor.x, top: cursor.y }}></div>}
+            {/* 赞 踩 */}
+            {chat.chat_id && <Thumbs id={chat.chat_id} data={1} className="absolute right-4 bottom-[-28px]"></Thumbs>}
         </div>
         {chat.source && source}
     </div>
diff --git a/src/frontend/src/pages/SkillChatPage/components/ChatPanne.tsx b/src/frontend/src/pages/SkillChatPage/components/ChatPanne.tsx
index 0aac1a49a..8cb7ac9c6 100644
--- a/src/frontend/src/pages/SkillChatPage/components/ChatPanne.tsx
+++ b/src/frontend/src/pages/SkillChatPage/components/ChatPanne.tsx
@@ -385,12 +385,12 @@ const useWebsocket = (chatId, flow, setChatHistory, libId, version) => {
         setTimeout(heartbeat, 30000);
     }
 
-    function getWebSocketUrl(_chatId, isDevelopment = false) {
+    function getWebSocketUrl(flowId, isDevelopment = false) {
         const isSecureProtocol = window.location.protocol === "https:";
         const webSocketProtocol = isSecureProtocol ? "wss" : "ws";
         const host = window.location.host // isDevelopment ? "localhost:7860" : window.location.host;
-        const chatEndpoint = version === 'v1' ? `/api/v1/chat/${_chatId}?type=L1&chat_id=${_chatId}`
-            : `/api/v2/chat/ws/${_chatId}?type=L1&chat_id=${_chatId}${libId ? '&knowledge_id=' + libId : ''}`
+        const chatEndpoint = version === 'v1' ? `/api/v1/chat/${flowId}?type=L1&chat_id=${chatId}`
+            : `/api/v2/chat/ws/${flowId}?type=L1&chat_id=${chatId}${libId ? '&knowledge_id=' + libId : ''}`
 
         return `${webSocketProtocol}://${host}${chatEndpoint}`;
     }
diff --git a/src/frontend/src/pages/SkillChatPage/components/Thumbs.tsx b/src/frontend/src/pages/SkillChatPage/components/Thumbs.tsx
new file mode 100644
index 000000000..4f13ba09c
--- /dev/null
+++ b/src/frontend/src/pages/SkillChatPage/components/Thumbs.tsx
@@ -0,0 +1,34 @@
+import { ThumbsDown, ThumbsUp } from "lucide-react";
+import { useState } from "react";
+import { classNames } from "../../../utils";
+
+const enum ThumbsState {
+    Default = 0,
+    ThumbsUp,
+    ThumbsDown
+}
+
+export default function Thumbs({ id, className, data }) {
+
+    const [state, setState] = useState<ThumbsState>(data)
+
+    const handleClick = (type: ThumbsState) => {
+        setState(_type => {
+            const newType = type === _type ? ThumbsState.Default : type
+            // api
+            console.log('newType :>> ', newType);
+            return newType
+        })
+    }
+
+    return <div className={classNames('flex gap-2', className)}>
+        <ThumbsUp
+            size={18}
+            className={`cursor-pointer hover:text-blue-400 ${state === ThumbsState.ThumbsUp ? 'text-blue-400' : 'text-gray-300'}`}
+            onClick={() => handleClick(ThumbsState.ThumbsUp)} />
+        <ThumbsDown
+            size={18}
+            className={`cursor-pointer hover:text-blue-400 ${state === ThumbsState.ThumbsDown ? 'text-blue-400' : 'text-gray-300'}`}
+            onClick={() => handleClick(ThumbsState.ThumbsDown)} />
+    </div>
+}
diff --git a/src/frontend/src/pages/SkillPage/components/FormSet.tsx b/src/frontend/src/pages/SkillPage/components/FormSet.tsx
index 1ee1b9f36..2050c3f27 100644
--- a/src/frontend/src/pages/SkillPage/components/FormSet.tsx
+++ b/src/frontend/src/pages/SkillPage/components/FormSet.tsx
@@ -58,9 +58,9 @@ export default forwardRef(function FormSet({ id }: any, ref) {
         }
     }
 
-    return <div className="mt-4">
+    return <div className="mt-8">
         <p className="text-center text-gray-400 mt-4 cursor-pointer flex justify-center" onClick={showContent}>{t('report.formSettings')}<ChevronUp /></p>
-        <div className="w-[68%] mx-auto overflow-hidden transition-all pl-8 px-1">
+        <div className="overflow-hidden transition-all pl-8 px-1">
             <DragDropContext onDragEnd={handleDragEnd}>
                 <Droppable droppableId={'list'} direction="vertical">
                     {(provided) => (
diff --git a/src/frontend/src/pages/SkillPage/l2Edit.tsx b/src/frontend/src/pages/SkillPage/l2Edit.tsx
index db915138b..c9738b1c0 100644
--- a/src/frontend/src/pages/SkillPage/l2Edit.tsx
+++ b/src/frontend/src/pages/SkillPage/l2Edit.tsx
@@ -123,7 +123,7 @@ export default function l2Edit() {
     const isForm = useHasForm(flow)
 
     return <div className="relative box-border">
-        <div className="p-6  pb-24 h-screen overflow-y-auto">
+        <div className="p-6 pb-48 h-screen overflow-y-auto">
             <div className="flex justify-between w-full">
                 <ShadTooltip content={t('back')} side="right">
                     <button className="extra-side-bar-buttons w-[36px]" onClick={() => navigate(-1)}>
@@ -137,40 +137,43 @@ export default function l2Edit() {
             </ShadTooltip> */}
             </div>
             {/* form */}
-            <div className="mt-6">
+            <div className="pt-6">
                 <p className="text-center text-2xl">{t('skills.skillSettings')}</p>
-                <div className="group w-[80%] mx-auto grid gap-4 py-4">
-                    <p className="text-center text-gray-400 mt-4 cursor-pointer flex justify-center" onClick={showContent}>{t('skills.basicInfo')}
+                <div className="w-[50%] max-w-2xl mx-auto">
+                    <p className="text-center text-gray-400 mt-4 cursor-pointer flex justify-center" onClick={showContent}>
+                        {t('skills.basicInfo')}
                         <ChevronUp />
                     </p>
                     {/* base form */}
-                    <div className="w-[68%] mx-auto overflow-hidden transition-all px-1">
+                    <div className="w-full overflow-hidden transition-all px-1">
                         <div className="mt-4">
-                            <Label htmlFor="name" className="text-right">{t('skills.skillName')}</Label>
-                            <Input ref={nameRef} placeholder={t('skills.skillName')} className={`col-span-2 mt-2 ${error.name && 'border-red-400'}`} />
+                            <Label htmlFor="name">{t('skills.skillName')}</Label>
+                            <Input ref={nameRef} placeholder={t('skills.skillName')} className={`mt-2 ${error.name && 'border-red-400'}`} />
                         </div>
                         <div className="mt-4">
-                            <Label htmlFor="username" className="text-right">{t('skills.description')}</Label>
-                            <Textarea ref={descRef} id="name" placeholder={t('skills.description')} className={`col-span-2 mt-2 ${error.desc && 'border-red-400'}`} />
+                            <Label htmlFor="username">{t('skills.description')}</Label>
+                            <Textarea ref={descRef} id="name" placeholder={t('skills.description')} className={`mt-2 ${error.desc && 'border-red-400'}`} />
                         </div>
                     </div>
                     {
-                        isL2 && <div className="mt-4">
-                            <p className="text-center pr-2 text-gray-400 cursor-pointer flex justify-center" onClick={showContent}>{t('skills.parameterInfo')}
+                        // L2 form
+                        isL2 && <div className="w-full mt-8">
+                            <p className="text-center text-gray-400 cursor-pointer flex justify-center" onClick={showContent}>
+                                {t('skills.parameterInfo')}
                                 <ChevronUp />
                             </p>
-                            <div className="grid gap-4 overflow-hidden transition-all">
+                            <div className="w-full overflow-hidden transition-all px-1">
                                 {flow?.data?.nodes.map(({ data }) => (
-                                    <div key={data.id}>
-                                        <div className="only:hidden grid-cols-4 mt-6">
-                                            <span className=" p-2 font-bold text-gray-400 ml-[18%] text-base">
+                                    <div key={data.id} className="w-full">
+                                        <div className="only:hidden mt-6">
+                                            <span className="p-2 font-bold text-gray-400 text-base">
                                                 {data.node.l2_name || data.node.display_name}
                                             </span>
                                         </div>
                                         {
                                             // 自定义组件
                                             Object.keys(data.node.template).map(k => (
-                                                data.node.template[k].l2 && <div className="w-[68%] mx-auto mt-4 px-1" key={k}>
+                                                data.node.template[k].l2 && <div className="w-full mt-4 px-1" key={k}>
                                                     <Label htmlFor="name" className="text-right">
                                                         {data.node.template[k].l2_name || data.node.template[k].name}
                                                     </Label>