add baidu keywords (labring#3127)

dignfei · Nov 12, 2024 · 2c5f88b · 2c5f88b
1 parent 2e1bf66
commit 2c5f88b
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 6 deletions.
diff --git a/packages/global/support/user/type.d.ts b/packages/global/support/user/type.d.ts
@@ -18,6 +18,9 @@ export type UserModelSchema = {
     key: string;
     baseUrl: string;
   };
+  fastgpt_sem?: {
+    keyword: string;
+  };
 };
 
 export type UserType = {

diff --git a/packages/service/support/user/schema.ts b/packages/service/support/user/schema.ts
@@ -70,6 +70,9 @@ const UserSchema = new Schema({
   },
   lastLoginTmbId: {
     type: Schema.Types.ObjectId
+  },
+  fastgpt_sem: {
+    type: Object
   }
 });
 

diff --git a/projects/app/src/pages/login/components/LoginForm/components/FormLayout.tsx b/projects/app/src/pages/login/components/LoginForm/components/FormLayout.tsx
@@ -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 (
     <Flex flexDirection={'column'} h={'100%'}>

diff --git a/projects/app/src/pages/login/components/RegisterForm.tsx b/projects/app/src/pages/login/components/RegisterForm.tsx
@@ -45,13 +45,24 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
 
   const { runAsync: onclickRegister, loading: requesting } = useRequest2(
     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(
         await postRegister({
           username,
           code,
           password,
           inviterId: localStorage.getItem('inviterId') || undefined,
-          bd_vid: localStorage.getItem('bd_vid') || undefined
+          bd_vid: sessionStorage.getItem('bd_vid') || undefined,
+          fastgpt_sem: fastgpt_sem
         })
       );
 

diff --git a/projects/app/src/pages/login/index.tsx b/projects/app/src/pages/login/index.tsx
@@ -86,6 +86,11 @@ const Login = ({ ChineseRedirectUrl }: { ChineseRedirectUrl: string }) => {
 
   /* default login type */
   useEffect(() => {
+    const bd_vid = sessionStorage.getItem('bd_vid');
+    if (bd_vid) {
+      setPageType(LoginPageTypeEnum.passwordLogin);
+      return;
+    }
     setPageType(
       feConfigs?.oauth?.wechat ? LoginPageTypeEnum.wechat : LoginPageTypeEnum.passwordLogin
     );

diff --git a/projects/app/src/web/context/useInitApp.ts b/projects/app/src/web/context/useInitApp.ts
@@ -8,7 +8,7 @@ import { TrackEventName } from '../common/system/constants';
 
 export const useInitApp = () => {
   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 [scripts, setScripts] = useState<FastGPTFeConfigsType['scripts']>([]);
   const [title, setTitle] = useState(process.env.SYSTEM_NAME || 'AI');
@@ -59,8 +59,9 @@ export const useInitApp = () => {
 
   useEffect(() => {
     hiId && localStorage.setItem('inviterId', hiId);
-    bd_vid && localStorage.setItem('bd_vid', bd_vid);
-  }, [bd_vid, hiId]);
+    bd_vid && sessionStorage.setItem('bd_vid', bd_vid);
+    k && sessionStorage.setItem('fastgpt_sem', JSON.stringify({ keyword: k }));
+  }, [bd_vid, hiId, k]);
 
   return {
     feConfigs,

diff --git a/projects/app/src/web/support/user/api.ts b/projects/app/src/web/support/user/api.ts
@@ -31,19 +31,24 @@ export const postRegister = ({
   password,
   code,
   inviterId,
-  bd_vid
+  bd_vid,
+  fastgpt_sem
 }: {
   username: string;
   code: string;
   password: string;
   inviterId?: string;
   bd_vid?: string;
+  fastgpt_sem?: {
+    keyword: string;
+  };
 }) =>
   POST<ResLogin>(`/proApi/support/user/account/register/emailAndPhone`, {
     username,
     code,
     inviterId,
     bd_vid,
+    fastgpt_sem,
     password: hashStr(password)
   });