mirror of
https://github.com/labring/FastGPT.git
synced 2025-07-23 05:12:39 +00:00
add baidu keywords (#3127)
This commit is contained in:
3
packages/global/support/user/type.d.ts
vendored
3
packages/global/support/user/type.d.ts
vendored
@@ -18,6 +18,9 @@ export type UserModelSchema = {
|
|||||||
key: string;
|
key: string;
|
||||||
baseUrl: string;
|
baseUrl: string;
|
||||||
};
|
};
|
||||||
|
fastgpt_sem?: {
|
||||||
|
keyword: string;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export type UserType = {
|
export type UserType = {
|
||||||
|
@@ -70,6 +70,9 @@ const UserSchema = new Schema({
|
|||||||
},
|
},
|
||||||
lastLoginTmbId: {
|
lastLoginTmbId: {
|
||||||
type: Schema.Types.ObjectId
|
type: Schema.Types.ObjectId
|
||||||
|
},
|
||||||
|
fastgpt_sem: {
|
||||||
|
type: Object
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@@ -71,7 +71,8 @@ const FormLayout = ({ children, setPageType, pageType }: Props) => {
|
|||||||
: [])
|
: [])
|
||||||
];
|
];
|
||||||
|
|
||||||
const show_oauth = !!(feConfigs?.sso || oAuthList.length > 0);
|
const show_oauth =
|
||||||
|
!sessionStorage.getItem('bd_vid') && !!(feConfigs?.sso || oAuthList.length > 0);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex flexDirection={'column'} h={'100%'}>
|
<Flex flexDirection={'column'} h={'100%'}>
|
||||||
|
@@ -45,13 +45,24 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
|
|||||||
|
|
||||||
const { runAsync: onclickRegister, loading: requesting } = useRequest2(
|
const { runAsync: onclickRegister, loading: requesting } = useRequest2(
|
||||||
async ({ username, password, code }: RegisterType) => {
|
async ({ username, password, code }: RegisterType) => {
|
||||||
|
const fastgpt_sem = (() => {
|
||||||
|
try {
|
||||||
|
return sessionStorage.getItem('fastgpt_sem')
|
||||||
|
? JSON.parse(sessionStorage.getItem('fastgpt_sem')!)
|
||||||
|
: undefined;
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
|
||||||
loginSuccess(
|
loginSuccess(
|
||||||
await postRegister({
|
await postRegister({
|
||||||
username,
|
username,
|
||||||
code,
|
code,
|
||||||
password,
|
password,
|
||||||
inviterId: localStorage.getItem('inviterId') || undefined,
|
inviterId: localStorage.getItem('inviterId') || undefined,
|
||||||
bd_vid: localStorage.getItem('bd_vid') || undefined
|
bd_vid: sessionStorage.getItem('bd_vid') || undefined,
|
||||||
|
fastgpt_sem: fastgpt_sem
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@@ -86,6 +86,11 @@ const Login = ({ ChineseRedirectUrl }: { ChineseRedirectUrl: string }) => {
|
|||||||
|
|
||||||
/* default login type */
|
/* default login type */
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
const bd_vid = sessionStorage.getItem('bd_vid');
|
||||||
|
if (bd_vid) {
|
||||||
|
setPageType(LoginPageTypeEnum.passwordLogin);
|
||||||
|
return;
|
||||||
|
}
|
||||||
setPageType(
|
setPageType(
|
||||||
feConfigs?.oauth?.wechat ? LoginPageTypeEnum.wechat : LoginPageTypeEnum.passwordLogin
|
feConfigs?.oauth?.wechat ? LoginPageTypeEnum.wechat : LoginPageTypeEnum.passwordLogin
|
||||||
);
|
);
|
||||||
|
@@ -8,7 +8,7 @@ import { TrackEventName } from '../common/system/constants';
|
|||||||
|
|
||||||
export const useInitApp = () => {
|
export const useInitApp = () => {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { hiId, bd_vid } = router.query as { hiId?: string; bd_vid?: string };
|
const { hiId, bd_vid, k } = router.query as { hiId?: string; bd_vid?: string; k?: string };
|
||||||
const { loadGitStar, setInitd, feConfigs } = useSystemStore();
|
const { loadGitStar, setInitd, feConfigs } = useSystemStore();
|
||||||
const [scripts, setScripts] = useState<FastGPTFeConfigsType['scripts']>([]);
|
const [scripts, setScripts] = useState<FastGPTFeConfigsType['scripts']>([]);
|
||||||
const [title, setTitle] = useState(process.env.SYSTEM_NAME || 'AI');
|
const [title, setTitle] = useState(process.env.SYSTEM_NAME || 'AI');
|
||||||
@@ -59,8 +59,9 @@ export const useInitApp = () => {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
hiId && localStorage.setItem('inviterId', hiId);
|
hiId && localStorage.setItem('inviterId', hiId);
|
||||||
bd_vid && localStorage.setItem('bd_vid', bd_vid);
|
bd_vid && sessionStorage.setItem('bd_vid', bd_vid);
|
||||||
}, [bd_vid, hiId]);
|
k && sessionStorage.setItem('fastgpt_sem', JSON.stringify({ keyword: k }));
|
||||||
|
}, [bd_vid, hiId, k]);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
feConfigs,
|
feConfigs,
|
||||||
|
@@ -31,19 +31,24 @@ export const postRegister = ({
|
|||||||
password,
|
password,
|
||||||
code,
|
code,
|
||||||
inviterId,
|
inviterId,
|
||||||
bd_vid
|
bd_vid,
|
||||||
|
fastgpt_sem
|
||||||
}: {
|
}: {
|
||||||
username: string;
|
username: string;
|
||||||
code: string;
|
code: string;
|
||||||
password: string;
|
password: string;
|
||||||
inviterId?: string;
|
inviterId?: string;
|
||||||
bd_vid?: string;
|
bd_vid?: string;
|
||||||
|
fastgpt_sem?: {
|
||||||
|
keyword: string;
|
||||||
|
};
|
||||||
}) =>
|
}) =>
|
||||||
POST<ResLogin>(`/proApi/support/user/account/register/emailAndPhone`, {
|
POST<ResLogin>(`/proApi/support/user/account/register/emailAndPhone`, {
|
||||||
username,
|
username,
|
||||||
code,
|
code,
|
||||||
inviterId,
|
inviterId,
|
||||||
bd_vid,
|
bd_vid,
|
||||||
|
fastgpt_sem,
|
||||||
password: hashStr(password)
|
password: hashStr(password)
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user