diff --git a/src/backend/bisheng/api/services/role_group_service.py b/src/backend/bisheng/api/services/role_group_service.py index 7616dfde2..3f0977454 100644 --- a/src/backend/bisheng/api/services/role_group_service.py +++ b/src/backend/bisheng/api/services/role_group_service.py @@ -10,6 +10,7 @@ from bisheng.api.services.user_service import UserPayload from bisheng.api.errcode.user import UserGroupNotDeleteError from bisheng.api.utils import get_request_ip +from bisheng.api.v1.schemas import resp_200 from bisheng.database.models.assistant import AssistantDao from bisheng.database.models.flow import FlowDao from bisheng.database.models.gpts_tools import GptsToolsDao @@ -91,15 +92,17 @@ def delete_group(self, request: Request, login_user: UserPayload, group_id: int) """删除用户组""" group_info = GroupDao.get_user_group(group_id) if not group_info: - return None + return resp_200() # 判断组下是否还有用户 user_group_list = UserGroupDao.get_group_user(group_id) if user_group_list: return UserGroupNotDeleteError.return_resp() GroupDao.delete_group(group_id) + self.delete_group_hook(request, login_user, group_info) + return resp_200() - def delete_group_hook(self, request: Request, login_user: UserPayload, group_info: int): + def delete_group_hook(self, request: Request, login_user: UserPayload, group_info: Group): logger.info(f'act=delete_group_hook user={login_user.user_name} group_id={group_info.id}') # 记录审计日志 AuditLogService.delete_user_group(login_user, get_request_ip(request), group_info) @@ -109,8 +112,8 @@ def delete_group_hook(self, request: Request, login_user: UserPayload, group_inf need_move_resource = [] for one in all_resource: # 获取资源属于几个组,属于多个组则不用处理, 否则将资源转移到默认用户组 - resourece_groups = GroupResourceDao.get_resource_group(ResourceTypeEnum(one.type), one.third_id) - if len(resourece_groups) > 1: + resource_groups = GroupResourceDao.get_resource_group(ResourceTypeEnum(one.type), one.third_id) + if len(resource_groups) > 1: continue else: one.group_id = DefaultGroup diff --git a/src/backend/bisheng/api/v1/usergroup.py b/src/backend/bisheng/api/v1/usergroup.py index d3f38f730..3ae4bee7f 100644 --- a/src/backend/bisheng/api/v1/usergroup.py +++ b/src/backend/bisheng/api/v1/usergroup.py @@ -82,7 +82,7 @@ async def delete_group(request: Request, if not login_user.is_admin(): return UnAuthorizedError.return_resp() - return resp_200(RoleGroupService().delete_group(request, login_user, group_id)) + return RoleGroupService().delete_group(request, login_user, group_id) @router.post('/set_user_group', diff --git a/src/frontend/index.html b/src/frontend/index.html index 93372b65a..0402eee16 100644 --- a/src/frontend/index.html +++ b/src/frontend/index.html @@ -6,7 +6,7 @@ - + <%- aceScriptSrc %>
{t('chat.chooseOne')}{t('chat.dialogue')}
{t('chat.start')}{t('chat.wenqingruijian')}
{t('chat.sourceDocumentsLabel')}
diff --git a/src/frontend/src/pages/DiffFlowPage/components/RunTest.tsx b/src/frontend/src/pages/DiffFlowPage/components/RunTest.tsx index 5e8118598..e8d27511c 100644 --- a/src/frontend/src/pages/DiffFlowPage/components/RunTest.tsx +++ b/src/frontend/src/pages/DiffFlowPage/components/RunTest.tsx @@ -260,7 +260,7 @@ const useBuild = () => { let finished = false; let buildEnd = false const qstr = flow.id ? `?version_id=${flow.id}` : '' - const apiUrl = `/api/v1/build/stream/${flowId}${qstr}`; + const apiUrl = `${__APP_ENV__.BASE_URL}/api/v1/build/stream/${flowId}${qstr}`; const eventSource = new EventSource(apiUrl); eventSource.onmessage = (event) => { diff --git a/src/frontend/src/pages/EvaluationPage/EvaluationCreate.tsx b/src/frontend/src/pages/EvaluationPage/EvaluationCreate.tsx index f89aed713..c17237abc 100644 --- a/src/frontend/src/pages/EvaluationPage/EvaluationCreate.tsx +++ b/src/frontend/src/pages/EvaluationPage/EvaluationCreate.tsx @@ -62,12 +62,12 @@ export default function EvaluatingCreate() { const errorlist = []; // 限制文件最大为 10M - if(size > 10 * 1024 * 1024){ + if (size > 10 * 1024 * 1024) { errorlist.push(t("evaluation.fileSizeLimit")); fileRef.current = null return handleError(errorlist); } - + const names = acceptedFiles[0].name; setFileName(names); }; @@ -131,7 +131,7 @@ export default function EvaluatingCreate() { const handleDownloadTemplate = () => { const link = document.createElement("a"); - link.href = "/template.csv"; // 文件路径 + link.href = __APP_ENV__.BASE_URL + "/template.csv"; // 文件路径 link.download = "template.csv"; // 下载时的文件名 document.body.appendChild(link); link.click(); @@ -140,15 +140,15 @@ export default function EvaluatingCreate() { const handleSearch = useCallback(debounce((value) => { if (selectedType === "flow") { - readFlowsFromDatabase(1, 100, value).then((_flow) => { - setDataSource(_flow.data); - }); - } else if (selectedType === "assistant") { - getAssistantsApi(1, 100, value).then((data) => { - setDataSource((data as any).data as AssistantItemDB[]); - }); - } - }, 300),[selectedType]) + readFlowsFromDatabase(1, 100, value).then((_flow) => { + setDataSource(_flow.data); + }); + } else if (selectedType === "assistant") { + getAssistantsApi(1, 100, value).then((data) => { + setDataSource((data as any).data as AssistantItemDB[]); + }); + } + }, 300), [selectedType]) const handleInputChange = (event) => { setQuery(event.target.value); @@ -157,7 +157,7 @@ export default function EvaluatingCreate() { useEffect(() => { return () => { - handleSearch.cancel(); + handleSearch.cancel(); }; }, [handleSearch]); diff --git a/src/frontend/src/pages/LoginPage/login.tsx b/src/frontend/src/pages/LoginPage/login.tsx index fdf725515..bc3665513 100644 --- a/src/frontend/src/pages/LoginPage/login.tsx +++ b/src/frontend/src/pages/LoginPage/login.tsx @@ -62,7 +62,7 @@ export const LoginPage = () => { // setUser(res.data) localStorage.setItem('ws_token', res.access_token) localStorage.setItem('isLogin', '1') - location.href = '/' + location.href = __APP_ENV__.BASE_URL + '/' }), (error) => { if (error.indexOf('过期') !== -1) { // 有时间改为 code 判断 localStorage.setItem('account', mail) @@ -119,13 +119,13 @@ export const LoginPage = () => { return