feat: 调整了登录的逻辑

src/App.vue

@@ -8,13 +8,8 @@ onLaunch(async () => {
   /// 获取环境配置
   await getEvnUrl();
   
-  /// 获取token
-  const token = getAccessToken();
-
-  if (token) {
   /// 刷新token
-    refreshToken();
+  await refreshToken();
-  }
 });
 
 onShow(() => {

src/hooks/useGoLogin.js

@@ -1,5 +1,5 @@
 import { oauthToken, checkUserPhone } from "@/request/api/LoginApi";
-import { loginAuth, bindPhone } from "@/manager/LoginManager";
+import { authLogin, refreshAuthLogin, checkRefreshToken } from "@/manager/LoginManager";
 import { clientId } from "@/constant/base";
 import { getAccessToken, removeAccessToken, setAccessToken } from "../constant/token";
 import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
@@ -10,6 +10,18 @@ export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" });
 // 登录成功后，返回上一页
 export const goBack = () => uni.navigateBack({ delta: 1 });
 
+// 检测token
+export const checkToken = () => {
+  const token = getAccessToken();
+  return new Promise((resolve) => {
+    if (!token) {
+      goLogin();
+      return;
+    }
+    resolve();
+  });
+};
+
 // 登录逻辑
 export const onLogin = async (e) => {
   console.info("onLogin code: ", e);
@@ -21,8 +33,8 @@ export const onLogin = async (e) => {
       return;
     }
 
-    await loginAuth(e).then(async () => {
+    await authLogin(e).then(async () => {
-      console.log("loginAuth resolve success");
+      console.log("authLogin resolve success");
       // 检查手机号是否绑定
       const checkRes = await checkUserPhone();
       if (checkRes.data) {
@@ -39,7 +51,7 @@ export const onLogin = async (e) => {
 
       // 绑定手机号
       const params = { wechatPhoneCode: code, clientId: clientId };
-      const res = await bindPhone(params);
+      const res = await bindUserPhone(params);
       if (res.data) {
         // 登录成功后，触发登录成功事件
         uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
@@ -53,70 +65,16 @@ export const onLogin = async (e) => {
   });
 };
 
-// 检测token
+/// 检查手机号登录
-export const checkToken = () => {
+export const onCheckPhoneLogin = async () => {
-  const token = getAccessToken();
-
-  return new Promise((resolve) => {
-    if (!token) {
-      goLogin();
-      return;
-    }
-
-    resolve();
-  });
-};
-
-// 刷新token
-export const refreshToken = () => {
-  let provider = "weixin";
-  let grant_type = "wechat";
-
-  // #ifdef APP-PLUS
-  const systemInfo = uni.getSystemInfoSync();
-  if (systemInfo.platform === "ios") {
-    provider = "apple";
-    grant_type = "apple";
-  }
-  // #endif
-  
   return new Promise(async (resolve) => {
-    uni.login({
+    await refreshAuthLogin().then(async () => {
-      provider,
+      // 刷新成功后，检查手机号是否绑定
-      success: async (loginRes) => {
+      const access_token = getAccessToken();
-        console.log("refreshToken success: ", JSON.stringify(loginRes));
-        const openIdCode =
-          provider === "apple"
-            ? loginRes.appleInfo && loginRes.appleInfo.identityToken
-            : loginRes.code;
-        console.log("获取到的授权code:", openIdCode);
-
-        if (!openIdCode) {
-          console.warn("refreshToken 未获取到登录 code");
-          resolve(true);
-          return;
-        }
-
-        const params = {
-          grant_type: grant_type,
-          clientId: clientId,
-          scope: "server",
-        };
-
-        if (provider === "apple") {
-          params.identityToken = openIdCode;
-        } else {
-          params.openIdCode = [openIdCode];
-        }
-        console.log("获取到的授权params:", JSON.stringify(params));
-
-        const response = await oauthToken(params);
-        if (response.access_token) {
-          setAccessToken(response.access_token);
-
       const checkRes = await checkUserPhone({
-            token: response.access_token,
+        token: access_token,
       });
+
       if (checkRes.data) {
         // 登录成功后，触发登录成功事件
         uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
@@ -124,12 +82,27 @@ export const refreshToken = () => {
       } else {
         resolve(true);
       }
-        }
-      },
-      fail: (err) => {
-        console.warn("refreshToken uni.login fail:", err);
-        resolve(true);
-      },
     });
   });
 };
+
+/// apple登录
+export const onAppleLogin = async (e) => { 
+  return new Promise(async (resolve) => {
+    await refreshAuthLogin()
+      .then(() => {
+        // 登录成功后，触发登录成功事件
+        uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
+        resolve(true);
+      })
+      .catch(() => {
+        resolve(false);
+      });
+  });
+}
+
+
+/// 刷新 token
+export const refreshToken = async () => {
+  await checkRefreshToken()
+};

src/manager/LoginManager.js

@@ -1,12 +1,64 @@
 import { oauthToken, bindUserPhone } from "../request/api/LoginApi";
 import { clientId } from "@/constant/base";
 import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
-import { removeAccessToken, setAccessToken } from "../constant/token";
+import { removeAccessToken, setAccessToken, getRefreshToken, setRefreshToken, getAccessToken } from "../constant/token";
 
-const loginAuth = (e) => {
+const authLogin = (e) => {
   removeAccessToken();
 
-  // 条件编译微信小程序、抖音小程序、APP-PLUS（包含iOS和Android）
+  // 条件编译微信小程序、抖音小程序
+  let provider = "weixin";
+  let grant_type = "wechat";
+
+  // #ifdef MP-WEIXIN
+  provider = "weixin";
+  grant_type = "wechat";
+  // #endif
+
+  // #ifdef MP-TOUTIAO
+  provider = "toutiao";
+  grant_type = "toutiao";
+  // #endif
+
+  return new Promise(async (resolve, reject) => {
+    uni.login({
+      provider,
+      onlyAuthorize: true,
+      success: async (loginRes) => {
+        console.log("Authorize success: ", JSON.stringify(loginRes));
+        const openIdCode = loginRes.code;
+        console.log("authLogin获取到的授权code:", openIdCode);
+
+        if (!openIdCode) {
+          console.warn("authLogin未获取到授权 code");
+          reject("authLogin未获取到授权code");
+          return;
+        }
+
+        const params = {
+          openIdCode: [openIdCode],
+          grant_type: grant_type,
+          clientId: clientId,
+          scope: "server",
+        };
+        console.log("authLogin获取到的授权params:", JSON.stringify(params));
+
+        await loginRequest(params)
+          .then(() => {
+            resolve(false);
+          })
+          .catch((err) => {
+            reject(err);
+          });
+      },
+      fail: (err) => {
+        reject("authLogin登录失败");
+      },
+    });
+  });
+};
+
+const refreshAuthLogin = () => {
   let provider = "weixin";
   let grant_type = "wechat";
   
@@ -31,18 +83,17 @@ const loginAuth = (e) => {
   return new Promise(async (resolve, reject) => {
     uni.login({
       provider,
-      onlyAuthorize: true,
       success: async (loginRes) => {
         console.log("Authorize success: ", JSON.stringify(loginRes));
         const openIdCode =
           provider === "apple"
             ? loginRes.appleInfo && loginRes.appleInfo.identityToken
             : loginRes.code;
-        console.log("获取到的授权code:", openIdCode);
+        console.log("refreshAuthLogin获取到的授权code:", openIdCode);
 
         if (!openIdCode) {
-          console.warn("refreshToken 未获取到登录 code");
+          console.warn("refreshAuthLogin未获取到授权code");
-          reject("refreshToken 未获取到登录 code");
+          reject("refreshAuthLogin未获取到授权code");
           return;
         }
 
@@ -58,30 +109,60 @@ const loginAuth = (e) => {
           params.openIdCode = [openIdCode];
         }
 
-        console.log("获取到的授权params:", JSON.stringify(params));
+        console.log("refreshAuthLogin获取到的授权params:", JSON.stringify(params));
+        await loginRequest(params)
+          .then(() => {
+            resolve();
+          })
+          .catch((err) => {
+            reject(err);
+          });
+      },
+      fail: (err) => {
+        console.warn("refreshAuthLogin fail:", err);
+        reject("refreshAuthLogin登录失败");
+      },
+    });
+  });
+};
 
+/// 检查刷新 token 是否有效
+const checkRefreshToken = async () => {
+  const token = getRefreshToken();
+  if (token) {
+    await refreshTokenRequest(token);
+  }
+}
+
+/// 刷新 token 的函数
+const refreshTokenRequest = async (token) => {
+  const params = {
+    grant_type: 'refresh_token',
+    refresh_token: token,
+    clientId: clientId,
+    scope: "server",
+  };
+
+  const response = await oauthToken(params);
+  if (response.refresh_token && response.access_token) {
+    setRefreshToken(response.refresh_token);
+    setAccessToken(response.access_token);
+    return true;
+  } else {
+    return false;
+  }
+}
+
+/// 重新登录的函数
+const loginRequest = async (params) => {
   const response = await oauthToken(params);
   if (response.access_token) {
     setAccessToken(response.access_token);
-          resolve();
+    setRefreshToken(response.refresh_token);
+    return true;
   } else {
-          reject(response.message || "登录失败");
+    throw new Error(response.message || "登录失败");
   }
-      },
+}
-      fail: (err) => {
-        reject("登录失败");
-      },
-    });
-  });
-};
 
-const bindPhone = async (params) => {
+export { authLogin, refreshAuthLogin, checkRefreshToken };
-  try {
-    const response = await bindUserPhone(params);
-    return response;
-  } catch (error) {
-    throw error;
-  }
-};
-
-export { loginAuth, bindPhone };

src/pages/ChatMain/NoticeMessage/index.vue

@@ -31,6 +31,7 @@
 <script setup>
 import { onMounted, ref } from "vue";
 import { getTimeNoticeList } from "@/request/api/MainPageDataApi";
+import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
 
 const autoplay = ref(true);
 const interval = ref(7000);
@@ -52,6 +53,9 @@ const getTimeNoticeListData = async () => {
 
 onMounted(() => {
   getTimeNoticeListData();
+  uni.$on(NOTICE_EVENT_LOGIN_SUCCESS, () => {
+    getTimeNoticeListData();
+  });
 });
 
 const clickItem = (item) => {

src/pages/login/index.vue

@@ -53,7 +53,7 @@ import {
   getServiceAgreement,
   getPrivacyAgreement,
 } from "@/request/api/LoginApi";
-import { onLogin, goBack, refreshToken } from "@/hooks/useGoLogin";
+import { onLogin, goBack, onCheckPhoneLogin, onAppleLogin } from "@/hooks/useGoLogin";
 import CheckBox from "@/components/CheckBox/index.vue";
 import AgreePopup from "./components/AgreePopup/index.vue";
 import { zniconsMap } from "@/static/fonts/znicons";
@@ -93,7 +93,33 @@ const handleAgreeAndGetPhone = () => {
     return;
   }
 
-  refreshToken().then(() => loginSuccess());
+  if (isAppleLogin.value) {
+    onAppleLogin()
+      .then((res) => {
+        if (res) {
+          loginSuccess();
+        }
+      })
+      .catch(() => {
+        uni.showToast({
+          title: "Apple ID登录失败",
+          icon: "none",
+        });
+      });
+  } else {
+    onCheckPhoneLogin()
+      .then((res) => {
+        if (!res) {
+          loginSuccess();
+        }
+      })
+      .catch(() => {
+        uni.showToast({
+          title: "手机号登录失败",
+          icon: "none",
+        });
+      });
+  }
 };
 
 /// 获取授权后绑定手机号登录
@@ -154,10 +180,12 @@ const getPrivacyAgreementData = async () => {
 };
 getPrivacyAgreementData();
 
-// 页面显示时刷新token
 onShow(async () => {
-  const res = await refreshToken();
+  if (!isAppleLogin.value) {
+    // 页面显示时检查微信授权登录状态
+    const res = await onCheckPhoneLogin();
     needWxAuthLogin.value = res;
+  }
 });
 
 

src/request/api/LoginApi.js

@@ -8,7 +8,6 @@ const oauthToken = (args) => {
       "Content-Type": "application/x-www-form-urlencoded",
     },
   };
-  removeAccessToken();
   return request.post("/auth/oauth2/token", args, config);
 };
 

src/request/base/request.js

@@ -42,7 +42,7 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
   if (customConfig.noToken) {
     delete header.Authorization;
   } else {
-    if (token || customConfig.token) {
+    if (!header.Authorization && (token || customConfig.token)) {
       header.Authorization = `Bearer ${token || customConfig.token}`;
     }
   }