Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit d44befef by Archer Committed by GitHub
Options

Feat: admin audit (#5068) 

* add admin audit (#5041)

* Test audit (#5058)

* feat: operation index

* fix: delete update vector

* perf: Clear invalid data

* perf: index

* perf: cleare invalid data

* index

* perf: audit event

* fix: schema enum

* add audit.svg (#5060)

Co-authored-by: dreamer6680 <146868355@qq.com>

* update package

* perf: audit

* perf: code move

* eslint

* doc

---------

Co-authored-by: gggaaallleee <91131304+gggaaallleee@users.noreply.github.com>
Co-authored-by: dreamer6680 <1468683855@qq.com>
Co-authored-by: dreamer6680 <146868355@qq.com>
parent 36fafd21
Showing with 414 additions and 205 deletions
dev.md
......@@ -101,7 +101,7 @@ export default staticContent;
## audit
Please fill the OperationLogEventEnum and operationLog/audit function is added to the ts, and on the corresponding position to fill i18n, at the same time to add the location of the log using addOpearationLog function add function
Please fill the AuditEventEnum and audit function is added to the ts, and on the corresponding position to fill i18n, at the same time to add the location of the log using addOpearationLog function add function
## Build
......
docSite/content/zh-cn/docs/development/upgrading/4914.md
......@@ -11,6 +11,7 @@ weight: 787
## 🚀 新增内容
1. 知识库导入，支持配置：自动将文件名加入系统索引中。
2. Admin 端审计日志。
## ⚙️ 优化
......
docSite/content/zh-cn/docs/guide/knowledge_base/third_dataset.md
......@@ -78,7 +78,7 @@ export type YuqueServer = {
![](/imgs/thirddataset-5.png)
`FastGPT\packages\service\support\operationLog\util.ts`文件下添加如下内容，以支持获取 I18n 翻译。
`FastGPT\packages\service\support\user/audit\util.ts`文件下添加如下内容，以支持获取 I18n 翻译。
![](/imgs/thirddataset-6.png)
......
packages/global/support/operationLog/constants.ts → packages/global/support/user/audit/constants.ts
export enum OperationLogEventEnum {
import type { auditLogMap, adminAuditLogMap } from '../../../../web/support/user/audit/constants';
export enum AdminAuditEventEnum {
ADMIN_LOGIN = 'ADMIN_LOGIN',
ADMIN_UPDATE_SYSTEM_MODAL = 'ADMIN_UPDATE_SYSTEM_MODAL',
ADMIN_SEND_SYSTEM_INFORM = 'ADMIN_SEND_SYSTEM_INFORM',
ADMIN_ADD_USER = 'ADMIN_ADD_USER',
ADMIN_UPDATE_USER = 'ADMIN_UPDATE_USER',
ADMIN_UPDATE_TEAM = 'ADMIN_UPDATE_TEAM',
ADMIN_ADD_PLAN = 'ADMIN_ADD_PLAN',
ADMIN_UPDATE_PLAN = 'ADMIN_UPDATE_PLAN',
ADMIN_FINISH_INVOICE = 'ADMIN_FINISH_INVOICE',
ADMIN_UPDATE_SYSTEM_CONFIG = 'ADMIN_UPDATE_SYSTEM_CONFIG',
ADMIN_CREATE_APP_TEMPLATE = 'ADMIN_CREATE_APP_TEMPLATE',
ADMIN_UPDATE_APP_TEMPLATE = 'ADMIN_UPDATE_APP_TEMPLATE',
ADMIN_DELETE_APP_TEMPLATE = 'ADMIN_DELETE_APP_TEMPLATE',
ADMIN_SAVE_TEMPLATE_TYPE = 'ADMIN_SAVE_TEMPLATE_TYPE',
ADMIN_DELETE_TEMPLATE_TYPE = 'ADMIN_DELETE_TEMPLATE_TYPE',
ADMIN_CREATE_PLUGIN = 'ADMIN_CREATE_PLUGIN',
ADMIN_UPDATE_PLUGIN = 'ADMIN_UPDATE_PLUGIN',
ADMIN_DELETE_PLUGIN = 'ADMIN_DELETE_PLUGIN',
ADMIN_CREATE_PLUGIN_GROUP = 'ADMIN_CREATE_PLUGIN_GROUP',
ADMIN_UPDATE_PLUGIN_GROUP = 'ADMIN_UPDATE_PLUGIN_GROUP',
ADMIN_DELETE_PLUGIN_GROUP = 'ADMIN_DELETE_PLUGIN_GROUP'
}
export enum AuditEventEnum {
//Team
LOGIN = 'LOGIN',
CREATE_INVITATION_LINK = 'CREATE_INVITATION_LINK',
......@@ -61,3 +87,10 @@ export enum OperationLogEventEnum {
UPDATE_API_KEY = 'UPDATE_API_KEY',
DELETE_API_KEY = 'DELETE_API_KEY'
}
export type AuditEventParamsType = {
[K in AuditEventEnum]: (typeof auditLogMap)[K]['params'];
};
export type AdminAuditEventParamsType = {
[K in AdminAuditEventEnum]: (typeof adminAuditLogMap)[K]['params'];
};
packages/global/support/operationLog/type.d.ts → packages/global/support/user/audit/type.d.ts
import type { SourceMemberType } from '../user/type';
import type { OperationLogEventEnum } from './constants';
import type { AuditEventEnum } from './constants';
export type OperationLogSchema = {
_id: string;
tmbId: string;
teamId: string;
timestamp: Date;
event: `${OperationLogEventEnum}`;
event: `${AuditEventEnum}`;
metadata?: Record<string, string>;
};
export type OperationListItemType = {
_id: string;
sourceMember: SourceMemberType;
event: `${OperationLogEventEnum}`;
event: `${AuditEventEnum}`;
timestamp: Date;
metadata: Record<string, string>;
};
packages/service/support/operationLog/addOperationLog.ts deleted 100644 → 0
import { MongoOperationLog } from './schema';
import type { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { type TemplateParamsMap } from './constants';
import { retryFn } from '../../../global/common/system/utils';
export function addOperationLog<T extends OperationLogEventEnum>({
teamId,
tmbId,
event,
params
}: {
tmbId: string;
teamId: string;
event: T;
params?: TemplateParamsMap[T];
}) {
retryFn(() =>
MongoOperationLog.create({
tmbId: tmbId,
teamId: teamId,
event,
metadata: params
})
);
}
packages/service/support/operationLog/schema.ts → packages/service/support/user/audit/schema.ts
import { Schema, getMongoLogModel } from '../../common/mongo';
import { type OperationLogSchema } from '@fastgpt/global/support/operationLog/type';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { Schema, getMongoLogModel } from '../../../common/mongo';
import { type OperationLogSchema } from '@fastgpt/global/support/user/audit/type';
import { AdminAuditEventEnum, AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import {
TeamCollectionName,
TeamMemberCollectionName
......@@ -25,7 +25,7 @@ const OperationLogSchema = new Schema({
},
event: {
type: String,
enum: Object.values(OperationLogEventEnum),
enum: [...Object.values(AuditEventEnum), ...Object.values(AdminAuditEventEnum)],
required: true
},
metadata: {
......
packages/service/support/operationLog/util.ts → packages/service/support/user/audit/util.ts
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
import { i18nT } from '../../../web/i18n/utils';
import { i18nT } from '../../../../web/i18n/utils';
import { MongoOperationLog } from './schema';
import type {
AdminAuditEventEnum,
AuditEventEnum,
AdminAuditEventParamsType,
AuditEventParamsType
} from '@fastgpt/global/support/user/audit/constants';
import { retryFn } from '@fastgpt/global/common/system/utils';
export function getI18nAppType(type: AppTypeEnum): string {
if (type === AppTypeEnum.folder) return i18nT('account_team:type.Folder');
......@@ -34,3 +42,54 @@ export function getI18nDatasetType(type: DatasetTypeEnum | string): string {
if (type === DatasetTypeEnum.yuque) return i18nT('account_team:dataset.yuque_dataset');
return i18nT('common:UnKnow');
}
export function getI18nInformLevel(level: string): string {
if (level === 'common') return i18nT('account_team:inform_level_common');
if (level === 'important') return i18nT('account_team:inform_level_important');
if (level === 'emergency') return i18nT('account_team:inform_level_emergency');
return i18nT('common:UnKnow');
}
export function addAuditLog<T extends AuditEventEnum>({
teamId,
tmbId,
event,
params
}: {
tmbId: string;
teamId: string;
event: T;
params?: AuditEventParamsType[T];
}): void;
export function addAuditLog<T extends AdminAuditEventEnum>({
teamId,
tmbId,
event,
params
}: {
tmbId: string;
teamId: string;
event: T;
params?: AdminAuditEventParamsType[T];
}): void;
export function addAuditLog<T extends AuditEventEnum | AdminAuditEventEnum>({
teamId,
tmbId,
event,
params
}: {
tmbId: string;
teamId: string;
event: T;
params?: any;
}) {
retryFn(() =>
MongoOperationLog.create({
tmbId: tmbId,
teamId: teamId,
event,
metadata: params
})
);
}
packages/web/components/common/Icon/constants.ts
......@@ -20,6 +20,7 @@ export const iconPaths = {
'common/addLight': () => import('./icons/common/addLight.svg'),
'common/addUser': () => import('./icons/common/addUser.svg'),
'common/administrator': () => import('./icons/common/administrator.svg'),
'common/audit': () => import('./icons/common/audit.svg'),
'common/alipay': () => import('./icons/common/alipay.svg'),
'common/app': () => import('./icons/common/app.svg'),
'common/arrowLeft': () => import('./icons/common/arrowLeft.svg'),
......
packages/web/components/common/Icon/icons/common/audit.svg 0 → 100644
<svg t="1750218314310" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4361" ><path d="M746.88 938.88v42.24a42.88 42.88 0 0 0 42.24-42.24zM149.12 149.12A21.76 21.76 0 0 1 170.88 128V42.88A106.24 106.24 0 0 0 64 149.12zM170.88 128h512V42.88h-512V128z m512 0a21.12 21.12 0 0 1 21.12 21.12h85.12A106.24 106.24 0 0 0 682.88 42.88V128z m21.12 21.12v789.76h85.12V149.12zM746.88 896h-576v85.12h576V896z m-576 0a21.76 21.76 0 0 1-21.76-21.12H64a106.24 106.24 0 0 0 106.88 106.24V896z m-21.76-21.12V149.12H64v725.76z" p-id="4362"></path><path d="M746.88 938.88H704a42.88 42.88 0 0 0 42.88 42.24v-42.24zM789.12 512V426.88A85.12 85.12 0 0 0 704 512z m0 0h85.76V426.88h-85.76V512z m85.76 0H960a85.12 85.12 0 0 0-85.12-85.12V512z m0 0v362.88H960V512z m0 362.88a21.76 21.76 0 0 1-21.76 21.12v85.12A106.24 106.24 0 0 0 960 874.88z m-21.76 21.12h-106.24v85.12h106.24V896z m-64 42.88V512H704v426.88zM234.88 213.12a42.88 42.88 0 0 0 0 85.76V213.12z m170.24 85.76a42.88 42.88 0 0 0 0-85.76v85.76z m-170.24 0h170.24V213.12H234.88v85.76zM234.88 362.88a42.24 42.24 0 0 0-42.88 42.24 42.88 42.88 0 0 0 42.88 42.88V362.88z m256 85.12a42.88 42.88 0 0 0 42.24-42.88 42.24 42.24 0 0 0-42.24-42.24V448z m-256 0h256V362.88h-256V448z" p-id="4363"></path></svg>
\ No newline at end of file
packages/web/i18n/en/account_team.json
......@@ -5,6 +5,28 @@
"7days": "7 Days",
"accept": "accept",
"action": "operate",
"admin_add_plan": "Add a team package",
"admin_add_user": "Add a user",
"admin_change_license": "Change of license",
"admin_create_app_template": "Add a template",
"admin_create_plugin": "Add plugins",
"admin_create_plugin_group": "Create plugin grouping",
"admin_delete_app_template": "Delete the template",
"admin_delete_plugin": "Plugin Delete",
"admin_delete_plugin_group": "Delete plugin grouping",
"admin_delete_template_type": "Delete template classification",
"admin_finish_invoice": "Issuing an invoice",
"admin_login": "Administrator login",
"admin_save_template_type": "Update template classification",
"admin_send_system_inform": "Send system notifications",
"admin_update_app_template": "Update templates",
"admin_update_plan": "Editorial Team Package",
"admin_update_plugin": "Plugin Update",
"admin_update_plugin_group": "Plugin group update",
"admin_update_system_config": "System configuration update",
"admin_update_system_modal": "System announcement configuration",
"admin_update_team": "Edit team information",
"admin_update_user": "Edit User",
"assign_permission": "Permission change",
"audit_log": "audit",
"change_department_name": "Department Editor",
......@@ -73,6 +95,9 @@
"has_forbidden": "Forbidden",
"has_invited": "Invited",
"ignore": "Ignore",
"inform_level_common": "Normal",
"inform_level_emergency": "Emergency",
"inform_level_important": "Important",
"invitation_copy_link": "[{{systemName}}] {{userName}} invites you to join the {{teamName}} team, link: {{url}}",
"invitation_link_auto_clean_hint": "Expired links will be automatically cleaned up after 30 days",
"invitation_link_description": "Link description",
......@@ -85,6 +110,28 @@
"label_sync": "Tag sync",
"leave": "Resigned",
"leave_team_failed": "Leaving the team exception",
"log_admin_add_plan": "【{{name}}】A package will be added to a team with a team id [{{teamId}}]",
"log_admin_add_user": "【{{name}}】Create a user named [{{userName}}]",
"log_admin_change_license": "【{{name}}】Changed License",
"log_admin_create_app_template": "【{{name}}】Added a template named [{{templateName}}]",
"log_admin_create_plugin": "【{{name}}】Added plugin named [{{pluginName}}]",
"log_admin_create_plugin_group": "【{{name}}】Create a plug-in group called [{{groupName}}]",
"log_admin_delete_app_template": "【{{name}}】Deleted the template named [{{templateName}}]",
"log_admin_delete_plugin": "【{{name}}】Remove plugin named [{{pluginName}}]",
"log_admin_delete_plugin_group": "【{{name}}】Deleted plug-in grouping named [{{groupName}}]",
"log_admin_delete_template_type": "【{{name}}】Deleted the template classification named [{{typeName}}]",
"log_admin_finish_invoice": "【{{name}}】Issued an invoice to a team named [{{teamName}}]",
"log_admin_login": "【{{name}}】Logined in the administrator background",
"log_admin_save_template_type": "【{{name}}】Added template classification called [{{typeName}}]",
"log_admin_send_system_inform": "【{{name}}】Sent a system notification titled [{{informTitle}}], with the level of [{{level}}]",
"log_admin_update_app_template": "【{{name}}】Updated template information named [{{templateName}}]",
"log_admin_update_plan": "【{{name}}】Edited the package information of the team with the team id [{{teamId}}]",
"log_admin_update_plugin": "【{{name}}】Updated plugin information called [{{pluginName}}]",
"log_admin_update_plugin_group": "【{{name}}】Updated plug-in grouping called [{{groupName}}]",
"log_admin_update_system_config": "【{{name}}】Updated system configuration",
"log_admin_update_system_modal": "【{{name}}】The system announcement configuration was carried out",
"log_admin_update_team": "[{{name}}] Replace the team editing information named [{{teamName}}] to the team name: [{{newTeamName}}], balance: [{{newBalance}}]",
"log_admin_update_user": "Modify the user information of 【{{userName}}】",
"log_assign_permission": "[{{name}}] Updated the permissions of [{{objectName}}]: [Application creation: [{{appCreate}}], Knowledge Base: [{{datasetCreate}}], API Key: [{{apiKeyCreate}}], Management: [{{manage}}]]",
"log_change_department": "【{{name}}】Updated department【{{departmentName}}】",
"log_change_member_name": "【{{name}}】Rename member [{{memberName}}] to 【{{newName}}】",
......
packages/web/i18n/zh-CN/account_team.json
......@@ -5,6 +5,28 @@
"7days": "7天",
"accept": "接受",
"action": "操作",
"admin_add_plan": "添加团队套餐",
"admin_add_user": "添加用户",
"admin_change_license": "变更许可证",
"admin_create_app_template": "添加模板",
"admin_create_plugin": "添加插件",
"admin_create_plugin_group": "创建插件分组",
"admin_delete_app_template": "删除模板",
"admin_delete_plugin": "插件删除",
"admin_delete_plugin_group": "删除插件分组",
"admin_delete_template_type": "删除模板分类",
"admin_finish_invoice": "开具发票",
"admin_login": "管理员登录",
"admin_save_template_type": "更新模板分类",
"admin_send_system_inform": "发送系统通知",
"admin_update_app_template": "更新模板",
"admin_update_plan": "编辑团队套餐",
"admin_update_plugin": "插件更新",
"admin_update_plugin_group": "插件分组更新",
"admin_update_system_config": "系统配置更新",
"admin_update_system_modal": "系统公告配置",
"admin_update_team": "编辑团队信息",
"admin_update_user": "编辑用户信息",
"assign_permission": "权限变更",
"audit_log": "审计",
"change_department_name": "部门编辑",
......@@ -74,6 +96,9 @@
"has_forbidden": "已失效",
"has_invited": "已邀请",
"ignore": "忽略",
"inform_level_common": "一般",
"inform_level_emergency": "紧急",
"inform_level_important": "重要",
"invitation_copy_link": "【{{systemName}}】 {{userName}} 邀请您加入{{teamName}}团队，链接：{{url}}",
"invitation_link_auto_clean_hint": "已失效链接将在30天后自动清理",
"invitation_link_description": "链接描述",
......@@ -86,6 +111,28 @@
"label_sync": "标签同步",
"leave": "已离职",
"leave_team_failed": "离开团队异常",
"log_admin_add_plan": "【{{name}}】将给团队id为【{{teamId}}】的团队添加了套餐",
"log_admin_add_user": "【{{name}}】创建了一个名为【{{userName}}】的用户",
"log_admin_change_license": "【{{name}}】变更了License",
"log_admin_create_app_template": "【{{name}}】添加了名为【{{templateName}}】的模板",
"log_admin_create_plugin": "【{{name}}】添加了名为【{{pluginName}}】的插件",
"log_admin_create_plugin_group": "【{{name}}】创建了名为【{{groupName}}】的插件分组",
"log_admin_delete_app_template": "【{{name}}】删除了名为【{{templateName}}】的模板",
"log_admin_delete_plugin": "【{{name}}】删除了名为【{{pluginName}}】的插件",
"log_admin_delete_plugin_group": "【{{name}}】删除了名为【{{groupName}}】的插件分组",
"log_admin_delete_template_type": "【{{name}}】删除了名为【{{typeName}}】的模板分类",
"log_admin_finish_invoice": "【{{name}}】给名为【{{teamName}}】的团队开具了发票",
"log_admin_login": "【{{name}}】登录了管理员后台",
"log_admin_save_template_type": "【{{name}}】添加了名为【{{typeName}}】的模板分类",
"log_admin_send_system_inform": "【{{name}}】发送了标题为【{{informTitle}}】的系统通知，等级为【{{level}}】",
"log_admin_update_app_template": "【{{name}}】更新了名为【{{templateName}}】的模板信息",
"log_admin_update_plan": "【{{name}}】编辑了团队id为【{{teamId}}】的团队的套餐信息",
"log_admin_update_plugin": "【{{name}}】更新了名为【{{pluginName}}】的插件信息",
"log_admin_update_plugin_group": "【{{name}}】更新了名为【{{groupName}}】的插件分组",
"log_admin_update_system_config": "【{{name}}】更新了系统配置",
"log_admin_update_system_modal": "【{{name}}】进行了系统公告配置",
"log_admin_update_team": "【{{name}}】将名为【{{teamName}}】的团队编辑信息为团队名：【{{newTeamName}}】，余额：【{{newBalance}}】",
"log_admin_update_user": "修改【{{userName}}】的用户信息",
"log_assign_permission": "【{{name}}】更新了【{{objectName}}】的权限：[应用创建:【{{appCreate}}】, 知识库:【{{datasetCreate}}】, API密钥:【{{apiKeyCreate}}】, 管理:【{{manage}}】]",
"log_change_department": "【{{name}}】更新了部门【{{departmentName}}】",
"log_change_member_name": "【{{name}}】将成员【{{memberName}}】重命名为【{{newName}}】",
......
packages/web/i18n/zh-Hant/account_team.json
......@@ -5,6 +5,27 @@
"7days": "7 天",
"accept": "接受",
"action": "操作",
"admin_add_plan": "添加團隊套餐",
"admin_add_user": "添加用戶",
"admin_change_license": "變更許可證",
"admin_create_app_template": "添加模板",
"admin_create_plugin": "添加插件",
"admin_create_plugin_group": "創建插件分組",
"admin_delete_app_template": "刪除模板",
"admin_delete_plugin": "插件刪除",
"admin_delete_plugin_group": "刪除插件分組",
"admin_delete_template_type": "刪除模板分類",
"admin_finish_invoice": "開具發票",
"admin_login": "管理員登錄",
"admin_send_system_inform": "發送系統通知",
"admin_update_app_template": "更新模板",
"admin_update_plan": "編輯團隊套餐",
"admin_update_plugin": "插件更新",
"admin_update_plugin_group": "插件分組更新",
"admin_update_system_config": "系統配置更新",
"admin_update_system_modal": "系統公告配置",
"admin_update_team": "編輯團隊信息",
"admin_update_user": "編輯用戶信息",
"assign_permission": "權限變更",
"audit_log": "審計",
"change_department_name": "部門編輯",
......@@ -73,6 +94,9 @@
"has_forbidden": "已失效",
"has_invited": "已邀請",
"ignore": "忽略",
"inform_level_common": "一般",
"inform_level_emergency": "緊急",
"inform_level_important": "重要",
"invitation_copy_link": "【{{systemName}}】 {{userName}} 邀請您加入{{teamName}}團隊，連結：{{url}}",
"invitation_link_auto_clean_hint": "已失效連結將在 30 天後自動清理",
"invitation_link_description": "連結描述",
......@@ -85,6 +109,28 @@
"label_sync": "標籤同步",
"leave": "已離職",
"leave_team_failed": "離開團隊異常",
"log_admin_add_plan": "【{{name}}】將給團隊id為【{{teamId}}】的團隊添加了套餐",
"log_admin_add_user": "【{{name}}】創建了一個名為【{{userName}}】的用戶",
"log_admin_change_license": "【{{name}}】變更了License",
"log_admin_create_app_template": "【{{name}}】添加了名為【{{templateName}}】的模板",
"log_admin_create_plugin": "【{{name}}】添加了名為【{{pluginName}}】的插件",
"log_admin_create_plugin_group": "【{{name}}】創建了名為【{{groupName}}】的插件分組",
"log_admin_delete_app_template": "【{{name}}】刪除了名為【{{templateName}}】的模板",
"log_admin_delete_plugin": "【{{name}}】刪除了名為【{{pluginName}}】的插件",
"log_admin_delete_plugin_group": "【{{name}}】刪除了名為【{{groupName}}】的插件分組",
"log_admin_delete_template_type": "【{{name}}】刪除了名為【{{typeName}}】的模板分類",
"log_admin_finish_invoice": "【{{name}}】給名為【{{teamName}}】的團隊開具了發票",
"log_admin_login": "【{{name}}】登錄了管理員後台",
"log_admin_save_template_type": "【{{name}}】添加了名為【{{typeName}}】的模板分類",
"log_admin_send_system_inform": "【{{name}}】發送了標題為【{{informTitle}}】的系統通知，等級為【{{level}}】",
"log_admin_update_app_template": "【{{name}}】更新了名為【{{templateName}}】的模板信息",
"log_admin_update_plan": "【{{name}}】編輯了團隊id為【{{teamId}}】的團隊的套餐信息",
"log_admin_update_plugin": "【{{name}}】更新了名為【{{pluginName}}】的插件信息",
"log_admin_update_plugin_group": "【{{name}}】更新了名為【{{groupName}}】的插件分組",
"log_admin_update_system_config": "【{{name}}】更新了系統配置",
"log_admin_update_system_modal": "【{{name}}】進行了系統公告配置",
"log_admin_update_team": "【{{name}}】將名為【{{teamName}}】的團隊編輯信息為團隊名：【{{newTeamName}}】，餘額：【{{newBalance}}】",
"log_admin_update_user": "修改【{{userName}}】的用戶信息",
"log_assign_permission": "【{{name}}】更新了【{{objectName}}】的權限：[應用創建:【{{appCreate}}】, 知識庫:【{{datasetCreate}}】, API密鑰:【{{apiKeyCreate}}】, 管理:【{{manage}}】]",
"log_change_department": "【{{name}}】更新了部門【{{departmentName}}】",
"log_change_member_name": "【{{name}}】將成員【{{memberName}}】重命名為【{{newName}}】",
......
projects/app/package.json
{
"name": "app",
"version": "4.9.12",
"version": "4.9.14",
"private": false,
"scripts": {
"dev": "next dev",
......
projects/app/src/components/core/chat/ChatContainer/ChatBox/Input/ChatInput.tsx
import type { FlexProps} from '@chakra-ui/react';
import type { FlexProps } from '@chakra-ui/react';
import { Box, Flex, Textarea, useBoolean } from '@chakra-ui/react';
import React, { useRef, useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'next-i18next';
......
projects/app/src/pageComponents/account/team/OperationLog/index.tsx → projects/app/src/pageComponents/account/team/Audit/index.tsx
......@@ -15,8 +15,8 @@ import { useTranslation } from 'next-i18next';
import MyBox from '@fastgpt/web/components/common/MyBox';
import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination';
import { getOperationLogs } from '@/web/support/user/team/operantionLog/api';
import { operationLogMap } from '@fastgpt/service/support/operationLog/constants';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { auditLogMap } from '@fastgpt/web/support/user/audit/constants';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { formatTime2YMDHMS } from '@fastgpt/global/common/string/time';
import UserBox from '@fastgpt/web/components/common/UserBox';
import MultipleSelect, {
......@@ -27,11 +27,11 @@ import { getTeamMembers } from '@/web/support/user/team/api';
import { specialProcessors } from './processors';
import { defaultMetadataProcessor } from './processors/commonProcessor';
function OperationLogTable({ Tabs }: { Tabs: React.ReactNode }) {
function AuditLog({ Tabs }: { Tabs: React.ReactNode }) {
const { t } = useTranslation();
const [searchParams, setSearchParams] = useState<{
tmbIds?: string[];
events?: OperationLogEventEnum[];
events?: AuditEventEnum[];
}>({});
const { data: members, ScrollData } = useScrollPagination(getTeamMembers, {});
......@@ -51,8 +51,8 @@ function OperationLogTable({ Tabs }: { Tabs: React.ReactNode }) {
const eventOptions = useMemo(
() =>
Object.values(OperationLogEventEnum).map((event) => ({
label: t(operationLogMap[event].typeLabel),
Object.values(AuditEventEnum).map((event) => ({
label: t(auditLogMap[event].typeLabel),
value: event
})),
[t]
......@@ -61,14 +61,14 @@ function OperationLogTable({ Tabs }: { Tabs: React.ReactNode }) {
const processMetadataByEvent = useCallback(
(event: string, metadata: any) => {
const defaultFormat = defaultMetadataProcessor(metadata, t);
const specialFormat = specialProcessors[event as OperationLogEventEnum]?.(defaultFormat, t);
const specialFormat = specialProcessors[event as AuditEventEnum]?.(defaultFormat, t);
return specialFormat || defaultFormat;
},
[t]
);
const {
data: operationLogs = [],
data: auditLog = [],
isLoading: loadingLogs,
ScrollData: LogScrollData
} = useScrollPagination(getOperationLogs, {
......@@ -92,7 +92,7 @@ function OperationLogTable({ Tabs }: { Tabs: React.ReactNode }) {
setValue: setSelectedEvents,
isSelectAll: isSelectAllEvent,
setIsSelectAll: setIsSelectAllEvent
} = useMultipleSelect<OperationLogEventEnum>(
} = useMultipleSelect<AuditEventEnum>(
eventOptions.map((item) => item.value),
true
);
......@@ -166,8 +166,8 @@ function OperationLogTable({ Tabs }: { Tabs: React.ReactNode }) {
</Tr>
</Thead>
<Tbody>
{operationLogs?.map((log) => {
const i18nData = operationLogMap[log.event];
{auditLog?.map((log) => {
const i18nData = auditLogMap[log.event];
const metadata = processMetadataByEvent(log.event, { ...log.metadata });
return i18nData ? (
......@@ -195,4 +195,4 @@ function OperationLogTable({ Tabs }: { Tabs: React.ReactNode }) {
);
}
export default OperationLogTable;
export default AuditLog;
projects/app/src/pageComponents/account/team/OperationLog/processors/index.ts → projects/app/src/pageComponents/account/team/Audit/processors/index.ts
import type { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import type { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { createTeamProcessors } from './teamProcessors';
import { createAppProcessors } from './appProcessors';
import { createDatasetProcessors } from './datasetProcessors';
export type MetadataProcessor = (metadata: any, t: any) => any;
export const specialProcessors: Partial<Record<OperationLogEventEnum, MetadataProcessor>> = {
export const specialProcessors: Partial<Record<AuditEventEnum, MetadataProcessor>> = {
...createTeamProcessors,
...createAppProcessors,
...createDatasetProcessors
......
projects/app/src/pages/account/team/index.tsx
......@@ -21,7 +21,7 @@ const MemberTable = dynamic(() => import('@/pageComponents/account/team/MemberTa
const PermissionManage = dynamic(
() => import('@/pageComponents/account/team/PermissionManage/index')
);
const OperationLogTable = dynamic(() => import('@/pageComponents/account/team/OperationLog/index'));
const AuditLog = dynamic(() => import('@/pageComponents/account/team/Audit/index'));
const GroupManage = dynamic(() => import('@/pageComponents/account/team/GroupManage/index'));
const OrgManage = dynamic(() => import('@/pageComponents/account/team/OrgManage/index'));
const HandleInviteModal = dynamic(
......@@ -96,7 +96,7 @@ const Team = () => {
}}
/>
),
[router, t, teamTab]
[planContent?.permissionTeamOperationLog, router, t, teamTab, toast]
);
return (
......@@ -175,7 +175,7 @@ const Team = () => {
{teamTab === TeamTabEnum.org && <OrgManage Tabs={Tabs} />}
{teamTab === TeamTabEnum.group && <GroupManage Tabs={Tabs} />}
{teamTab === TeamTabEnum.permission && <PermissionManage Tabs={Tabs} />}
{teamTab === TeamTabEnum.audit && <OperationLogTable Tabs={Tabs} />}
{teamTab === TeamTabEnum.audit && <AuditLog Tabs={Tabs} />}
</Box>
</Flex>
{invitelinkid && <HandleInviteModal invitelinkid={invitelinkid} />}
......
projects/app/src/pages/api/core/app/copy.ts
......@@ -5,10 +5,10 @@ import { authApp } from '@fastgpt/service/support/permission/app/auth';
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
import { onCreateApp } from './create';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
export type copyAppQuery = {};
export type copyAppBody = { appId: string };
......@@ -46,10 +46,10 @@ async function handler(
pluginData: app.pluginData
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.CREATE_APP_COPY,
event: AuditEventEnum.CREATE_APP_COPY,
params: {
appName: app.name,
appType: getI18nAppType(app.type)
......
projects/app/src/pages/api/core/app/create.ts
......@@ -19,9 +19,9 @@ import { checkTeamAppLimit } from '@fastgpt/service/support/permission/teamLimit
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
import { type ApiRequestProps } from '@fastgpt/service/type/next';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
export type CreateAppBody = {
parentId?: ParentIdType;
......@@ -152,10 +152,10 @@ export const onCreateApp = async ({
);
}
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.CREATE_APP,
event: AuditEventEnum.CREATE_APP,
params: {
appName: name!,
appType: getI18nAppType(type!)
......
projects/app/src/pages/api/core/app/del.ts
......@@ -19,9 +19,9 @@ import { deleteChatFiles } from '@fastgpt/service/core/chat/controller';
import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
import { MongoOpenApi } from '@fastgpt/service/support/openapi/schema';
import { removeImageByPath } from '@fastgpt/service/common/file/image/controller';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
const { appId } = req.query as { appId: string };
......@@ -43,10 +43,10 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
appId
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.DELETE_APP,
event: AuditEventEnum.DELETE_APP,
params: {
appName: app.name,
appType: getI18nAppType(app.type)
......
projects/app/src/pages/api/core/app/folder/create.ts
......@@ -18,8 +18,8 @@ import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPe
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
import { type ApiRequestProps } from '@fastgpt/service/type/next';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
export type CreateAppFolderBody = {
parentId?: ParentIdType;
name: string;
......@@ -85,10 +85,10 @@ async function handler(req: ApiRequestProps<CreateAppFolderBody>) {
}
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.CREATE_APP_FOLDER,
event: AuditEventEnum.CREATE_APP_FOLDER,
params: {
folderName: name
}
......
projects/app/src/pages/api/core/app/getChatLogs.ts
......@@ -13,9 +13,9 @@ import { parsePaginationRequest } from '@fastgpt/service/common/api/pagination';
import { type PaginationResponse } from '@fastgpt/web/common/fetch/type';
import { addSourceMember } from '@fastgpt/service/support/user/utils';
import { replaceRegChars } from '@fastgpt/global/common/string/tools';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
async function handler(
req: NextApiRequest,
......@@ -148,10 +148,10 @@ async function handler(
const listWithoutTmbId = list.filter((item) => !item.tmbId);
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.EXPORT_APP_CHAT_LOG,
event: AuditEventEnum.EXPORT_APP_CHAT_LOG,
params: {
appName: app.name,
appType: getI18nAppType(app.type)
......
projects/app/src/pages/api/core/app/update.ts
......@@ -24,9 +24,9 @@ import { TeamAppCreatePermissionVal } from '@fastgpt/global/support/permission/u
import { AppErrEnum } from '@fastgpt/global/common/error/code/app';
import { refreshSourceAvatar } from '@fastgpt/service/common/file/image/controller';
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
import { i18nT } from '@fastgpt/web/i18n/utils';
export type AppUpdateQuery = {
......@@ -204,10 +204,10 @@ const logAppMove = ({
app: any;
targetName: string;
}) => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.MOVE_APP,
event: AuditEventEnum.MOVE_APP,
params: {
appName: app.name,
targetFolderName: targetName,
......@@ -251,10 +251,10 @@ const logAppUpdate = ({
const { names: newItemNames, values: newItemValues } = getUpdateItems();
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.UPDATE_APP_INFO,
event: AuditEventEnum.UPDATE_APP_INFO,
params: {
appName: app.name,
newItemNames: newItemNames,
......
projects/app/src/pages/api/core/app/version/publish.ts
......@@ -9,9 +9,9 @@ import { getNextTimeByCronStringAndTimezone } from '@fastgpt/global/common/strin
import { type PostPublishAppProps } from '@/global/core/app/api';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { type ApiRequestProps } from '@fastgpt/service/type/next';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
import { i18nT } from '@fastgpt/web/i18n/utils';
async function handler(req: ApiRequestProps<PostPublishAppProps>, res: NextApiResponse<any>) {
......@@ -37,10 +37,10 @@ async function handler(req: ApiRequestProps<PostPublishAppProps>, res: NextApiRe
updateTime: new Date()
});
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.UPDATE_PUBLISH_APP,
event: AuditEventEnum.UPDATE_PUBLISH_APP,
params: {
appName: app.name,
operationName: i18nT('account_team:update'),
......@@ -99,10 +99,10 @@ async function handler(req: ApiRequestProps<PostPublishAppProps>, res: NextApiRe
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.UPDATE_PUBLISH_APP,
event: AuditEventEnum.UPDATE_PUBLISH_APP,
params: {
appName: app.name,
operationName: isPublish
......
projects/app/src/pages/api/core/dataset/collection/create.ts
......@@ -4,9 +4,9 @@ import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
import { createOneCollection } from '@fastgpt/service/core/dataset/collection/controller';
import { NextAPI } from '@/service/middleware/entry';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
async function handler(req: NextApiRequest) {
const body = req.body as CreateDatasetCollectionParams;
......@@ -26,10 +26,10 @@ async function handler(req: NextApiRequest) {
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.CREATE_COLLECTION,
event: AuditEventEnum.CREATE_COLLECTION,
params: {
collectionName: body.name,
datasetName: dataset.name,
......
projects/app/src/pages/api/core/dataset/collection/create/reTrainingCollection.ts
......@@ -7,9 +7,9 @@ import { delCollection } from '@fastgpt/service/core/dataset/collection/controll
import { authDatasetCollection } from '@fastgpt/service/support/permission/dataset/auth';
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
type RetrainingCollectionResponse = {
collectionId: string;
......@@ -52,10 +52,10 @@ async function handler(
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.RETRAIN_COLLECTION,
event: AuditEventEnum.RETRAIN_COLLECTION,
params: {
collectionName: collection.name,
datasetName: collection.dataset?.name || '',
......
projects/app/src/pages/api/core/dataset/collection/delete.ts
......@@ -6,9 +6,9 @@ import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
import { NextAPI } from '@/service/middleware/entry';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
async function handler(req: NextApiRequest) {
const { id: collectionId } = req.query as { id: string };
......@@ -44,10 +44,10 @@ async function handler(req: NextApiRequest) {
);
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.DELETE_COLLECTION,
event: AuditEventEnum.DELETE_COLLECTION,
params: {
collectionName: collection.name,
datasetName: collection.dataset?.name || '',
......
projects/app/src/pages/api/core/dataset/collection/update.ts
......@@ -12,9 +12,9 @@ import { DatasetCollectionTypeEnum } from '@fastgpt/global/core/dataset/constant
import { type ClientSession } from '@fastgpt/service/common/mongo';
import { type CollectionWithDatasetType } from '@fastgpt/global/core/dataset/type';
import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
export type UpdateDatasetCollectionParams = {
id?: string;
parentId?: string;
......@@ -135,10 +135,10 @@ async function handler(req: ApiRequestProps<UpdateDatasetCollectionParams>) {
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.UPDATE_COLLECTION,
event: AuditEventEnum.UPDATE_COLLECTION,
params: {
collectionName: collection.name,
datasetName: collection.dataset?.name || '',
......
projects/app/src/pages/api/core/dataset/create.ts
......@@ -18,9 +18,9 @@ import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
import { checkTeamDatasetLimit } from '@fastgpt/service/support/permission/teamLimit';
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
import type { ApiRequestProps } from '@fastgpt/service/type/next';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
export type DatasetCreateQuery = {};
export type DatasetCreateBody = CreateDatasetParams;
......@@ -102,10 +102,10 @@ async function handler(
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.CREATE_DATASET,
event: AuditEventEnum.CREATE_DATASET,
params: {
datasetName: name,
datasetType: getI18nDatasetType(type)
......
projects/app/src/pages/api/core/dataset/data/delete.ts
......@@ -4,9 +4,9 @@ import { deleteDatasetData } from '@/service/core/dataset/data/controller';
import { NextAPI } from '@/service/middleware/entry';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
async function handler(req: NextApiRequest) {
const { id: dataId } = req.query as {
id: string;
......@@ -27,10 +27,10 @@ async function handler(req: NextApiRequest) {
await deleteDatasetData(datasetData);
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.DELETE_DATA,
event: AuditEventEnum.DELETE_DATA,
params: {
collectionName: collection.name,
datasetName: collection.dataset?.name || '',
......
projects/app/src/pages/api/core/dataset/data/insertData.ts
......@@ -17,9 +17,9 @@ import { NextAPI } from '@/service/middleware/entry';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
import { getLLMMaxChunkSize } from '@fastgpt/global/core/dataset/training/utils';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
async function handler(req: NextApiRequest) {
const { collectionId, q, a, indexes } = req.body as InsertOneDatasetDataProps;
......@@ -99,10 +99,10 @@ async function handler(req: NextApiRequest) {
});
(() => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.CREATE_DATA,
event: AuditEventEnum.CREATE_DATA,
params: {
collectionName: collection.name,
datasetName: collection.dataset?.name || '',
......
projects/app/src/pages/api/core/dataset/data/update.ts
......@@ -5,9 +5,9 @@ import { NextAPI } from '@/service/middleware/entry';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { authDatasetData } from '@fastgpt/service/support/permission/dataset/auth';
import { type ApiRequestProps } from '@fastgpt/service/type/next';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
async function handler(req: ApiRequestProps<UpdateDatasetDataProps>) {
const { dataId, q, a, indexes = [] } = req.body;
......@@ -48,10 +48,10 @@ async function handler(req: ApiRequestProps<UpdateDatasetDataProps>) {
});
(() => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.UPDATE_DATA,
event: AuditEventEnum.UPDATE_DATA,
params: {
collectionName: collection.name,
datasetName: collection.dataset?.name || '',
......
projects/app/src/pages/api/core/dataset/delete.ts
......@@ -11,9 +11,9 @@ import { MongoDatasetCollectionTags } from '@fastgpt/service/core/dataset/tag/sc
import { removeImageByPath } from '@fastgpt/service/common/file/image/controller';
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
import { removeWebsiteSyncJobScheduler } from '@fastgpt/service/core/dataset/websiteSync';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
async function handler(req: NextApiRequest) {
const { id: datasetId } = req.query as {
......@@ -72,10 +72,10 @@ async function handler(req: NextApiRequest) {
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.DELETE_DATASET,
event: AuditEventEnum.DELETE_DATASET,
params: {
datasetName: dataset.name,
datasetType: getI18nDatasetType(dataset.type)
......
projects/app/src/pages/api/core/dataset/folder/create.ts
......@@ -17,8 +17,8 @@ import { syncCollaborators } from '@fastgpt/service/support/permission/inheritPe
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
import { authUserPer } from '@fastgpt/service/support/permission/user/auth';
import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
export type DatasetFolderCreateQuery = {};
export type DatasetFolderCreateBody = {
parentId?: string;
......@@ -95,10 +95,10 @@ async function handler(
}
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.CREATE_DATASET_FOLDER,
event: AuditEventEnum.CREATE_DATASET_FOLDER,
params: {
folderName: name
}
......
projects/app/src/pages/api/core/dataset/searchTest.ts
......@@ -14,9 +14,9 @@ import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
import { useIPFrequencyLimit } from '@fastgpt/service/common/middle/reqFrequencyLimit';
import { type ApiRequestProps } from '@fastgpt/service/type/next';
import { getRerankModel } from '@fastgpt/service/core/ai/model';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
async function handler(req: ApiRequestProps<SearchTestProps>): Promise<SearchTestResponse> {
const {
datasetId,
......@@ -133,10 +133,10 @@ async function handler(req: ApiRequestProps<SearchTestProps>): Promise<SearchTes
});
}
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.SEARCH_TEST,
event: AuditEventEnum.SEARCH_TEST,
params: {
datasetName: dataset.name,
datasetType: getI18nDatasetType(dataset.type)
......
projects/app/src/pages/api/core/dataset/update.ts
......@@ -37,9 +37,9 @@ import {
} from '@fastgpt/service/core/dataset/websiteSync';
import { delDatasetRelevantData } from '@fastgpt/service/core/dataset/controller';
import { isEqual } from 'lodash';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
import { getEmbeddingModel, getLLMModel } from '@fastgpt/service/core/ai/model';
import { computedCollectionChunkSettings } from '@fastgpt/global/core/dataset/training/utils';
......@@ -368,10 +368,10 @@ const logDatasetMove = ({
targetName: string;
}) => {
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.MOVE_DATASET,
event: AuditEventEnum.MOVE_DATASET,
params: {
datasetName: dataset.name,
targetFolderName: targetName,
......@@ -391,10 +391,10 @@ const logDatasetUpdate = ({
dataset: any;
}) => {
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.UPDATE_DATASET,
event: AuditEventEnum.UPDATE_DATASET,
params: {
datasetName: dataset.name,
datasetType: getI18nDatasetType(dataset.type)
......
projects/app/src/pages/api/support/openapi/create.ts
......@@ -8,8 +8,8 @@ import { ManagePermissionVal } from '@fastgpt/global/support/permission/constant
import { authApp } from '@fastgpt/service/support/permission/app/auth';
import { OpenApiErrEnum } from '@fastgpt/global/common/error/code/openapi';
import { TeamApikeyCreatePermissionVal } from '@fastgpt/global/support/permission/user/constant';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
async function handler(req: ApiRequestProps<EditApiKeyProps>): Promise<string> {
const { appId, name, limit } = req.body;
const { tmbId, teamId } = await (async () => {
......@@ -51,10 +51,10 @@ async function handler(req: ApiRequestProps<EditApiKeyProps>): Promise<string> {
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.CREATE_API_KEY,
event: AuditEventEnum.CREATE_API_KEY,
params: {
keyName: name
}
......
projects/app/src/pages/api/support/openapi/delete.ts
......@@ -4,8 +4,8 @@ import { OwnerPermissionVal } from '@fastgpt/global/support/permission/constant'
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
import { NextAPI } from '@/service/middleware/entry';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
export type OpenAPIDeleteQuery = { id: string };
export type OpenAPIDeleteBody = {};
export type OpenAPIDeleteResponse = {};
......@@ -28,10 +28,10 @@ async function handler(
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.DELETE_API_KEY,
event: AuditEventEnum.DELETE_API_KEY,
params: {
keyName: openapi.name
}
......
projects/app/src/pages/api/support/openapi/update.ts
......@@ -4,8 +4,8 @@ import { authOpenApiKeyCrud } from '@fastgpt/service/support/permission/auth/ope
import { OwnerPermissionVal } from '@fastgpt/global/support/permission/constant';
import type { ApiRequestProps } from '@fastgpt/service/type/next';
import { NextAPI } from '@/service/middleware/entry';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
async function handler(req: ApiRequestProps<EditApiKeyProps & { _id: string }>): Promise<void> {
const { _id, name, limit } = req.body;
......@@ -17,10 +17,10 @@ async function handler(req: ApiRequestProps<EditApiKeyProps & { _id: string }>):
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.UPDATE_API_KEY,
event: AuditEventEnum.UPDATE_API_KEY,
params: {
keyName: name
}
......
projects/app/src/pages/api/support/outLink/create.ts
......@@ -5,9 +5,9 @@ import type { PublishChannelEnum } from '@fastgpt/global/support/outLink/constan
import { ManagePermissionVal } from '@fastgpt/global/support/permission/constant';
import type { ApiRequestProps } from '@fastgpt/service/type/next';
import { NextAPI } from '@/service/middleware/entry';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
import { getNanoid } from '@fastgpt/global/common/string/tools';
export type OutLinkCreateQuery = {};
......@@ -40,10 +40,10 @@ async function handler(
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.CREATE_APP_PUBLISH_CHANNEL,
event: AuditEventEnum.CREATE_APP_PUBLISH_CHANNEL,
params: {
appName: app.name,
channelName: props.name,
......
projects/app/src/pages/api/support/outLink/delete.ts
......@@ -3,9 +3,9 @@ import { authOutLinkCrud } from '@fastgpt/service/support/permission/publish/aut
import { OwnerPermissionVal } from '@fastgpt/global/support/permission/constant';
import type { ApiRequestProps } from '@fastgpt/service/type/next';
import { NextAPI } from '@/service/middleware/entry';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
export type OutLinkDeleteQuery = {
id: string;
......@@ -28,10 +28,10 @@ async function handler(
await MongoOutLink.findByIdAndDelete(id);
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.DELETE_APP_PUBLISH_CHANNEL,
event: AuditEventEnum.DELETE_APP_PUBLISH_CHANNEL,
params: {
appName: app.name,
channelName: outLink.name,
......
projects/app/src/pages/api/support/outLink/update.ts
......@@ -5,9 +5,9 @@ import { ManagePermissionVal } from '@fastgpt/global/support/permission/constant
import type { ApiRequestProps } from '@fastgpt/service/type/next';
import { NextAPI } from '@/service/middleware/entry';
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nAppType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nAppType } from '@fastgpt/service/support/user/audit/util';
export type OutLinkUpdateQuery = {};
// {
......@@ -55,10 +55,10 @@ async function handler(
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.UPDATE_APP_PUBLISH_CHANNEL,
event: AuditEventEnum.UPDATE_APP_PUBLISH_CHANNEL,
params: {
appName: logApp.name,
channelName: outLink.name,
......
projects/app/src/pages/api/support/user/account/loginByPassword.ts
......@@ -9,8 +9,8 @@ import { useIPFrequencyLimit } from '@fastgpt/service/common/middle/reqFrequency
import { pushTrack } from '@fastgpt/service/common/middle/tracks/utils';
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common';
import { UserErrEnum } from '@fastgpt/global/common/error/code/user';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { UserAuthTypeEnum } from '@fastgpt/global/support/user/auth/constants';
import { authCode } from '@fastgpt/service/support/user/auth/controller';
import { createUserSession } from '@fastgpt/service/support/user/session';
......@@ -79,10 +79,10 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
teamId: userDetail.team.teamId,
tmbId: userDetail.team.tmbId
});
addOperationLog({
addAuditLog({
tmbId: userDetail.team.tmbId,
teamId: userDetail.team.teamId,
event: OperationLogEventEnum.LOGIN
event: AuditEventEnum.LOGIN
});
return {
......
projects/app/src/pages/api/support/user/account/updatePasswordByOld.ts
......@@ -5,8 +5,8 @@ import { MongoUser } from '@fastgpt/service/support/user/schema';
import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
import { i18nT } from '@fastgpt/web/i18n/utils';
import { NextAPI } from '@/service/middleware/entry';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
const { oldPsw, newPsw } = req.body as { oldPsw: string; newPsw: string };
......@@ -41,10 +41,10 @@ async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.CHANGE_PASSWORD,
event: AuditEventEnum.CHANGE_PASSWORD,
params: {}
});
})();
......
projects/app/src/pages/api/support/user/team/limit/exportDatasetLimit.ts
......@@ -3,9 +3,9 @@ import { authDataset } from '@fastgpt/service/support/permission/dataset/auth';
import { checkExportDatasetLimit } from '@fastgpt/service/support/user/utils';
import { NextAPI } from '@/service/middleware/entry';
import { WritePermissionVal } from '@fastgpt/global/support/permission/constant';
import { addOperationLog } from '@fastgpt/service/support/operationLog/addOperationLog';
import { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/operationLog/util';
import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
async function handler(req: NextApiRequest) {
const { datasetId } = req.query as {
......@@ -30,10 +30,10 @@ async function handler(req: NextApiRequest) {
});
(async () => {
addOperationLog({
addAuditLog({
tmbId,
teamId,
event: OperationLogEventEnum.EXPORT_DATASET,
event: AuditEventEnum.EXPORT_DATASET,
params: {
datasetName: dataset.name,
datasetType: getI18nDatasetType(dataset.type)
......
projects/app/src/web/support/user/team/operantionLog/api.ts
import { GET, POST, PUT } from '@/web/common/api/request';
import type { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
import type { OperationListItemType } from '@fastgpt/global/support/operationLog/type';
import type { OperationLogEventEnum } from '@fastgpt/global/support/operationLog/constants';
import type { OperationListItemType } from '@fastgpt/global/support/user/audit/type';
import type { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
export const getOperationLogs = (
props: PaginationProps & {
tmbIds?: string[];
events?: OperationLogEventEnum[];
events?: AuditEventEnum[];
}
) =>
POST<PaginationResponse<OperationListItemType>>(
`/proApi/support/user/team/operationLog/list`,
props
);
) => POST<PaginationResponse<OperationListItemType>>(`/proApi/support/user/audit/list`, props);
test/mocks/index.ts
import { vi } from 'vitest';
import './request';
vi.mock(import('@fastgpt/service/support/operationLog/addOperationLog'), () => {
vi.mock(import('@fastgpt/service/support/audit/util'), async (importOriginal) => {
const actual = await importOriginal();
return {
addOperationLog: vi.fn()
...actual,
addAuditLog: vi.fn()
};
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment