From d26c4da45f489b373a30465bb816c0ad06bd64a3 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Wed, 1 Nov 2023 10:31:14 +0800
Subject: [PATCH] Optimize code

---
 src/components/common/sidebar/SidebarScroll.tsx |  2 +-
 src/components/home/Footer.tsx                  |  2 +-
 src/pages/HomeFramework.tsx                     |  2 +-
 src/pages/Login.tsx                             | 10 +++++-----
 src/pages/ToolsFramework.tsx                    |  9 ++-------
 src/router/index.tsx                            | 12 +++++++++++-
 src/router/user.tsx                             |  2 ++
 src/utils/auth.ts                               |  2 +-
 8 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/components/common/sidebar/SidebarScroll.tsx b/src/components/common/sidebar/SidebarScroll.tsx
index 8690664..cdd1fa5 100644
--- a/src/components/common/sidebar/SidebarScroll.tsx
+++ b/src/components/common/sidebar/SidebarScroll.tsx
@@ -1,4 +1,4 @@
-import React, { useImperativeHandle } from 'react'
+import React from 'react'
 import HideScrollbar, { HideScrollbarElement } from '@/components/common/HideScrollbar'
 
 export interface SidebarScrollElement {
diff --git a/src/components/home/Footer.tsx b/src/components/home/Footer.tsx
index 2200e30..1ec0e35 100644
--- a/src/components/home/Footer.tsx
+++ b/src/components/home/Footer.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
-import FitCenter from '@/components/common/FitCenter'
 import Icon from '@ant-design/icons'
 import '@/assets/css/components/home/footer.scss'
+import FitCenter from '@/components/common/FitCenter'
 import FitFullScreen from '@/components/common/FitFullScreen'
 import { NavLink } from 'react-router-dom'
 
diff --git a/src/pages/HomeFramework.tsx b/src/pages/HomeFramework.tsx
index b16e2ec..bc6b1b5 100644
--- a/src/pages/HomeFramework.tsx
+++ b/src/pages/HomeFramework.tsx
@@ -1,10 +1,10 @@
 import React from 'react'
 import Icon from '@ant-design/icons'
 import router from '@/router'
-import { COLOR_FONT_SECONDARY } from '@/constants/common.constants'
 import '@/assets/css/pages/home-framework.scss'
 import LoadingMask from '@/components/common/LoadingMask'
 import HideScrollbar, { HideScrollbarElement } from '@/components/common/HideScrollbar'
+import { COLOR_FONT_SECONDARY } from '@/constants/common.constants'
 
 export const HomeFrameworkContext = createContext<{
     navbarHiddenState: {
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 47322d3..e8f0dbe 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -1,15 +1,15 @@
 import React from 'react'
+import { notification } from 'antd'
+import moment from 'moment'
+import '@/assets/css/pages/login.scss'
+import { setToken } from '@/utils/common'
+import { getUserInfo, login } from '@/utils/auth'
 import {
     SYSTEM_LOGIN_SUCCESS,
     SYSTEM_LOGIN_USERNAME_PASSWORD_ERROR,
     SYSTEM_USER_DISABLE,
     SYSTEM_USERNAME_NOT_FOUND
 } from '@/constants/common.constants'
-import '@/assets/css/pages/login.scss'
-import { setToken } from '@/utils/common'
-import { getUserInfo, login } from '@/utils/auth'
-import { notification } from 'antd'
-import moment from 'moment'
 
 const Login: React.FC = () => {
     const [messageApi, contextHolder] = message.useMessage()
diff --git a/src/pages/ToolsFramework.tsx b/src/pages/ToolsFramework.tsx
index d246630..53e916f 100644
--- a/src/pages/ToolsFramework.tsx
+++ b/src/pages/ToolsFramework.tsx
@@ -23,18 +23,13 @@ const ToolsFramework: React.FC = () => {
                 <div className={'left-panel'}>
                     <Sidebar title={'氮工具'} onSidebarSwitch={handleOnSidebarSwitch}>
                         <SidebarItemList>
-                            <SidebarItem
-                                end
-                                path={''}
-                                icon={tools[0].icon}
-                                text={tools[0].name}
-                            ></SidebarItem>
+                            <SidebarItem end path={''} icon={tools[0].icon} text={tools[0].name} />
                             <SidebarItem
                                 end
                                 path={'all'}
                                 icon={tools[1].icon}
                                 text={tools[1].name}
-                            ></SidebarItem>
+                            />
                         </SidebarItemList>
                         <SidebarSeparate style={{ marginBottom: 0 }} />
                         <SidebarScroll ref={sidebarScrollRef}>
diff --git a/src/router/index.tsx b/src/router/index.tsx
index eac7490..435affd 100644
--- a/src/router/index.tsx
+++ b/src/router/index.tsx
@@ -1,7 +1,8 @@
 import React from 'react'
 import tools from '@/router/tools'
 import home from '@/router/home'
-import user from '@/router/user.tsx'
+import user from '@/router/user'
+import system from '@/router/system'
 
 const mapJsonToRoute = (jsonObject: RouteJsonObject[]): RouteObject[] => {
     return jsonObject.map((value) => ({
@@ -69,6 +70,15 @@ const root: RouteJsonObject[] = [
                 name: '个人中心',
                 auth: true
             },
+            {
+                path: 'system',
+                absolutePath: '/system',
+                id: 'systemFramework',
+                component: React.lazy(() => import('@/pages/SystemFramework')),
+                children: setTitle(system, '系统设置'),
+                name: '系统设置',
+                auth: true
+            },
             {
                 path: '',
                 absolutePath: '/',
diff --git a/src/router/user.tsx b/src/router/user.tsx
index ee8c550..c561281 100644
--- a/src/router/user.tsx
+++ b/src/router/user.tsx
@@ -3,6 +3,7 @@ import React from 'react'
 const user: RouteJsonObject[] = [
     {
         path: '',
+        absolutePath: '/user',
         id: 'user',
         name: '个人档案',
         icon: React.lazy(() => import('~icons/fatweb/user.jsx')),
@@ -10,6 +11,7 @@ const user: RouteJsonObject[] = [
     },
     {
         path: '*',
+        absolutePath: '*',
         element: <Navigate to="/user" replace />
     }
 ]
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 78cc186..c5ef482 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,10 +1,10 @@
 import { getCaptcha, getLocalStorage, removeToken, setLocalStorage } from './common'
+import request from '@/services'
 import {
     STORAGE_TOKEN_KEY,
     STORAGE_USER_INFO_KEY,
     DATABASE_SELECT_SUCCESS
 } from '@/constants/common.constants'
-import request from '@/services'
 import { URL_API_LOGIN, URL_API_LOGOUT, URL_API_USER_INFO } from '@/constants/urls.constants'
 
 let captcha: Captcha