fix conflicts

new-ui/packages/request/index.ts

@@ -0,0 +1,28 @@
+import axios from "axios";
+import tokenHandler from "./token";
+
+const { _tokenData, refreshToken, setCurRequest } = tokenHandler();
+
+const createInstance = (baseURL: string = (import.meta as any).env.VITE_PROXY_BASE_URL) => {
+
+  const instance = axios.create({
+    baseURL,
+    timeout: 10000,
+    withCredentials: true,
+  });
+
+  instance.interceptors.request.use((config) => {
+    if (config.url !== _tokenData.get("lastRequest")) {
+      refreshToken();
+    }
+    if (config.method === "post") {
+      setCurRequest(config.url);
+      config.headers["request-id"] = _tokenData.get("__token");
+    }
+    return config;
+  });
+
+  return instance;
+}
+
+export default createInstance;

new-ui/packages/request/token.ts

@@ -0,0 +1,13 @@
+import { getUUID } from "../utils";
+
+const _tokenData = new Map();
+export default function tokenHandler() {
+  const refreshToken = () => {
+    _tokenData.set("__token", getUUID());
+    _tokenData.set("lastRequest", null);
+  };
+  const setCurRequest = (curRequest?: string) => {
+    _tokenData.set("lastRequest", curRequest);
+  };
+  return { _tokenData, refreshToken, setCurRequest };
+}