feat: 登录逻辑调整

src/App.vue

@@ -2,12 +2,12 @@
 import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
 import { getEvnUrl } from "@/request/api/config";
 import { refreshToken } from "@/hooks/useGoLogin";
-import { getStorageSyncToken } from "@/constant/token";
+import { getAccessToken } from "@/constant/token";
 
 onLaunch(async () => {
   await getEvnUrl({ versionValue: "1.0.3" });
 
-  const token = getStorageSyncToken();
+  const token = getAccessToken();
 
   if (token) {
     refreshToken();

src/constant/token.js

@@ -1,19 +1,35 @@
-import { appId, clientId } from "@/constant/base";
+import { currentClientType } from "@/constant/base";
 
-/// 存储在本地的认证 token 键名
+// 存储在本地的认证 token 键名
-export const clientAuthToken = "AUTH_TOKEN_" + clientId + "_" + appId;
+const CLIENT_TYPE = currentClientType();
+const ACCESS_TOKEN = `${CLIENT_TYPE}_ACCESS_TOKEN`;
+const REFRESH_ACCESS_TOKEN = `${CLIENT_TYPE}_REFRESH_ACCESS_TOKEN`;
 
-/// 设置本地存储的认证 token
+// 设置本地存储的认证 token
-export const setStorageSyncToken = (token) => {
+export const setAccessToken = (token) => {
-  uni.setStorageSync(clientAuthToken, token);
+  return uni.setStorageSync(ACCESS_TOKEN, token);
 };
 
-/// 获取本地存储的认证 token
+// 设置本地存储的刷新 token
-export const getStorageSyncToken = () => {
+export const setRefreshToken = (token) => {
-  return uni.getStorageSync(clientAuthToken);
+  return uni.setStorageSync(REFRESH_ACCESS_TOKEN, token);
 };
 
-/// 移除本地存储的认证 token
+// 获取本地存储的刷新 token
-export const removeStorageSyncToken = () => {
+export const getRefreshToken = () => {
-  uni.setStorageSync(clientAuthToken, "");
+  return uni.getStorageSync(REFRESH_ACCESS_TOKEN);
-};
+};
+
+// 获取本地存储的认证 token
+export const getAccessToken = () => {
+  return uni.getStorageSync(ACCESS_TOKEN);
+};
+
+// 移除本地存储的认证 token
+export const removeAccessToken = () => {
+  return uni.removeStorageSync(ACCESS_TOKEN);
+};
+
+export const removeRefreshToken = () => {
+  return uni.removeStorageSync(REFRESH_ACCESS_TOKEN);
+};

src/hooks/useGoLogin.js

@@ -1,8 +1,8 @@
-import { wxLogin, checkUserPhone } from "../request/api/LoginApi";
+import { wxLogin, checkUserPhone } from "@/request/api/LoginApi";
 import { loginAuth, bindPhone } from "@/manager/LoginManager";
 import { clientId } from "@/constant/base";
 import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
-import { getStorageSyncToken, setStorageSyncToken } from "../constant/token";
+import { getAccessToken, setAccessToken } from "../constant/token";
 
 // 跳转登录
 export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" });
@@ -49,7 +49,7 @@ export const onLogin = async (e) => {
 
 // 检测token
 export const checkToken = () => {
-  const token = getStorageSyncToken();
+  const token = getAccessToken();
 
   return new Promise((resolve) => {
     if (!token) {
@@ -79,9 +79,19 @@ export const refreshToken = () => {
         const response = await wxLogin(params);
 
         if (response.access_token) {
-          setStorageSyncToken(response.access_token);
+          const checkRes = await checkUserPhone({
-          // 登录成功后，触发登录成功事件
+            token: response.access_token,
-          uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
+          });
+
+          if (checkRes.data) {
+            setAccessToken(response.access_token);
+
+            // 登录成功后，触发登录成功事件
+            uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
+            resolve(false);
+          } else {
+            resolve(true);
+          }
         }
       },
     });

src/manager/LoginManager.js

@@ -1,15 +1,11 @@
-import {
+import { wxLogin, bindUserPhone } from "../request/api/LoginApi";
-  wxLogin,
-  bindUserPhone,
-  checkUserPhone,
-} from "../request/api/LoginApi";
 import { getWeChatAuthCode } from "./AuthManager";
 import { clientId } from "@/constant/base";
 import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
-import { removeStorageSyncToken, setStorageSyncToken } from "../constant/token";
+import { removeAccessToken, setAccessToken } from "../constant/token";
 
 const loginAuth = (e) => {
-  removeStorageSyncToken();
+  removeAccessToken();
 
   return new Promise(async (resolve, reject) => {
     const openIdCode = await getWeChatAuthCode(e);
@@ -26,7 +22,8 @@ const loginAuth = (e) => {
 
     if (response.access_token) {
       console.log("进入条件");
-      setStorageSyncToken(response.access_token);
+      setAccessToken(response.access_token);
+
       // 登录成功后，触发登录成功事件
       uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
       resolve();

src/pages/index/components/chat/ChatMainList/index.vue

@@ -108,7 +108,7 @@ import WebSocketManager from "@/utils/WebSocketManager";
 import { ThrottleUtils, IdUtils } from "@/utils";
 import { checkToken } from "@/hooks/useGoLogin";
 import { useAppStore } from "@/store";
-import { getStorageSyncToken } from "@/constant/token";
+import { getAccessToken } from "@/constant/token";
 
 const appStore = useAppStore();
 /// 导航栏相关
@@ -296,7 +296,7 @@ onLoad(() => {
 // token存在，初始化数据
 const initHandler = () => {
   console.log("initHandler");
-  const token = getStorageSyncToken();
+  const token = getAccessToken();
 
   if (!token) return;
   loadRecentConversation();
@@ -364,7 +364,7 @@ const initWebSocket = async () => {
   }
 
   // 使用配置的WebSocket服务器地址
-  const token = getStorageSyncToken();
+  const token = getAccessToken();
   const wsUrl = `${appStore.serverConfig.wssUrl}?access_token=${token}`;
 
   // 初始化WebSocket管理器

src/pages/login/index.vue

@@ -52,7 +52,7 @@ import CheckBox from "@/components/CheckBox/index.vue";
 import AgreePopup from "./components/AgreePopup/index.vue";
 import { zniconsMap } from "@/static/fonts/znicons";
 import { getCurrentConfig } from "@/constant/base";
-import { getStorageSyncToken } from "@/constant/token";
+import { getAccessToken } from "@/constant/token";
 
 const needWxLogin = ref(false);
 const isAgree = ref(false);
@@ -126,15 +126,9 @@ getPrivacyAgreementData();
 
 // 页面显示时刷新token
 onShow(async () => {
-  const token = getStorageSyncToken();
+  const res = await refreshToken();
 
-  if (token) {
+  needWxLogin.value = res;
-    const res = await checkUserPhone();
-
-    needWxLogin.value = res.data;
-  } else {
-    needWxLogin.value = true;
-  }
 });
 </script>
 

src/request/api/AgentChatStream.js

@@ -1,7 +1,7 @@
 import { goLogin } from "@/hooks/useGoLogin";
 import { useAppStore } from "@/store";
-import { getStorageSyncToken } from "@/constant/token";
+import { getAccessToken } from "@/constant/token";
-import { removeStorageSyncToken } from "@/constant/token";
+import { removeAccessToken } from "@/constant/token";
 
 /// 请求流式数据的API
 const API = "/agent/assistant/chat";
@@ -74,7 +74,7 @@ const stopAbortTask = () => {
 
 const agentChatStream = (params, onChunk) => {
   return new Promise((resolve, reject) => {
-    const token = getStorageSyncToken();
+    const token = getAccessToken();
     const requestId = Date.now().toString(); // 生成唯一请求ID
 
     // 重置状态
@@ -132,7 +132,7 @@ const agentChatStream = (params, onChunk) => {
               res.statusCode
             );
             if (res.statusCode === 424) {
-              removeStorageSyncToken();
+              removeAccessToken();
               goLogin();
             }
             if (onChunk) {
@@ -146,7 +146,8 @@ const agentChatStream = (params, onChunk) => {
           }
         } else {
           console.log(
-            `❌ 请求 [${requestId}] ${isAborted ? "已终止" : "已过期"
+            `❌ 请求 [${requestId}] ${
+              isAborted ? "已终止" : "已过期"
             }，忽略complete回调`
           );
         }
@@ -241,7 +242,7 @@ const weAtob = (string) => {
     r2,
     i = 0;
 
-  for (; i < string.length;) {
+  for (; i < string.length; ) {
     bitmap =
       (b64.indexOf(string.charAt(i++)) << 18) |
       (b64.indexOf(string.charAt(i++)) << 12) |

src/request/api/LoginApi.js

@@ -1,49 +1,49 @@
-import { removeStorageSyncToken } from "@/constant/token";
+import { removeAccessToken } from "@/constant/token";
 import request from "../base/request";
 
 const wxLogin = (args) => {
-    const config = {
+  const config = {
-        header: {
+    header: {
-            Authorization: "Basic Y3VzdG9tOmN1c3RvbQ==", // 可在此动态设置 token
+      Authorization: "Basic Y3VzdG9tOmN1c3RvbQ==", // 可在此动态设置 token
-            "Content-Type": "application/x-www-form-urlencoded",
+      "Content-Type": "application/x-www-form-urlencoded",
-        },
+    },
-    };
+  };
 
-    removeStorageSyncToken();
+  removeAccessToken();
 
-    return request.post("/auth/oauth2/token", args, config);
+  return request.post("/auth/oauth2/token", args, config);
 };
 
 // 绑定用户手机号
 const bindUserPhone = (args) => {
-    return request.post("/hotelBiz/user/bindUserPhone", args);
+  return request.post("/hotelBiz/user/bindUserPhone", args);
 };
 
 // 检测用户是否绑定手机号
-const checkUserPhone = (args) => {
+const checkUserPhone = (config) => {
-    return request.get("/hotelBiz/user/checkUserHasBindPhone", args);
+  return request.get("/hotelBiz/user/checkUserHasBindPhone", {}, config);
 };
 
 // 获取登录用户手机号
 const getLoginUserPhone = (args) => {
-    return request.get("/hotelBiz/user/getLoginUserPhone", args);
+  return request.get("/hotelBiz/user/getLoginUserPhone", args);
 };
 
 // 获取服务协议
 const getServiceAgreement = (args) => {
-    return request.get("/hotelBiz/mainScene/serviceAgreement", args);
+  return request.get("/hotelBiz/mainScene/serviceAgreement", args);
 };
 
 // 获取隐私协议
 const getPrivacyAgreement = (args) => {
-    return request.get("/hotelBiz/mainScene/privacyPolicy", args);
+  return request.get("/hotelBiz/mainScene/privacyPolicy", args);
 };
 
 export {
-    wxLogin,
+  wxLogin,
-    bindUserPhone,
+  bindUserPhone,
-    checkUserPhone,
+  checkUserPhone,
-    getLoginUserPhone,
+  getLoginUserPhone,
-    getServiceAgreement,
+  getServiceAgreement,
-    getPrivacyAgreement,
+  getPrivacyAgreement,
 };

src/request/api/UpdateFile.js

@@ -1,11 +1,11 @@
 import { getCurrentConfig } from "@/constant/base";
 import { useAppStore } from "@/store";
-import { getStorageSyncToken } from "@/constant/token";
+import { getAccessToken } from "@/constant/token";
 
 export const updateImageFile = (file) => {
   const { serverConfig } = useAppStore();
   const url = serverConfig.baseUrl + "/hotelBiz/hotBizCommon/upload";
-  const token = getStorageSyncToken();
+  const token = getAccessToken();
   const clientId = getCurrentConfig().clientId;
 
   return new Promise((resolve, reject) => {

src/request/base/request.js

@@ -2,7 +2,7 @@ import { goLogin } from "../../hooks/useGoLogin";
 import { getCurrentConfig } from "@/constant/base";
 import { useAppStore } from "@/store";
 import { NOTICE_EVENT_LOGOUT } from "@/constant/constant";
-import { getStorageSyncToken } from "@/constant/token";
+import { getAccessToken } from "@/constant/token";
 
 const clientId = getCurrentConfig().clientId;
 const defaultConfig = {
@@ -20,7 +20,7 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
     url = appStore.serverConfig?.baseUrl + url;
   }
   // 动态获取 token
-  const token = getStorageSyncToken();
+  const token = getAccessToken();
 
   let header = {
     ...defaultConfig.header,
@@ -31,8 +31,8 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
   if (customConfig.noToken) {
     delete header.Authorization;
   } else {
-    if (token) {
+    if (token || customConfig.token) {
-      header.Authorization = `Bearer ${token}`;
+      header.Authorization = `Bearer ${token || customConfig.token}`;
     }
   }
 
@@ -59,7 +59,7 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
         resolve(res.data);
         if (res.statusCode && res.statusCode === 424) {
           console.log("424错误，重新登录");
-          // removeStorageSyncToken();
+          // removeAccessToken();
           uni.$emit(NOTICE_EVENT_LOGOUT);
           // goLogin();
         }