Merge branch 'refs/heads/feat/0.3.1.4' into feat/0.3.1.5

src/frontend/README.md

@@ -45,7 +45,5 @@ You can learn more in the [Create React App documentation](https://facebook.gith
 
 To learn React, check out the [React documentation](https://reactjs.org/).
 
-TODO
-
 advance false 显示在组件中
 show 

src/frontend/src/components/bs-comp/chatComponent/MessageSystem.tsx

@@ -35,7 +35,7 @@ export default function MessageSystem({ data }) {
     const border = { system: 'border-slate-500', question: 'border-amber-500', processing: 'border-cyan-600', answer: 'border-lime-600', report: 'border-slate-500', guide: 'border-none' }
 
     // 中英去掉最终的回答（report)
-    if(data.category === 'report') return null
+    // if(data.category === 'report') return null
 
     return <div className="py-1">
         <div className={`relative rounded-sm px-6 py-4 border text-sm ${data.category === 'guide' ? 'bg-[#EDEFF6]' : 'bg-slate-50'} ${border[data.category || 'system']}`}>

src/frontend/src/pages/LoginPage/login.tsx

@@ -178,10 +178,10 @@ export const LoginPage = () => {
                             )
                         }
                         {/* 中英 */}
-                        {/* <Button
+                        <Button
                             className='h-[48px] mt-[32px] dark:bg-button'
-                            disabled={isLoading} onClick={handleLogin} >{t('login.loginButton')}</Button> */}
-                        {
+                            disabled={isLoading} onClick={handleLogin} >{t('login.loginButton')}</Button>
+                        {/* {
                             showLogin ? <>
                                 <div className="text-center">
                                     <a href="javascript:;" className=" text-blue-500 text-sm hover:underline" onClick={() => setShowLogin(false)}>{t('login.noAccountRegister')}</a>
@@ -198,7 +198,7 @@ export const LoginPage = () => {
                                         className='h-[48px] mt-[32px] dark:bg-button'
                                         disabled={isLoading} onClick={handleRegister} >{t('login.registerButton')}</Button>
                                 </>
-                        }
+                        } */}
                         {appConfig.hasSSO && <LoginBridge />}
                     </div>
                     <div className=" absolute right-[16px] bottom-[16px] flex">

src/frontend/src/pages/SystemPage/components/EditUserGroup.tsx

@@ -50,7 +50,7 @@ function FlowRadio({ limit, onChange }) {
     }
     useEffect(() => {
         setStatus(limit ? LimitType.LIMITED : LimitType.UNLIMITED)
-    },[limit])
+    }, [limit])
 
     return <div>
         <RadioGroup className="flex space-x-2 h-[20px] items-center" value={status}
@@ -194,7 +194,7 @@ export default function EditUserGroup({ data, onBeforeChange, onChange }) {
         // 过滤系统管理员
         const users = selected.filter(item => !lockOptions.some(id => id === item.value))
 
-        const res:any = await (data.id ? updateUserGroup(data.id, form, users) : // 修改
+        const res: any = await (data.id ? updateUserGroup(data.id, form, users) : // 修改
             saveUserGroup(form, users)) // 保存
 
         if (appConfig.isPro) {

src/frontend/src/pages/SystemPage/components/UserGroup.tsx

@@ -29,7 +29,7 @@ export default function UserGroups() {
     const defaultAdminsRef = useRef([])
 
     const loadData = async () => {
-        const res:any = await (appConfig.isPro ? getUserGroupsProApi : getUserGroupsApi)()
+        const res: any = await (appConfig.isPro ? getUserGroupsProApi : getUserGroupsApi)()
         defaultAdminsRef.current = await getAdminsApi()
         res.records.map(g => g.group_admins = [...defaultAdminsRef.current, ...g.group_admins])
         setUserGroups(res.records)
@@ -91,16 +91,18 @@ export default function UserGroups() {
                     </TableRow>
                 </TableHeader>
                 <TableBody>
-                    {userGroups.map((ug:any) => (
+                    {userGroups.map((ug: any) => (
                         <TableRow key={ug.id}>
                             <TableCell className="font-medium">{ug.group_name}</TableCell>
                             <TableCell className="break-all">{(ug.admin_user || ug.group_admins).map(el => el.user_name).join(',')}</TableCell>
                             {appConfig.isPro && <TableCell>{ug.group_limit ? t('system.limit') : t('system.unlimited')}</TableCell>}
                             <TableCell>{ug.update_time.replace('T', ' ')}</TableCell>
                             <TableCell className="text-right">
-                                <Button variant="link" onClick={() => setUserGroup({...ug, 
-                                group_admins:ug.group_admins.slice(defaultAdminsRef.current.length,ug.group_admins.length-1)})} 
-                                className="px-0 pl-6">{t('edit')}
+                                <Button variant="link" onClick={() => setUserGroup({
+                                    ...ug,
+                                    group_admins: ug.group_admins.slice(defaultAdminsRef.current.length)
+                                })}
+                                    className="px-0 pl-6">{t('edit')}
                                 </Button>
                                 <Button variant="link" disabled={ug.id === 2} onClick={() => handleDelete(ug)} className="text-red-500 px-0 pl-6">{t('delete')}</Button>
                             </TableCell>

src/frontend/vite.config.ts

@@ -3,24 +3,12 @@ import { visualizer } from "rollup-plugin-visualizer";
 import { defineConfig } from "vite";
 import { viteStaticCopy } from 'vite-plugin-static-copy';
 import svgr from "vite-plugin-svgr";
-const apiRoutes = ["^/api/", "^/gw/", "/health"];
+const apiRoutes = ["^/api/", "/health"];
 import path from "path";
 // Use environment variable to determine the target.
-const target = process.env.VITE_PROXY_TARGET || "http://192.168.106.120:3002";
-// const target = process.env.VITE_PROXY_TARGET || "http://192.168.106.115:8098";
-// const target = process.env.VITE_PROXY_TARGET || "http://192.168.106.116:7861";
-// const target = process.env.VITE_PROXY_TARGET || "http://192.168.2.7:7860";
+const target = process.env.VITE_PROXY_TARGET || "http://127.0.0.1:7860";
 
 const proxyTargets = apiRoutes.reduce((proxyObj, route) => {
-
-  proxyObj['/gw/api/v1/group'] = {
-    target: target,
-    changeOrigin: true,
-    withCredentials: true,
-    rewrite: (path) => path.replace(/^\/gw\/api\/v1\/group/, '/group'),
-    secure: false,
-    ws: true,
-  };
   proxyObj[route] = {
     target: target,
     changeOrigin: true,