resolve conflict

.env.example

@@ -1 +1,2 @@
+REACT_APP_BASE_NAME=/
 REACT_APP_URL=

src/App.tsx

@@ -1,6 +1,5 @@
-import React from "react";
 import styles from "./App.module.less";
-import { useLocation, useRoutes, useNavigate } from "react-router-dom";
+import { useRoutes } from "react-router-dom";
 import routes from "./router/routes";
 import { getToken } from "./utils/index";
 import { login } from "./api/index";
@@ -22,15 +21,7 @@ function App() {
       dispatch(SetPermisssionsActionCreator(data.permissions));
     });
   };
-  // const CheckLogin = () => {
+  if (getToken()) {
-  //   const navigate = useNavigate();
-  //   const location = useLocation();
-  //   if (location.pathname !== "/login") {
-  //     navigate("/login");
-  //   }
-  // };
-  const token = getToken();
-  if (token) {
     getUser();
   }
 

src/api/internal/httpClient.ts

@@ -1,11 +1,11 @@
 import axios, { Axios, AxiosResponse } from "axios";
 import { message } from "antd";
 import { getToken, clearToken } from "../../utils/index";
-import { useNavigate } from "react-router-dom";
+import { redirect } from "react-router-dom";
 
 const GoLogin = () => {
-  const navigate = useNavigate();
+  clearToken();
-  navigate("/login");
+  redirect("/login");
 };
 
 export class HttpClient {
@@ -35,7 +35,6 @@ export class HttpClient {
 
     this.axios.interceptors.response.use(
       (response: AxiosResponse) => {
-        let status = response.data.status; //HTTP状态码
         let code = response.data.code; //业务返回代码
         let msg = response.data.msg; //错误消息
 
@@ -43,15 +42,14 @@ export class HttpClient {
           return Promise.resolve(response);
         } else {
           message.error(msg);
-          return Promise.reject(response);
         }
+        return Promise.reject(response);
       },
       // 当http的状态码非0
       (error) => {
         let status = error.response.status;
         if (status === 401) {
-          clearToken();
+          message.error("请重新登录");
-          // 跳转到登录界面
           GoLogin();
         } else if (status === 404) {
           // 跳转到404页面

src/index.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import ReactDOM from "react-dom/client";
 import "./index.less";
 import App from "./App";
@@ -7,12 +6,14 @@ import { BrowserRouter } from "react-router-dom";
 import { Provider } from "react-redux";
 import store from "./store/store";
 
+const basename = process.env.REACT_BASE_NAME || "";
+
 const root = ReactDOM.createRoot(
   document.getElementById("root") as HTMLElement
 );
 root.render(
   <Provider store={store}>
-    <BrowserRouter>
+    <BrowserRouter basename={basename}>
       <App />
     </BrowserRouter>
   </Provider>

src/router/routes.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import { RouteObject } from "react-router-dom";
 import { Login, HomePage, Dashboard, ErrorPage, VodListPage } from "../pages";