liushengqiang před 1 rokem
rodič
revize
ffd5108cd3
3 změnil soubory, kde provedl 22 přidání a 8 odebrání
  1. 13 2
      src/helpers/communication.ts
  2. 8 5
      src/page-instrument/App.tsx
  3. 1 1
      vite.config.ts

+ 13 - 2
src/helpers/communication.ts

@@ -1,6 +1,17 @@
 import { storeData } from "../store";
-import { CallBack, IPostMessage, listenerMessage, postMessage, promisefiyPostMessage, removeListenerMessage } from "../utils/native-message";
-
+import {
+	CallBack,
+	IPostMessage,
+	listenerMessage,
+	postMessage,
+	promisefiyPostMessage,
+	removeListenerMessage,
+} from "../utils/native-message";
+/** 获取token */
+export const api_getToken = (): Promise<IPostMessage | undefined> => {
+	if (!storeData.isApp) return Promise.resolve({} as any);
+	return promisefiyPostMessage({ api: "getToken" });
+};
 /**获取耳机的插入状态 */
 export const getEarphone = (): Promise<IPostMessage | undefined> => {
 	if (!storeData.isApp) return Promise.resolve({} as any);

+ 8 - 5
src/page-instrument/App.tsx

@@ -7,6 +7,7 @@ import { getRandomKey, getToken, setBehaviorId, setToken } from "../utils";
 import { getQuery } from "../utils/queryString";
 import Notfind from "../view/notfind";
 import { studentQueryUserInfo } from "./api";
+import { api_getToken } from "../helpers/communication";
 
 export default defineComponent({
 	name: "App",
@@ -27,15 +28,17 @@ export default defineComponent({
 			setUserInfo(student);
 			// console.log("🚀 ~ res:", student);
 		};
-		onBeforeMount(() => {
+		onBeforeMount(async () => {
 			if (query.Authorization) {
 				setToken(query.Authorization);
 			}
 			if (!getToken()) {
-				const token = /(dev\.kt\.colexiu\.com|localhost)/gi.test(location.origin)
-					? "bearer 529d1359-20c6-4ea2-b2ba-2694cdeda8a4"
-					: "bearer 3527f6b3-9953-41de-80f0-334dec910eac";
-				setToken(token);
+				const res = await api_getToken();
+				if (res) {
+					const content = res.content;
+					const token = content.tokenType + " " + content.accessToken;
+					setToken(token);
+				}
 			}
 			setUser();
 			setBehaviorId(getRandomKey());

+ 1 - 1
vite.config.ts

@@ -12,7 +12,7 @@ export default defineConfig({
 	base: "./",
 	resolve: {},
 	plugins: [
-		mkcert(), // 本地https
+		// mkcert(), // 本地https
 		legacy({
 			targets: 'last 2 versions and not dead, > 0.3%, Firefox ESR'
 		}),