Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 56f6e69b by Archer Committed by GitHub
Options

System inform (#2263) 

* feat: Bind Notification Pipe (#2229)

* chore: account page add bind notification modal

* feat: timerlock schema and type

* feat(fe): bind notification method modal

* chore: fe adjust

* feat: clean useless code

* fix: cron lock

* chore: adjust the code

* chore: rename api

* chore: remove unused code

* chore: fe adjust

* perf: bind inform ux

* fix: time ts

* chore: notification (#2251)

* perf: send message code

* perf: sub schema index

* fix: timezone plugin

* fix: format

---------

Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com>
parent 998e7833
Showing with 340 additions and 169 deletions
packages/global/common/string/time.ts
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import cronParser from 'cron-parser'; import cronParser from 'cron-parser';
import utc from 'dayjs/plugin/utc';
import timezone from 'dayjs/plugin/timezone';
dayjs.extend(utc);
dayjs.extend(timezone);
export const formatTime2YMDHMW = (time?: Date) => dayjs(time).format('YYYY-MM-DD HH:mm:ss dddd'); export const formatTime2YMDHMW = (time?: Date) => dayjs(time).format('YYYY-MM-DD HH:mm:ss dddd');
export const formatTime2YMDHM = (time?: Date) => export const formatTime2YMDHM = (time?: Date) =>
......
packages/global/common/type/utils.ts 0 → 100644
export type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = Omit<T, Keys> &
{
[K in Keys]-?: Required<Pick<T, K>> & Partial<Omit<T, K>>;
}[Keys];
export type RequireOnlyOne<T, Keys extends keyof T = keyof T> = Omit<T, Keys> &
{
[K in Keys]-?: Required<Pick<T, K>> & Partial<Record<Exclude<Keys, K>, undefined>>;
}[Keys];
packages/global/support/user/auth/constants.ts
export enum UserAuthTypeEnum { export enum UserAuthTypeEnum {
register = 'register', register = 'register',
findPassword = 'findPassword', findPassword = 'findPassword',
wxLogin = 'wxLogin' wxLogin = 'wxLogin',
bindNotification = 'bindNotification'
} }
export const userAuthTypeMap = { export const userAuthTypeMap = {
[UserAuthTypeEnum.register]: 'register', [UserAuthTypeEnum.register]: 'register',
[UserAuthTypeEnum.findPassword]: 'findPassword', [UserAuthTypeEnum.findPassword]: 'findPassword',
[UserAuthTypeEnum.wxLogin]: 'wxLogin' [UserAuthTypeEnum.wxLogin]: 'wxLogin',
[UserAuthTypeEnum.bindNotification]: 'bindNotification'
}; };
packages/global/support/user/inform/constants.ts
...@@ -15,3 +15,14 @@ export const InformLevelMap = { ...@@ -15,3 +15,14 @@ export const InformLevelMap = {
label: '紧急' label: '紧急'
} }
}; };
export enum SendInformTemplateCodeEnum {
EXPIRE_SOON = 'EXPIRE_SOON',
EXPIRED = 'EXPIRED',
FREE_CLEAN = 'FREE_CLEAN',
REGISTER = 'REGISTER',
RESET_PASSWORD = 'RESET_PASSWORD',
BIND_NOTIFICATION = 'BIND_NOTIFICATION',
LACK_OF_POINTS = 'LACK_OF_POINTS',
CUSTOM = 'CUSTOM'
}
packages/global/support/user/inform/type.d.ts
import { InformLevelEnum } from './constants'; import { InformLevelEnum, SendInformTemplateCodeEnum } from './constants';
export type SendInformProps = { export type SendInformProps = {
title: string;
content: string;
level: `${InformLevelEnum}`; level: `${InformLevelEnum}`;
templateCode: `${SendInformTemplateCodeEnum}`;
templateParam: Record<string, any>;
customLockMinutes?: number; // custom lock minutes
}; };
export type SendInform2UserProps = SendInformProps & { export type SendInform2UserProps = SendInformProps & {
tmbId: string; teamId: string;
}; };
export type SendInform2User = SendInformProps & { export type SendInform2User = SendInformProps & {
type: `${InformTypeEnum}`; type: `${InformTypeEnum}`;
tmbId: string; tmbId: string;
......
packages/global/support/user/team/type.d.ts
...@@ -18,7 +18,9 @@ export type TeamSchema = { ...@@ -18,7 +18,9 @@ export type TeamSchema = {
}; };
lafAccount: LafAccountType; lafAccount: LafAccountType;
defaultPermission: PermissionValueType; defaultPermission: PermissionValueType;
notificationAccount?: string;
}; };
export type tagsType = { export type tagsType = {
label: string; label: string;
key: string; key: string;
...@@ -63,6 +65,7 @@ export type TeamTmbItemType = { ...@@ -63,6 +65,7 @@ export type TeamTmbItemType = {
role: `${TeamMemberRoleEnum}`; role: `${TeamMemberRoleEnum}`;
status: `${TeamMemberStatusEnum}`; status: `${TeamMemberStatusEnum}`;
lafAccount?: LafAccountType; lafAccount?: LafAccountType;
notificationAccount?: string;
permission: TeamPermission; permission: TeamPermission;
}; };
...@@ -72,7 +75,6 @@ export type TeamMemberItemType = { ...@@ -72,7 +75,6 @@ export type TeamMemberItemType = {
teamId: string; teamId: string;
memberName: string; memberName: string;
avatar: string; avatar: string;
// TODO: this should be deprecated.
role: `${TeamMemberRoleEnum}`; role: `${TeamMemberRoleEnum}`;
status: `${TeamMemberStatusEnum}`; status: `${TeamMemberStatusEnum}`;
permission: TeamPermission; permission: TeamPermission;
......
packages/global/support/user/type.d.ts
import { TeamPermission } from '../permission/user/controller';
import { UserStatusEnum } from './constant'; import { UserStatusEnum } from './constant';
import { TeamTmbItemType } from './team/type'; import { TeamTmbItemType } from './team/type';
export type UserModelSchema = { export type UserModelSchema = {
_id: string; _id: string;
username: string; username: string;
email?: string;
phonePrefix?: number;
phone?: string;
password: string; password: string;
avatar: string; avatar: string;
promotionRate: number; promotionRate: number;
...@@ -31,4 +29,6 @@ export type UserType = { ...@@ -31,4 +29,6 @@ export type UserType = {
openaiAccount: UserModelSchema['openaiAccount']; openaiAccount: UserModelSchema['openaiAccount'];
team: TeamTmbItemType; team: TeamTmbItemType;
standardInfo?: standardInfoType; standardInfo?: standardInfoType;
notificationAccount?: string;
permission: TeamPermission;
}; };
packages/service/common/system/timerLock/constants.ts
...@@ -4,14 +4,21 @@ export enum TimerIdEnum { ...@@ -4,14 +4,21 @@ export enum TimerIdEnum {
checkInvalidVector = 'checkInvalidVector', checkInvalidVector = 'checkInvalidVector',
clearExpiredSubPlan = 'clearExpiredSubPlan', clearExpiredSubPlan = 'clearExpiredSubPlan',
updateStandardPlan = 'updateStandardPlan', updateStandardPlan = 'updateStandardPlan',
scheduleTriggerApp = 'scheduleTriggerApp' scheduleTriggerApp = 'scheduleTriggerApp',
notification = 'notification'
} }
export const timerIdMap = { export enum LockNotificationEnum {
[TimerIdEnum.checkInValidDatasetFiles]: 'checkInValidDatasetFiles', NotificationExpire = 'notification_expire',
[TimerIdEnum.checkInvalidDatasetData]: 'checkInvalidDatasetData', NotificationFreeClean = 'notification_free_clean',
[TimerIdEnum.checkInvalidVector]: 'checkInvalidVector', NotificationLackOfPoints = 'notification_lack_of_points'
[TimerIdEnum.clearExpiredSubPlan]: 'clearExpiredSubPlan', }
[TimerIdEnum.updateStandardPlan]: 'updateStandardPlan',
[TimerIdEnum.scheduleTriggerApp]: 'scheduleTriggerApp' export type LockType = `${LockNotificationEnum}`;
};
// add a new type enum example:
// export enum ExampleLockEnum {
// ExampleLockType1 = 'example_lock_type1'
// }
//
// export type LockType = `${NotificationLockEnum}` | `${ExampleLockEnum}`
packages/service/common/system/timerLock/schema.ts
import { connectionMongo, getMongoModel, type Model } from '../../mongo'; import { connectionMongo, getMongoModel } from '../../mongo';
import { timerIdMap } from './constants'; const { Schema } = connectionMongo;
const { Schema, model, models } = connectionMongo;
import { TimerLockSchemaType } from './type.d'; import { TimerLockSchemaType } from './type.d';
export const collectionName = 'systemtimerlocks'; export const collectionName = 'systemtimerlocks';
...@@ -9,8 +8,7 @@ const TimerLockSchema = new Schema({ ...@@ -9,8 +8,7 @@ const TimerLockSchema = new Schema({
timerId: { timerId: {
type: String, type: String,
required: true, required: true,
unique: true, unique: true
enum: Object.keys(timerIdMap)
}, },
expiredTime: { expiredTime: {
type: Date, type: Date,
......
packages/service/common/system/timerLock/utils.ts
import { TimerIdEnum } from './constants';
import { MongoTimerLock } from './schema'; import { MongoTimerLock } from './schema';
import { addMinutes } from 'date-fns'; import { addMinutes } from 'date-fns';
...@@ -9,7 +8,7 @@ export const checkTimerLock = async ({ ...@@ -9,7 +8,7 @@ export const checkTimerLock = async ({
timerId, timerId,
lockMinuted lockMinuted
}: { }: {
timerId: TimerIdEnum; timerId: string;
lockMinuted: number; lockMinuted: number;
}) => { }) => {
try { try {
......
packages/service/support/user/controller.ts
...@@ -45,6 +45,8 @@ export async function getUserDetail({ ...@@ -45,6 +45,8 @@ export async function getUserDetail({
timezone: user.timezone, timezone: user.timezone,
promotionRate: user.promotionRate, promotionRate: user.promotionRate,
openaiAccount: user.openaiAccount, openaiAccount: user.openaiAccount,
team: tmb team: tmb,
notificationAccount: tmb.notificationAccount,
permission: tmb.permission
}; };
} }
packages/service/support/user/schema.ts
import { connectionMongo, getMongoModel, type Model } from '../../common/mongo'; import { connectionMongo, getMongoModel } from '../../common/mongo';
const { Schema, model, models } = connectionMongo; const { Schema } = connectionMongo;
import { hashStr } from '@fastgpt/global/common/string/tools'; import { hashStr } from '@fastgpt/global/common/string/tools';
import type { UserModelSchema } from '@fastgpt/global/support/user/type'; import type { UserModelSchema } from '@fastgpt/global/support/user/type';
import { UserStatusEnum, userStatusMap } from '@fastgpt/global/support/user/constant'; import { UserStatusEnum, userStatusMap } from '@fastgpt/global/support/user/constant';
...@@ -18,15 +18,9 @@ const UserSchema = new Schema({ ...@@ -18,15 +18,9 @@ const UserSchema = new Schema({
required: true, required: true,
unique: true // 唯一 unique: true // 唯一
}, },
email: {
type: String
},
phonePrefix: { phonePrefix: {
type: Number type: Number
}, },
phone: {
type: String
},
password: { password: {
type: String, type: String,
required: true, required: true,
......
packages/service/support/user/team/controller.ts
...@@ -40,7 +40,8 @@ async function getTeamMember(match: Record<string, any>): Promise<TeamTmbItemTyp ...@@ -40,7 +40,8 @@ async function getTeamMember(match: Record<string, any>): Promise<TeamTmbItemTyp
permission: new TeamPermission({ permission: new TeamPermission({
per: tmbPer?.permission ?? tmb.teamId.defaultPermission, per: tmbPer?.permission ?? tmb.teamId.defaultPermission,
isOwner: tmb.role === TeamMemberRoleEnum.owner isOwner: tmb.role === TeamMemberRoleEnum.owner
}) }),
notificationAccount: tmb.teamId.notificationAccount
}; };
} }
......
packages/service/support/user/team/teamSchema.ts
import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo'; import { connectionMongo, getMongoModel } from '../../../common/mongo';
const { Schema, model, models } = connectionMongo; const { Schema } = connectionMongo;
import { TeamSchema as TeamType } from '@fastgpt/global/support/user/team/type.d'; import { TeamSchema as TeamType } from '@fastgpt/global/support/user/team/type.d';
import { userCollectionName } from '../../user/schema'; import { userCollectionName } from '../../user/schema';
import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant'; import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
...@@ -51,6 +51,10 @@ const TeamSchema = new Schema({ ...@@ -51,6 +51,10 @@ const TeamSchema = new Schema({
pat: { pat: {
type: String type: String
} }
},
notificationAccount: {
type: String,
required: false
} }
}); });
......
packages/service/support/wallet/sub/schema.ts
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
1. type=standard: There will only be 1, and each team will have one 1. type=standard: There will only be 1, and each team will have one
2. type=extraDatasetSize/extraPoints: Can buy multiple 2. type=extraDatasetSize/extraPoints: Can buy multiple
*/ */
import { connectionMongo, getMongoModel, type Model } from '../../../common/mongo'; import { connectionMongo, getMongoModel } from '../../../common/mongo';
const { Schema, model, models } = connectionMongo; const { Schema } = connectionMongo;
import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant'; import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
import { import {
standardSubLevelMap, standardSubLevelMap,
...@@ -84,11 +84,13 @@ const SubSchema = new Schema({ ...@@ -84,11 +84,13 @@ const SubSchema = new Schema({
}); });
try { try {
// get team plan // Get plan by expiredTime
SubSchema.index({ teamId: 1, type: 1, expiredTime: -1 }); SubSchema.index({ expiredTime: -1, currentSubLevel: 1 });
// timer task. check expired plan; update standard plan; // Get team plan
SubSchema.index({ type: 1, currentSubLevel: 1, expiredTime: -1 }); SubSchema.index({ teamId: 1, type: 1, expiredTime: -1 });
// timer task. Get standard plan;Get free plan;Clear expired extract plan
SubSchema.index({ type: 1, expiredTime: -1, currentSubLevel: 1 });
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
......
packages/service/support/wallet/usage/schema.ts
...@@ -63,7 +63,7 @@ const UsageSchema = new Schema({ ...@@ -63,7 +63,7 @@ const UsageSchema = new Schema({
try { try {
UsageSchema.index({ teamId: 1, tmbId: 1, source: 1, time: -1 }, { background: true }); UsageSchema.index({ teamId: 1, tmbId: 1, source: 1, time: -1 }, { background: true });
// timer task. clear dead team // timer task. clear dead team
UsageSchema.index({ teamId: 1, time: -1 }, { background: true }); // UsageSchema.index({ teamId: 1, time: -1 }, { background: true });
UsageSchema.index({ time: 1 }, { expireAfterSeconds: 180 * 24 * 60 * 60 }); UsageSchema.index({ time: 1 }, { expireAfterSeconds: 180 * 24 * 60 * 60 });
} catch (error) { } catch (error) {
......
packages/web/i18n/en/common.json
...@@ -1165,6 +1165,8 @@ ...@@ -1165,6 +1165,8 @@
"Language": "Language", "Language": "Language",
"Member Name": "Nickname", "Member Name": "Nickname",
"Notice": "Notice", "Notice": "Notice",
"Notification Receive": "Notification Receive",
"Notification Receive Bind": "Please bind notification receive method",
"Old password is error": "Old password is incorrect", "Old password is error": "Old password is incorrect",
"OpenAI Account Setting": "OpenAI account settings", "OpenAI Account Setting": "OpenAI account settings",
"Password": "Password", "Password": "Password",
......
packages/web/i18n/en/user.json
{ {
"bind_inform_account_error": "Abnormal binding notification account",
"bind_inform_account_success": "Binding notification account successful",
"permission": { "permission": {
"Manage": "administrator", "Manage": "administrator",
"Manage tip": "Team administrator, with full permissions", "Manage tip": "Team administrator, with full permissions",
...@@ -10,4 +12,4 @@ ...@@ -10,4 +12,4 @@
"team": { "team": {
"Add manager": "Add manager" "Add manager": "Add manager"
} }
} }
\ No newline at end of file
packages/web/i18n/zh/common.json
...@@ -992,6 +992,8 @@ ...@@ -992,6 +992,8 @@
} }
}, },
"user": { "user": {
"Email Or Phone": "邮箱/手机号",
"Verify Code": "验证码",
"Avatar": "头像", "Avatar": "头像",
"Go laf env": "点击前往 {{env}} 获取 PAT 凭证。", "Go laf env": "点击前往 {{env}} 获取 PAT 凭证。",
"Laf account course": "查看绑定 laf 账号教程。", "Laf account course": "查看绑定 laf 账号教程。",
...@@ -1165,6 +1167,8 @@ ...@@ -1165,6 +1167,8 @@
"Language": "语言", "Language": "语言",
"Member Name": "昵称", "Member Name": "昵称",
"Notice": "通知", "Notice": "通知",
"Notification Receive": "通知接收",
"Notification Receive Bind": "请绑定通知接收途径",
"Old password is error": "旧密码错误", "Old password is error": "旧密码错误",
"OpenAI Account Setting": "OpenAI 账号配置", "OpenAI Account Setting": "OpenAI 账号配置",
"Password": "密码", "Password": "密码",
......
packages/web/i18n/zh/user.json
{ {
"bind_inform_account_error": "绑定通知账号异常",
"bind_inform_account_success": "绑定通知账号成功",
"notification": {
"Bind Notification Pipe Hint": "绑定接收通知的邮箱或手机号，以确保您能及时接收到重要的系统通知。"
},
"permission": { "permission": {
"Manage": "管理员", "Manage": "管理员",
"Manage tip": "团队管理员，拥有全部权限", "Manage tip": "团队管理员，拥有全部权限",
...@@ -10,4 +15,4 @@ ...@@ -10,4 +15,4 @@
"team": { "team": {
"Add manager": "添加管理员" "Add manager": "添加管理员"
} }
} }
\ No newline at end of file
projects/app/src/pages/account/components/Info.tsx
...@@ -50,6 +50,7 @@ const StandDetailModal = dynamic(() => import('./standardDetailModal')); ...@@ -50,6 +50,7 @@ const StandDetailModal = dynamic(() => import('./standardDetailModal'));
const TeamMenu = dynamic(() => import('@/components/support/user/team/TeamMenu')); const TeamMenu = dynamic(() => import('@/components/support/user/team/TeamMenu'));
const PayModal = dynamic(() => import('./PayModal')); const PayModal = dynamic(() => import('./PayModal'));
const UpdatePswModal = dynamic(() => import('./UpdatePswModal')); const UpdatePswModal = dynamic(() => import('./UpdatePswModal'));
const UpdateNotification = dynamic(() => import('./UpdateNotificationModal'));
const OpenAIAccountModal = dynamic(() => import('./OpenAIAccountModal')); const OpenAIAccountModal = dynamic(() => import('./OpenAIAccountModal'));
const LafAccountModal = dynamic(() => import('@/components/support/laf/LafAccountModal')); const LafAccountModal = dynamic(() => import('@/components/support/laf/LafAccountModal'));
const CommunityModal = dynamic(() => import('@/components/CommunityModal')); const CommunityModal = dynamic(() => import('@/components/CommunityModal'));
...@@ -113,6 +114,11 @@ const MyInfo = () => { ...@@ -113,6 +114,11 @@ const MyInfo = () => {
onClose: onCloseUpdatePsw, onClose: onCloseUpdatePsw,
onOpen: onOpenUpdatePsw onOpen: onOpenUpdatePsw
} = useDisclosure(); } = useDisclosure();
const {
isOpen: isOpenUpdateNotification,
onClose: onCloseUpdateNotification,
onOpen: onOpenUpdateNotification
} = useDisclosure();
const { File, onOpen: onOpenSelectFile } = useSelectFile({ const { File, onOpen: onOpenSelectFile } = useSelectFile({
fileType: '.jpg,.png', fileType: '.jpg,.png',
multiple: false multiple: false
...@@ -225,7 +231,7 @@ const MyInfo = () => { ...@@ -225,7 +231,7 @@ const MyInfo = () => {
</Flex> </Flex>
</Flex> </Flex>
)} )}
{feConfigs.isPlus && ( {feConfigs?.isPlus && (
<Flex mt={[0, 4]} alignItems={'center'}> <Flex mt={[0, 4]} alignItems={'center'}>
<Box {...labelStyles}>{t('common:user.Member Name')}:&nbsp;</Box> <Box {...labelStyles}>{t('common:user.Member Name')}:&nbsp;</Box>
<Input <Input
...@@ -249,7 +255,7 @@ const MyInfo = () => { ...@@ -249,7 +255,7 @@ const MyInfo = () => {
<Box {...labelStyles}>{t('common:user.Account')}:&nbsp;</Box> <Box {...labelStyles}>{t('common:user.Account')}:&nbsp;</Box>
<Box flex={1}>{userInfo?.username}</Box> <Box flex={1}>{userInfo?.username}</Box>
</Flex> </Flex>
{feConfigs.isPlus && ( {feConfigs?.isPlus && (
<Flex mt={6} alignItems={'center'}> <Flex mt={6} alignItems={'center'}>
<Box {...labelStyles}>{t('common:user.Password')}:&nbsp;</Box> <Box {...labelStyles}>{t('common:user.Password')}:&nbsp;</Box>
<Box flex={1}>*****</Box> <Box flex={1}>*****</Box>
...@@ -258,13 +264,27 @@ const MyInfo = () => { ...@@ -258,13 +264,27 @@ const MyInfo = () => {
</Button> </Button>
</Flex> </Flex>
)} )}
{feConfigs?.isPlus && (
<Flex mt={6} alignItems={'center'}>
<Box {...labelStyles}>{t('common:user.Notification Receive')}:&nbsp;</Box>
<Box flex={1} {...(userInfo?.team.notificationAccount ? {} : { color: 'red.600' })}>
{userInfo?.team.notificationAccount || t('common:user.Notification Receive Bind')}
</Box>
{userInfo?.permission.isOwner && (
<Button size={'sm'} variant={'whitePrimary'} onClick={onOpenUpdateNotification}>
{t('common:user.Change')}
</Button>
)}
</Flex>
)}
<Flex mt={6} alignItems={'center'}> <Flex mt={6} alignItems={'center'}>
<Box {...labelStyles}>{t('common:user.Team')}:&nbsp;</Box> <Box {...labelStyles}>{t('common:user.Team')}:&nbsp;</Box>
<Box flex={1}> <Box flex={1}>
<TeamMenu /> <TeamMenu />
</Box> </Box>
</Flex> </Flex>
{feConfigs.isPlus && ( {feConfigs?.isPlus && (
<Box mt={6} whiteSpace={'nowrap'}> <Box mt={6} whiteSpace={'nowrap'}>
<Flex alignItems={'center'}> <Flex alignItems={'center'}>
<Box {...labelStyles}>{t('common:user.team.Balance')}:&nbsp;</Box> <Box {...labelStyles}>{t('common:user.team.Balance')}:&nbsp;</Box>
...@@ -282,6 +302,7 @@ const MyInfo = () => { ...@@ -282,6 +302,7 @@ const MyInfo = () => {
</Box> </Box>
{isOpenPayModal && <PayModal onClose={onClosePayModal} />} {isOpenPayModal && <PayModal onClose={onClosePayModal} />}
{isOpenUpdatePsw && <UpdatePswModal onClose={onCloseUpdatePsw} />} {isOpenUpdatePsw && <UpdatePswModal onClose={onCloseUpdatePsw} />}
{isOpenUpdateNotification && <UpdateNotification onClose={onCloseUpdateNotification} />}
<File onSelect={onSelectFile} /> <File onSelect={onSelectFile} />
</Box> </Box>
); );
...@@ -579,7 +600,7 @@ const Other = () => { ...@@ -579,7 +600,7 @@ const Other = () => {
)} )}
{feConfigs?.chatbotUrl && ( {feConfigs?.chatbotUrl && (
<Link <Link
href={feConfigs.chatbotUrl} href={feConfigs?.chatbotUrl}
target="_blank" target="_blank"
display={'flex'} display={'flex'}
py={3} py={3}
......
projects/app/src/pages/account/components/UpdateNotificationModal.tsx 0 → 100644
import React, { useCallback } from 'react';
import { ModalBody, Box, Flex, Input, ModalFooter, Button, HStack } from '@chakra-ui/react';
import MyModal from '@fastgpt/web/components/common/MyModal';
import { useTranslation } from 'next-i18next';
import { useForm } from 'react-hook-form';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { updateNotificationAccount } from '@/web/support/user/api';
import Icon from '@fastgpt/web/components/common/Icon';
import { useSendCode } from '@/web/support/user/hooks/useSendCode';
import { useUserStore } from '@/web/support/user/useUserStore';
type FormType = {
account: string;
verifyCode: string;
};
const UpdateNotificationModal = ({ onClose }: { onClose: () => void }) => {
const { t } = useTranslation();
const { initUserInfo } = useUserStore();
const { register, handleSubmit, trigger, getValues, watch } = useForm<FormType>({
defaultValues: {
account: '',
verifyCode: ''
}
});
const account = watch('account');
const verifyCode = watch('verifyCode');
const { runAsync: onSubmit, loading: isLoading } = useRequest2(
(data: FormType) => {
return updateNotificationAccount(data);
},
{
onSuccess() {
initUserInfo();
onClose();
},
successToast: t('user:bind_inform_account_success'),
errorToast: t('user:bind_inform_account_error')
}
);
const { sendCodeText, sendCode, codeCountDown } = useSendCode();
const onclickSendCode = useCallback(async () => {
const check = await trigger('account');
if (!check) return;
sendCode({
username: getValues('account'),
type: 'bindNotification'
});
}, [getValues, sendCode, trigger]);
return (
<MyModal
isOpen
iconSrc="common/settingLight"
w={'32rem'}
title={t('common:user.Notification Receive')}
>
<ModalBody px={10}>
<Flex flexDirection="column">
<HStack px="6" py="3" color="primary.600" bgColor="primary.50" borderRadius="md">
<Icon name="common/info" w="1rem" />
<Box fontSize={'sm'}>{t('user:notification.Bind Notification Pipe Hint')}</Box>
</HStack>
<Flex mt="4" alignItems="center">
<Box flex={'0 0 70px'}>{t('common:user.Account')}</Box>
<Input
flex={1}
bg={'myGray.50'}
{...register('account', { required: true })}
placeholder={t('common:support.user.Email Or Phone')}
></Input>
</Flex>
<Flex mt="6" alignItems="center" position={'relative'}>
<Box flex={'0 0 70px'}>{t('common:support.user.Verify Code')}</Box>
<Input
flex={1}
bg={'myGray.50'}
{...register('verifyCode', { required: true })}
placeholder={t('common:support.user.Verify Code')}
></Input>
<Box
position={'absolute'}
right={2}
zIndex={1}
fontSize={'sm'}
{...(codeCountDown > 0
? {
color: 'myGray.500'
}
: {
color: 'primary.700',
cursor: 'pointer',
onClick: onclickSendCode
})}
>
{sendCodeText}
</Box>
</Flex>
</Flex>
</ModalBody>
<ModalFooter>
<Button mr={3} variant={'whiteBase'} onClick={onClose}>
{t('common:common.Cancel')}
</Button>
<Button
isLoading={isLoading}
isDisabled={!account || !verifyCode}
onClick={handleSubmit((data) => onSubmit(data))}
>
{t('common:common.Confirm')}
</Button>
</ModalFooter>
</MyModal>
);
};
export default UpdateNotificationModal;
projects/app/src/pages/api/support/user/account/loginByPassword.ts
...@@ -6,6 +6,7 @@ import { connectToDatabase } from '@/service/mongo'; ...@@ -6,6 +6,7 @@ import { connectToDatabase } from '@/service/mongo';
import { getUserDetail } from '@fastgpt/service/support/user/controller'; import { getUserDetail } from '@fastgpt/service/support/user/controller';
import type { PostLoginProps } from '@fastgpt/global/support/user/api.d'; import type { PostLoginProps } from '@fastgpt/global/support/user/api.d';
import { UserStatusEnum } from '@fastgpt/global/support/user/constant'; import { UserStatusEnum } from '@fastgpt/global/support/user/constant';
import { checkTeamAiPointsAndLock } from '@/service/events/utils';
export default async function handler(req: NextApiRequest, res: NextApiResponse) { export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try { try {
......
projects/app/src/pages/api/support/user/account/tokenLogin.ts
import type { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@fastgpt/service/common/response';
import { authCert } from '@fastgpt/service/support/permission/auth/common'; import { authCert } from '@fastgpt/service/support/permission/auth/common';
import { connectToDatabase } from '@/service/mongo';
import { getUserDetail } from '@fastgpt/service/support/user/controller'; import { getUserDetail } from '@fastgpt/service/support/user/controller';
import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
export default async function handler(req: NextApiRequest, res: NextApiResponse) { import { NextAPI } from '@/service/middleware/entry';
try { export type TokenLoginQuery = {};
await connectToDatabase(); export type TokenLoginBody = {};
const { tmbId } = await authCert({ req, authToken: true }); export type TokenLoginResponse = {};
async function handler(
jsonRes(res, { req: ApiRequestProps<TokenLoginBody, TokenLoginQuery>,
data: await getUserDetail({ tmbId }) _res: ApiResponseType<any>
}); ): Promise<TokenLoginResponse> {
} catch (err) { const { tmbId } = await authCert({ req, authToken: true });
jsonRes(res, { return getUserDetail({ tmbId });
code: 500,
error: err
});
}
} }
export default NextAPI(handler);
projects/app/src/pages/api/support/user/account/update.ts
import type { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@fastgpt/service/common/response';
import { MongoUser } from '@fastgpt/service/support/user/schema'; import { MongoUser } from '@fastgpt/service/support/user/schema';
import { authCert } from '@fastgpt/service/support/permission/auth/common'; import { authCert } from '@fastgpt/service/support/permission/auth/common';
import { UserUpdateParams } from '@/types/user'; import { UserUpdateParams } from '@/types/user';
import { getAIApi, openaiBaseUrl } from '@fastgpt/service/core/ai/config'; import { getAIApi, openaiBaseUrl } from '@fastgpt/service/core/ai/config';
import { connectToDatabase } from '@/service/mongo';
import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema'; import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
/* update user info */ /* update user info */
export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) { import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
try { import { NextAPI } from '@/service/middleware/entry';
await connectToDatabase(); export type UserAccountUpdateQuery = {};
const { avatar, timezone, openaiAccount, lafAccount } = req.body as UserUpdateParams; export type UserAccountUpdateBody = UserUpdateParams;
export type UserAccountUpdateResponse = {};
async function handler(
req: ApiRequestProps<UserAccountUpdateBody, UserAccountUpdateQuery>,
_res: ApiResponseType<any>
): Promise<UserAccountUpdateResponse> {
const { avatar, timezone, openaiAccount, lafAccount } = req.body;
const { tmbId } = await authCert({ req, authToken: true }); const { tmbId } = await authCert({ req, authToken: true });
const tmb = await MongoTeamMember.findById(tmbId); const tmb = await MongoTeamMember.findById(tmbId);
if (!tmb) { if (!tmb) {
throw new Error('can not find it'); throw new Error('can not find it');
} }
const userId = tmb.userId; const userId = tmb.userId;
// auth key // auth key
if (openaiAccount?.key) { if (openaiAccount?.key) {
console.log('auth user openai key', openaiAccount?.key); console.log('auth user openai key', openaiAccount?.key);
const baseUrl = openaiAccount?.baseUrl || openaiBaseUrl; const baseUrl = openaiAccount?.baseUrl || openaiBaseUrl;
openaiAccount.baseUrl = baseUrl; openaiAccount.baseUrl = baseUrl;
const ai = getAIApi({ const ai = getAIApi({
userKey: openaiAccount userKey: openaiAccount
}); });
const response = await ai.chat.completions.create({ const response = await ai.chat.completions.create({
model: 'gpt-4o-mini', model: 'gpt-4o-mini',
max_tokens: 1, max_tokens: 1,
messages: [{ role: 'user', content: 'hi' }] messages: [{ role: 'user', content: 'hi' }]
}); });
if (response?.choices?.[0]?.message?.content === undefined) { if (response?.choices?.[0]?.message?.content === undefined) {
throw new Error('Key response is empty'); throw new Error('Key response is empty');
}
} }
}
// 更新对应的记录 // 更新对应的记录
await MongoUser.updateOne( await MongoUser.updateOne(
{ {
_id: userId _id: userId
}, },
{ {
...(avatar && { avatar }), ...(avatar && { avatar }),
...(timezone && { timezone }), ...(timezone && { timezone }),
openaiAccount: openaiAccount?.key ? openaiAccount : null, openaiAccount: openaiAccount?.key ? openaiAccount : null,
lafAccount: lafAccount?.token ? lafAccount : null lafAccount: lafAccount?.token ? lafAccount : null
} }
); );
jsonRes(res); return {};
} catch (err) {
jsonRes(res, {
code: 500,
error: err
});
}
} }
export default NextAPI(handler);
projects/app/src/pages/app/list/components/List.tsx
...@@ -49,7 +49,6 @@ const ListItem = () => { ...@@ -49,7 +49,6 @@ const ListItem = () => {
const { parentId = null } = router.query; const { parentId = null } = router.query;
const { isPc } = useSystem(); const { isPc } = useSystem();
const { lastChatAppId, setLastChatAppId } = useChatStore(); const { lastChatAppId, setLastChatAppId } = useChatStore();
const { myApps, loadMyApps, onUpdateApp, setMoveAppId, folderDetail } = useContextSelector( const { myApps, loadMyApps, onUpdateApp, setMoveAppId, folderDetail } = useContextSelector(
AppListContext, AppListContext,
......
projects/app/src/service/events/generateQA.ts
...@@ -88,7 +88,7 @@ export async function generateQA(): Promise<any> { ...@@ -88,7 +88,7 @@ export async function generateQA(): Promise<any> {
} }
// auth balance // auth balance
if (!(await checkTeamAiPointsAndLock(data.teamId, data.tmbId))) { if (!(await checkTeamAiPointsAndLock(data.teamId))) {
reduceQueue(); reduceQueue();
return generateQA(); return generateQA();
} }
......
projects/app/src/service/events/generateVector.ts
...@@ -89,7 +89,7 @@ export async function generateVector(): Promise<any> { ...@@ -89,7 +89,7 @@ export async function generateVector(): Promise<any> {
} }
// auth balance // auth balance
if (!(await checkTeamAiPointsAndLock(data.teamId, data.tmbId))) { if (!(await checkTeamAiPointsAndLock(data.teamId))) {
reduceQueue(); reduceQueue();
return generateVector(); return generateVector();
} }
......
projects/app/src/service/events/utils.ts
...@@ -4,7 +4,7 @@ import { sendOneInform } from '../support/user/inform/api'; ...@@ -4,7 +4,7 @@ import { sendOneInform } from '../support/user/inform/api';
import { lockTrainingDataByTeamId } from '@fastgpt/service/core/dataset/training/controller'; import { lockTrainingDataByTeamId } from '@fastgpt/service/core/dataset/training/controller';
import { InformLevelEnum } from '@fastgpt/global/support/user/inform/constants'; import { InformLevelEnum } from '@fastgpt/global/support/user/inform/constants';
export const checkTeamAiPointsAndLock = async (teamId: string, tmbId: string) => { export const checkTeamAiPointsAndLock = async (teamId: string) => {
try { try {
await checkTeamAIPoints(teamId); await checkTeamAIPoints(teamId);
return true; return true;
...@@ -13,11 +13,10 @@ export const checkTeamAiPointsAndLock = async (teamId: string, tmbId: string) => ...@@ -13,11 +13,10 @@ export const checkTeamAiPointsAndLock = async (teamId: string, tmbId: string) =>
// send inform and lock data // send inform and lock data
try { try {
sendOneInform({ sendOneInform({
level: InformLevelEnum.important, level: InformLevelEnum.emergency,
title: '文本训练任务中止', templateCode: 'LACK_OF_POINTS',
content: templateParam: {},
'该团队账号AI积分不足，文本训练任务中止，重新充值后将会继续。暂停的任务将在 7 天后被删除。', teamId
tmbId: tmbId
}); });
console.log('余额不足，暂停【向量】生成任务'); console.log('余额不足，暂停【向量】生成任务');
lockTrainingDataByTeamId(teamId); lockTrainingDataByTeamId(teamId);
......
projects/app/src/web/support/user/api.ts
...@@ -63,6 +63,9 @@ export const updatePasswordByOld = ({ oldPsw, newPsw }: { oldPsw: string; newPsw ...@@ -63,6 +63,9 @@ export const updatePasswordByOld = ({ oldPsw, newPsw }: { oldPsw: string; newPsw
newPsw: hashStr(newPsw) newPsw: hashStr(newPsw)
}); });
export const updateNotificationAccount = (data: { account: string; verifyCode: string }) =>
PUT('/proApi/support/user/team/updateNotificationAccount', data);
export const postLogin = ({ password, ...props }: PostLoginProps) => export const postLogin = ({ password, ...props }: PostLoginProps) =>
POST<ResLogin>('/support/user/account/loginByPassword', { POST<ResLogin>('/support/user/account/loginByPassword', {
...props, ...props,
......
projects/app/src/web/support/user/hooks/useSendCode.ts
import { useState, useMemo, useCallback } from 'react'; import { useState, useMemo } from 'react';
import { sendAuthCode } from '@/web/support/user/api'; import { sendAuthCode } from '@/web/support/user/api';
import { UserAuthTypeEnum } from '@fastgpt/global/support/user/auth/constants'; import { UserAuthTypeEnum } from '@fastgpt/global/support/user/auth/constants';
import { useToast } from '@fastgpt/web/hooks/useToast';
import { getErrText } from '@fastgpt/global/common/error/utils';
import { useTranslation } from 'next-i18next'; import { useTranslation } from 'next-i18next';
import { useSystemStore } from '@/web/common/system/useSystemStore'; import { useSystemStore } from '@/web/common/system/useSystemStore';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
let timer: any; let timer: NodeJS.Timeout;
export const useSendCode = () => { export const useSendCode = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const { toast } = useToast();
const { feConfigs } = useSystemStore(); const { feConfigs } = useSystemStore();
const [codeSending, setCodeSending] = useState(false);
const [codeCountDown, setCodeCountDown] = useState(0); const [codeCountDown, setCodeCountDown] = useState(0);
const { runAsync: sendCode, loading: codeSending } = useRequest2(
async ({ username, type }: { username: string; type: `${UserAuthTypeEnum}` }) => {
if (codeCountDown > 0) return;
const googleToken = await getClientToken(feConfigs.googleClientVerKey);
await sendAuthCode({ username, type, googleToken });
setCodeCountDown(60);
timer = setInterval(() => {
setCodeCountDown((val) => {
if (val <= 0) {
clearInterval(timer);
}
return val - 1;
});
}, 1000);
},
{
successToast: '验证码已发送',
errorToast: '验证码发送异常',
refreshDeps: [codeCountDown, feConfigs?.googleClientVerKey]
}
);
const sendCodeText = useMemo(() => { const sendCodeText = useMemo(() => {
if (codeSending) return t('common:support.user.auth.Sending Code'); if (codeSending) return t('common:support.user.auth.Sending Code');
if (codeCountDown >= 10) { if (codeCountDown >= 10) {
...@@ -25,41 +46,6 @@ export const useSendCode = () => { ...@@ -25,41 +46,6 @@ export const useSendCode = () => {
return '获取验证码'; return '获取验证码';
}, [codeCountDown, codeSending, t]); }, [codeCountDown, codeSending, t]);
const sendCode = useCallback(
async ({ username, type }: { username: string; type: `${UserAuthTypeEnum}` }) => {
if (codeCountDown > 0) return;
setCodeSending(true);
try {
await sendAuthCode({
username,
type,
googleToken: await getClientToken(feConfigs.googleClientVerKey)
});
setCodeCountDown(60);
timer = setInterval(() => {
setCodeCountDown((val) => {
if (val <= 0) {
clearInterval(timer);
}
return val - 1;
});
}, 1000);
toast({
title: '验证码已发送',
status: 'success',
position: 'top'
});
} catch (error: any) {
toast({
title: getErrText(error, '验证码发送异常'),
status: 'error'
});
}
setCodeSending(false);
},
[codeCountDown, feConfigs?.googleClientVerKey, toast]
);
return { return {
codeSending, codeSending,
sendCode, sendCode,
......
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