Browse Source

登录对接

zouzs 1 week ago
parent
commit
0e611f07ac
3 changed files with 15 additions and 18 deletions
  1. 2 6
      src/store/modules/user.ts
  2. 5 4
      src/utils/auth.ts
  3. 8 8
      src/views/login/index.vue

+ 2 - 6
src/store/modules/user.ts

@@ -77,13 +77,9 @@ export const useUserStore = defineStore("pure-user", {
         const loginfn = submitType === 1 ? getLogin : verifySmsLogin;
         const loginfn = submitType === 1 ? getLogin : verifySmsLogin;
         loginfn(data)
         loginfn(data)
           .then(res => {
           .then(res => {
-            if (res?.code === 200) {
+            if (res?.code === 0) {
               setToken(res.data);
               setToken(res.data);
-              getUserInfo().then(response => {
-                if (response?.code === 200) {
-                  setUserInfo(response);
-                }
-              });
+              setUserInfo(res.data);
             }
             }
             resolve(res);
             resolve(res);
           })
           })

+ 5 - 4
src/utils/auth.ts

@@ -68,15 +68,16 @@ export function getToken(): DataInfo<number> {
  */
  */
 export function setToken(data: DataInfo<number>) {
 export function setToken(data: DataInfo<number>) {
   // const { accessToken, refreshToken } = data;
   // const { accessToken, refreshToken } = data;
-  const { access_token, expires_in } = data;
+  const expires = 0;
+  const { token } = data;
   const { isRemembered, loginDay } = useUserStoreHook();
   const { isRemembered, loginDay } = useUserStoreHook();
   // expires = new Date(data.expires).getTime(); // 如果后端直接设置时间戳,将此处代码改为expires = data.expires,然后把上面的DataInfo<Date>改成DataInfo<number>即可
   // expires = new Date(data.expires).getTime(); // 如果后端直接设置时间戳,将此处代码改为expires = data.expires,然后把上面的DataInfo<Date>改成DataInfo<number>即可
   // const cookieString = JSON.stringify({ token, expires, refreshToken });
   // const cookieString = JSON.stringify({ token, expires, refreshToken });
-  const cookieString = JSON.stringify({ access_token, expires_in });
+  const cookieString = JSON.stringify({ token, expires });
 
 
-  expires_in > 0
+  expires > 0
     ? Cookies.set(TokenKey, cookieString, {
     ? Cookies.set(TokenKey, cookieString, {
-        expires: expires_in
+        expires: expires
       })
       })
     : Cookies.set(TokenKey, cookieString);
     : Cookies.set(TokenKey, cookieString);
 
 

+ 8 - 8
src/views/login/index.vue

@@ -108,7 +108,7 @@ const getVerifySmsCode = () => {
     });
     });
 };
 };
 
 
-/*const onLogin = async (formEl: FormInstance | undefined) => {
+const onLogin = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   if (!formEl) return;
   const submitType = showVerifySms.value ? 2 : 1;
   const submitType = showVerifySms.value ? 2 : 1;
   // 1普通登录 2短信登录
   // 1普通登录 2短信登录
@@ -128,7 +128,7 @@ const getVerifySmsCode = () => {
           let { code, msg } = res;
           let { code, msg } = res;
           if (code === 0 || code === 3) {
           if (code === 0 || code === 3) {
             // 存储输入信息
             // 存储输入信息
-            /!*const { storageExpires } = commonSetting;
+            /*const { storageExpires } = commonSetting;
               if (formData.agree) {
               if (formData.agree) {
                 storage.setCookie(
                 storage.setCookie(
                   "loginRemember",
                   "loginRemember",
@@ -151,7 +151,7 @@ const getVerifySmsCode = () => {
                   "0",
                   "0",
                   storageExpires * 24 * 60 * 60
                   storageExpires * 24 * 60 * 60
                 );
                 );
-              }*!/
+              }*/
             message("登录成功,即将进入系统", {
             message("登录成功,即将进入系统", {
               type: "success",
               type: "success",
               duration: 1000,
               duration: 1000,
@@ -168,9 +168,9 @@ const getVerifySmsCode = () => {
                   );
                   );
                   console.log(route.name);
                   console.log(route.name);
                   if (route.name === "Login") {
                   if (route.name === "Login") {
-                    /!*initRouter().then(() => {
+                    /*initRouter().then(() => {
                       router.push(getTopMenu(true).path);
                       router.push(getTopMenu(true).path);
-                    });*!/
+                    });*/
                     // 全部采取静态路由模式
                     // 全部采取静态路由模式
                     usePermissionStoreHook().handleWholeMenus([]);
                     usePermissionStoreHook().handleWholeMenus([]);
                     addPathMatch();
                     addPathMatch();
@@ -218,9 +218,9 @@ const getVerifySmsCode = () => {
         .finally(() => (loading.value = false));
         .finally(() => (loading.value = false));
     }
     }
   });
   });
-};*/
+};
 
 
-const onLogin = async (formEl: FormInstance | undefined) => {
+/*const onLogin = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   if (!formEl) return;
   await formEl.validate(valid => {
   await formEl.validate(valid => {
     if (valid) {
     if (valid) {
@@ -237,7 +237,7 @@ const onLogin = async (formEl: FormInstance | undefined) => {
       loading.value = false;
       loading.value = false;
     }
     }
   });
   });
-};
+};*/
 
 
 const immediateDebounce: any = debounce(
 const immediateDebounce: any = debounce(
   formRef => onLogin(formRef),
   formRef => onLogin(formRef),